From 22fb22e7439d98474048041abbd506f7975c3c4e Mon Sep 17 00:00:00 2001
From: Michael Kuryshev <me@mk9.name>
Date: Sun, 19 Jul 2015 17:13:01 +0300
Subject: [PATCH 001/436] mpd: disable libjack2 and libpulseaudio on darwin

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

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index c7380b023067..71d8c80d4ecb 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -60,8 +60,8 @@ in stdenv.mkDerivation rec {
     ++ opt mpg123Support mpg123
     ++ opt aacSupport faad2
     ++ opt zipSupport zziplib
-    ++ opt pulseaudioSupport libpulseaudio
-    ++ opt jackSupport libjack2
+    ++ opt (!stdenv.isDarwin && pulseaudioSupport) libpulseaudio
+    ++ opt (!stdenv.isDarwin && jackSupport) libjack2
     ++ opt gmeSupport game-music-emu
     ++ opt icuSupport icu
     ++ opt clientSupport mpd_clientlib
@@ -87,8 +87,8 @@ in stdenv.mkDerivation rec {
       (mkFlag mmsSupport "mms")
       (mkFlag mpg123Support "mpg123")
       (mkFlag aacSupport "aac")
-      (mkFlag pulseaudioSupport "pulse")
-      (mkFlag jackSupport "jack")
+      (mkFlag (!stdenv.isDarwin && pulseaudioSupport) "pulse")
+      (mkFlag (!stdenv.isDarwin && jackSupport) "jack")
       (mkFlag stdenv.isDarwin "osx")
       (mkFlag icuSupport "icu")
       (mkFlag gmeSupport "gme")

From 3be214d32466f7eb96f94cc3e287abce266e523f Mon Sep 17 00:00:00 2001
From: Michael Kuryshev <me@mk9.name>
Date: Sun, 19 Jul 2015 17:26:06 +0300
Subject: [PATCH 002/436] mpd: reenable c++ exceptions in configure

resolves #8880
---
 .../mpd/darwin-enable-cxx-exceptions.patch    | 142 ++++++++++++++++++
 pkgs/servers/mpd/default.nix                  |   2 +
 2 files changed, 144 insertions(+)
 create mode 100644 pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch

diff --git a/pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch b/pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch
new file mode 100644
index 000000000000..db330a913cbd
--- /dev/null
+++ b/pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch
@@ -0,0 +1,142 @@
+diff -Naur mpd-0.19.9.orig/configure mpd-0.19.9/configure
+--- mpd-0.19.9.orig/configure	2015-01-26 19:47:27.000000000 +0000
++++ mpd-0.19.9/configure	2015-01-26 19:47:27.000000000 +0000
+@@ -17113,138 +17113,6 @@
+ done
+ 
+ 
+-if test x$no_exceptions = xyes; then
+-
+-
+-
+-
+-for flag in -fno-exceptions; do
+-  as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__$flag" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
+-$as_echo_n "checking whether C++ compiler accepts $flag... " >&6; }
+-if eval \${$as_CACHEVAR+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-  ax_check_save_flags=$CXXFLAGS
+-  CXXFLAGS="$CXXFLAGS  $flag"
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_cxx_try_compile "$LINENO"; then :
+-  eval "$as_CACHEVAR=yes"
+-else
+-  eval "$as_CACHEVAR=no"
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  CXXFLAGS=$ax_check_save_flags
+-fi
+-eval ac_res=\$$as_CACHEVAR
+-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
+-  if ${CXXFLAGS+:} false; then :
+-  case " $CXXFLAGS " in
+-    *" $flag "*)
+-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5
+-  (: CXXFLAGS already contains $flag) 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }
+-      ;;
+-    *)
+-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$flag\""; } >&5
+-  (: CXXFLAGS="$CXXFLAGS $flag") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }
+-      CXXFLAGS="$CXXFLAGS $flag"
+-      ;;
+-   esac
+-else
+-  CXXFLAGS="$flag"
+-fi
+-
+-else
+-  :
+-fi
+-
+-done
+-
+-
+-
+-
+-
+-for flag in -fno-rtti; do
+-  as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__$flag" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
+-$as_echo_n "checking whether C++ compiler accepts $flag... " >&6; }
+-if eval \${$as_CACHEVAR+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-  ax_check_save_flags=$CXXFLAGS
+-  CXXFLAGS="$CXXFLAGS  $flag"
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_cxx_try_compile "$LINENO"; then :
+-  eval "$as_CACHEVAR=yes"
+-else
+-  eval "$as_CACHEVAR=no"
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  CXXFLAGS=$ax_check_save_flags
+-fi
+-eval ac_res=\$$as_CACHEVAR
+-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
+-  if ${CXXFLAGS+:} false; then :
+-  case " $CXXFLAGS " in
+-    *" $flag "*)
+-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5
+-  (: CXXFLAGS already contains $flag) 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }
+-      ;;
+-    *)
+-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$flag\""; } >&5
+-  (: CXXFLAGS="$CXXFLAGS $flag") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }
+-      CXXFLAGS="$CXXFLAGS $flag"
+-      ;;
+-   esac
+-else
+-  CXXFLAGS="$flag"
+-fi
+-
+-else
+-  :
+-fi
+-
+-done
+-
+-fi
+ 
+ 
+ 
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 71d8c80d4ecb..7f088331b1df 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -38,6 +38,8 @@ in stdenv.mkDerivation rec {
     sha256 = "0vzj365s4j0pw5w37lfhx3dmpkdp85driravsvx8rlrw0lii91a7";
   };
 
+  patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch;
+
   buildInputs = [ pkgconfig glib boost ]
     ++ opt stdenv.isLinux systemd
     ++ opt (stdenv.isLinux && alsaSupport) alsaLib

From 140e48f3c1986f8bb5820e9a9bef394b3908ac62 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Wed, 16 Mar 2016 16:09:22 -0700
Subject: [PATCH 003/436] ffmpeg: 2.8.5 -> 3.0

---
 pkgs/development/libraries/ffmpeg/3.0.nix | 7 +++++++
 pkgs/top-level/all-packages.nix           | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/ffmpeg/3.0.nix

diff --git a/pkgs/development/libraries/ffmpeg/3.0.nix b/pkgs/development/libraries/ffmpeg/3.0.nix
new file mode 100644
index 000000000000..e7d28bfc4388
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/3.0.nix
@@ -0,0 +1,7 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}";
+  branch = "3.0";
+  sha256 = "1h0k05cj6j0nd2i16z7hc5scpwsbg3sfx68lvm0nlwvz5xxgg7zi";
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9eaaab0b0e87..d7d70795530d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6716,11 +6716,15 @@ let
   ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
+  ffmpeg_3_0 = callPackage ../development/libraries/ffmpeg/3.0.nix {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };
   # Aliases
   ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;
   ffmpeg_2 = ffmpeg_2_8;
-  ffmpeg = ffmpeg_2;
+  ffmpeg_3 = ffmpeg_3_0;
+  ffmpeg = ffmpeg_3;
 
   ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
     # The following need to be fixed on Darwin

From a6734bdd2734b96b1cade2c973929856b7283c0e Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sun, 17 Jan 2016 17:55:13 +0800
Subject: [PATCH 004/436] lasso: init at 2.5.1

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

diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix
new file mode 100644
index 000000000000..a16a1f431a61
--- /dev/null
+++ b/pkgs/development/libraries/lasso/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobjectIntrospection, gtk_doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }:
+
+stdenv.mkDerivation rec {
+
+  name = "lasso-${version}";
+  version = "2.5.1";
+
+  src = fetchurl {
+    url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz";
+    sha256 = "0n10zjjw84303c9vfy9bqhyzdl01459akbwy86cbgphd826mq45y";
+
+  };
+
+  buildInputs = [ autoconf automake autoreconfHook glib gobjectIntrospection gtk_doc libtool libxml2 libxslt openssl pkgconfig python27Packages.six xmlsec zlib ];
+
+  configurePhase = ''
+    ./configure --with-pkg-config=$PKG_CONFIG_PATH \
+                --disable-python \
+                --disable-perl \
+                --prefix=$out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://lasso.entrouvert.org/;
+    description = "Liberty Alliance Single Sign-On library";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ womfoo ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6c488660f56..cf3047dfa259 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7430,6 +7430,8 @@ in
   };
   libkrb5 = self.krb5Full.override { type = "lib"; };
 
+  lasso = callPackage ../development/libraries/lasso { };  
+
   LASzip = callPackage ../development/libraries/LASzip { };
 
   lcms = self.lcms1;

From 25fbac5b52f80b43c778e16e906f2d5223412707 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sun, 7 Feb 2016 05:27:48 +0800
Subject: [PATCH 005/436] mod_auth_mellon: init at 0.12.0

---
 .../web-servers/apache-httpd/default.nix      |  8 ++++
 .../mod_auth_mellon/default.nix               | 38 +++++++++++++++++++
 .../mod_auth_mellon/fixdeps.patch             | 30 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 78 insertions(+)
 create mode 100644 pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
 create mode 100644 pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index c23897192b4c..9844e3c435d1 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -337,6 +337,7 @@ let
         allModules =
           concatMap (svc: svc.extraModulesPre) allSubservices
           ++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules
+          ++ optional mainCfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; }
           ++ optional enablePHP { name = "php5"; path = "${php}/modules/libphp5.so"; }
           ++ concatMap (svc: svc.extraModules) allSubservices
           ++ extraForeignModules;
@@ -541,6 +542,12 @@ in
         '';
       };
 
+      enableMellon = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the mod_auth_mellon module.";
+      };
+
       enablePHP = mkOption {
         type = types.bool;
         default = false;
@@ -650,6 +657,7 @@ in
 
         environment =
           optionalAttrs enablePHP { PHPRC = phpIni; }
+          // optionalAttrs mainCfg.enableMellon { LD_LIBRARY_PATH  = "${pkgs.xmlsec}/lib"; }
           // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
 
         preStart =
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
new file mode 100644
index 000000000000..5bad8b7dc53d
--- /dev/null
+++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, apacheHttpd, autoconf, automake, autoreconfHook, curl, fetchFromGitHub, glib, lasso, libtool, libxml2, libxslt, openssl, pkgconfig, xmlsec }:
+
+stdenv.mkDerivation rec {
+
+  name = "mod_auth_mellon-${version}";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "UNINETT";
+    repo = "mod_auth_mellon";
+    rev = "v${version}";
+    sha256 = "1p6v6vgrfvgvc5y2ygqyyxi0klpm3nxaw3fg35zmpmw663w8skqn";
+  };
+
+  patches = [
+    ./fixdeps.patch
+  ];
+
+  buildInputs = [ apacheHttpd autoconf autoreconfHook automake curl glib lasso libtool libxml2 libxslt openssl pkgconfig xmlsec ];
+
+  configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs" "--exec-prefix=$out"];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ./mellon_create_metadata.sh $out/bin
+    mkdir -p $out/modules
+    cp ./.libs/mod_auth_mellon.so $out/modules
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/UNINETT/mod_auth_mellon;
+    description = "An Apache module with a simple SAML 2.0 service provider";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ womfoo ];
+  };
+
+}
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch b/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch
new file mode 100644
index 000000000000..63b69fb142f6
--- /dev/null
+++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/fixdeps.patch
@@ -0,0 +1,30 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,6 +74,16 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.12])
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ 
++#include <libxml/uri.h>
++PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
++AC_SUBST(LIBXML2_CFLAGS)
++AC_SUBST(LIBXML2_LIBS)
++
++#include <xmlsec/xmlenc.h>
++PKG_CHECK_MODULES(XMLSEC, xmlsec1-openssl)
++AC_SUBST(XMLSEC_CFLAGS)
++AC_SUBST(XMLSEC_LIBS)
++
+ # Test to see if we can include lasso/utils.h
+ # AC_CHECK_HEADER won't work correctly unless we specifiy the include directories
+ # found in the LASSO_CFLAGS. Save and restore CFLAGS and CPPFLAGS.
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -25,7 +25,7 @@
+ all:	mod_auth_mellon.la
+ 
+ mod_auth_mellon.la: $(SRC) auth_mellon.h auth_mellon_compat.h
+-	@APXS2@ -Wc,"-std=c99 @OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@ @GLIB_CFLAGS@ @CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@ @GLIB_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC)
++	@APXS2@ -Wc,"-std=c99 @OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@ @GLIB_CFLAGS@ @CFLAGS@ @LIBXML2_CFLAGS@ @XMLSEC_CFLAGS@ @CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@ @GLIB_LIBS@ @LIBXML2_LIBS@ @XMLSEC_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC)
+ 
+ 
+ # Building configure (for distribution)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf3047dfa259..db67e5bd2711 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9731,6 +9731,8 @@ in
   apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {
     inherit apacheHttpd;
 
+    mod_auth_mellon = callPackage ../servers/http/apache-modules/mod_auth_mellon { };
+
     mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { };
 
     mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { };

From aea7158e794dcf30e83f29c8c2f59a2db59a60ca Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 8 Mar 2016 00:50:06 +0100
Subject: [PATCH 006/436] opencl icd: init at 2.2.9

---
 pkgs/development/libraries/opencl-icd/default.nix | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix                   |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/opencl-icd/default.nix

diff --git a/pkgs/development/libraries/opencl-icd/default.nix b/pkgs/development/libraries/opencl-icd/default.nix
new file mode 100644
index 000000000000..9f556739ae62
--- /dev/null
+++ b/pkgs/development/libraries/opencl-icd/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, ruby, opencl-headers }: let
+
+  version = "2.2.9";
+
+in stdenv.mkDerivation {
+
+  name = "opencl-icd-${version}";
+  buildInputs = [ ruby opencl-headers ];
+  configureFlags = [ "--enable-official-khronos-headers" ];
+  src = fetchurl {
+    url = "https://forge.imag.fr/frs/download.php/716/ocl-icd-${version}.tar.gz";
+    sha256 = "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc";
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a05669559bd..cc714d2f2039 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8555,6 +8555,8 @@ in
 
   opencl-headers = callPackage ../development/libraries/opencl-headers { };
 
+  opencl-icd = callPackage ../development/libraries/opencl-icd { };
+
   opencollada = callPackage ../development/libraries/opencollada { };
 
   opencsg = callPackage ../development/libraries/opencsg { };

From 33c6a9d1e79470a98fe5cebf9bf288165d653d16 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 8 Mar 2016 00:50:53 +0100
Subject: [PATCH 007/436] wine: add optional dependencies

---
 pkgs/misc/emulators/wine/base.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 0398ed57a702..4d4e897ba9d2 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -22,10 +22,16 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   buildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
     freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
     alsaLib libxml2 libxslt lcms2 gettext dbus mpg123 openal
+
+    libva libpcap saneBackends libv4l libgphoto2 gtk3 gsm openldap
+    opencl-headers opencl-icd gnome.glib cairo libtiff unixODBC
+    
+    ## for libnetapi
+    samba3_light
   ])
   ++ lib.optional pulseaudioSupport pkgs.libpulseaudio
   ++ (with pkgs.xorg; [
-    libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite libXext
+    libX11  libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite libXext
   ]));
 
   # Wine locates a lot of libraries dynamically through dlopen().  Add

From 4416644eb32fe0572846a0f9b55b402cb5ba0ddb Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 25 Apr 2016 03:48:19 +0200
Subject: [PATCH 008/436] wine-unstable: 1.9.7 -> 1.9.9

---
 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 9ad09ed5dfe1..4b28b103da1a 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -30,9 +30,9 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "1.9.7";
+    version = "1.9.9";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "1v47i0pxqcixnh06x23kzp2dbz1cf3d2sric0bw6xqh54ph5yw29";
+    sha256 = "0hbvvb7b5sbfrpcp3rqzs57a0d9h37kn5k9hx62y63rdhkcnzrx1";
     inherit (stable) mono;
     gecko32 = fetchurl rec {
       version = "2.44";
@@ -48,7 +48,7 @@ in rec {
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "1h5hwd07qyx0qw5whf6lcp7v57kqd6mrrcvwwg1bydir68b0zp16";
+    sha256 = "1hmdl7gaiqjc22pw77ra237bnlpg1gxndlvlqf6nd9av6rlkvafj";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From 0f3ff1401dfd0c15fe69cadf8e8d523a58330b48 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 10 May 2016 20:41:25 +0200
Subject: [PATCH 009/436] wine-staging: move libtxc_dxtn to buildInputs

this adds it to RPATH, via LDFLAGS (see base.nix)
---
 pkgs/misc/emulators/wine/staging.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index 9419aff1a39c..51af13b8a157 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -8,8 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging;
 in assert (builtins.parseDrvName wineUnstable.name).version == patch.version;
 
 stdenv.lib.overrideDerivation wineUnstable (self: {
-  nativeBuildInputs = build-inputs [ libtxc_dxtn_Name ] self.nativeBuildInputs; 
-  buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;
+  buildInputs = build-inputs [ "perl" "utillinux" "autoconf" libtxc_dxtn_Name ] self.buildInputs;
 
   name = "${self.name}-staging";
 

From edb5a8c63228971be54bae3b2ab066e738db75db Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 26 May 2016 14:29:25 +0200
Subject: [PATCH 010/436] wine: 1.9.9 -> 1.9.10

---
 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 4b28b103da1a..0021fbb46dd6 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -30,9 +30,9 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "1.9.9";
+    version = "1.9.10";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "0hbvvb7b5sbfrpcp3rqzs57a0d9h37kn5k9hx62y63rdhkcnzrx1";
+    sha256 = "1gqvhqq8a7h4s2ll5y54x65w51bdv8izw4k17qy9fb2lyvgh0jcd";
     inherit (stable) mono;
     gecko32 = fetchurl rec {
       version = "2.44";
@@ -48,7 +48,7 @@ in rec {
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "1hmdl7gaiqjc22pw77ra237bnlpg1gxndlvlqf6nd9av6rlkvafj";
+    sha256 = "0lk171mk8iar7vhgv7af90975dqa4vrj5p3729bvp6r6fs3pqxkh";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From 98d720d72c51099044597c30ad096a5a8390d27e Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 26 May 2016 14:31:00 +0200
Subject: [PATCH 011/436] wine: 1.8.1 -> 1.8.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 0021fbb46dd6..bb726941a4b1 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -6,9 +6,9 @@ let fetchurl = args@{url, sha256, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "1.8.1";
+    version = "1.8.2";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "15ya496qq24ipqii7ij8x8h5x8n21vgqa4h6binb74w5mzdd76hl";
+    sha256 = "0vsswlnaa9ndg1pais63c39xks519r9fhz0yq3q8fphly2nlyqji";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {

From 1c215828d5c811a523fbc599e7c38d96b586d9e8 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 29 May 2016 10:43:47 +0200
Subject: [PATCH 012/436] wine: make features configurable

---
 pkgs/misc/emulators/wine/base.nix     | 51 +++++++++++++++++++--------
 pkgs/misc/emulators/wine/default.nix  | 40 +++++++++++++++++++--
 pkgs/misc/emulators/wine/packages.nix | 10 +++---
 pkgs/top-level/all-packages.nix       | 46 +++++++++++++++++++++++-
 4 files changed, 124 insertions(+), 23 deletions(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 4d4e897ba9d2..f5b64f1517f6 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, pkgArches,
   name, version, src, monos, geckos, platforms,
   pkgconfig, fontforge, makeWrapper, flex, bison,
-  pulseaudioSupport,
+  supportFlags,
   buildScript ? null, configureFlags ? ""
 }:
 
@@ -19,20 +19,41 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
     pkgconfig fontforge makeWrapper flex bison
   ];
 
-  buildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
-    freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
-    alsaLib libxml2 libxslt lcms2 gettext dbus mpg123 openal
-
-    libva libpcap saneBackends libv4l libgphoto2 gtk3 gsm openldap
-    opencl-headers opencl-icd gnome.glib cairo libtiff unixODBC
-    
-    ## for libnetapi
-    samba3_light
-  ])
-  ++ lib.optional pulseaudioSupport pkgs.libpulseaudio
+  buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs:
+  [ pkgs.freetype ]
+  ++ lib.optional pngSupport             pkgs.libpng
+  ++ lib.optional jpegSupport            pkgs.libjpeg
+  ++ lib.optional cupsSupport            pkgs.cups
+  ++ lib.optional colorManagementSupport pkgs.lcms2
+  ++ lib.optional gettextSupport         pkgs.gettext
+  ++ lib.optional dbusSupport            pkgs.dbus
+  ++ lib.optional mpg123Support          pkgs.mpg123
+  ++ lib.optional openalSupport          pkgs.openal
+  ++ lib.optional cairoSupport           pkgs.cairo
+  ++ lib.optional tiffSupport            pkgs.libtiff
+  ++ lib.optional odbcSupport            pkgs.unixODBC
+  ++ lib.optional netapiSupport          pkgs.samba3_light
+  ++ lib.optional cursesSupport          pkgs.ncurses
+  ++ lib.optional vaSupport              pkgs.libva
+  ++ lib.optional pcapSupport            pkgs.libpcap
+  ++ lib.optional v4lSupport             pkgs.libv4l
+  ++ lib.optional saneSupport            pkgs.saneBackends
+  ++ lib.optional gsmSupport             pkgs.gsm
+  ++ lib.optional gphoto2Support         pkgs.libgphoto2
+  ++ lib.optional ldapSupport            pkgs.openldap
+  ++ lib.optional fontconfigSupport      pkgs.fontconfig
+  ++ lib.optional alsaSupport            pkgs.alsaLib
+  ++ lib.optional pulseaudioSupport      pkgs.libpulseaudio
+  ++ lib.optional xineramaSupport        pkgs.xorg.libXinerama
+  ++ lib.optional gstreamerSupport       pkgs.gst_plugins_base
+  ++ lib.optionals gtkSupport    [ pkgs.gtk3 pkgs.gnome.glib ]
+  ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.opencl-icd ]
+  ++ lib.optionals xmlSupport    [ pkgs.libxml2 pkgs.libxslt ]
+  ++ lib.optionals tlsSupport    [ pkgs.openssl pkgs.gnutls ]
+  ++ lib.optionals openglSupport [ pkgs.mesa pkgs.mesa_noglu.osmesa pkgs.libdrm ]
   ++ (with pkgs.xorg; [
-    libX11  libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite libXext
-  ]));
+    libX11  libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext
+  ])));
 
   # Wine locates a lot of libraries dynamically through dlopen().  Add
   # them to the RPATH so that the user doesn't have to set them in
@@ -40,7 +61,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   NIX_LDFLAGS = map (path: "-rpath " + path) (
       map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs)
       # libpulsecommon.so is linked but not found otherwise
-      ++ lib.optionals pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio")
+      ++ lib.optionals supportFlags.pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio")
           (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
     );
 
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index a402fba69f67..deeff3c73437 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -9,13 +9,49 @@
 { lib, pkgs, system, callPackage,
   wineRelease ? "stable",
   wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
+  libtxc_dxtn_Name ? "libtxc_dxtn_s2tc",
+  pngSupport ? false,
+  jpegSupport ? false,
+  tiffSupport ? false,
+  gettextSupport ? false,
+  fontconfigSupport ? false,
+  alsaSupport ? false,
+  gtkSupport ? false,
+  openglSupport ? false,
+  tlsSupport ? false,
+  gstreamerSupport ? false,
+  cupsSupport ? false,
+  colorManagementSupport ? false,
+  dbusSupport ? false,
+  mpg123Support ? false,
+  openalSupport ? false,
+  openclSupport ? false,
+  cairoSupport ? false,
+  odbcSupport ? false,
+  netapiSupport ? false,
+  cursesSupport ? false,
+  vaSupport ? false,
+  pcapSupport ? false,
+  v4lSupport ? false,
+  saneSupport ? false,
+  gsmSupport ? false,
+  gphoto2Support ? false,
+  ldapSupport ? false,
   pulseaudioSupport ? false,
-  libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }:
+  xineramaSupport ? false,
+  xmlSupport ? false }:
 
 let wine-build = build: release:
       lib.getAttr build (callPackage ./packages.nix {
         wineRelease = release;
-        inherit pulseaudioSupport;
+        supportFlags = {
+          inherit pngSupport jpegSupport cupsSupport colorManagementSupport gettextSupport
+                  dbusSupport mpg123Support openalSupport cairoSupport tiffSupport odbcSupport
+                  netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport
+                  gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
+                  pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
+                  openglSupport gstreamerSupport;
+        };
       });
 
 in if wineRelease == "staging" then
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index 206deb01b8bb..6c06bcb0949b 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -1,14 +1,14 @@
 { system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686,
   overrideCC, wrapCCMulti, gcc49,
-  pulseaudioSupport,
-  wineRelease ? "stable"
+  wineRelease ? "stable",
+  supportFlags
 }:
 
 let src = lib.getAttr wineRelease (callPackage ./sources.nix {});
 in with src; {
   wine32 = callPackage_i686 ./base.nix {
     name = "wine-${version}";
-    inherit src version pulseaudioSupport;
+    inherit src version supportFlags;
     pkgArches = [ pkgsi686Linux ];
     geckos = [ gecko32 ];
     monos =  [ mono ];
@@ -16,7 +16,7 @@ in with src; {
   };
   wine64 = callPackage ./base.nix {
     name = "wine64-${version}";
-    inherit src version pulseaudioSupport;
+    inherit src version supportFlags;
     # FIXME: drop this when GCC is updated to >5.3.
     # Corresponding bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69140
     stdenv = overrideCC stdenv gcc49;
@@ -28,7 +28,7 @@ in with src; {
   };
   wineWow = callPackage ./base.nix {
     name = "wine-wow-${version}";
-    inherit src version pulseaudioSupport;
+    inherit src version supportFlags;
     # FIXME: see above.
     stdenv = overrideCC stdenv_32bit (wrapCCMulti gcc49);
     pkgArches = [ pkgs pkgsi686Linux ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc714d2f2039..01a65e76ffed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16819,8 +16819,52 @@ in
     wineRelease = config.wine.release or "stable";
     wineBuild = config.wine.build or "wine32";
     pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
+    pngSupport = true;
+    jpegSupport = true;
+    tiffSupport = true;
+    gettextSupport = true;
+    fontconfigSupport = true;
+    alsaSupport = true;
+    openglSupport = true;
+    tlsSupport = true;
+    cursesSupport = true;
   };
-  wineStable = wine.override { wineRelease = "stable"; };
+  wineMinimal = lowPrio (self.wine.override {
+    pulseaudioSupport = false;
+    pngSupport = false;
+    jpegSupport = false;
+    tiffSupport = false;
+    gettextSupport = false;
+    fontconfigSupport = false;
+    alsaSupport = false;
+    openglSupport = false;
+    tlsSupport = false;
+    cursesSupport = false;
+  });
+  wineFull = lowPrio (self.wine.override {
+    gtkSupport = true;
+    gstreamerSupport = true;
+    cupsSupport = true;
+    colorManagementSupport = true;
+    dbusSupport = true;
+    mpg123Support = true;
+    openalSupport = true;
+    openclSupport = true;
+    cairoSupport = true;
+    odbcSupport = true;
+    netapiSupport = true;
+    vaSupport = true;
+    pcapSupport = true;
+    v4lSupport = true;
+    saneSupport = true;
+    gsmSupport = true;
+    gphoto2Support = true;
+    ldapSupport = true;
+    pulseaudioSupport = true;
+    xineramaSupport = true;
+    xmlSupport = true;
+  });
+  wineStable = self.wine.override { wineRelease = "stable"; };
   wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; });
   wineStaging = lowPrio (self.wine.override { wineRelease = "staging"; });
 

From 8c0f03ae9dacf0dcdcdacdc13069634614c47d14 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 30 May 2016 03:54:02 +0200
Subject: [PATCH 013/436] wine: 1.9.10 -> 1.9.11

---
 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 bb726941a4b1..0c4690bffef8 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -30,9 +30,9 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "1.9.10";
+    version = "1.9.11";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "1gqvhqq8a7h4s2ll5y54x65w51bdv8izw4k17qy9fb2lyvgh0jcd";
+    sha256 = "15mbrnx4zqsdsxz7rwkb1pp58bcyfqnm8f2fh7cbbdgwh117k3vj";
     inherit (stable) mono;
     gecko32 = fetchurl rec {
       version = "2.44";
@@ -48,7 +48,7 @@ in rec {
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "0lk171mk8iar7vhgv7af90975dqa4vrj5p3729bvp6r6fs3pqxkh";
+    sha256 = "0q990d26wsik16w1yya2z8nwxnhnaiiy85igdnan1ib2b00z861m";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From fe1f3b70bcbaf83af7be16620350a280c740ff8e Mon Sep 17 00:00:00 2001
From: yawnt <me@yawnt.com>
Date: Mon, 30 May 2016 11:42:10 +0200
Subject: [PATCH 014/436] postscript-lexmark: add package

---
 .../drivers/postscript-lexmark/default.nix    | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/misc/drivers/postscript-lexmark/default.nix

diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix
new file mode 100644
index 000000000000..5b8f88218ff1
--- /dev/null
+++ b/pkgs/misc/drivers/postscript-lexmark/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, lib, fetchurl, rpmextract }:
+let
+  version = "20160218";
+in
+stdenv.mkDerivation {
+  name = "postscript-lexmark-${version}";
+
+  src = fetchurl {
+    url = "http://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm";
+    sha256 = "0wbhvypdr96a5ddg6kj41dn9sbl49n7pfi2vs762ij82hm2gvwcm";
+  };
+
+  nativeBuildInputs = [ rpmextract ];
+
+  phases = [ "unpackPhase" "installPhase"];
+
+  sourceRoot = ".";
+
+  unpackPhase = ''
+    rpmextract $src
+    for ppd in opt/OpenPrinting-Lexmark/ppds/Lexmark/*; do
+      gzip -d $ppd
+    done
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/cups/model/postscript-lexmark
+    cp opt/OpenPrinting-Lexmark/ppds/Lexmark/*.ppd $out/share/cups/model/postscript-lexmark/
+    cp -r opt/OpenPrinting-Lexmark/doc $out/doc
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.openprinting.org/driver/Postscript-Lexmark/";
+    description = "Lexmark Postscript Drivers";
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29f1b0c529ae..cba89bac5aa1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2989,6 +2989,8 @@ in
 
   popfile = callPackage ../tools/text/popfile { };
 
+  postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { };
+
   povray = callPackage ../tools/graphics/povray {
     automake = automake113x; # fails with 14
   };
@@ -4488,7 +4490,7 @@ in
   inherit (self.haskellPackages) ghc;
 
   cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install;
-   
+
   stack = haskell.lib.overrideCabal haskellPackages.stack (drv: {
     enableSharedExecutables = false;
     isLibrary = false;
@@ -10824,7 +10826,7 @@ in
     batman_adv = callPackage ../os-specific/linux/batman-adv {};
 
     bcc = callPackage ../os-specific/linux/bcc { };
-    
+
     bbswitch = callPackage ../os-specific/linux/bbswitch {};
 
     ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
@@ -15947,7 +15949,7 @@ in
 
   openspecfun = callPackage ../development/libraries/science/math/openspecfun {};
 
-  magma = callPackage ../development/libraries/science/math/magma { };  
+  magma = callPackage ../development/libraries/science/math/magma { };
 
   mathematica = callPackage ../applications/science/math/mathematica { };
   mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { };

From 32ff5bbc3088ca9afff585898947ecf173ffb9a1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 1 Jun 2016 04:21:56 +0300
Subject: [PATCH 015/436] krita: init at 3.0

---
 pkgs/applications/graphics/krita/default.nix | 45 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  5 +++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/applications/graphics/krita/default.nix

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
new file mode 100644
index 000000000000..e8d2951dd169
--- /dev/null
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, lib, fetchgit, cmake, extra-cmake-modules, makeQtWrapper
+, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
+, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
+, kio, kcrash
+, boost, libraw, fftw, eigen, exiv2, lcms2, gsl, openexr
+, openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase
+}:
+
+stdenv.mkDerivation rec {
+  name = "krita-${version}";
+  version = "3.0";
+
+  src = fetchgit {
+    url = "http://phabricator.kde.org/diffusion/KRITA/krita.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "0aas86667ncp8jz00c8qk7bm26g76l65cysh06wxr8kxbvqynrdn";
+  };
+
+  nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
+
+  buildInputs = [
+    karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
+    ki18n kitemmodels kitemviews kwindowsystem kio kcrash
+    boost libraw fftw eigen exiv2 lcms2 gsl openexr
+    openjpeg opencolorio vc poppler_qt5 curl ilmbase
+  ];
+
+  NIX_CFLAGS_COMPILE = [ "-I${ilmbase}/include/OpenEXR" ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    for i in $out/bin/*; do
+      wrapQtProgram "$i"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A free an open source painting application";
+    homepage = "https://krita.org/";
+    maintainers = with maintainers; [ abbradar ];
+    platforms = platforms.linux;
+    licenses = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1377f1b958e1..065bca2e27ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15790,6 +15790,11 @@ in
 
     konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { };
 
+    krita = callPackage ../applications/graphics/krita {
+      vc = vc_0_7;
+      openjpeg = openjpeg_1;
+    };
+
     phonon = callPackage ../development/libraries/phonon { };
 
     phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { };

From 6427cc008bebd6dba836e65bc5b74f506f9a3379 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 1 Jun 2016 11:37:29 +0100
Subject: [PATCH 016/436] godep: ddd7fbf -> 73

---
 pkgs/development/tools/godep/default.nix |  6 ++---
 pkgs/development/tools/godep/deps.nix    | 34 +++++++++++++++---------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/godep/default.nix b/pkgs/development/tools/godep/default.nix
index 2dd4ce351222..3503a6c2c625 100644
--- a/pkgs/development/tools/godep/default.nix
+++ b/pkgs/development/tools/godep/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "ddd7fbf";
+  version = "73";
   name = "godep-${version}";
 
   src = import ./deps.nix {
-    inherit stdenv lib fetchgit fetchFromGitHub;
+    inherit stdenv lib fetchgit;
   };
 
   buildInputs = [ go ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Ddependency tool for go";
+    description = "Dependency tool for go";
     homepage = https://github.com/tools/godep;
     license = licenses.bsd3;
     maintainers = with maintainers; [ offline ];
diff --git a/pkgs/development/tools/godep/deps.nix b/pkgs/development/tools/godep/deps.nix
index e0369c9476d4..10071fa51955 100644
--- a/pkgs/development/tools/godep/deps.nix
+++ b/pkgs/development/tools/godep/deps.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, lib, fetchFromGitHub, fetchgit }:
+{ stdenv, lib, fetchgit }:
 
 let
   goDeps = [
@@ -15,32 +15,40 @@ let
       root = "github.com/tools/godep";
       src = fetchgit {
         url = "https://github.com/tools/godep.git";
-        rev = "0baa7ea464025b2cb8e84b13c5ac4da99237a1bf";
-        sha256 = "10hr10fj6ymmfzwjg5drf7j0f4mrpb4p97a01rqp7xvfv5j0zisj";
+        rev = "f4edf338389e6e2bde0e8307886718133dc0613e";
+        sha256 = "1jdza8kwnzdsh3layqjzy9dnr92xdg3kfhnzvqkq3p50vsdims9w";
       };
     }
     {
-      root = "golang.org/x/net";
+      root = "github.com/kr/pretty";
       src = fetchgit {
-        url = "https://go.googlesource.com/net";
-        rev = "8b2d0ae1f4c3b83c10ff17e89a89ff04cc0903c3";
-        sha256 = "0nxawxhq7yysbrrd88hkqzfr5hvsqpd452yzi53cp1afzma3zjay";
+        url = "https://github.com/kr/pretty";
+        rev = "f31442d60e51465c69811e2107ae978868dbea5c";
+        sha256 = "12nczwymikxmivb10q5ml5yxrwpz9s8p6k4vqig9g9707yhpxrkh";
       };
     }
     {
-      root = "golang.org/x/text";
+      root = "github.com/kr/text";
       src = fetchgit {
-        url = "https://go.googlesource.com/text";
-        rev = "bfad311ce93436dc888b40d76c78f99dc3104473";
-        sha256 = "1mbhp5q24drz2l2x6ib3180i42f9015ry80bn7jhr7rwizvyp6lh";
+        url = "https://github.com/kr/text";
+        rev = "6807e777504f54ad073ecef66747de158294b639";
+        sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698";
+      };
+    }
+    {
+      root = "github.com/pmezard/go-difflib";
+      src = fetchgit {
+        url = "https://github.com/pmezard/go-difflib";
+        rev = "f78a839676152fd9f4863704f5d516195c18fc14";
+        sha256 = "1bws3qyy572b62i3wkwfr1aw1g2nwcim2sy42jqsvh9pajjsf1vz";
       };
     }
     {
       root = "golang.org/x/tools";
       src = fetchgit {
         url = "https://go.googlesource.com/tools";
-        rev = "3ecc311976cc3f7c7b7a50314929bdc1b07c4c9d";
-        sha256 = "0ic3lrg6ykxrlnzcway4ka280n052qysjawf4lvj8gl3r1vlmwfg";
+        rev = "1f1b3322f67af76803c942fd237291538ec68262";
+        sha256 = "0h2yarcvcgg1px20r8n58psra1czv0sgly5gins2q3wp25iql6gj";
       };
     }
   ];

From 64e727138a5378a505325c7614b5d4b58adebf1e Mon Sep 17 00:00:00 2001
From: James Earl Douglas <james@earldouglas.com>
Date: Thu, 2 Jun 2016 08:34:35 -0600
Subject: [PATCH 017/436] avian: init at 1.2.0

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

diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix
new file mode 100644
index 000000000000..c2a2b93fc0c5
--- /dev/null
+++ b/pkgs/development/compilers/avian/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, zlib, jdk }:
+
+stdenv.mkDerivation rec {
+  name = "avian-${version}";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "readytalk";
+    repo = "avian";
+    rev = "v${version}";
+    sha256 = "1j2y45cpqk3x6a743mgpg7z3ivwm7qc9jy6xirvay7ah1qyxmm48";
+  };
+
+  buildInputs = [
+    zlib
+    jdk
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp build/*/avian $out/bin/
+    cp build/*/avian-dynamic $out/bin/
+  '';
+
+  meta = {
+    description = "Lightweight Java virtual machine";
+    longDescription = ''
+      Avian is a lightweight virtual machine and class library designed
+      to provide a useful subset of Java’s features, suitable for
+      building self-contained applications.
+    '';
+    homepage = https://readytalk.github.io/avian/;
+    license = stdenv.lib.licenses.isc;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65fced534a85..2a2b2c4f3fdc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4107,6 +4107,10 @@ in
 
   avra = callPackage ../development/compilers/avra { };
 
+  avian = callPackage ../development/compilers/avian {
+    stdenv = overrideCC stdenv gcc49;
+  };
+
   bigloo = callPackage ../development/compilers/bigloo {
     stdenv = overrideCC stdenv gcc49;
   };

From 5b51f0bff92290e4a4f41837126c722293301672 Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Sun, 5 Jun 2016 14:33:19 +0200
Subject: [PATCH 018/436] clblas-cuda: init at git-20160505

---
 .../science/math/clblas/cuda/default.nix      | 68 +++++++++++++++++++
 .../science/math/clblas/cuda/platform.patch   | 34 ++++++++++
 pkgs/top-level/all-packages.nix               |  9 +++
 3 files changed, 111 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/clblas/cuda/default.nix
 create mode 100644 pkgs/development/libraries/science/math/clblas/cuda/platform.patch

diff --git a/pkgs/development/libraries/science/math/clblas/cuda/default.nix b/pkgs/development/libraries/science/math/clblas/cuda/default.nix
new file mode 100644
index 000000000000..8691009acae7
--- /dev/null
+++ b/pkgs/development/libraries/science/math/clblas/cuda/default.nix
@@ -0,0 +1,68 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, gfortran
+, blas
+, boost
+, python
+, cudatoolkit
+, nvidia_x11
+}:
+
+stdenv.mkDerivation rec {
+  name = "clblas-cuda-${version}"; 
+  version = "git-20160505"; 
+
+  src = fetchFromGitHub {
+    owner = "clMathLibraries"; 
+    repo = "clBLAS";
+    rev = "d20977ec4389c6b3751e318779410007c5e272f8";
+    sha256 = "1jna176cxznv7iz43svd6cjrbbf0fc2lrbpfpg4s08vc7xnwp0n4";
+  }; 
+
+  patches = [ ./platform.patch ]; 
+
+  postPatch = ''
+    sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt
+  '';
+
+  configurePhase = ''    
+    findInputs ${boost} 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
+
+    mkdir -p Build
+    pushd Build
+
+    export LD_LIBRARY_PATH="${blas}/lib:${nvidia_x11}/lib"
+
+    cmake ../src -DCMAKE_INSTALL_PREFIX=$out \
+                 -DCMAKE_BUILD_TYPE=Release \
+                 -DOPENCL_ROOT=${cudatoolkit} \
+  '';
+
+  dontStrip = true; 
+
+  buildInputs = [
+    cmake
+    gfortran
+    blas
+    python
+    cudatoolkit
+    nvidia_x11
+  ]; 
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/clMathLibraries/clBLAS;
+    description = "A software library containing BLAS functions written in OpenCL";
+    longDescription = ''
+      This package contains a library of BLAS functions on top of OpenCL. 
+      The current version is linked to the NVIDIA OpenCL implementation provided by the CUDA toolkit. 
+    '';
+    license = licenses.asl20;
+    maintainers = with maintainers; [ artuuge ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/development/libraries/science/math/clblas/cuda/platform.patch b/pkgs/development/libraries/science/math/clblas/cuda/platform.patch
new file mode 100644
index 000000000000..87404a426a4b
--- /dev/null
+++ b/pkgs/development/libraries/science/math/clblas/cuda/platform.patch
@@ -0,0 +1,34 @@
+diff --git a/src/library/tools/ktest/config.cpp b/src/library/tools/ktest/config.cpp
+index 8b20128..faf9bde 100644
+--- a/src/library/tools/ktest/config.cpp
++++ b/src/library/tools/ktest/config.cpp
+@@ -24,8 +24,6 @@
+ 
+ using namespace clMath;
+ 
+-static const char DEFAULT_PLATFORM_NAME[] = "AMD Accelerated Parallel Processing";
+-
+ Config::Config() :
+     defaultConfig_(""),
+     cpp_("ktest.cpp"),
+@@ -35,7 +33,10 @@ Config::Config() :
+     hasFuncID_(false), hasSubdims_(false),
+     skipAccuracy_(false)
+ {
+-    setPlatform(DEFAULT_PLATFORM_NAME);
++    platform_ = NULL;
++    setPlatform("");
++
++    device_ = NULL;
+     setDevice("");
+ 
+     memset(&kargs_, 0, sizeof(kargs_));
+@@ -262,7 +263,7 @@ Config::setPlatform(const std::string& name)
+             continue;
+         }
+         if (name.empty()) {
+-            found = (strcmp(pname, DEFAULT_PLATFORM_NAME) == 0);
++	    found = true;
+         }
+         else {
+             found = (strcmp(pname, name.c_str()) == 0);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17a1c1d855dd..8e6e52cb3114 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15945,6 +15945,15 @@ in
 
   blas = callPackage ../development/libraries/science/math/blas { };
 
+  clblas-cuda = callPackage ../development/libraries/science/math/clblas/cuda {
+    cudatoolkit = pkgs.cudatoolkit75;
+    inherit (linuxPackages) nvidia_x11;
+    python = pkgs.python34Packages.python;
+    boost = pkgs.boost159.override {
+      inherit python;
+    };
+  };
+
   jags = callPackage ../applications/science/math/jags { };
 
 

From 93a11d8b0f8d53cc8171e6b74db1f31f9a6d63b5 Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Sun, 5 Jun 2016 14:49:45 +0200
Subject: [PATCH 019/436] libgpuarray-cuda: init at -9998.0

---
 .../libgpuarray/cuda/default.nix              | 130 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 pkgs/top-level/python-packages.nix            |  14 ++
 3 files changed, 146 insertions(+)
 create mode 100644 pkgs/development/python-modules/libgpuarray/cuda/default.nix

diff --git a/pkgs/development/python-modules/libgpuarray/cuda/default.nix b/pkgs/development/python-modules/libgpuarray/cuda/default.nix
new file mode 100644
index 000000000000..70a79b76ec1a
--- /dev/null
+++ b/pkgs/development/python-modules/libgpuarray/cuda/default.nix
@@ -0,0 +1,130 @@
+{ stdenv 
+, buildPythonPackage
+, fetchFromGitHub
+, cmake
+, cython
+, numpy
+, Mako
+, six
+, nose
+, beaker
+, memcached
+, pkgconfig
+, glibc
+, clblas
+, Babel
+, pygments
+, scipy
+, python
+, cudatoolkit
+, nvidia_x11
+}: 
+
+buildPythonPackage rec {
+  name = "libgpuarray-cuda-${version}";
+  version = "-9998.0"; 
+
+  src = fetchFromGitHub {
+    owner = "Theano"; 
+    repo = "libgpuarray";
+    rev = "fc36a40526c0a8303ace6c574ffdefba7feafe17"; 
+    sha256 = "1kb0k42addqjxiahlcbv6v6271yhsmz71j12186fpy60870i7zm7"; 
+  }; 
+
+  doCheck = true;
+
+  configurePhase = ''
+    mkdir -p Build/Install
+    pushd Build
+
+    cmake .. -DCMAKE_BUILD_TYPE=Release \
+             -DCMAKE_INSTALL_PREFIX=./Install \
+             -DCLBLAS_ROOT_DIR=${clblas}
+
+    popd
+  ''; 
+
+  preBuild = ''
+    pushd Build
+    make 
+    make install
+
+    function fixRunPath {
+      p=$(patchelf --print-rpath $1)
+      patchelf --set-rpath "$p:${cudatoolkit}/lib:${clblas}/lib:${nvidia_x11}/lib" $1
+    }
+
+    fixRunPath Install/lib/libgpuarray.so
+
+    popd
+  ''; 
+
+  setupPyBuildFlags = [ "-L $(pwd)/Build/Install/lib" "-I $(pwd)/Build/Install/include" ];
+
+  preInstall = ''
+    cp -r Build/Install $out
+  '';
+
+  postInstall = ''
+    pushd $out/${python.sitePackages}/pygpu
+    for f in $(find $out/pygpu -name "*.h"); do
+      ln -s $f $(basename $f)
+    done
+    popd
+  ''; 
+  checkPhase = ''
+    mkdir -p my_bin
+    pushd my_bin
+
+    cat > libgpuarray_run_tests << EOF
+#!/bin/sh
+if [ \$# -eq 0 ]; then 
+  echo "No argument provided."
+  echo "Available tests:"
+  ls $out/${python.sitePackages}/pygpu/tests | grep "test_"
+  exit 1
+else
+  nosetests -v "$out/${python.sitePackages}/pygpu/tests/\$@"
+fi
+EOF
+
+    chmod +x libgpuarray_run_tests
+    popd
+
+    cp -r my_bin $out/bin
+  '';
+
+  dontStrip = true; 
+
+  propagatedBuildInputs = [
+    numpy
+    scipy
+    nose
+    six
+    Mako
+  ];
+
+  buildInputs = [ 
+    cmake 
+    cython 
+    beaker 
+    memcached 
+    pkgconfig 
+    glibc 
+    Babel 
+    pygments 
+    numpy.blas 
+    cudatoolkit
+    nvidia_x11
+    clblas
+  ]; 
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/Theano/libgpuarray;
+    description = "Library to manipulate tensors on GPU.";
+    license = licenses.free;
+    maintainers = with maintainers; [ artuuge ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e6e52cb3114..ca53a536a46b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1550,6 +1550,8 @@ in
 
   libbladeRF = callPackage ../development/libraries/libbladeRF { };
 
+  libgpuarray-cuda = python34Packages.libgpuarray-cuda;
+
   lp_solve = callPackage ../applications/science/math/lp_solve { };
 
   lprof = callPackage ../tools/graphics/lprof { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7d7c4bc58aaa..6956800c2d07 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11890,6 +11890,20 @@ in modules // {
     };
   });
 
+  libgpuarray-cuda = callPackage ../development/python-modules/libgpuarray/cuda/default.nix rec {
+    numpy = self.numpy_1_10;
+    scipy = self.buildScipyPackage rec {
+      version = "0.17.1";
+      src = pkgs.fetchurl {
+        url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
+        sha256 = "1b1qpfz2j2rvmlplsjbnznnxnqr9ckbmis506110ii1w07wd4k4w";
+      };
+      inherit numpy;
+    };
+    inherit (pkgs.linuxPackages) nvidia_x11;
+    cudatoolkit = pkgs.cudatoolkit75;
+    clblas = pkgs.clblas-cuda;
+  };
 
   limnoria = buildPythonPackage rec {
     name = "limnoria-${version}";

From 74107a7867aa0c55c9d823726f80f9fb6cf3251c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 5 Jun 2016 04:44:06 +0300
Subject: [PATCH 020/436] buildFHSEnv: refactor and simplify, drop
 buildFHSChrootEnv

This takes another approach at binding FHS directory structure. We
now bind-mount all the root filesystem to directory "/host" in the target tree.
From that we symlink all the directories into the tree if they do not already
exist in FHS structure.

This probably makes `CHROOTENV_EXTRA_BINDS` unnecessary -- its main usecase was
to add bound directories from the host to the sandbox, and we not just symlink
all of them. I plan to get some feedback on its usage and maybe deprecate it.

This also drops old `buildFHSChrootEnv` infrastructure. The main problem with it
is it's very difficult to unmount a recursive-bound directory when mount is not
sandboxed. This problem is a bug even without these changes -- if
you have for example `/home/alice` mounted to somewhere, you wouldn't see
it in `buildFHSChrootEnv` now. With the new directory structure, it's
impossible to use regular bind at all. After some tackling with this I realized
that the fix would be brittle and dangerous (if you don't unmount everything
clearly and proceed to removing the temporary directory, bye-bye fs!). It also
probably doesn't worth it because I haven't heard that someone actually uses it
for a long time, and `buildFHSUserEnv` should cover most cases while being much
more maintainable and safe for the end-user.
---
 .../build-fhs-chrootenv/default.nix           | 48 ------------
 .../build-fhs-chrootenv/destroy.sh.in         | 22 ------
 .../build-fhs-chrootenv/init.sh.in            | 22 ------
 .../build-fhs-chrootenv/load.sh.in            | 13 ----
 .../build-fhs-chrootenv/mount.sh.in           | 34 --------
 .../build-fhs-chrootenv/umount.sh.in          |  6 --
 .../build-fhs-userenv/chroot-user.rb          | 34 ++------
 .../build-fhs-userenv/default.nix             | 31 ++++----
 .../env.nix                                   | 77 ++++++++-----------
 pkgs/top-level/all-packages.nix               | 24 +-----
 10 files changed, 58 insertions(+), 253 deletions(-)
 delete mode 100644 pkgs/build-support/build-fhs-chrootenv/default.nix
 delete mode 100644 pkgs/build-support/build-fhs-chrootenv/destroy.sh.in
 delete mode 100644 pkgs/build-support/build-fhs-chrootenv/init.sh.in
 delete mode 100644 pkgs/build-support/build-fhs-chrootenv/load.sh.in
 delete mode 100644 pkgs/build-support/build-fhs-chrootenv/mount.sh.in
 delete mode 100644 pkgs/build-support/build-fhs-chrootenv/umount.sh.in
 rename pkgs/build-support/{build-fhs-chrootenv => build-fhs-userenv}/env.nix (73%)

diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix
deleted file mode 100644
index dfce8edcb23d..000000000000
--- a/pkgs/build-support/build-fhs-chrootenv/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv } : { env, extraInstallCommands ? "" } :
-
-let
-  # References to shell scripts that set up or tear down the environment
-  initSh    = ./init.sh.in;
-  mountSh   = ./mount.sh.in;
-  loadSh    = ./load.sh.in;
-  umountSh  = ./umount.sh.in;
-  destroySh = ./destroy.sh.in;
-
-  name = env.pname;
-
-in stdenv.mkDerivation {
-  name = "${name}-chrootenv";
-  preferLocalBuild = true;
-  buildCommand = ''
-    mkdir -p $out/bin
-    cd $out/bin
-
-    sed -e "s|@chrootEnv@|${env}|g" \
-        -e "s|@name@|${name}|g" \
-        -e "s|@shell@|${stdenv.shell}|g" \
-        ${initSh} > init-${name}-chrootenv
-    chmod +x init-${name}-chrootenv
-
-    sed -e "s|@shell@|${stdenv.shell}|g" \
-        -e "s|@name@|${name}|g" \
-        ${mountSh} > mount-${name}-chrootenv
-    chmod +x mount-${name}-chrootenv
-
-    sed -e "s|@shell@|${stdenv.shell}|g" \
-        -e "s|@name@|${name}|g" \
-        ${loadSh} > load-${name}-chrootenv
-    chmod +x load-${name}-chrootenv
-
-    sed -e "s|@shell@|${stdenv.shell}|g" \
-        -e "s|@name@|${name}|g" \
-        ${umountSh} > umount-${name}-chrootenv
-    chmod +x umount-${name}-chrootenv
-
-    sed -e "s|@chrootEnv@|${env}|g" \
-        -e "s|@shell@|${stdenv.shell}|g" \
-        -e "s|@name@|${name}|g" \
-        ${destroySh} > destroy-${name}-chrootenv
-    chmod +x destroy-${name}-chrootenv
-    ${extraInstallCommands}
-  '';
-}
diff --git a/pkgs/build-support/build-fhs-chrootenv/destroy.sh.in b/pkgs/build-support/build-fhs-chrootenv/destroy.sh.in
deleted file mode 100644
index 015f742d85a5..000000000000
--- a/pkgs/build-support/build-fhs-chrootenv/destroy.sh.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#! @shell@ -e
-
-chrootenvDest=/run/chrootenv/@name@
-
-# Remove bind mount points
-rmdir $chrootenvDest/{dev,nix/store,nix,proc,sys,host-etc,home,var,run,tmp}
-
-# Remove symlinks to the software that should be part of the chroot system profile
-for i in @chrootEnv@/*
-do
-    if [ "$i" != "@chrootEnv@/etc" ] && [ "$i" != "@chrootEnv@/var" ]
-    then
-        rm $chrootenvDest/$(basename $i)
-    fi
-done
-
-# Remove the remaining folders
-rm -Rf $chrootenvDest/{etc,root}
-rm -Rf /tmp/chrootenv-@name@
-
-# Remove the chroot environment folder
-rmdir $chrootenvDest
diff --git a/pkgs/build-support/build-fhs-chrootenv/init.sh.in b/pkgs/build-support/build-fhs-chrootenv/init.sh.in
deleted file mode 100644
index 9c85069a655c..000000000000
--- a/pkgs/build-support/build-fhs-chrootenv/init.sh.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#! @shell@ -e
-
-chrootenvDest=/run/chrootenv/@name@
-
-# Create some mount points for stuff that must be bind mounted
-mkdir -p $chrootenvDest/{nix/store,dev,proc,sys,host-etc,host-tmp,home,var,run}
-
-# Symlink the software that should be part of the chroot system profile
-for i in @chrootEnv@/*
-do
-    if [ "$i" != "@chrootEnv@/var" ]
-    then
-        ln -s "$i" "$chrootenvDest"
-    fi
-done
-
-# Create root folder
-mkdir $chrootenvDest/root
-
-# Create tmp folder
-mkdir -m1777    $chrootenvDest/tmp
-mkdir -m1777 -p /tmp/chrootenv-@name@
diff --git a/pkgs/build-support/build-fhs-chrootenv/load.sh.in b/pkgs/build-support/build-fhs-chrootenv/load.sh.in
deleted file mode 100644
index f3a6d13e8ff7..000000000000
--- a/pkgs/build-support/build-fhs-chrootenv/load.sh.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#! @shell@ -e
-
-chrootenvDest=/run/chrootenv/@name@
-
-# Enter the LFS chroot environment
-sudo chroot --userspec "$USER:${GROUPS[0]}" --groups "${GROUPS[0]}" $chrootenvDest /usr/bin/env -i \
-     TERM="$TERM" \
-     DISPLAY="$DISPLAY" \
-     HOME="$HOME" \
-     XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" \
-     LANG="$LANG" \
-     SSL_CERT_FILE="$SSL_CERT_FILE" \
-     /bin/bash --login
diff --git a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in
deleted file mode 100644
index 24b28aae78f7..000000000000
--- a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#! @shell@ -e
-
-chrootenvDest=/run/chrootenv/@name@
-
-# Bind mount the Nix store
-mount --bind /nix/store $chrootenvDest/nix/store
-
-# Bind mount some kernel related stuff
-mount --bind /dev $chrootenvDest/dev
-mount --bind /dev/pts $chrootenvDest/dev/pts
-mount --bind /dev/shm $chrootenvDest/dev/shm
-mount --bind /proc $chrootenvDest/proc
-mount --bind /sys $chrootenvDest/sys
-
-# Bind mount home directories
-mount --bind /home $chrootenvDest/home
-
-# Bind mount state directories
-mount --bind /var $chrootenvDest/var
-mount --rbind /run $chrootenvDest/run
-
-# Bind mount the host system's /etc
-mount --bind /etc $chrootenvDest/host-etc
-
-# Bind mount the host system's /tmp
-mount --bind /tmp $chrootenvDest/host-tmp
-
-# Bind mount /tmp
-mount --bind /tmp/chrootenv-@name@ $chrootenvDest/tmp
-
-# Expose sockets in /tmp
-for i in /tmp/.*-unix; do
-  ln -s "/host-tmp/$(basename "$i")" "$chrootenvDest/$i"
-done
diff --git a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in
deleted file mode 100644
index 27000cff10a9..000000000000
--- a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#! @shell@ -e
-
-chrootenvDest=/run/chrootenv/@name@
-
-# Unmount all (r)bind mounts
-umount -l $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,host-tmp,home,var,tmp,run}
diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
index 250e6a908434..2fb3b0954b37 100755
--- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb
+++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
@@ -2,16 +2,15 @@
 
 # Bind mounts hierarchy: from => to (relative)
 # If 'to' is nil, path will be the same
-mounts = { '/nix/store' => nil,
-           '/dev' => nil,
+mounts = { '/' => 'host',
            '/proc' => nil,
            '/sys' => nil,
-           '/etc' => 'host-etc',
-           '/tmp' => 'host-tmp',
-           '/home' => nil,
+           '/nix' => nil,
+           '/tmp' => nil,
            '/var' => nil,
            '/run' => nil,
-           '/root' => nil,
+           '/dev' => nil,
+           '/home' => nil,
          }
 
 # Propagate environment variables
@@ -62,9 +61,8 @@ $mount = make_fcall 'mount', [Fiddle::TYPE_VOIDP,
                     Fiddle::TYPE_INT
 
 # Read command line args
-abort "Usage: chrootenv swdir program args..." unless ARGV.length >= 2
-swdir = Pathname.new ARGV[0]
-execp = ARGV.drop 1
+abort "Usage: chrootenv program args..." unless ARGV.length >= 1
+execp = ARGV
 
 # Populate extra mounts
 if not ENV["CHROOTENV_EXTRA_BINDS"].nil?
@@ -132,24 +130,6 @@ if $cpid == 0
   Dir.chroot root
   Dir.chdir '/'
 
-  # Symlink swdir hierarchy
-  mount_dirs = Set.new mounts.map { |_, v| Pathname.new v }
-  link_swdir = lambda do |swdir, prefix|
-    swdir.find do |path|
-      rel = prefix.join path.relative_path_from(swdir)
-      # Don't symlink anything in binded or symlinked directories
-      Find.prune if mount_dirs.include? rel or rel.symlink?
-      if not rel.directory?
-        # File does not exist; make a symlink and bail out
-        rel.make_symlink path
-        Find.prune
-      end
-      # Recursively follow symlinks
-      link_swdir.call path.readlink, rel if path.symlink?
-    end
-  end
-  link_swdir.call swdir, Pathname.new('')
-
   # New environment
   new_env = Hash[ envvars.map { |x| [x, ENV[x]] } ]
 
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index 94c72e29a225..233db39788b0 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -1,28 +1,29 @@
-{ runCommand, lib, writeText, writeScriptBin, stdenv, ruby } :
-{ env, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "", meta ? {}, passthru ? {} } :
+{ callPackage, runCommand, lib, writeScript, stdenv, coreutils, ruby }:
+
+let buildFHSEnv = callPackage ./env.nix { }; in
+
+args@{ name, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }:
 
 let
-  name = env.pname;
+  env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" "meta" "passthru" ]);
 
   # Sandboxing script
-  chroot-user = writeScriptBin "chroot-user" ''
+  chroot-user = writeScript "chroot-user" ''
     #! ${ruby}/bin/ruby
     ${builtins.readFile ./chroot-user.rb}
   '';
 
-  init = run: writeText "${name}-init" ''
-    source /etc/profile
-
-    # Make /tmp directory
-    mkdir -m 1777 /tmp
-
-    # Expose sockets in /tmp
-    for i in /host-tmp/.*-unix; do
-      ln -s "$i" "/tmp/$(basename "$i")"
+  init = run: writeScript "${name}-init" ''
+    #! ${stdenv.shell}
+    for i in ${env}/* /host/*; do
+      path="/''${i##*/}"
+      [ -e "$path" ] || ${coreutils}/bin/ln -s "$i" "$path"
     done
 
     [ -d "$1" ] && [ -r "$1" ] && cd "$1"
     shift
+
+    source /etc/profile
     exec ${run} "$@"
   '';
 
@@ -32,7 +33,7 @@ in runCommand name {
     env = runCommand "${name}-shell-env" {
       shellHook = ''
         export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS"
-        exec ${chroot-user}/bin/chroot-user ${env} bash ${init "bash"} "$(pwd)"
+        exec ${chroot-user} ${init "bash"} "$(pwd)"
       '';
     } ''
       echo >&2 ""
@@ -46,7 +47,7 @@ in runCommand name {
   cat <<EOF >$out/bin/${name}
   #! ${stdenv.shell}
   export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:\$CHROOTENV_EXTRA_BINDS"
-  exec ${chroot-user}/bin/chroot-user ${env} bash ${init runScript} "\$(pwd)" "\$@"
+  exec ${chroot-user} ${init runScript} "\$(pwd)" "\$@"
   EOF
   chmod +x $out/bin/${name}
   ${extraInstallCommands}
diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
similarity index 73%
rename from pkgs/build-support/build-fhs-chrootenv/env.nix
rename to pkgs/build-support/build-fhs-userenv/env.nix
index 0b2f8bcba6a4..c776abe761dd 100644
--- a/pkgs/build-support/build-fhs-chrootenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -1,7 +1,7 @@
-{ nixpkgs, nixpkgs_i686, system
-} :
+{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux, system }:
+
 { name, profile ? ""
-, pkgs ? null, targetPkgs ? pkgs: [], multiPkgs ? pkgs: []
+, targetPkgs ? pkgs: [], multiPkgs ? pkgs: []
 , extraBuildCommands ? "", extraBuildCommandsMulti ? ""
 , extraOutputsToInstall ? []
 }:
@@ -22,37 +22,32 @@
 # /lib will link to /lib32
 
 let
-  isMultiBuild  = pkgs == null && multiPkgs != null && system == "x86_64-linux";
+  is64Bit = system == "x86_64-linux";
+  isMultiBuild  = multiPkgs != null && is64Bit;
   isTargetBuild = !isMultiBuild;
 
-  # support deprecated "pkgs" option.
-  targetPkgs' =
-    if pkgs != null
-      then builtins.trace "buildFHSEnv: 'pkgs' option is deprecated, use 'targetPkgs'" (pkgs': pkgs)
-      else targetPkgs;
-
   # list of packages (usually programs) which are only be installed for the
   # host's architecture
-  targetPaths = targetPkgs' nixpkgs ++ (if multiPkgs == null then [] else multiPkgs nixpkgs);
+  targetPaths = targetPkgs pkgs ++ (if multiPkgs == null then [] else multiPkgs pkgs);
 
   # list of packages which are installed for both x86 and x86_64 on x86_64
   # systems
-  multiPaths = multiPkgs nixpkgs_i686;
+  multiPaths = multiPkgs pkgsi686Linux;
 
   # base packages of the chroot
   # these match the host's architecture, glibc_multi is used for multilib
   # builds.
-  basePkgs = with nixpkgs;
+  basePkgs = with pkgs;
     [ (if isMultiBuild then glibc_multi else glibc)
       gcc.cc.lib bashInteractive coreutils less shadow su
       gawk diffutils findutils gnused gnugrep
       gnutar gzip bzip2 xz glibcLocales
     ];
-  baseMultiPkgs = with nixpkgs_i686;
+  baseMultiPkgs = with pkgsi686Linux;
     [ gcc.cc.lib
     ];
 
-  etcProfile = nixpkgs.writeText "profile" ''
+  etcProfile = writeText "profile" ''
     export PS1='${name}-chrootenv:\u@\h:\w\$ '
     export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
     export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32'
@@ -67,7 +62,7 @@ let
   '';
 
   # Compose /etc for the chroot environment
-  etcPkg = nixpkgs.stdenv.mkDerivation {
+  etcPkg = stdenv.mkDerivation {
     name         = "${name}-chrootenv-etc";
     buildCommand = ''
       mkdir -p $out/etc
@@ -77,38 +72,38 @@ let
       ln -s ${etcProfile} profile
 
       # compatibility with NixOS
-      ln -s /host-etc/static static
+      ln -s /host/etc/static static
 
       # symlink some NSS stuff
-      ln -s /host-etc/passwd passwd
-      ln -s /host-etc/group group
-      ln -s /host-etc/shadow shadow
-      ln -s /host-etc/hosts hosts
-      ln -s /host-etc/resolv.conf resolv.conf
-      ln -s /host-etc/nsswitch.conf nsswitch.conf
+      ln -s /host/etc/passwd passwd
+      ln -s /host/etc/group group
+      ln -s /host/etc/shadow shadow
+      ln -s /host/etc/hosts hosts
+      ln -s /host/etc/resolv.conf resolv.conf
+      ln -s /host/etc/nsswitch.conf nsswitch.conf
 
       # symlink sudo and su stuff
-      ln -s /host-etc/login.defs login.defs
-      ln -s /host-etc/sudoers sudoers
-      ln -s /host-etc/sudoers.d sudoers.d
+      ln -s /host/etc/login.defs login.defs
+      ln -s /host/etc/sudoers sudoers
+      ln -s /host/etc/sudoers.d sudoers.d
 
       # symlink other core stuff
-      ln -s /host-etc/localtime localtime
-      ln -s /host-etc/machine-id machine-id
-      ln -s /host-etc/os-release os-release
+      ln -s /host/etc/localtime localtime
+      ln -s /host/etc/machine-id machine-id
+      ln -s /host/etc/os-release os-release
 
       # symlink PAM stuff
-      ln -s /host-etc/pam.d pam.d
+      ln -s /host/etc/pam.d pam.d
 
       # symlink fonts stuff
-      ln -s /host-etc/fonts fonts
+      ln -s /host/etc/fonts fonts
 
       # symlink ALSA stuff
-      ln -s /host-etc/asound.conf asound.conf
+      ln -s /host/etc/asound.conf asound.conf
 
       # symlink SSL certs
       mkdir -p ssl
-      ln -s /host-etc/ssl/certs ssl/certs
+      ln -s /host/etc/ssl/certs ssl/certs
 
       # symlink /etc/mtab -> /proc/mounts (compat for old userspace progs)
       ln -s /proc/mounts mtab
@@ -116,14 +111,14 @@ let
   };
 
   # Composes a /usr-like directory structure
-  staticUsrProfileTarget = nixpkgs.buildEnv {
+  staticUsrProfileTarget = buildEnv {
     name = "${name}-usr-target";
     paths = [ etcPkg ] ++ basePkgs ++ targetPaths;
     extraOutputsToInstall = [ "lib" "out" ] ++ extraOutputsToInstall;
     ignoreCollisions = true;
   };
 
-  staticUsrProfileMulti = nixpkgs.buildEnv {
+  staticUsrProfileMulti = buildEnv {
     name = "${name}-usr-multi";
     paths = baseMultiPkgs ++ multiPaths;
     extraOutputsToInstall = [ "lib" "out" ] ++ extraOutputsToInstall;
@@ -132,10 +127,9 @@ let
 
   # setup library paths only for the targeted architecture
   setupLibDirs_target = ''
-    mkdir -m0755 lib
-
-    # copy content of targetPaths
-    cp -rsHf ${staticUsrProfileTarget}/lib/* lib/
+    # link content of targetPaths
+    cp -rsHf ${staticUsrProfileTarget}/lib lib
+    ln -s lib lib${if is64Bit then "64" else "32"}
   '';
 
   # setup /lib, /lib32 and /lib64
@@ -184,7 +178,7 @@ let
     done
   '';
 
-in nixpkgs.stdenv.mkDerivation {
+in stdenv.mkDerivation {
   name         = "${name}-fhs";
   buildCommand = ''
     mkdir -p $out
@@ -196,7 +190,4 @@ in nixpkgs.stdenv.mkDerivation {
     ${if isMultiBuild then extraBuildCommandsMulti else ""}
   '';
   preferLocalBuild = true;
-  passthru = {
-    pname = name;
-  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27a935eed119..d0614840c2f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -118,29 +118,7 @@ in
 
   buildEnv = callPackage ../build-support/buildenv { }; # not actually a package
 
-  buildFHSEnv = callPackage ../build-support/build-fhs-chrootenv/env.nix {
-    nixpkgs      = pkgs;
-    nixpkgs_i686 = pkgsi686Linux;
-  };
-
-  chrootFHSEnv = callPackage ../build-support/build-fhs-chrootenv { };
-  userFHSEnv = callPackage ../build-support/build-fhs-userenv {
-   ruby = ruby_2_1;
-  };
-
-  buildFHSChrootEnv = args: chrootFHSEnv {
-    env = buildFHSEnv (removeAttrs args [ "extraInstallCommands" ]);
-    extraInstallCommands = args.extraInstallCommands or "";
-  };
-
-  buildFHSUserEnv = args: userFHSEnv {
-    env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" "meta" "passthru" ]);
-    runScript = args.runScript or "bash";
-    extraBindMounts = args.extraBindMounts or [];
-    extraInstallCommands = args.extraInstallCommands or "";
-    meta = args.meta or {};
-    passthru = args.passthru or {};
-  };
+  buildFHSUserEnv = callPackage ../build-support/build-fhs-userenv { };
 
   buildMaven = callPackage ../build-support/build-maven.nix {};
 

From 8d9e5d297d8c7aa6c1aa77bf3d4b9dd3fba7c9ec Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 5 Jun 2016 16:12:25 +0300
Subject: [PATCH 021/436] buildFHSEnv: don't link GCC compiler part

---
 pkgs/build-support/build-fhs-userenv/env.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index c776abe761dd..04b4c10237a2 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -39,12 +39,12 @@ let
   # builds.
   basePkgs = with pkgs;
     [ (if isMultiBuild then glibc_multi else glibc)
-      gcc.cc.lib bashInteractive coreutils less shadow su
+      (toString gcc.cc.lib) bashInteractive coreutils less shadow su
       gawk diffutils findutils gnused gnugrep
       gnutar gzip bzip2 xz glibcLocales
     ];
   baseMultiPkgs = with pkgsi686Linux;
-    [ gcc.cc.lib
+    [ (toString gcc.cc.lib)
     ];
 
   etcProfile = writeText "profile" ''

From 3e90b00c1081dc878a2b9ab195c9bb136104f3cd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 7 Jun 2016 03:50:16 +0300
Subject: [PATCH 022/436] buildFHSEnv: link 'bin' output

---
 pkgs/build-support/build-fhs-userenv/env.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index 04b4c10237a2..1dc71987f543 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -114,14 +114,14 @@ let
   staticUsrProfileTarget = buildEnv {
     name = "${name}-usr-target";
     paths = [ etcPkg ] ++ basePkgs ++ targetPaths;
-    extraOutputsToInstall = [ "lib" "out" ] ++ extraOutputsToInstall;
+    extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall;
     ignoreCollisions = true;
   };
 
   staticUsrProfileMulti = buildEnv {
     name = "${name}-usr-multi";
     paths = baseMultiPkgs ++ multiPaths;
-    extraOutputsToInstall = [ "lib" "out" ] ++ extraOutputsToInstall;
+    extraOutputsToInstall = [ "out" "lib" ] ++ extraOutputsToInstall;
     ignoreCollisions = true;
   };
 

From 3d8664ee42d43218bdec1cc9b1075998ad66082f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 7 Jun 2016 14:22:38 +0300
Subject: [PATCH 023/436] buildFHSUserEnv: mark CHROOTENV_EXTRA_BINDS as
 discussed for deprecation

---
 pkgs/build-support/build-fhs-userenv/chroot-user.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
index 2fb3b0954b37..e3b268d57af6 100755
--- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb
+++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
@@ -66,6 +66,10 @@ execp = ARGV
 
 # Populate extra mounts
 if not ENV["CHROOTENV_EXTRA_BINDS"].nil?
+  $stderr.puts "CHROOTENV_EXTRA_BINDS is discussed for deprecation."
+  $stderr.puts "If you have a usecase, please drop a note in issue #16030."
+  $stderr.puts "Notice that we now bind-mount host FS to '/host' and symlink all directories from it to '/' by default."
+
   for extra in ENV["CHROOTENV_EXTRA_BINDS"].split(':')
     paths = extra.split('=')
     if not paths.empty?

From f3ebf1376284629b3da9ed57774a31ae79a7ec53 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 7 Jun 2016 09:57:07 -0400
Subject: [PATCH 024/436] kernel: 4.1.20 -> 4.1.25

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index 57e239c1d094..1e8932ad598a 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1.20";
+  version = "4.1.25";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1dpq8dgj351jzm7n6330a4xriz9dxv7d9wxzj9zn9q7ya22np9gs";
+    sha256 = "0rfs5vn9ggymd426jr4gkhgk9bnn1g9c5x7k3xgfh4i08mq1920f";
   };
 
   kernelPatches = args.kernelPatches;

From a57cbf6546ddf226a4ea3201fd72d260c7154d3e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 7 Jun 2016 09:57:47 -0400
Subject: [PATCH 025/436] kernel: 4.4.11 -> 4.4.12

---
 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 e89a53d21bfc..4bc501a3ba27 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.11";
+  version = "4.4.12";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1c0lqk2q4hf8jx6myhcqgh2509d36wx87l5k5cl3xfsnrzrpclrs";
+    sha256 = "1r96jyvm44615f5zh5sn04zx7y8bllpx12lx1zjkns66i4ddv0rq";
   };
 
   kernelPatches = args.kernelPatches;

From 8f4755a0ae4d70577a62238f93ddf4849755212c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 7 Jun 2016 09:58:24 -0400
Subject: [PATCH 026/436] kernel: 4.5.5 -> 4.5.6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.5.nix b/pkgs/os-specific/linux/kernel/linux-4.5.nix
index 84d48865bcb7..94561ed2e549 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.5.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.5.5";
+  version = "4.5.6";
   extraMeta.branch = "4.5";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0l7wnilqqhg3im2v04g6k2x621yckdb9bpfh8s8jq9l2fixjln99";
+    sha256 = "1bdyviimgnc4zbgd9v1xk87sj9h8cprjykifriddwslqxyr2yh0y";
   };
 
   kernelPatches = args.kernelPatches;

From 269b7d30a7ab049bd6dd0bb575f6cd9e4a601425 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 7 Jun 2016 09:59:19 -0400
Subject: [PATCH 027/436] kernel: 4.6.0 -> 4.6.1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.6.nix b/pkgs/os-specific/linux/kernel/linux-4.6.nix
index 0a85af58473a..b93550b6ea63 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.6.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.6";
-  modDirVersion = "4.6.0";
+  version = "4.6.1";
   extraMeta.branch = "4.6";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866";
+    sha256 = "073vpwidl28ka3y2rd7n6dcckrppi5kalh48vsz980k9z12g9pfm";
   };
 
   kernelPatches = args.kernelPatches;

From 3913aaeaadc75d6beeb632abefc1e39608968fec Mon Sep 17 00:00:00 2001
From: Hurshal Patel <hurshal@imap.cc>
Date: Tue, 19 Apr 2016 23:24:53 -0700
Subject: [PATCH 028/436] xbanish service: init at 1.4

---
 nixos/modules/module-list.nix          |  1 +
 nixos/modules/services/x11/xbanish.nix | 30 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 nixos/modules/services/x11/xbanish.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 509634cf34c1..f30433bed3af 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -490,6 +490,7 @@
   ./services/x11/window-managers/windowlab.nix
   ./services/x11/window-managers/wmii.nix
   ./services/x11/window-managers/xmonad.nix
+  ./services/x11/xbanish.nix
   ./services/x11/xfs.nix
   ./services/x11/xserver.nix
   ./system/activation/activation-script.nix
diff --git a/nixos/modules/services/x11/xbanish.nix b/nixos/modules/services/x11/xbanish.nix
new file mode 100644
index 000000000000..e1e3cbc8e441
--- /dev/null
+++ b/nixos/modules/services/x11/xbanish.nix
@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.services.xbanish;
+
+in {
+  options.services.xbanish = {
+
+    enable = mkEnableOption "xbanish";
+
+    arguments = mkOption {
+      description = "Arguments to pass to xbanish command";
+      default = "";
+      example = "-d -i shift";
+      type = types.str;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.xbanish = {
+      description = "xbanish hides the mouse pointer";
+      wantedBy = [ "default.target" ];
+      serviceConfig.ExecStart = ''
+        ${pkgs.xbanish}/bin/xbanish ${cfg.arguments}
+      '';
+      serviceConfig.Restart = "always";
+    };
+  };
+}

From 331cbe78489585bde4727145958dc3f7e238b970 Mon Sep 17 00:00:00 2001
From: Erik Ouchterlony <erik.ouchterlony@bredband.net>
Date: Wed, 8 Jun 2016 20:31:36 +0200
Subject: [PATCH 029/436] electron: 0.36.2 -> 1.2.2

---
 pkgs/development/tools/electron/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index a3afc235a6c5..7c8315859560 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv }:
+{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
 
 stdenv.mkDerivation rec {
   name = "electron-${version}";
-  version = "0.36.2";
+  version = "1.2.2";
 
   src = fetchurl {
-    url = "https://github.com/atom/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-    sha256 = "01d78j8dfrdygm1r141681b3bfz1f1xqg9vddz7j52z1mlfv9f1d";
+    url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
+    sha256 = "0jqzs1297f6w7s4j9pd7wyyqbidb0c61yjz47raafslg6nljgp1c";
     name = "${name}.zip";
   };
 
-  buildInputs = [ unzip ];
+  buildInputs = [ unzip makeWrapper ];
 
   buildCommand = ''
     mkdir -p $out/lib/electron $out/bin
@@ -23,11 +23,14 @@ stdenv.mkDerivation rec {
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "${atomEnv.libPath}:$out/lib/electron" \
       $out/lib/electron/electron
+
+    wrapProgram $out/lib/electron/electron \
+      --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
   '';
 
   meta = with stdenv.lib; {
     description = "Cross platform desktop application shell";
-    homepage = https://github.com/atom/electron;
+    homepage = https://github.com/electron/electron;
     license = licenses.mit;
     maintainers = [ maintainers.travisbhartwell ];
     platforms = [ "x86_64-linux" ];

From d1e4ee146d68a21c263d094acb416b050af32939 Mon Sep 17 00:00:00 2001
From: uwap <me@uwap.name>
Date: Thu, 9 Jun 2016 00:15:55 +0200
Subject: [PATCH 030/436] Postfix: Add an option to enable Submission

Adds services.postfix.enableSubmission and services.postfix.extraSubmissionOptions to make it easy to enable submission in master.cf
---
 nixos/modules/services/mail/postfix.nix | 26 ++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index bad9d527f9a1..e354ae668197 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -127,11 +127,14 @@ let
     #               (yes)   (yes)   (no)    (never) (100)
     # ==========================================================================
     smtp      inet  n       -       n       -       -       smtpd
-    #submission inet n       -       n       -       -       smtpd
-    #  -o smtpd_tls_security_level=encrypt
-    #  -o smtpd_sasl_auth_enable=yes
-    #  -o smtpd_client_restrictions=permit_sasl_authenticated,reject
-    #  -o milter_macro_daemon_name=ORIGINATING
+  '' + optionalString cfg.enableSubmission ''
+    submission inet n       -       n       -       -       smtpd
+      -o smtpd_tls_security_level=encrypt
+      -o smtpd_sasl_auth_enable=yes
+      -o smtpd_client_restrictions=permit_sasl_authenticated,reject
+      ${cfg.extraSubmissionOptions}
+  ''
+  + ''
     pickup    unix  n       -       n       60      1       pickup
     cleanup   unix  n       -       n       -       0       cleanup
     qmgr      unix  n       -       n       300     1       qmgr
@@ -201,6 +204,19 @@ in
         default = true;
         description = "Whether to enable smtp in master.cf.";
       };
+      
+      enableSubmission = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable smtp submission in master.cf.";
+      };
+
+      extraSubmissionOptions = mkOption {
+        type = types.str;
+        default = "";
+        description = "Extra options for the submission config in master.cf.";
+        example = "-o milter_macro_daemon_name=ORIGINATING";
+      };
 
       setSendmail = mkOption {
         type = types.bool;

From 2b7b6047a548d12ebd85c82ef655bac311db073c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 8 Jun 2016 20:11:03 -0500
Subject: [PATCH 031/436] exif: use libintl on darwin

fixes #16034
---
 pkgs/tools/graphics/exif/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix
index a8599980d94d..dd749c05e4a8 100644
--- a/pkgs/tools/graphics/exif/default.nix
+++ b/pkgs/tools/graphics/exif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libexif, popt }:
+{ stdenv, fetchurl, pkgconfig, libexif, popt, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
   name = "exif-0.6.21";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1zb9hwdl783d4vd2s2rw642hg8hd6n0mfp6lrbiqmp9jmhlq5rsr";
   };
 
-  buildInputs = [ pkgconfig libexif popt ];
-  
+  buildInputs = [ pkgconfig libexif popt ] ++ libintlOrEmpty;
+
   meta = {
     homepage = http://libexif.sourceforge.net/;
     description = "A utility to read and manipulate EXIF data in digital photographs";

From 4bc528ce280d3a2e65ee3937949f4b8793928615 Mon Sep 17 00:00:00 2001
From: Jinjing Wang <nfjinjing@gmail.com>
Date: Fri, 3 Jun 2016 18:27:27 +0800
Subject: [PATCH 032/436] shadowsocks-libev: 2.4.6 -> 2.4.7

---
 .../networking/shadowsocks-libev/default.nix  | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix
index 25068f8916be..e12d25930210 100644
--- a/pkgs/tools/networking/shadowsocks-libev/default.nix
+++ b/pkgs/tools/networking/shadowsocks-libev/default.nix
@@ -1,18 +1,23 @@
 { withPolarSSL ? false
+, enableSystemSharedLib ? true
 , stdenv, fetchurl, zlib
 , openssl ? null
 , polarssl ? null
+, libev ? null
+, libsodium ? null
+, udns ? null
 }:
 
 let
 
-  version = "2.4.6";
-  sha256 = "c87781bc280d7a7180cf82b17ad4e8f38242c73431d5b4b6cd4ccd0c29e1fe93";
+  version = "2.4.7";
+  sha256 = "957265cc5339e020d8c8bb7414ab14936e3939dc7355f334aec896ec9b03c6ed";
 
 in
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
-  inherit version;
   name = "shadowsocks-libev-${version}";
   src = fetchurl {
     url = "https://github.com/shadowsocks/shadowsocks-libev/archive/v${version}.tar.gz";
@@ -20,13 +25,15 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ zlib ]
-                ++ stdenv.lib.optional (!withPolarSSL) openssl
-                ++ stdenv.lib.optional withPolarSSL polarssl;
+                ++ optional (!withPolarSSL) openssl
+                ++ optional withPolarSSL polarssl
+                ++ optional enableSystemSharedLib [libev libsodium udns];
 
-  configureFlags = stdenv.lib.optional (withPolarSSL)
+  configureFlags = optional withPolarSSL
                      [ "--with-crypto-library=polarssl"
                        "--with-polarssl=${polarssl}"
-                     ];
+                     ]
+                   ++ optional enableSystemSharedLib "--enable-system-shared-lib";
 
   meta = {
     description = "A lightweight secured SOCKS5 proxy";
@@ -35,8 +42,8 @@ stdenv.mkDerivation rec {
       It is a port of Shadowsocks created by @clowwindy, which is maintained by @madeye and @linusyang.
     '';
     homepage = https://github.com/shadowsocks/shadowsocks-libev;
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.nfjinjing ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.nfjinjing ];
+    platforms = platforms.all;
   };
 }

From bfa32800c3df6dd3a8e23bd239ec102173407249 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 21 Apr 2016 11:49:33 +0200
Subject: [PATCH 033/436] First programs extracted from go-packages: deis and
 gawp

---
 pkgs/development/go-modules/libs.json   | 29 ++++++++++++++++++++
 pkgs/development/tools/deis/default.nix | 36 +++++++++++++++++++++++++
 pkgs/tools/misc/gawp/default.nix        | 29 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 +--
 pkgs/top-level/go-packages.nix          | 32 ----------------------
 5 files changed, 96 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/development/go-modules/libs.json
 create mode 100644 pkgs/development/tools/deis/default.nix
 create mode 100644 pkgs/tools/misc/gawp/default.nix

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
new file mode 100644
index 000000000000..8e5fee179bf2
--- /dev/null
+++ b/pkgs/development/go-modules/libs.json
@@ -0,0 +1,29 @@
+[
+  {
+    "goPackagePath": "golang.org/x/sys",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/sys",
+      "rev": "7a56174f0086b32866ebd746a794417edbc678a1",
+      "sha256": "13jaz47wyrfak066ywkrvqnk1ijxik0nlvi7vkpi3gaiwcrlb5g2"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/fsnotify.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/fsnotify.v1",
+      "rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8",
+      "sha256": "1ljkdzbj9ll3jx1dggslzpm475prvsg22hdpxnb6kxqyk3z8dqdj"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/yaml.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/yaml.v2",
+      "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
+      "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
+    }
+  }
+]
\ No newline at end of file
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
new file mode 100644
index 000000000000..3787e30fbf43
--- /dev/null
+++ b/pkgs/development/tools/deis/default.nix
@@ -0,0 +1,36 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "deis-${version}";
+  version = "1.13.0";
+  rev = "v${version}";
+  
+  goPackagePath = "github.com/deis/deis";
+  subPackages = [ "client" ];
+
+  postInstall = ''
+    if [ -f "$bin/bin/client" ]; then
+      mv "$bin/bin/client" "$bin/bin/deis"
+    fi
+  '';
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/deis/deis";
+    sha256 = "1fblg3gf7dh5hhm4ajq7yl7iy6gw8p5xlh4z8kvfy542m1fzr0dc";
+  };
+
+  extraSrcs = map ( jsonDep:
+    {
+      inherit (jsonDep) goPackagePath;
+      src = if jsonDep.fetch.type == "git" then
+        fetchgit {
+          inherit (jsonDep.fetch) url rev sha256;
+        }
+        else {};
+    }
+  ) (builtins.fromJSON (builtins.readFile ../../go-modules/libs.json));
+}
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
new file mode 100644
index 000000000000..608b1764887a
--- /dev/null
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -0,0 +1,29 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "gawp-${version}";
+  version = "20160121-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
+  
+  goPackagePath = "github.com/martingallagher/gawp";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/martingallagher/gawp";
+    sha256 = "0r4bp4w3s9rkmg3cz9jb7d6ngh7vfj31p9kbim6mhilxvmgjk4ly";
+  };
+
+  extraSrcs = map ( jsonDep:
+    {
+      inherit (jsonDep) goPackagePath;
+      src = if jsonDep.fetch.type == "git" then
+        fetchgit {
+          inherit (jsonDep.fetch) url rev sha256;
+        }
+        else {};
+    }
+  ) (builtins.fromJSON (builtins.readFile ../../../development/go-modules/libs.json));
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cead489cf25..a45a56161617 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -730,7 +730,7 @@ in
 
   ddate = callPackage ../tools/misc/ddate { };
 
-  deis = goPackages.deis.bin // { outputs = [ "bin" ]; };
+  deis = (callPackage ../development/tools/deis {}).bin;
 
   dfilemanager = self.kde5.dfilemanager;
 
@@ -1644,7 +1644,7 @@ in
   gawkInteractive = appendToName "interactive"
     (gawk.override { interactive = true; });
 
-  gawp = goPackages.gawp.bin // { outputs = [ "bin" ]; };
+  gawp = (callPackage ../tools/misc/gawp {}).bin;
 
   gazeboSimulator = recurseIntoAttrs {
     sdformat = gazeboSimulator.sdformat4;
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 95337accf6b4..619d4c60f1d6 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -669,20 +669,6 @@ let
     sha256 = "1wxv2cbihzcsz2z7iycyzl7f3arhhgagcc5kqln1k1mkm4l85z0q";
   };
 
-  deis = buildFromGitHub {
-    rev = "v1.12.2";
-    owner = "deis";
-    repo = "deis";
-    sha256 = "03lznzcij3gn08kqj2p6skifcdv5aw09dm6zxgvqw7nxx2n1j2ib";
-    subPackages = [ "client" ];
-    buildInputs = [ docopt-go crypto yaml-v2 ];
-    postInstall = ''
-      if [ -f "$bin/bin/client" ]; then
-        mv "$bin/bin/client" "$bin/bin/deis"
-      fi
-    '';
-  };
-
   dns = buildFromGitHub {
     rev     = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa";
     version = "2016-03-28";
@@ -934,24 +920,6 @@ let
     sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj";
   };
 
-  gawp = buildFromGitHub {
-    rev    = "488705639109de54d38974cc31353d34cc2cd609";
-    version = "2015-08-31";
-    owner  = "martingallagher";
-    repo   = "gawp";
-    sha256 = "0iqqd63nqdijdskdb9f0jwnm6akkh1p2jw4p2w7r1dbaqz1znyay";
-    dontInstallSrc = true;
-    buildInputs = [ fsnotify.v1 yaml-v2 ];
-
-    meta = with stdenv.lib; {
-      homepage    = "https://github.com/martingallagher/gawp";
-      description = "A simple, configurable, file watching, job execution tool implemented in Go";
-      maintainers = with maintainers; [ kamilchm ];
-      license     = licenses.asl20 ;
-      platforms   = platforms.all;
-    };
-  };
-
   gcloud-golang = buildFromGitHub {
     rev = "6335269abf9002cf5a84613c13cda6010842b834";
     owner = "GoogleCloudPlatform";

From 5c2628a7049841b152b304443e7a364f60e1768b Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Tue, 26 Apr 2016 21:09:45 +0200
Subject: [PATCH 034/436] When using common deps include only specified
 packages, not all set

---
 pkgs/tools/misc/gawp/default.nix | 34 ++++++++++++++++++++++----------
 pkgs/tools/misc/gawp/deps.json   | 10 ++++++++++
 2 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/tools/misc/gawp/deps.json

diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index 608b1764887a..5f87d2bed71e 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -1,8 +1,31 @@
 # This file was generated by go2nix.
 { stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
+with builtins;
 with goPackages;
 
+let
+  depToSrc = jsonDep:
+    {
+      inherit (jsonDep) goPackagePath;
+      src = if jsonDep.fetch.type == "git" then
+        fetchgit {
+          inherit (jsonDep.fetch) url rev sha256;
+        }
+        else {};
+    };
+
+  importGodeps = { depsFile, filterPackages ? [] }:
+  let
+    deps = lib.importJSON depsFile;
+    external = filter (d: d ? include) deps;
+    direct = filter (d: d ? goPackagePath && (length filterPackages == 0 || elem d.goPackagePath filterPackages)) deps;
+  in
+    concatLists (map importGodeps (map (d: { depsFile = ./. + d.include; filterPackages = d.packages; }) external)) ++ (map depToSrc direct);
+
+  godeps = importGodeps { depsFile = ./deps.json; };
+in
+
 buildGoPackage rec {
   name = "gawp-${version}";
   version = "20160121-${stdenv.lib.strings.substring 0 7 rev}";
@@ -16,14 +39,5 @@ buildGoPackage rec {
     sha256 = "0r4bp4w3s9rkmg3cz9jb7d6ngh7vfj31p9kbim6mhilxvmgjk4ly";
   };
 
-  extraSrcs = map ( jsonDep:
-    {
-      inherit (jsonDep) goPackagePath;
-      src = if jsonDep.fetch.type == "git" then
-        fetchgit {
-          inherit (jsonDep.fetch) url rev sha256;
-        }
-        else {};
-    }
-  ) (builtins.fromJSON (builtins.readFile ../../../development/go-modules/libs.json));
+  extraSrcs = godeps;
 }
diff --git a/pkgs/tools/misc/gawp/deps.json b/pkgs/tools/misc/gawp/deps.json
new file mode 100644
index 000000000000..28b9216ca007
--- /dev/null
+++ b/pkgs/tools/misc/gawp/deps.json
@@ -0,0 +1,10 @@
+[
+    {
+        "include": "../../../../development/go-modules/libs.json",
+        "packages": [
+            "golang.org/x/sys",
+            "gopkg.in/yaml.v2",
+            "gopkg.in/fsnotify.v1"
+        ]
+    }
+]

From 81f3092e1168ef3f149031fca5acd78009acd2e5 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Wed, 27 Apr 2016 08:45:04 +0200
Subject: [PATCH 035/436] Reusing go libs in deis build

---
 .../go-modules/generic/default.nix            | 40 +++++++++++++++----
 pkgs/development/go-modules/libs.json         | 20 +++++++++-
 pkgs/development/tools/deis/default.nix       | 13 +-----
 pkgs/development/tools/deis/deps.json         | 10 +++++
 pkgs/tools/misc/gawp/default.nix              | 26 +-----------
 5 files changed, 66 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/development/tools/deis/deps.json

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 89258062f263..4f4fa3275175 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,4 +1,4 @@
-{ go, govers, parallel, lib }:
+{ go, govers, parallel, lib, fetchgit }:
 
 { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
 
@@ -17,6 +17,9 @@
 # Extra sources to include in the gopath
 , extraSrcs ? [ ]
 
+# go2nix dependency file
+, goDeps ? null
+
 , dontRenameImports ? false
 
 # Do not enable this without good reason
@@ -27,6 +30,8 @@
 
 if disabled then throw "${name} not supported for go ${go.meta.branch}" else
 
+with builtins;
+
 let
   args = lib.filterAttrs (name: _: name != "extraSrcs") args';
 
@@ -35,6 +40,27 @@ let
   removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: ''
     | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \
   '');
+
+  dep2src = goDep:
+    {
+      inherit (goDep) goPackagePath;
+      src = if goDep.fetch.type == "git" then
+        fetchgit {
+          inherit (goDep.fetch) url rev sha256;
+        }
+        else {};
+    };
+
+  importGodeps = { depsFile, filterPackages ? [] }:
+  let
+    deps = lib.importJSON depsFile;
+    external = filter (d: d ? include) deps;
+    direct = filter (d: d ? goPackagePath && (length filterPackages == 0 || elem d.goPackagePath filterPackages)) deps;
+  in
+    concatLists (map importGodeps (map (d: { depsFile = ./. + d.include; filterPackages = d.packages; }) external)) ++ (map dep2src direct);
+
+  goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs
+                             else extraSrcs;
 in
 
 go.stdenv.mkDerivation (
@@ -53,13 +79,13 @@ go.stdenv.mkDerivation (
     mkdir -p "go/src/$(dirname "$goPackagePath")"
     mv "$sourceRoot" "go/src/$goPackagePath"
 
-  '' + lib.flip lib.concatMapStrings extraSrcs ({ src, goPackagePath }: ''
-    mkdir extraSrc
-    (cd extraSrc; unpackFile "${src}")
+  '' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: ''
+    mkdir goPath
+    (cd goPath; unpackFile "${src}")
     mkdir -p "go/src/$(dirname "${goPackagePath}")"
-    chmod -R u+w extraSrc/*
-    mv extraSrc/* "go/src/${goPackagePath}"
-    rmdir extraSrc
+    chmod -R u+w goPath/*
+    mv goPath/* "go/src/${goPackagePath}"
+    rmdir goPath
 
   '') + ''
     export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 8e5fee179bf2..4336fcc44bc9 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -25,5 +25,23 @@
       "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
       "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
     }
+  },
+  {
+    "goPackagePath": "github.com/docopt/docopt-go",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/docopt/docopt-go",
+      "rev": "784ddc588536785e7299f7272f39101f7faccc3f",
+      "sha256": "13x00cnady5znysfwca3x59dl04m8rvnk2yprgyqqpg2y4v0xmbf"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/crypto",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/crypto",
+      "rev": "1f22c0103821b9390939b6776727195525381532",
+      "sha256": "05ahvn9g9cj7797n8ryfxv2g26v3lx1pza9d9pg97iw0rvar9i1h"
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index 3787e30fbf43..5336a14c5a17 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, goPackages, fetchgit }:
 
 with goPackages;
 
@@ -23,14 +23,5 @@ buildGoPackage rec {
     sha256 = "1fblg3gf7dh5hhm4ajq7yl7iy6gw8p5xlh4z8kvfy542m1fzr0dc";
   };
 
-  extraSrcs = map ( jsonDep:
-    {
-      inherit (jsonDep) goPackagePath;
-      src = if jsonDep.fetch.type == "git" then
-        fetchgit {
-          inherit (jsonDep.fetch) url rev sha256;
-        }
-        else {};
-    }
-  ) (builtins.fromJSON (builtins.readFile ../../go-modules/libs.json));
+  goDeps = ./deps.json;
 }
diff --git a/pkgs/development/tools/deis/deps.json b/pkgs/development/tools/deis/deps.json
new file mode 100644
index 000000000000..a0333247062e
--- /dev/null
+++ b/pkgs/development/tools/deis/deps.json
@@ -0,0 +1,10 @@
+[
+    {
+        "include": "../../../go-modules/libs.json",
+        "packages": [
+            "github.com/docopt/docopt-go",
+            "golang.org/x/crypto",
+            "gopkg.in/yaml.v2"
+        ]
+    }
+]
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index 5f87d2bed71e..552d01041310 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -1,31 +1,9 @@
 # This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, goPackages, fetchgit }:
 
 with builtins;
 with goPackages;
 
-let
-  depToSrc = jsonDep:
-    {
-      inherit (jsonDep) goPackagePath;
-      src = if jsonDep.fetch.type == "git" then
-        fetchgit {
-          inherit (jsonDep.fetch) url rev sha256;
-        }
-        else {};
-    };
-
-  importGodeps = { depsFile, filterPackages ? [] }:
-  let
-    deps = lib.importJSON depsFile;
-    external = filter (d: d ? include) deps;
-    direct = filter (d: d ? goPackagePath && (length filterPackages == 0 || elem d.goPackagePath filterPackages)) deps;
-  in
-    concatLists (map importGodeps (map (d: { depsFile = ./. + d.include; filterPackages = d.packages; }) external)) ++ (map depToSrc direct);
-
-  godeps = importGodeps { depsFile = ./deps.json; };
-in
-
 buildGoPackage rec {
   name = "gawp-${version}";
   version = "20160121-${stdenv.lib.strings.substring 0 7 rev}";
@@ -39,5 +17,5 @@ buildGoPackage rec {
     sha256 = "0r4bp4w3s9rkmg3cz9jb7d6ngh7vfj31p9kbim6mhilxvmgjk4ly";
   };
 
-  extraSrcs = godeps;
+  goDeps = ./deps.json;
 }

From dfe1064b4e49fcda317021e183e85e419b33b473 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 2 Jun 2016 20:55:19 +0200
Subject: [PATCH 036/436] asciinema: top level pkgs extracted from goPackages

---
 pkgs/tools/misc/asciinema/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        |  7 -------
 3 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/tools/misc/asciinema/default.nix

diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix
new file mode 100644
index 000000000000..9a1269815afb
--- /dev/null
+++ b/pkgs/tools/misc/asciinema/default.nix
@@ -0,0 +1,19 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "asciinema-${version}";
+  version = "20160520-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "6683bdaa263d0ce3645b87fe54aa87276b89988a";
+
+  
+  goPackagePath = "github.com/asciinema/asciinema";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/asciinema/asciinema";
+    sha256 = "08jyvnjpd5jdgyvkly9fswac4p10bqim5v4rhmivpg4y8pbcmxkz";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a45a56161617..d2e5535db8f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -446,7 +446,7 @@ in
 
   ascii = callPackage ../tools/text/ascii { };
 
-  asciinema = goPackages.asciinema.bin // { outputs = [ "bin" ]; };
+  asciinema = (callPackage ../tools/misc/asciinema {}).bin;
 
   asymptote = callPackage ../tools/graphics/asymptote {
     texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 619d4c60f1d6..80e3d590c688 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -250,13 +250,6 @@ let
     sha256 = "0b38mrfm3rwgdi7hrp4gjhf0y0f6bw73qjkfrkafxjrdpdg7nyly";
   };
 
-  asciinema = buildFromGitHub {
-    rev = "v1.2.0";
-    owner = "asciinema";
-    repo = "asciinema";
-    sha256 = "0wvrq92ackhfycfs1fircs8al3ji69igqqrc55ic29wbpnvz355x";
-  };
-
   asmfmt = buildFromGitHub {
     rev = "7971758b0c6584f67d745c62d006814ae7b44e9d";
     owner = "klauspost";

From dbf48cd10baf816d1ce48829f169a531165a8f2d Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 2 Jun 2016 21:21:45 +0200
Subject: [PATCH 037/436] fzf: application extracted from goPackages

---
 pkgs/tools/misc/fzf/default.nix | 33 +++++++++++++++++++++++
 pkgs/tools/misc/fzf/deps.json   | 20 ++++++++++++++
 pkgs/top-level/all-packages.nix |  2 +-
 pkgs/top-level/go-packages.nix  | 46 ---------------------------------
 4 files changed, 54 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/tools/misc/fzf/default.nix
 create mode 100644 pkgs/tools/misc/fzf/deps.json

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
new file mode 100644
index 000000000000..08def70ecb6e
--- /dev/null
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -0,0 +1,33 @@
+# This file was generated by go2nix.
+{ stdenv, lib, ncurses, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "fzf-${version}";
+  version = "0.12.2";
+  rev = "${version}";
+
+  goPackagePath = "github.com/junegunn/fzf";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/junegunn/fzf";
+    sha256 = "02qqcnijv8z3736iczbx082yizpqk02g5k746k7sdgfkgyxydppk";
+  };
+
+  buildInputs = [ ncurses ];
+
+  goDeps = ./deps.json;
+  
+  patchPhase = ''
+    sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim
+    sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim
+  '';
+
+  postInstall= ''
+    cp $src/bin/fzf-tmux $bin/bin
+    mkdir -p $out/share/vim-plugins
+    ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${(builtins.parseDrvName fzf.name).name}
+  '';
+}
diff --git a/pkgs/tools/misc/fzf/deps.json b/pkgs/tools/misc/fzf/deps.json
new file mode 100644
index 000000000000..a856d2d5fa81
--- /dev/null
+++ b/pkgs/tools/misc/fzf/deps.json
@@ -0,0 +1,20 @@
+[
+  {
+    "goPackagePath": "github.com/junegunn/go-runewidth",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/junegunn/go-runewidth",
+      "rev": "63c378b851290989b19ca955468386485f118c65",
+      "sha256": "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d"
+    }
+  },
+  {
+    "goPackagePath": "github.com/junegunn/go-shellwords",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/junegunn/go-shellwords",
+      "rev": "35d512af75e283aae4ca1fc3d44b159ed66189a4",
+      "sha256": "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7"
+    }
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2e5535db8f5..73a52f005250 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -801,7 +801,7 @@ in
 
   fsmark = callPackage ../tools/misc/fsmark { };
 
-  fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; };
+  fzf = (callPackage ../tools/misc/fzf {}).bin;
 
   fzy = callPackage ../tools/misc/fzy { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 80e3d590c688..b8cde1700cb6 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -884,28 +884,6 @@ let
     buildInputs = [ afero ];
   };
 
-  fzf = buildFromGitHub {
-    rev = "0.12.0";
-    owner = "junegunn";
-    repo = "fzf";
-    sha256 = "0lxh8nf5xc5qnmx18h0q43iy3hy818firkz4rfkr3b0b5gd3aan1";
-
-    buildInputs = [
-      crypto ginkgo gomega junegunn.go-runewidth go-shellwords pkgs.ncurses text
-    ];
-
-    patchPhase = ''
-      sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim
-      sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim
-    '';
-
-    postInstall= ''
-      cp $src/bin/fzf-tmux $bin/bin
-      mkdir -p $out/share/vim-plugins
-      ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${(builtins.parseDrvName fzf.name).name}
-    '';
-  };
-
   g2s = buildFromGitHub {
     rev    = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc";
     owner  = "peterbourgon";
@@ -1843,18 +1821,6 @@ let
     sha256 = "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c";
   };
 
-  junegunn.go-runewidth = buildGoPackage rec {
-    rev = "travisish";
-    name = "go-runewidth-${rev}";
-    goPackagePath = "github.com/junegunn/go-runewidth";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "junegunn";
-      repo = "go-runewidth";
-      sha256 = "07d612val59sibqly5d6znfkp4h4gjd77783jxvmiq6h2fwb964k";
-    };
-  };
-
   jp = buildFromGitHub {
     rev = "0.1.2";
     owner = "jmespath";
@@ -1877,18 +1843,6 @@ let
     sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
   };
 
-  go-shellwords = buildGoPackage rec {
-    rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4";
-    name = "go-shellwords-${rev}";
-    goPackagePath = "github.com/junegunn/go-shellwords";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "junegunn";
-      repo = "go-shellwords";
-      sha256 = "c792abe5fda48d0dfbdc32a84edb86d884a0ccbd9ed49ad48a30cda5ba028a22";
-    };
-  };
-
   go-restful = buildFromGitHub {
     rev    = "892402ba11a2e2fd5e1295dd633481f27365f14d";
     owner  = "emicklei";

From 89a256e463403dab84d89b1bc4563c6b95951383 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 2 Jun 2016 22:22:21 +0200
Subject: [PATCH 038/436] interlock: extracted from goPackages

---
 pkgs/development/go-modules/libs.json | 47 ++++++++++++++++++++++++++-
 pkgs/servers/interlock/default.nix    | 38 ++++++++++++++++++++++
 pkgs/servers/interlock/deps.json      | 14 ++++++++
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        | 25 --------------
 5 files changed, 99 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/servers/interlock/default.nix
 create mode 100644 pkgs/servers/interlock/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 4336fcc44bc9..88d6f547fca6 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -43,5 +43,50 @@
       "rev": "1f22c0103821b9390939b6776727195525381532",
       "sha256": "05ahvn9g9cj7797n8ryfxv2g26v3lx1pza9d9pg97iw0rvar9i1h"
     }
+  },
+  {
+    "goPackagePath": "github.com/Sirupsen/logrus",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/Sirupsen/logrus",
+      "rev": "a26f43589d737684363ff856c5a0f9f24b946510",
+      "sha256": "13vprfbrsrqky145k26vayl9209gldh2v79614m0qxpx0ln1w2bs"
+    }
+  },
+  {
+    "goPackagePath": "github.com/agl/ed25519",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/agl/ed25519",
+      "rev": "278e1ec8e8a6e017cd07577924d6766039146ced",
+      "sha256": "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"
+    }
+  },
+  {
+    "goPackagePath": "github.com/golang/protobuf",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/golang/protobuf",
+      "rev": "dda510ac0fd43b39770f22ac6260eb91d377bce3",
+      "sha256": "0bmz87is9zvxvzycp3135l61ippjw6vmpjz0b9pq8gpxx6sj2vj4"
+    }
+  },
+  {
+    "goPackagePath": "github.com/janimo/textsecure",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/janimo/textsecure",
+      "rev": "c38f429e48d6b2776d17b4171f216f132185b0f6",
+      "sha256": "191pwgfgphr0x04dwpvniax4wilpv52l25bw7d3igvnw302y7i94"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/net",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/net",
+      "rev": "ef00b378c73f107bf44d5c9b69875255ce89b79a",
+      "sha256": "168dhvl0wqiac8xmy8mqkvspd7cq6vfjpj80zdnriwy169nykcyz"
+    }
   }
-]
+]
\ No newline at end of file
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
new file mode 100644
index 000000000000..9b49f051ac21
--- /dev/null
+++ b/pkgs/servers/interlock/default.nix
@@ -0,0 +1,38 @@
+# This file was generated by go2nix.
+{ stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup,
+  goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "interlock-${version}";
+  version = "2016.04.13";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/inversepath/interlock";
+
+  subPackages = [ "./cmd/interlock" ];
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/inversepath/interlock";
+    sha256 = "1lnaz0vdg0k21wipc6w8h580cbpymiyasah98yzyzrmwraclb2bb";
+  };
+
+  goDeps = ./deps.json;
+
+  nativeBuildInputs = [ sudo ];
+  buildFlags = [ "-tags textsecure" ];
+  postPatch = ''
+    grep -lr '/s\?bin/' | xargs sed -i \
+      -e 's|/bin/mount|${utillinux}/bin/mount|' \
+      -e 's|/bin/umount|${utillinux}/bin/umount|' \
+      -e 's|/bin/cp|${coreutils}/bin/cp|' \
+      -e 's|/bin/mv|${coreutils}/bin/mv|' \
+      -e 's|/bin/chown|${coreutils}/bin/chown|' \
+      -e 's|/bin/date|${coreutils}/bin/date|' \
+      -e 's|/sbin/poweroff|${systemd}/sbin/poweroff|' \
+      -e 's|/usr/bin/sudo|/var/setuid-wrappers/sudo|' \
+      -e 's|/sbin/cryptsetup|${cryptsetup}/bin/cryptsetup|'
+  '';
+}
diff --git a/pkgs/servers/interlock/deps.json b/pkgs/servers/interlock/deps.json
new file mode 100644
index 000000000000..a501a3087d7b
--- /dev/null
+++ b/pkgs/servers/interlock/deps.json
@@ -0,0 +1,14 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "github.com/Sirupsen/logrus",
+      "github.com/agl/ed25519",
+      "github.com/golang/protobuf",
+      "github.com/janimo/textsecure",
+      "golang.org/x/crypto",
+      "golang.org/x/net",
+      "gopkg.in/yaml.v2"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73a52f005250..06a27fb52065 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -819,7 +819,7 @@ in
 
   heatseeker = callPackage ../tools/misc/heatseeker { };
 
-  interlock = goPackages.interlock.bin // { outputs = [ "bin" ]; };
+  interlock = (callPackage ../servers/interlock {}).bin;
 
   mathics = pythonPackages.mathics;
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index b8cde1700cb6..3907f8339f3b 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -4080,31 +4080,6 @@ let
     disabled = isGo14;
   };
 
-  interlock = buildFromGitHub rec {
-    version = "2016.01.14";
-    rev = "v${version}";
-    owner = "inversepath";
-    repo = "interlock";
-    sha256 = "0wabx6vqdxh2aprsm2rd9mh71q7c2xm6xk9a6r1bn53r9dh5wrsb";
-    buildInputs = [ crypto textsecure ];
-    nativeBuildInputs = [ pkgs.sudo ];
-    buildFlags = [ "-tags textsecure" ];
-    subPackages = [ "./cmd/interlock" ];
-    postPatch = ''
-      grep -lr '/s\?bin/' | xargs sed -i \
-        -e 's|/bin/mount|${pkgs.utillinux}/bin/mount|' \
-        -e 's|/bin/umount|${pkgs.utillinux}/bin/umount|' \
-        -e 's|/bin/cp|${pkgs.coreutils}/bin/cp|' \
-        -e 's|/bin/mv|${pkgs.coreutils}/bin/mv|' \
-        -e 's|/bin/chown|${pkgs.coreutils}/bin/chown|' \
-        -e 's|/bin/date|${pkgs.coreutils}/bin/date|' \
-        -e 's|/sbin/poweroff|${pkgs.systemd}/sbin/poweroff|' \
-        -e 's|/usr/bin/sudo|/var/setuid-wrappers/sudo|' \
-        -e 's|/sbin/cryptsetup|${pkgs.cryptsetup}/bin/cryptsetup|'
-    '';
-    disabled = isGo14;
-  };
-
   template = buildFromGitHub {
     rev = "14fd436dd20c3cc65242a9f396b61bfc8a3926fc";
     owner = "alecthomas";

From 387246080b2cd9675d7fcdab3ad528a4048842b5 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 13:05:48 +0200
Subject: [PATCH 039/436] mongodb-tools: extracted from goPackages

---
 pkgs/development/go-modules/libs.json     | 36 +++++++++++++++++++++
 pkgs/tools/misc/mongodb-tools/default.nix | 39 +++++++++++++++++++++++
 pkgs/tools/misc/mongodb-tools/deps.json   | 12 +++++++
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            | 21 ------------
 5 files changed, 88 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/tools/misc/mongodb-tools/default.nix
 create mode 100644 pkgs/tools/misc/mongodb-tools/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 88d6f547fca6..964875cc3f79 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -88,5 +88,41 @@
       "rev": "ef00b378c73f107bf44d5c9b69875255ce89b79a",
       "sha256": "168dhvl0wqiac8xmy8mqkvspd7cq6vfjpj80zdnriwy169nykcyz"
     }
+  },
+  {
+    "goPackagePath": "github.com/howeyc/gopass",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/howeyc/gopass",
+      "rev": "2c70fa70727c953c51695f800f25d6b44abb368e",
+      "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jessevdk/go-flags",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jessevdk/go-flags",
+      "rev": "97448c91aac742cbca3d020b3e769013a420a06f",
+      "sha256": "0fv3yxvq8m3639a279hq4pf0c52ngqfl5n1vklcfympndrb7zjzj"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/mgo.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/mgo.v2",
+      "rev": "c6a7dce14133ccac2dcac3793f1d6e2ef048503a",
+      "sha256": "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/tomb.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/tomb.v2",
+      "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8",
+      "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"
+    }
   }
 ]
\ No newline at end of file
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
new file mode 100644
index 000000000000..74240a859c89
--- /dev/null
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -0,0 +1,39 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+let
+  tools = [
+    "bsondump" "mongodump" "mongoexport" "mongofiles" "mongoimport"
+    "mongooplog" "mongorestore" "mongostat" "mongotop"
+  ];
+in
+buildGoPackage rec {
+  name = "mongo-tools-${version}";
+  version = "3.0.12";
+  rev = "r${version}";
+
+  goPackagePath = "github.com/mongodb/mongo-tools";
+  subPackages = map (t: t + "/main") tools;
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/mongodb/mongo-tools";
+    sha256 = "142vxgniri1mfy2xmfgxhbdp6k6h8c5milv454krv1b51v43hsbm";
+  };
+
+  goDeps = ./deps.json;
+
+  # Mongodb incorrectly names all of their binaries main
+  # Let's work around this with our own installer
+  preInstall = ''
+    mkdir -p $bin/bin
+  '' + toString (map (t: ''
+      go install $goPackagePath/${t}/main
+      mv go/bin/main $bin/bin/${t}
+  ''
+  ) tools) + ''  
+    rm -r go/bin
+  '';
+}
diff --git a/pkgs/tools/misc/mongodb-tools/deps.json b/pkgs/tools/misc/mongodb-tools/deps.json
new file mode 100644
index 000000000000..1489b9e57adb
--- /dev/null
+++ b/pkgs/tools/misc/mongodb-tools/deps.json
@@ -0,0 +1,12 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "github.com/howeyc/gopass",
+      "github.com/jessevdk/go-flags",
+      "golang.org/x/crypto",
+      "gopkg.in/mgo.v2",
+      "gopkg.in/tomb.v2"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06a27fb52065..bbb0b59e3e07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -881,7 +881,7 @@ in
 
   mcrypt = callPackage ../tools/misc/mcrypt { };
 
-  mongodb-tools = goPackages.mongo-tools.bin // { outputs = [ "bin" ]; };
+  mongodb-tools = (callPackage ../tools/misc/mongodb-tools { }).bin;
 
   mstflint = callPackage ../tools/misc/mstflint { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3907f8339f3b..81db5296e9fa 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2536,27 +2536,6 @@ let
     buildInputs = [ toml ];
   };
 
-  mongo-tools = buildFromGitHub {
-    rev    = "4fcfd3e57415de95c0c016def07b95bca63cccb4";
-    owner  = "mongodb";
-    repo   = "mongo-tools";
-    sha256 = "0rm7bnb81hr0byxhvagwv8an1bky882nz68cmm2kbznzyprvhyaa";
-    buildInputs = [ gopass go-flags mgo openssl tomb ];
-    excludedPackages = "vendor";
-
-    # Mongodb incorrectly names all of their binaries main
-    # Let's work around this with our own installer
-    preInstall = ''
-      mkdir -p $bin/bin
-      while read b; do
-        rm -f go/bin/main
-        go install $goPackagePath/$b/main
-        cp go/bin/main $bin/bin/$b
-      done < <(find go/src/$goPackagePath -name main | xargs dirname | xargs basename -a)
-      rm -r go/bin
-    '';
-  };
-
   motion = buildFromGitHub {
     rev = "e09baac69ad86bff1de868e8d6c4327eb0a918d7";
     owner = "fatih";

From e5b9d23de7c4687fc0356c14cf5105d1cc809178 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 13:17:53 +0200
Subject: [PATCH 040/436] flannel: extracted from goPackages

---
 pkgs/tools/networking/flannel/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            |  7 -------
 3 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/tools/networking/flannel/default.nix

diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
new file mode 100644
index 000000000000..be2f10b3a35e
--- /dev/null
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -0,0 +1,18 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "flannel-${version}";
+  version = "0.5.5";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/coreos/flannel";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/coreos/flannel";
+    sha256 = "19nrilcc41411rag2qm22vdna4kpqm933ry9m82wkd7sqzb50fpw";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbb0b59e3e07..f473461b8b11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1514,7 +1514,7 @@ in
     inherit (perlPackages) ImageExifTool JSON;
   };
 
-  flannel = goPackages.flannel.bin // { outputs = [ "bin" ]; };
+  flannel = (callPackage ../tools/networking/flannel {}).bin;
 
   flashbench = callPackage ../os-specific/linux/flashbench { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 81db5296e9fa..f056b5273a0e 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -856,13 +856,6 @@ let
     };
   };
 
-  flannel = buildFromGitHub {
-    rev = "v0.5.5";
-    owner = "coreos";
-    repo = "flannel";
-    sha256 = "19nrilcc41411rag2qm22vdna4kpqm933ry9m82wkd7sqzb50fpw";
-  };
-
   fsnotify.v1 = buildGoPackage rec {
     rev = "v1.2.0";
     name = "fsnotify.v1-${rev}";

From ece0626593674e4962a432ee685df54917adaa0b Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 13:37:23 +0200
Subject: [PATCH 041/436] git-lfs: extracted from goPackages

---
 .../version-management/git-lfs/default.nix    | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 21 -------------
 3 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/applications/version-management/git-lfs/default.nix

diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
new file mode 100644
index 000000000000..5186d2a5ba90
--- /dev/null
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -0,0 +1,31 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "git-lfs-${version}";
+  version = "1.2.0";
+  rev = "v${version}";
+  
+  goPackagePath = "github.com/github/git-lfs";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/github/git-lfs";
+    sha256 = "0z8giavcvfpzmhnxxsqvsgabjfq5gpka8jy4qvadf60yibxds9fp";
+  };
+
+  # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block'
+  excludedPackages = [ "test" ];
+
+  preBuild = ''
+    pushd go/src/github.com/github/git-lfs
+      go generate ./commands
+    popd
+  '';
+
+  postInstall = ''
+    rm -v $bin/bin/{man,script}
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f473461b8b11..e0c02f58a5a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1690,7 +1690,7 @@ in
 
   gifsicle = callPackage ../tools/graphics/gifsicle { };
 
-  git-lfs = goPackages.git-lfs.bin // { outputs = [ "bin" ]; };
+  git-lfs = (callPackage ../applications/version-management/git-lfs {}).bin;
 
   gitfs = callPackage ../tools/filesystems/gitfs { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f056b5273a0e..dfc21301c05c 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -971,27 +971,6 @@ let
     sha256 = "124hci9whsvlcywsfz5y20kkj3nhy176a1d5s1lkvsga09yxq6wm";
   };
 
-  git-lfs = buildFromGitHub {
-    version = "1.1.1";
-    rev = "v1.1.1";
-    owner = "github";
-    repo = "git-lfs";
-    sha256 = "1m7kii57jrsb22m5x9v8xa3s1qmipfkpk6cscgxrbrj7g0a75fnc";
-
-    # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block'
-    excludedPackages = [ "test" ];
-
-    preBuild = ''
-      pushd go/src/github.com/github/git-lfs
-        go generate ./commands
-      popd
-    '';
-
-    postInstall = ''
-      rm -v $bin/bin/{man,script}
-    '';
-  };
-
   glide = buildFromGitHub {
     rev    = "0.10.2";
     owner  = "Masterminds";

From ce81a8a65dcc7209159fcd35bf1fc703e2ec56aa Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 13:50:07 +0200
Subject: [PATCH 042/436] go-mtpfs: extracted from goPackages

---
 pkgs/development/go-modules/libs.json       | 11 +++++++++-
 pkgs/tools/filesystems/go-mtpfs/default.nix | 23 +++++++++++++++++++++
 pkgs/tools/filesystems/go-mtpfs/deps.json   | 17 +++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +-
 pkgs/top-level/go-packages.nix              | 20 ------------------
 5 files changed, 51 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/tools/filesystems/go-mtpfs/default.nix
 create mode 100644 pkgs/tools/filesystems/go-mtpfs/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 964875cc3f79..497487f5d1e7 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -124,5 +124,14 @@
       "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8",
       "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"
     }
+  },
+  {
+    "goPackagePath": "github.com/hanwen/go-fuse",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hanwen/go-fuse",
+      "rev": "bd746dd8bcc8c059a9d953a786a6156eb83f398e",
+      "sha256": "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56"
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix
new file mode 100644
index 000000000000..55be2dd9e73b
--- /dev/null
+++ b/pkgs/tools/filesystems/go-mtpfs/default.nix
@@ -0,0 +1,23 @@
+# This file was generated by go2nix.
+{ stdenv, lib, pkgconfig, libusb1, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "go-mtpfs-${version}";
+  version = "20150917-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "bc7c0f716e3b4ed5610069a55fc00828ebba890b";
+
+  goPackagePath = "github.com/hanwen/go-mtpfs";
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libusb1 ];
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/hanwen/go-mtpfs";
+    sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.json b/pkgs/tools/filesystems/go-mtpfs/deps.json
new file mode 100644
index 000000000000..cc2ce33ac301
--- /dev/null
+++ b/pkgs/tools/filesystems/go-mtpfs/deps.json
@@ -0,0 +1,17 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "github.com/hanwen/go-fuse"
+    ]
+  },
+  {
+    "goPackagePath": "github.com/hanwen/usb",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hanwen/usb",
+      "rev": "69aee4530ac705cec7c5344418d982aaf15cf0b1",
+      "sha256": "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"
+    }
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0c02f58a5a2..7b9edee05fd6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1758,7 +1758,7 @@ in
 
   goaccess = callPackage ../tools/misc/goaccess { };
 
-  go-mtpfs = goPackages.mtpfs.bin // { outputs = [ "bin" ]; };
+  go-mtpfs = (callPackage ../tools/filesystems/go-mtpfs { }).bin;
 
   go-pup = goPackages.pup.bin // { outputs = [ "bin" ]; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index dfc21301c05c..52bb8df4cb41 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2536,15 +2536,6 @@ let
     };
   };
 
-  mtpfs = buildFromGitHub {
-    rev = "bc7c0f716e3b4ed5610069a55fc00828ebba890b";
-    date = "2015-09-17";
-    owner = "hanwen";
-    repo = "go-mtpfs";
-    sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm";
-    buildInputs = [ go-fuse usb ];
-  };
-
   mux = buildFromGitHub {
     rev = "5a8a0400500543e28b2886a8c52d21a435815411";
     version = "2015-08-05";
@@ -3824,17 +3815,6 @@ let
     sha256 = "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni";
   };
 
-  usb = buildFromGitHub rec {
-    rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1";
-    version = "2014-12-17";
-    owner = "hanwen";
-    repo = "usb";
-    sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky";
-
-    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ pkgs.libusb1 ];
-  };
-
   uuid = buildFromGitHub {
     rev = "cccd189d45f7ac3368a0d127efb7f4d08ae0b655";
     version = "2015-08-24";

From 977f23ca37d4381d3cdc97b437f9fb7b0e03740d Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 14:13:10 +0200
Subject: [PATCH 043/436] go-pup: extracted from goPackages

---
 pkgs/development/tools/pup/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +-
 pkgs/top-level/go-packages.nix         | 15 ---------------
 3 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/tools/pup/default.nix

diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix
new file mode 100644
index 000000000000..23ced868bd3e
--- /dev/null
+++ b/pkgs/development/tools/pup/default.nix
@@ -0,0 +1,18 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "pup-${version}";
+  version = "20160425-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "e76307d03d4d2e0f01fb7ab51dee09f2671c3db6";
+  
+  goPackagePath = "github.com/ericchiang/pup";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/ericchiang/pup";
+    sha256 = "15lwas4cjchlwhrwnd5l4gxcwqdfgazdyh466hava5qzxacqxrm5";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b9edee05fd6..b3f38640780e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1760,7 +1760,7 @@ in
 
   go-mtpfs = (callPackage ../tools/filesystems/go-mtpfs { }).bin;
 
-  go-pup = goPackages.pup.bin // { outputs = [ "bin" ]; };
+  go-pup = (callPackage ../development/tools/pup { }).bin;
 
   go-sct = goPackages.go-sct.bin // { outputs = [ "bin" ]; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 52bb8df4cb41..39596bead4c4 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3987,21 +3987,6 @@ let
     buildInputs = [ ansicolor go-colorable ];
   };
 
-  pup = buildFromGitHub {
-    rev      = "9693b292601dd24dab3c04bc628f9ae3fa72f831";
-    owner    = "EricChiang";
-    repo     = "pup";
-    sha256   = "04j3fy1vk6xap8ad7k3c05h9b5mg2n1vy9vcyg9rs02cb13d3sy0";
-    propagatedBuildInputs = [ net ];
-    buildInputs = [ go-colorable color ];
-    postPatch = ''
-      grep -sr github.com/ericchiang/pup/Godeps/_workspace/src/ |
-        cut -f 1 -d : |
-        sort -u |
-        xargs -d '\n' sed -i -e s,github.com/ericchiang/pup/Godeps/_workspace/src/,,g
-    '';
-  };
-
   textsecure = buildFromGitHub rec {
     rev = "505e129c42fc4c5cb2d105520cef7c04fa3a6b64";
     owner = "janimo";

From e2e3d8802f878495bb54a631554a9b1705ace456 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 14:25:31 +0200
Subject: [PATCH 044/436] go-sct: extracted from goPackages

---
 pkgs/development/go-modules/libs.json | 11 +++++++++-
 pkgs/tools/X11/go-sct/default.nix     | 29 +++++++++++++++++++++++++++
 pkgs/tools/X11/go-sct/deps.json       |  8 ++++++++
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        | 22 --------------------
 5 files changed, 48 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/tools/X11/go-sct/default.nix
 create mode 100644 pkgs/tools/X11/go-sct/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 497487f5d1e7..a172cc524842 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -133,5 +133,14 @@
       "rev": "bd746dd8bcc8c059a9d953a786a6156eb83f398e",
       "sha256": "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56"
     }
+  },
+  {
+    "goPackagePath": "github.com/cpucycle/astrotime",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/cpucycle/astrotime",
+      "rev": "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca",
+      "sha256": "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1"
+    }
   }
-]
+]
\ No newline at end of file
diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix
new file mode 100644
index 000000000000..18877917d0d3
--- /dev/null
+++ b/pkgs/tools/X11/go-sct/default.nix
@@ -0,0 +1,29 @@
+# This file was generated by go2nix.
+{ stdenv, lib, xorg, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "go-sct-${version}";
+  version = "20160529-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "1d6b5e05a0b63bfeac9df55003efec352e1bc19d";
+
+  goPackagePath = "github.com/d4l3k/go-sct";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/d4l3k/go-sct";
+    sha256 = "1iqdagrq0j7sqxgsj31skgk73k2rbpbvj41v087af9103wf8h9z7";
+  };
+
+  goDeps = ./deps.json;
+
+  buildInputs = [ xorg.libX11 xorg.libXrandr ];
+
+  meta = with stdenv.lib; {
+    description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift";
+    license = licenses.mit;
+    maintainers = with maintainers; [ cstrahan ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/X11/go-sct/deps.json b/pkgs/tools/X11/go-sct/deps.json
new file mode 100644
index 000000000000..7a7ce4989d35
--- /dev/null
+++ b/pkgs/tools/X11/go-sct/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "github.com/cpucycle/astrotime"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3f38640780e..226abaee854b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1762,7 +1762,7 @@ in
 
   go-pup = (callPackage ../development/tools/pup { }).bin;
 
-  go-sct = goPackages.go-sct.bin // { outputs = [ "bin" ]; };
+  go-sct = (callPackage ../tools/X11/go-sct { }).bin;
 
   go-upower-notify = goPackages.upower-notify.bin // { outputs = [ "bin" ]; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 39596bead4c4..190f520df31e 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -290,13 +290,6 @@ let
     doCheck = false;
   };
 
-  astrotime = buildFromGitHub {
-    rev = "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca";
-    owner = "cpucycle";
-    repo = "astrotime";
-    sha256 = "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1";
-  };
-
   aws-sdk-go = buildFromGitHub {
     rev    = "d85fa529a99a833067e11c0a838b9db7a5d5ea71";
     version = "1.1.24";
@@ -1848,21 +1841,6 @@ let
     sha256 = "00f2rfhsaqj2wjanh5qp73phx7x12a5pwd7lc0rjfv68l6sgpg2v";
   };
 
-  go-sct = buildFromGitHub {
-    rev = "b82c2f81727357c45a47a43965c50ed5da5a2e74";
-    version = "2016-01-11";
-    owner = "d4l3k";
-    repo = "go-sct";
-    sha256 = "13hgmpv2c8ll5ap8fn1n480bdv1j21n86jjwcssd36kh2i933anl";
-    buildInputs = [ astrotime pkgs.xorg.libX11 pkgs.xorg.libXrandr ];
-    meta = with stdenv.lib; {
-      description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift";
-      license = licenses.mit;
-      maintainers = with maintainers; [ cstrahan ];
-      platforms = platforms.unix;
-    };
-  };
-
   go-shlex = buildFromGitHub {
     rev    = "3f9db97f856818214da2e1057f8ad84803971cff";
     owner  = "flynn";

From d765026f99e3e97fb00a77f9d8db84f3774377f6 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 14:38:37 +0200
Subject: [PATCH 045/436] go-upower-notify: extracted from goPackages

---
 pkgs/development/go-modules/libs.json     |  9 ++++++++
 pkgs/tools/misc/upower-notify/default.nix | 26 +++++++++++++++++++++++
 pkgs/tools/misc/upower-notify/deps.json   |  8 +++++++
 pkgs/top-level/all-packages.nix           |  3 ++-
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/misc/upower-notify/default.nix
 create mode 100644 pkgs/tools/misc/upower-notify/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index a172cc524842..1fb038e71938 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -142,5 +142,14 @@
       "rev": "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca",
       "sha256": "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1"
     }
+  },
+  {
+    "goPackagePath": "github.com/godbus/dbus",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/godbus/dbus",
+      "rev": "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15",
+      "sha256": "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3"
+    }
   }
 ]
\ No newline at end of file
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix
new file mode 100644
index 000000000000..fef1707d5052
--- /dev/null
+++ b/pkgs/tools/misc/upower-notify/default.nix
@@ -0,0 +1,26 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+# To use upower-notify, the maintainer suggests adding something like this to your configuration.nix:
+#
+# service.xserver.displayManager.sessionCommands = ''
+#   ${pkgs.dunst}/bin/dunst -shrink -geometry 0x0-50-50 -key space & # ...if don't already have a dbus notification display app
+#   (sleep 3; exec ${pkgs.yeshup}/bin/yeshup ${pkgs.go-upower-notify}/bin/upower-notify) &
+# '';
+buildGoPackage rec {
+  name = "upower-notify-${version}";
+  version = "20160310-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "14c581e683a7e90ec9fa6d409413c16599a5323c";
+  
+  goPackagePath = "github.com/omeid/upower-notify";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/omeid/upower-notify";
+    sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/tools/misc/upower-notify/deps.json b/pkgs/tools/misc/upower-notify/deps.json
new file mode 100644
index 000000000000..3a254084ae36
--- /dev/null
+++ b/pkgs/tools/misc/upower-notify/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "github.com/godbus/dbus"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 226abaee854b..b059eee3dbba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1764,7 +1764,8 @@ in
 
   go-sct = (callPackage ../tools/X11/go-sct { }).bin;
 
-  go-upower-notify = goPackages.upower-notify.bin // { outputs = [ "bin" ]; };
+  # rename to upower-notify?
+  go-upower-notify = (callPackage ../tools/misc/upower-notify { }).bin;
 
   googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
 

From a1f3808e2f6475cc2fabecc870c261966c633ccf Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 15:55:03 +0200
Subject: [PATCH 046/436] lxd: extracted from goPackages

---
 pkgs/development/go-modules/libs.json | 135 ++++++++++++++++++++++++++
 pkgs/tools/admin/lxd/default.nix      |  36 +++++++
 pkgs/tools/admin/lxd/deps.json        |  26 +++++
 pkgs/top-level/all-packages.nix       |   2 +-
 pkgs/top-level/go-packages.nix        |  36 -------
 5 files changed, 198 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/tools/admin/lxd/default.nix
 create mode 100644 pkgs/tools/admin/lxd/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 1fb038e71938..4ad8eb0dc219 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -151,5 +151,140 @@
       "rev": "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15",
       "sha256": "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3"
     }
+  },
+  {
+    "goPackagePath": "github.com/gorilla/websocket",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gorilla/websocket",
+      "rev": "a622679ebd7a3b813862379232f645f8e690e43f",
+      "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"
+    }
+  },
+  {
+    "goPackagePath": "github.com/syndtr/gocapability",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/syndtr/gocapability",
+      "rev": "2c00daeb6c3b45114c80ac44119e7b8801fdd852",
+      "sha256": "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/inconshreveable/log15.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/inconshreveable/log15.v2",
+      "rev": "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f",
+      "sha256": "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gorilla/mux",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gorilla/mux",
+      "rev": "8096f47503459bcc74d1f4c487b7e6e42e5746b5",
+      "sha256": "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9"
+    }
+  },
+  {
+    "goPackagePath": "github.com/pborman/uuid",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/pborman/uuid",
+      "rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4",
+      "sha256": "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/flosch/pongo2.v3",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/flosch/pongo2.v3",
+      "rev": "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9",
+      "sha256": "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8"
+    }
+  },
+  {
+    "goPackagePath": "github.com/olekukonko/tablewriter",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/olekukonko/tablewriter",
+      "rev": "cca8bbc0798408af109aaaa239cbd2634846b340",
+      "sha256": "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mattn/go-sqlite3",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mattn/go-sqlite3",
+      "rev": "c5aee9649735e8dadac55eb968ccebd9fa29a881",
+      "sha256": "1505piq2mks6s77hfzrlv2siiqpy55lxgy1h9364jfz0baxjqpas"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/lxc/go-lxc.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/lxc/go-lxc.v2",
+      "rev": "8f9e220b36393c03854c2d224c5a55644b13e205",
+      "sha256": "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mattn/go-runewidth",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mattn/go-runewidth",
+      "rev": "d6bea18f789704b5f83375793155289da36a3c7f",
+      "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"
+    }
+  },
+  {
+    "goPackagePath": "github.com/coreos/go-systemd",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/coreos/go-systemd",
+      "rev": "a606a1e936df81b70d85448221c7b1c6d8a74ef1",
+      "sha256": "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"
+    }
+  },
+  {
+    "goPackagePath": "github.com/dustinkirkland/golang-petname",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/dustinkirkland/golang-petname",
+      "rev": "2182cecef7f257230fc998bc351a08a5505f5e6c",
+      "sha256": "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gorilla/context",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gorilla/context",
+      "rev": "215affda49addc4c8ef7e2534915df2c8c35c6cd",
+      "sha256": "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mattn/go-colorable",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mattn/go-colorable",
+      "rev": "3dac7b4f76f6e17fb39b768b89e3783d16e237fe",
+      "sha256": "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gosexy/gettext",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gosexy/gettext",
+      "rev": "305f360aee30243660f32600b87c3c1eaa947187",
+      "sha256": "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09"
+    }
   }
 ]
\ No newline at end of file
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
new file mode 100644
index 000000000000..e1adb6ccf90d
--- /dev/null
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -0,0 +1,36 @@
+# This file was generated by go2nix.
+{ stdenv, lib, pkgconfig, lxc, goPackages, fetchFromGitHub }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "lxd-${version}";
+  version = "2.0.0.rc4";
+  rev = "lxd-${version}";
+
+  goPackagePath = "github.com/lxc/lxd";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "lxc";
+    repo = "lxd";
+    sha256 = "1rpyyj6d38d9kmb47dcmy1x41fiacj384yx01yslsrj2l6qxcdjn";
+  };
+
+  goDeps = ./deps.json;
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ lxc ];
+
+  postInstall = ''
+    cp go/src/$goPackagePath/scripts/lxd-images $bin/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Daemon based on liblxc offering a REST API to manage containers";
+    homepage = https://github.com/lxc/lxd;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ globin fpletz ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/admin/lxd/deps.json b/pkgs/tools/admin/lxd/deps.json
new file mode 100644
index 000000000000..3e9a811accef
--- /dev/null
+++ b/pkgs/tools/admin/lxd/deps.json
@@ -0,0 +1,26 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "github.com/golang/protobuf",
+      "github.com/gorilla/websocket",
+      "github.com/syndtr/gocapability",
+      "gopkg.in/inconshreveable/log15.v2",
+      "github.com/gorilla/mux",
+      "github.com/pborman/uuid",
+      "golang.org/x/crypto",
+      "gopkg.in/flosch/pongo2.v3",
+      "gopkg.in/tomb.v2",
+      "github.com/olekukonko/tablewriter",
+      "github.com/mattn/go-sqlite3",
+      "gopkg.in/lxc/go-lxc.v2",
+      "gopkg.in/yaml.v2",
+      "github.com/mattn/go-runewidth",
+      "github.com/coreos/go-systemd",
+      "github.com/dustinkirkland/golang-petname",
+      "github.com/gorilla/context",
+      "github.com/mattn/go-colorable",
+      "github.com/gosexy/gettext"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b059eee3dbba..4482e11e3de4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2350,7 +2350,7 @@ in
   lshw = callPackage ../tools/system/lshw { };
 
   lxc = callPackage ../os-specific/linux/lxc { };
-  lxd = goPackages.lxd.bin // { outputs = [ "bin" ]; };
+  lxd = (callPackage ../tools/admin/lxd { }).bin;
 
   lzip = callPackage ../tools/compression/lzip { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 190f520df31e..75b7d25fd79b 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1666,17 +1666,6 @@ let
     propagatedBuildInputs = [ osext go-systemd ];
   };
 
-  go-lxc = buildFromGitHub {
-    rev    = "d89df0ad9dc13a7ce491eedaa771b076cf32db16";
-    version = "2016-02-12";
-    owner  = "lxc";
-    repo   = "go-lxc";
-    sha256 = "051kqvvclfcinqcbi4zch694llvnxa5vvbw6cbdxbkzhr5zxm36q";
-    goPackagePath = "gopkg.in/lxc/go-lxc.v2";
-    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ pkgs.lxc ];
-  };
-
   go-lz4 = buildFromGitHub {
     rev    = "74ddf82598bc4745b965729e9c6a463bedd33049";
     owner  = "bkaradzic";
@@ -2344,31 +2333,6 @@ let
     goPackageAliases = [ "github.com/natefinch/lumberjack" ];
   };
 
-
-  lxd = buildFromGitHub {
-    rev    = "lxd-2.0.0.rc4";
-    owner  = "lxc";
-    repo   = "lxd";
-    sha256 = "1rpyyj6d38d9kmb47dcmy1x41fiacj384yx01yslsrj2l6qxcdjn";
-    excludedPackages = "test"; # Don't build the binary called test which causes conflicts
-    buildInputs = [
-      gosexy.gettext websocket crypto log15 go-lxc yaml-v2 tomb protobuf pongo2
-      go-uuid tablewriter golang-petname mux go-sqlite3 goproxy
-      pkgs.python3 go-systemd uuid gocapability
-    ];
-    postInstall = ''
-      cp go/src/$goPackagePath/scripts/lxd-images $bin/bin
-    '';
-
-    meta = with stdenv.lib; {
-      description = "Daemon based on liblxc offering a REST API to manage containers";
-      homepage = https://github.com/lxc/lxd;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ globin fpletz ];
-      platforms = platforms.linux;
-    };
-  };
-
   manners = buildFromGitHub {
     rev = "0.4.0";
     owner = "braintree";

From 93b9ebfde8fdc33ea6d202cba4091ba16a277a48 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 16:46:37 +0200
Subject: [PATCH 047/436] ngrok: extracted from goPackages

---
 pkgs/development/go-modules/libs.json   | 92 ++++++++++++++++++++++++-
 pkgs/tools/networking/ngrok/default.nix | 34 +++++++++
 pkgs/tools/networking/ngrok/deps.json   | 19 +++++
 pkgs/top-level/all-packages.nix         |  2 +-
 4 files changed, 145 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/networking/ngrok/default.nix
 create mode 100644 pkgs/tools/networking/ngrok/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 4ad8eb0dc219..f478b92eec8d 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -286,5 +286,95 @@
       "rev": "305f360aee30243660f32600b87c3c1eaa947187",
       "sha256": "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09"
     }
+  },
+  {
+    "goPackagePath": "github.com/rcrowley/go-metrics",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/rcrowley/go-metrics",
+      "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3",
+      "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"
+    }
+  },
+  {
+    "goPackagePath": "github.com/inconshreveable/go-vhost",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/inconshreveable/go-vhost",
+      "rev": "c4c28117502e4bf00960c8282b2d1c51c865fe2c",
+      "sha256": "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32"
+    }
+  },
+  {
+    "goPackagePath": "code.google.com/p/log4go",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/ccpaging/log4go",
+      "rev": "cb4cc51cd03958183d3b637d0750497d88c2f7a8",
+      "sha256": "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2"
+    }
+  },
+  {
+    "goPackagePath": "github.com/daviddengcn/go-colortext",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/daviddengcn/go-colortext",
+      "rev": "13eaeb896f5985a1ab74ddea58707a73d875ba57",
+      "sha256": "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/yaml.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-yaml/yaml",
+      "rev": "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a",
+      "sha256": "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy"
+    }
+  },
+  {
+    "goPackagePath": "github.com/inconshreveable/mousetrap",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/inconshreveable/mousetrap",
+      "rev": "9dbb96d2c3a964935b0870b5abaea13c98b483aa",
+      "sha256": "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"
+    }
+  },
+  {
+    "goPackagePath": "github.com/nsf/termbox-go",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/nsf/termbox-go",
+      "rev": "9aecf65084a5754f12d27508fa2e6ed56851953b",
+      "sha256": "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/inconshreveable/go-update.v0",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/inconshreveable/go-update",
+      "rev": "d8b0b1d421aa1cbf392c05869f8abbc669bb7066",
+      "sha256": "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa"
+    }
+  },
+  {
+    "goPackagePath": "github.com/kardianos/osext",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/kardianos/osext",
+      "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc",
+      "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"
+    }
+  },
+  {
+    "goPackagePath": "github.com/kr/binarydist",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/kr/binarydist",
+      "rev": "9955b0ab8708602d411341e55fffd7e0700f86bd",
+      "sha256": "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3"
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok/default.nix
new file mode 100644
index 000000000000..5344a4ec46bc
--- /dev/null
+++ b/pkgs/tools/networking/ngrok/default.nix
@@ -0,0 +1,34 @@
+# This file was generated by go2nix.
+{ stdenv, lib, pkgconfig, goPackages, fetchFromGitHub }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "ngrok-${version}";
+  version = "1.7.1";
+  rev = "${version}";
+
+  goPackagePath = "ngrok";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "inconshreveable";
+    repo = "ngrok";
+    sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4";
+  };
+
+  goDeps = ./deps.json;
+
+  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.json b/pkgs/tools/networking/ngrok/deps.json
new file mode 100644
index 000000000000..61dfbf337266
--- /dev/null
+++ b/pkgs/tools/networking/ngrok/deps.json
@@ -0,0 +1,19 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "gopkg.in/yaml.v1",
+      "github.com/gorilla/websocket",
+      "github.com/rcrowley/go-metrics",
+      "github.com/inconshreveable/go-vhost",
+      "code.google.com/p/log4go",
+      "github.com/daviddengcn/go-colortext",
+      "gopkg.in/yaml.v1",
+      "github.com/inconshreveable/mousetrap",
+      "github.com/nsf/termbox-go",
+      "gopkg.in/inconshreveable/go-update.v0",
+      "github.com/kardianos/osext",
+      "github.com/kr/binarydist"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4482e11e3de4..3d5b68057d03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2607,7 +2607,7 @@ in
 
   ngrep = callPackage ../tools/networking/ngrep { };
 
-  ngrok = goPackages.ngrok.bin // { outputs = [ "bin" ]; };
+  ngrok = (callPackage ../tools/networking/ngrok { }).bin;
 
   noip = callPackage ../tools/networking/noip { };
 

From e44d38125ce2bf1ec6ba2f72f04c4bf105cc859d Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 17:20:43 +0200
Subject: [PATCH 048/436] s3gof3r: extracted from goPackages

---
 pkgs/development/go-modules/libs.json     | 20 ++++++++++----------
 pkgs/tools/networking/s3gof3r/default.nix | 20 ++++++++++++++++++++
 pkgs/tools/networking/s3gof3r/deps.json   |  8 ++++++++
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            | 10 ----------
 5 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/tools/networking/s3gof3r/default.nix
 create mode 100644 pkgs/tools/networking/s3gof3r/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index f478b92eec8d..c8bcc99194a5 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -98,15 +98,6 @@
       "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"
     }
   },
-  {
-    "goPackagePath": "github.com/jessevdk/go-flags",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/jessevdk/go-flags",
-      "rev": "97448c91aac742cbca3d020b3e769013a420a06f",
-      "sha256": "0fv3yxvq8m3639a279hq4pf0c52ngqfl5n1vklcfympndrb7zjzj"
-    }
-  },
   {
     "goPackagePath": "gopkg.in/mgo.v2",
     "fetch": {
@@ -376,5 +367,14 @@
       "rev": "9955b0ab8708602d411341e55fffd7e0700f86bd",
       "sha256": "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3"
     }
+  },
+  {
+    "goPackagePath": "github.com/jessevdk/go-flags",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jessevdk/go-flags",
+      "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539",
+      "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"
+    }
   }
-]
+]
\ No newline at end of file
diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix
new file mode 100644
index 000000000000..e751d991542d
--- /dev/null
+++ b/pkgs/tools/networking/s3gof3r/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "s3gof3r-${version}";
+  version = "20151109-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445";
+  
+  goPackagePath = "github.com/rlmcpherson/s3gof3r";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/rlmcpherson/s3gof3r";
+    sha256 = "10banc8hnhxpsdmlkf9nc5fjkh1349bgpd9k7lggw3yih1rvmh7k";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/tools/networking/s3gof3r/deps.json b/pkgs/tools/networking/s3gof3r/deps.json
new file mode 100644
index 000000000000..d4a41d349b28
--- /dev/null
+++ b/pkgs/tools/networking/s3gof3r/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "github.com/jessevdk/go-flags"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d5b68057d03..909a33d4e8a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3237,7 +3237,7 @@ in
 
   s3cmd = callPackage ../tools/networking/s3cmd { };
 
-  s3gof3r = goPackages.s3gof3r.bin // { outputs = [ "bin" ]; };
+  s3gof3r = (callPackage ../tools/networking/s3gof3r { }).bin;
 
   s6Dns = callPackage ../tools/networking/s6-dns { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 75b7d25fd79b..52fd41d79eea 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3387,16 +3387,6 @@ let
     sha256 = "0g9fj10xnxcv034c8hpcgbhswv6as0d8l176c5nfgh1lh6klmmzc";
   };
 
-  s3gof3r = buildFromGitHub rec {
-    owner    = "rlmcpherson";
-    repo     = "s3gof3r";
-    rev      = "v${version}";
-    version  = "0.5.0";
-    sha256   = "10banc8hnhxpsdmlkf9nc5fjkh1349bgpd9k7lggw3yih1rvmh7k";
-    disabled = isGo14;
-    propagatedBuildInputs = [ go-flags ];
-  };
-
   sandblast = buildGoPackage rec {
     rev = "694d24817b9b7b8bacb6d458b7989b30d7fe3555";
     name = "sandblast-${stdenv.lib.strings.substring 0 7 rev}";

From d010d39e15cda42f76105baf5fcf69363d4d4fe4 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 18:17:43 +0200
Subject: [PATCH 049/436] skydns: extracted from goPackages

---
 pkgs/development/go-modules/libs.json | 92 ++++++++++++++++++++++++++-
 pkgs/servers/skydns/default.nix       | 20 ++++++
 pkgs/servers/skydns/deps.json         | 20 ++++++
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        | 11 ----
 5 files changed, 132 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/servers/skydns/default.nix
 create mode 100644 pkgs/servers/skydns/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index c8bcc99194a5..03107ea8e498 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -376,5 +376,95 @@
       "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539",
       "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"
     }
+  },
+  {
+    "goPackagePath": "github.com/prometheus/client_model",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/prometheus/client_model",
+      "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6",
+      "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"
+    }
+  },
+  {
+    "goPackagePath": "github.com/prometheus/common",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/prometheus/common",
+      "rev": "40456948a47496dc22168e6af39297a2f8fbf38c",
+      "sha256": "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l"
+    }
+  },
+  {
+    "goPackagePath": "github.com/beorn7/perks",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/beorn7/perks",
+      "rev": "3ac7bf7a47d159a033b107610db8a1b6575507a4",
+      "sha256": "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"
+    }
+  },
+  {
+    "goPackagePath": "github.com/coreos/go-etcd",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/coreos/go-etcd",
+      "rev": "003851be7bb0694fe3cc457a49529a19388ee7cf",
+      "sha256": "0n78m4lwsjiaqhjizcsp25paj2l2d4fdr7c4i671ldvpggq76lrl"
+    }
+  },
+  {
+    "goPackagePath": "github.com/matttproud/golang_protobuf_extensions",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/matttproud/golang_protobuf_extensions",
+      "rev": "d0c3fe89de86839aecf2e0579c40ba3bb336a453",
+      "sha256": "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r"
+    }
+  },
+  {
+    "goPackagePath": "github.com/prometheus/client_golang",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/prometheus/client_golang",
+      "rev": "90c15b5efa0dc32a7d259234e02ac9a99e6d3b82",
+      "sha256": "11hbll3x7hm69a7b0pwnhz5diligjy5yykdkqz2rsvs8s1k796zm"
+    }
+  },
+  {
+    "goPackagePath": "github.com/stathat/go",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/stathat/go",
+      "rev": "91dfa3a59c5b233fef9a346a1460f6e2bc889d93",
+      "sha256": "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r"
+    }
+  },
+  {
+    "goPackagePath": "github.com/ugorji/go",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/ugorji/go",
+      "rev": "c062049c1793b01a3cc3fe786108edabbaf7756b",
+      "sha256": "00cy7flxlm52ahxmqsznv87im5hx6xa9qg09i7cvrm70r74zh58q"
+    }
+  },
+  {
+    "goPackagePath": "github.com/miekg/dns",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/miekg/dns",
+      "rev": "b9171237b0642de1d8e8004f16869970e065f46b",
+      "sha256": "1biz7j8mdyil2vks1hyvwkjh5na5fy45rn5fnxl68b9iw6r0xsc3"
+    }
+  },
+  {
+    "goPackagePath": "github.com/prometheus/procfs",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/prometheus/procfs",
+      "rev": "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8",
+      "sha256": "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
new file mode 100644
index 000000000000..fc4c82f50429
--- /dev/null
+++ b/pkgs/servers/skydns/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "skydns-${version}";
+  version = "2.5.3a";
+  rev = "${version}";
+  
+  goPackagePath = "github.com/skynetservices/skydns";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/skynetservices/skydns";
+    sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/servers/skydns/deps.json b/pkgs/servers/skydns/deps.json
new file mode 100644
index 000000000000..9ddbfa3c4347
--- /dev/null
+++ b/pkgs/servers/skydns/deps.json
@@ -0,0 +1,20 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/miekg/dns",
+      "github.com/prometheus/client_golang",
+      "github.com/prometheus/client_model",
+      "github.com/prometheus/common",
+      "github.com/prometheus/procfs",
+      "github.com/coreos/go-systemd",
+      "github.com/matttproud/golang_protobuf_extensions",
+      "github.com/ugorji/go",
+      "github.com/golang/protobuf",
+      "github.com/stathat/go",
+      "github.com/beorn7/perks",
+      "github.com/coreos/go-etcd",
+      "github.com/rcrowley/go-metrics"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 909a33d4e8a8..b7b3a0527b2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3329,7 +3329,7 @@ in
 
   skippy-xd = callPackage ../tools/X11/skippy-xd {};
 
-  skydns = goPackages.skydns.bin // { outputs = [ "bin" ]; };
+  skydns = (callPackage ../servers/skydns { }).bin;
 
   sipcalc = callPackage ../tools/networking/sipcalc { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 52fd41d79eea..6b51ccacd473 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3483,17 +3483,6 @@ let
     sha256 = "0ybz1w3hndma8myq3pxan36533hy9f4w598hsv4hnj21l4br8jpx";
   };
 
-  skydns = buildFromGitHub {
-    rev = "2.5.3a";
-    owner = "skynetservices";
-    repo = "skydns";
-    sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7";
-
-    buildInputs = [
-      go-etcd rcrowley.go-metrics dns go-systemd prometheus.client_golang
-    ];
-  };
-
   slices = buildGoPackage rec {
     rev = "bb44bb2e4817fe71ba7082d351fd582e7d40e3ea";
     name = "slices-${stdenv.lib.strings.substring 0 7 rev}";

From 17770101b51ffcceacd9588f4543a681a179ef7c Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 18:30:38 +0200
Subject: [PATCH 050/436] wego: extracted from goPackages

---
 pkgs/applications/misc/wego/default.nix | 20 ++++++++++++++++++++
 pkgs/applications/misc/wego/deps.json   | 10 ++++++++++
 pkgs/development/go-modules/libs.json   |  9 +++++++++
 pkgs/top-level/all-packages.nix         |  2 +-
 pkgs/top-level/go-packages.nix          |  9 ---------
 5 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/applications/misc/wego/default.nix
 create mode 100644 pkgs/applications/misc/wego/deps.json

diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix
new file mode 100644
index 000000000000..2ce62783100a
--- /dev/null
+++ b/pkgs/applications/misc/wego/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "wego-${version}";
+  version = "20160407-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "81d72ffd761f032fbd73dba4f94bd94c8c2d53d5";
+  
+  goPackagePath = "github.com/schachmat/wego";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/schachmat/wego";
+    sha256 = "14p3hvv82bsxqnbnzz8hjv75i39kzg154a132n6cdxx3vgw76gck";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/applications/misc/wego/deps.json b/pkgs/applications/misc/wego/deps.json
new file mode 100644
index 000000000000..2255fdeb69e3
--- /dev/null
+++ b/pkgs/applications/misc/wego/deps.json
@@ -0,0 +1,10 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/mattn/go-colorable",
+      "github.com/mattn/go-runewidth",
+      "github.com/schachmat/ingo"
+    ]
+  }
+]
diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 03107ea8e498..2ee01f42ea22 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -466,5 +466,14 @@
       "rev": "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8",
       "sha256": "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"
     }
+  },
+  {
+    "goPackagePath": "github.com/schachmat/ingo",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/schachmat/ingo",
+      "rev": "fab41e4e62cbef5d92998746ec25f7e195100f38",
+      "sha256": "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb"
+    }
   }
 ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7b3a0527b2e..e993fc9b1a44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3714,7 +3714,7 @@ in
 
   weather = callPackage ../applications/misc/weather { };
 
-  wego = goPackages.wego.bin // { outputs = [ "bin" ]; };
+  wego = (callPackage ../applications/misc/wego { }).bin;
 
   wal_e = callPackage ../tools/backup/wal-e { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 6b51ccacd473..dd171b484d62 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -4008,15 +4008,6 @@ let
     propagatedBuildInputs = [ ];
   };
 
-  wego = buildFromGitHub rec {
-    rev     = "81d72ffd761f032fbd73dba4f94bd94c8c2d53d5";
-    version = "2016-04-07";
-    owner   = "schachmat";
-    repo    = "wego";
-    sha256  = "14p3hvv82bsxqnbnzz8hjv75i39kzg154a132n6cdxx3vgw76gck";
-    propagatedBuildInputs = [ go-colorable mattn.go-runewidth ingo ];
-  };
-
   textql = buildFromGitHub rec {
     rev     = "1785cd353c68aa34f97627143b9c2908dfd4ea04";
     version = "2.0.3";

From bce93755b9ac9dd154812dda0ebaae9d86e34f41 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 18:42:33 +0200
Subject: [PATCH 051/436] textql: extracted from goPackages

---
 pkgs/development/go-modules/libs.json     |  6 ++---
 pkgs/development/tools/textql/default.nix | 27 +++++++++++++++++++++++
 pkgs/development/tools/textql/deps.json   |  8 +++++++
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            | 17 --------------
 5 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/tools/textql/default.nix
 create mode 100644 pkgs/development/tools/textql/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 2ee01f42ea22..673c5c8010e2 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -211,8 +211,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/mattn/go-sqlite3",
-      "rev": "c5aee9649735e8dadac55eb968ccebd9fa29a881",
-      "sha256": "1505piq2mks6s77hfzrlv2siiqpy55lxgy1h9364jfz0baxjqpas"
+      "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42",
+      "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"
     }
   },
   {
@@ -476,4 +476,4 @@
       "sha256": "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb"
     }
   }
-]
+]
\ No newline at end of file
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix
new file mode 100644
index 000000000000..abc9312c9e2d
--- /dev/null
+++ b/pkgs/development/tools/textql/default.nix
@@ -0,0 +1,27 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "textql-${version}";
+  version = "2.0.3";
+  rev = "${version}";
+  
+  goPackagePath = "github.com/dinedal/textql";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/dinedal/textql";
+    sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3";
+  };
+
+  goDeps = ./deps.json;
+
+  meta = with stdenv.lib; {
+    description = "Execute SQL against structured text like CSV or TSV";
+    homepage = https://github.com/dinedal/textql;
+    license = licenses.mit;
+    maintainers = with maintainers; [ vrthra ];
+  };
+}
diff --git a/pkgs/development/tools/textql/deps.json b/pkgs/development/tools/textql/deps.json
new file mode 100644
index 000000000000..d2a75b9e45b0
--- /dev/null
+++ b/pkgs/development/tools/textql/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/mattn/go-sqlite3"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e993fc9b1a44..d087e118c1fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3740,7 +3740,7 @@ in
 
   testdisk = callPackage ../tools/misc/testdisk { };
 
-  textql = goPackages.textql.bin // { outputs = [ "bin" ]; };
+  textql = (callPackage ../development/tools/textql { }).bin;
 
   html2text = callPackage ../tools/text/html2text { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index dd171b484d62..9bf27c55fa5f 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -4008,23 +4008,6 @@ let
     propagatedBuildInputs = [ ];
   };
 
-  textql = buildFromGitHub rec {
-    rev     = "1785cd353c68aa34f97627143b9c2908dfd4ea04";
-    version = "2.0.3";
-    owner   = "dinedal";
-    repo    = "textql";
-    sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3";
-    propagatedBuildInputs = [ go-sqlite3 ];
-
-    meta = with stdenv.lib; {
-      description = "Execute SQL against structured text like CSV or TSV";
-      homepage = https://github.com/dinedal/textql;
-      license = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-  };
-
   gopsutil = buildFromGitHub rec {
     version = "1.0.0";
     rev = "37d89088411de59a4ef9fc340afa0e89dfcb4ea9";

From c7bf8afbfc02dbed6957d095d00f6e9a1a4f5279 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 18:52:46 +0200
Subject: [PATCH 052/436] oh: extracted from goPackages

---
 pkgs/development/go-modules/libs.json | 24 +++++++++++++++++++++---
 pkgs/shells/oh/default.nix            | 20 ++++++++++++++++++++
 pkgs/shells/oh/deps.json              | 10 ++++++++++
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        | 11 -----------
 5 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/shells/oh/default.nix
 create mode 100644 pkgs/shells/oh/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 673c5c8010e2..33a3420d5b68 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -4,8 +4,8 @@
     "fetch": {
       "type": "git",
       "url": "https://go.googlesource.com/sys",
-      "rev": "7a56174f0086b32866ebd746a794417edbc678a1",
-      "sha256": "13jaz47wyrfak066ywkrvqnk1ijxik0nlvi7vkpi3gaiwcrlb5g2"
+      "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f",
+      "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"
     }
   },
   {
@@ -475,5 +475,23 @@
       "rev": "fab41e4e62cbef5d92998746ec25f7e195100f38",
       "sha256": "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb"
     }
+  },
+  {
+    "goPackagePath": "github.com/michaelmacinnis/adapted",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/michaelmacinnis/adapted",
+      "rev": "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978",
+      "sha256": "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv"
+    }
+  },
+  {
+    "goPackagePath": "github.com/peterh/liner",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/peterh/liner",
+      "rev": "ad1edfd30321d8f006ccf05f1e0524adeb943060",
+      "sha256": "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317"
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix
new file mode 100644
index 000000000000..3c8b2c89524d
--- /dev/null
+++ b/pkgs/shells/oh/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "oh-${version}";
+  version = "20160522-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "0daaf4081475fb9d6b3801c85019bdd57b2ee9b4";
+
+  goPackagePath = "github.com/michaelmacinnis/oh";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/michaelmacinnis/oh";
+    sha256 = "0ajidzs0aisbw74nri9ks6sx6644nmwkisc9mvxm3f89zmnlsgwr";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/shells/oh/deps.json b/pkgs/shells/oh/deps.json
new file mode 100644
index 000000000000..a0e67ed42dcc
--- /dev/null
+++ b/pkgs/shells/oh/deps.json
@@ -0,0 +1,10 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/michaelmacinnis/adapted",
+      "github.com/peterh/liner",
+      "golang.org/x/sys"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d087e118c1fb..62c8316ccb0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4085,7 +4085,7 @@ in
 
   mksh = callPackage ../shells/mksh { };
 
-  oh = goPackages.oh.bin // { outputs = [ "bin" ]; };
+  oh = (callPackage ../shells/oh { }).bin;
 
   pash = callPackage ../shells/pash { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 9bf27c55fa5f..65a0e065cadc 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2643,17 +2643,6 @@ let
     doCheck = false; # check this again
   };
 
-  oh = buildFromGitHub {
-    rev = "0daaf4081475fb9d6b3801c85019bdd57b2ee9b4";
-    version = "2016-05-23";
-    owner = "michaelmacinnis";
-    repo = "oh";
-    sha256 = "0ajidzs0aisbw74nri9ks6sx6644nmwkisc9mvxm3f89zmnlsgwr";
-    goPackageAliases = [ "github.com/michaelmacinnis/oh" ];
-    buildInputs = [ adapted liner ];
-    disabled = isGo14;
-  };
-
   openssl = buildFromGitHub {
     rev = "4c6dbafa5ec35b3ffc6a1b1e1fe29c3eba2053ec";
     owner = "10gen";

From 0066d89b0ce4b0e40bf5393861fac21124d5c288 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 19:11:31 +0200
Subject: [PATCH 053/436] go-repo-root: extracted from goPackages

---
 .../tools/go-repo-root/default.nix            | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                |  9 ---------
 3 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/tools/go-repo-root/default.nix

diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix
new file mode 100644
index 000000000000..15aa1504d93c
--- /dev/null
+++ b/pkgs/development/tools/go-repo-root/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "go-repo-root-${version}";
+  version = "20140911-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
+  
+  goPackagePath = "github.com/cstrahan/go-repo-root";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/cstrahan/go-repo-root";
+    sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4";
+  };
+
+  buildInputs = [ tools ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62c8316ccb0d..36a20ff3ac6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4551,7 +4551,7 @@ in
 
   go = self.go_1_5;
 
-  go-repo-root = goPackages.go-repo-root.bin // { outputs = [ "bin" ]; };
+  go-repo-root = (callPackage ../development/tools/go-repo-root { }).bin;
 
   gox = goPackages.gox.bin // { outputs = [ "bin" ]; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 65a0e065cadc..1d19bb945da4 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1804,15 +1804,6 @@ let
     sha256 = "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x";
   };
 
-  go-repo-root = buildFromGitHub {
-    rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
-    version = "2014-09-11";
-    owner = "cstrahan";
-    repo = "go-repo-root";
-    sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4";
-    buildInputs = [ tools ];
-  };
-
   go-rice = buildFromGitHub {
     rev    = "4f3c5af2322e393f305d9674845bc36cd1dea589";
     version = "2016-01-04";

From 6dc8237385f08761750367fbda18318094be00ea Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 19:19:32 +0200
Subject: [PATCH 054/436] gox: extracted from goPackages

---
 pkgs/development/go-modules/libs.json  | 11 ++++++++++-
 pkgs/development/tools/gox/default.nix | 21 +++++++++++++++++++++
 pkgs/development/tools/gox/deps.json   |  8 ++++++++
 pkgs/top-level/all-packages.nix        |  2 +-
 pkgs/top-level/go-packages.nix         | 20 --------------------
 5 files changed, 40 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/tools/gox/default.nix
 create mode 100644 pkgs/development/tools/gox/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 33a3420d5b68..3d54517796c5 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -493,5 +493,14 @@
       "rev": "ad1edfd30321d8f006ccf05f1e0524adeb943060",
       "sha256": "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317"
     }
+  },
+  {
+    "goPackagePath": "github.com/mitchellh/iochan",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mitchellh/iochan",
+      "rev": "b584a329b193e206025682ae6c10cdbe03b0cd77",
+      "sha256": "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"
+    }
   }
-]
+]
\ No newline at end of file
diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
new file mode 100644
index 000000000000..7b58bafcd627
--- /dev/null
+++ b/pkgs/development/tools/gox/default.nix
@@ -0,0 +1,21 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "gox-${version}";
+  version = "20140904-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549";
+
+  
+  goPackagePath = "github.com/mitchellh/gox";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/mitchellh/gox";
+    sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/development/tools/gox/deps.json b/pkgs/development/tools/gox/deps.json
new file mode 100644
index 000000000000..288b2d9f714f
--- /dev/null
+++ b/pkgs/development/tools/gox/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/mitchellh/iochan"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36a20ff3ac6b..9406c7120b2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4553,7 +4553,7 @@ in
 
   go-repo-root = (callPackage ../development/tools/go-repo-root { }).bin;
 
-  gox = goPackages.gox.bin // { outputs = [ "bin" ]; };
+  gox = (callPackage ../development/tools/gox { }).bin;
 
   gprolog = callPackage ../development/compilers/gprolog { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 1d19bb945da4..a435283abebc 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1336,19 +1336,6 @@ let
     buildInputs = [ opencontainers.runc ];
   };
 
-  gox = buildGoPackage rec {
-    rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549";
-    name = "gox-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/mitchellh/gox";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "mitchellh";
-      repo   = "gox";
-      sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1";
-    };
-    buildInputs = [ iochan ];
-  };
-
   gozim = buildFromGitHub {
     rev    = "ea9b7c39cb1d13bd8bf19ba4dc4e2a16bab52f14";
     version = "2016-01-15";
@@ -2152,13 +2139,6 @@ let
     sha256 = "1y6wf1s51c90qc1aki8qikkw1wqapzjzr690xrmnrngsfpdyvkrc";
   };
 
-  iochan = buildFromGitHub {
-    rev    = "b584a329b193e206025682ae6c10cdbe03b0cd77";
-    owner  = "mitchellh";
-    repo   = "iochan";
-    sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b";
-  };
-
   ipfs = buildFromGitHub{
     rev = "7070b4d878baad57dcc8da80080dd293aa46cabd";
     version = "2016-01-12";

From 26d231c536bec9b26c9e0b8009cf2d72d8c285c2 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 19:40:02 +0200
Subject: [PATCH 055/436] mesos-dns: extracted from goPackages

---
 pkgs/development/go-modules/libs.json | 91 +++++++++++++++++++++++++--
 pkgs/servers/mesos-dns/default.nix    | 23 +++++++
 pkgs/servers/mesos-dns/deps.json      | 18 ++++++
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        | 21 -------
 5 files changed, 128 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/servers/mesos-dns/default.nix
 create mode 100644 pkgs/servers/mesos-dns/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 3d54517796c5..18ddb080b19d 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -85,8 +85,8 @@
     "fetch": {
       "type": "git",
       "url": "https://go.googlesource.com/net",
-      "rev": "ef00b378c73f107bf44d5c9b69875255ce89b79a",
-      "sha256": "168dhvl0wqiac8xmy8mqkvspd7cq6vfjpj80zdnriwy169nykcyz"
+      "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4",
+      "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"
     }
   },
   {
@@ -454,8 +454,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/miekg/dns",
-      "rev": "b9171237b0642de1d8e8004f16869970e065f46b",
-      "sha256": "1biz7j8mdyil2vks1hyvwkjh5na5fy45rn5fnxl68b9iw6r0xsc3"
+      "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa",
+      "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"
     }
   },
   {
@@ -502,5 +502,86 @@
       "rev": "b584a329b193e206025682ae6c10cdbe03b0cd77",
       "sha256": "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"
     }
+  },
+  {
+    "goPackagePath": "github.com/gogo/protobuf",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gogo/protobuf",
+      "rev": "7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4",
+      "sha256": "16ja7lqq96q0pnzgnbwnh0j8qzvqgns1nfk8ndxgkg4sg93bg372"
+    }
+  },
+  {
+    "goPackagePath": "github.com/golang/glog",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/golang/glog",
+      "rev": "fca8c8854093a154ff1eb580aae10276ad6b1b5f",
+      "sha256": "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mesos/mesos-go",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mesos/mesos-go",
+      "rev": "aaa5b2fecf0e2db463f4f996c89617d6766b2969",
+      "sha256": "1pk1fpxksjln6kqvgm1igw3582jgrn14fwa8bdj5cwbpy6skjdvk"
+    }
+  },
+  {
+    "goPackagePath": "github.com/pmezard/go-difflib",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/pmezard/go-difflib",
+      "rev": "d8ed2627bdf02c080bf22230dbb337003b7aba2d",
+      "sha256": "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"
+    }
+  },
+  {
+    "goPackagePath": "github.com/samuel/go-zookeeper",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/samuel/go-zookeeper",
+      "rev": "5bb5cfc093ad18a28148c578f8632cfdb4d802e4",
+      "sha256": "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"
+    }
+  },
+  {
+    "goPackagePath": "github.com/stretchr/objx",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/stretchr/objx",
+      "rev": "cbeaeb16a013161a98496fad62933b1d21786672",
+      "sha256": "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"
+    }
+  },
+  {
+    "goPackagePath": "github.com/davecgh/go-spew",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/davecgh/go-spew",
+      "rev": "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d",
+      "sha256": "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"
+    }
+  },
+  {
+    "goPackagePath": "github.com/emicklei/go-restful",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/emicklei/go-restful",
+      "rev": "892402ba11a2e2fd5e1295dd633481f27365f14d",
+      "sha256": "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x"
+    }
+  },
+  {
+    "goPackagePath": "github.com/stretchr/testify",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/stretchr/testify",
+      "rev": "089c7181b8c728499929ff09b62d3fdd8df8adff",
+      "sha256": "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p"
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix
new file mode 100644
index 000000000000..1fa2a6101788
--- /dev/null
+++ b/pkgs/servers/mesos-dns/default.nix
@@ -0,0 +1,23 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "mesos-dns-${version}";
+  version = "0.1.2";
+  rev = "v${version}";
+  
+  goPackagePath = "github.com/mesosphere/mesos-dns";
+
+  # Avoid including the benchmarking test helper in the output:
+  subPackages = [ "." ];
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/mesosphere/mesos-dns";
+    sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/servers/mesos-dns/deps.json b/pkgs/servers/mesos-dns/deps.json
new file mode 100644
index 000000000000..8ac9d7058413
--- /dev/null
+++ b/pkgs/servers/mesos-dns/deps.json
@@ -0,0 +1,18 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/gogo/protobuf",
+      "github.com/golang/glog",
+      "github.com/mesos/mesos-go",
+      "github.com/pmezard/go-difflib",
+      "github.com/samuel/go-zookeeper",
+      "github.com/stretchr/objx",
+      "github.com/davecgh/go-spew",
+      "github.com/emicklei/go-restful",
+      "github.com/stretchr/testify",
+      "github.com/miekg/dns",
+      "golang.org/x/net"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9406c7120b2f..d9a60f50f464 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5607,7 +5607,7 @@ in
     perf = linuxPackages.perf;
   };
 
-  mesos-dns = goPackages.mesos-dns.bin // { outputs = [ "bin" ]; };
+  mesos-dns = (callPackage ../servers/mesos-dns { }).bin;
 
   mujs = callPackage ../development/interpreters/mujs { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a435283abebc..3be6aa47dd88 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2370,27 +2370,6 @@ let
     propagatedBuildInputs = [ ugorji.go armon.go-metrics ];
   };
 
-  mesos-dns = buildFromGitHub {
-    rev = "v0.1.2";
-    owner = "mesosphere";
-    repo = "mesos-dns";
-    sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02";
-
-    # Avoid including the benchmarking test helper in the output:
-    subPackages = [ "." ];
-
-    buildInputs = [ glog mesos-go dns go-restful ];
-  };
-
-  mesos-go = buildFromGitHub {
-    rev = "d98afa618cc9a9251758916f49ce87f9051b69a4";
-    owner = "mesos";
-    repo = "mesos-go";
-    sha256 = "01ab0jf3cfb1rdwwb21r38rcfr5vp86pkfk28mws8298mlzbpri7";
-    propagatedBuildInputs = [ gogo.protobuf glog net testify go-zookeeper objx uuid ];
-    excludedPackages = "test";
-  };
-
   mesos-stats = buildGoPackage rec {
     rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920";
     name = "mesos-stats-${stdenv.lib.strings.substring 0 7 rev}";

From 20a457faf777dee002024aa425a9076c936e0d3f Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 20:03:09 +0200
Subject: [PATCH 056/436] gotty: extracted from goPackages

---
 pkgs/development/go-modules/libs.json | 63 +++++++++++++++++++++++++++
 pkgs/servers/gotty/default.nix        | 27 ++++++++++++
 pkgs/servers/gotty/deps.json          | 15 +++++++
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        | 16 -------
 5 files changed, 106 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/servers/gotty/default.nix
 create mode 100644 pkgs/servers/gotty/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 18ddb080b19d..8fe25540bc51 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -583,5 +583,68 @@
       "rev": "089c7181b8c728499929ff09b62d3fdd8df8adff",
       "sha256": "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p"
     }
+  },
+  {
+    "goPackagePath": "github.com/kr/pty",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/kr/pty",
+      "rev": "67e2db24c831afa6c64fc17b4a143390674365ef",
+      "sha256": "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d"
+    }
+  },
+  {
+    "goPackagePath": "github.com/braintree/manners",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/braintree/manners",
+      "rev": "cab36f97339b1925cd89e158632728025557e550",
+      "sha256": "1q508c62iiklghkhwqz9c0zsn9hrij7kqb93gdywzj7ms7x6hlfh"
+    }
+  },
+  {
+    "goPackagePath": "github.com/codegangsta/cli",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/codegangsta/cli",
+      "rev": "71f57d300dd6a780ac1856c005c4b518cfd498ec",
+      "sha256": "1fxznirkvank5461789dm5aw5z8aqi0jvwligvz44659rfl376p3"
+    }
+  },
+  {
+    "goPackagePath": "github.com/elazarl/go-bindata-assetfs",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/elazarl/go-bindata-assetfs",
+      "rev": "d5cac425555ca5cf00694df246e04f05e6a55150",
+      "sha256": "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17"
+    }
+  },
+  {
+    "goPackagePath": "github.com/fatih/structs",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/fatih/structs",
+      "rev": "a9f7daa9c2729e97450c2da2feda19130a367d8f",
+      "sha256": "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/hcl",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/hcl",
+      "rev": "54864211433d45cb780682431585b3e573b49e4a",
+      "sha256": "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/go-multierror",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/go-multierror",
+      "rev": "56912fb08d85084aa318edcf2bba735b97cf35c5",
+      "sha256": "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"
+    }
   }
 ]
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
new file mode 100644
index 000000000000..c826180d7585
--- /dev/null
+++ b/pkgs/servers/gotty/default.nix
@@ -0,0 +1,27 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "gotty-${version}";
+  version = "0.0.10";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/yudai/gotty";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/yudai/gotty";
+    sha256 = "1jc620j4y2r8706r6qn7g2nghiidaaj7f8m2vjgq2gwv288qjafd";
+  };
+
+  goDeps = ./deps.json;
+
+  meta = with stdenv.lib; {
+    description = "Share your terminal as a web application";
+    homepage = "https://github.com/yudai/gotty";
+    maintainers = with maintainers; [ matthiasbeyer ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/servers/gotty/deps.json b/pkgs/servers/gotty/deps.json
new file mode 100644
index 000000000000..ff0016df6233
--- /dev/null
+++ b/pkgs/servers/gotty/deps.json
@@ -0,0 +1,15 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/kr/pty",
+      "github.com/braintree/manners",
+      "github.com/codegangsta/cli",
+      "github.com/elazarl/go-bindata-assetfs",
+      "github.com/fatih/structs",
+      "github.com/gorilla/websocket",
+      "github.com/hashicorp/hcl",
+      "github.com/hashicorp/go-multierror"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9a60f50f464..89dc95eaeeb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6216,7 +6216,7 @@ in
 
   gob2 = callPackage ../development/tools/misc/gob2 { };
 
-  gotty = goPackages.gotty.bin // { outputs = [ "bin" ]; };
+  gotty = (callPackage ../servers/gotty { }).bin;
 
   gradleGen = callPackage ../development/tools/build-managers/gradle { };
   gradle = self.gradleGen.gradleLatest;
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3be6aa47dd88..3adaf33f8928 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1134,22 +1134,6 @@ let
     sha256  = "1l1w4mczqmah0c154vb1daw5l3cc7vn5gmy5s67p3ad1lnz5l79x";
   };
 
-  gotty = buildFromGitHub {
-    rev     = "v0.0.10";
-    owner   = "yudai";
-    repo    = "gotty";
-    sha256  = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09";
-
-    buildInputs = [ cli-go go manners go-bindata-assetfs go-multierror structs websocket hcl pty ];
-
-    meta = with stdenv.lib; {
-      description = "Share your terminal as a web application";
-      homepage = "https://github.com/yudai/gotty";
-      maintainers = with maintainers; [ matthiasbeyer ];
-      license = licenses.mit;
-    };
-  };
-
   govers = buildFromGitHub {
     rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
     version = "2015-01-09";

From 6909d0e45688b132600021f90f725e82ad144d98 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 08:14:36 +0200
Subject: [PATCH 057/436] vimPlugins: FIX fzf outside goPackages

---
 pkgs/misc/vim-plugins/default.nix | 8 ++++----
 pkgs/tools/misc/fzf/default.nix   | 2 +-
 pkgs/top-level/all-packages.nix   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 800caad76e00..98a8a4ddf249 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,7 +1,7 @@
 # TODO check that no license information gets lost
 { fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
 , which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip
-, vim_configurable, vimPlugins, xkb_switch, git, racerdRust, goPackages
+, vim_configurable, vimPlugins, xkb_switch, git, racerdRust, fzf
 , Cocoa ? null
 }:
 
@@ -98,9 +98,9 @@ rec {
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
 
-  fzf = buildVimPluginFrom2Nix {
-    name = goPackages.fzf.name;
-    src = "${goPackages.fzf}/share/go/src/github.com/junegunn/fzf";
+  fzfWrapper = buildVimPluginFrom2Nix {
+    name = fzf.name;
+    src = "${fzf}/share/go/src/github.com/junegunn/fzf";
     dependencies = [];
   };
 
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 08def70ecb6e..d1fd3ac0afce 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -28,6 +28,6 @@ buildGoPackage rec {
   postInstall= ''
     cp $src/bin/fzf-tmux $bin/bin
     mkdir -p $out/share/vim-plugins
-    ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${(builtins.parseDrvName fzf.name).name}
+    ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}
   '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89dc95eaeeb3..09842b4c232a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -801,7 +801,7 @@ in
 
   fsmark = callPackage ../tools/misc/fsmark { };
 
-  fzf = (callPackage ../tools/misc/fzf {}).bin;
+  fzf = callPackage ../tools/misc/fzf { };
 
   fzy = callPackage ../tools/misc/fzy { };
 

From 144ea787530fbabbbef1dbdd5f5e0e6eed5155bb Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 08:40:17 +0200
Subject: [PATCH 058/436] etcd: extracted from goPackages

---
 pkgs/servers/etcd/default.nix   | 22 ++++++++++++++++++++++
 pkgs/servers/etcd/deps.json     |  9 +++++++++
 pkgs/top-level/all-packages.nix |  2 +-
 pkgs/top-level/go-packages.nix  |  8 --------
 4 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/servers/etcd/default.nix
 create mode 100644 pkgs/servers/etcd/deps.json

diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
new file mode 100644
index 000000000000..05bb61049693
--- /dev/null
+++ b/pkgs/servers/etcd/default.nix
@@ -0,0 +1,22 @@
+# This file was generated by go2nix.
+{ stdenv, lib, libpcap, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "etcd-${version}";
+  version = "2.3.0";
+  rev = "v${version}";
+  
+  goPackagePath = "github.com/coreos/etcd";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/coreos/etcd";
+    sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7";
+  };
+
+  goDeps = ./deps.json;
+
+  buildInputs = [ libpcap ];
+}
diff --git a/pkgs/servers/etcd/deps.json b/pkgs/servers/etcd/deps.json
new file mode 100644
index 000000000000..b5977a855515
--- /dev/null
+++ b/pkgs/servers/etcd/deps.json
@@ -0,0 +1,9 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/olekukonko/tablewriter",
+      "github.com/mattn/go-runewidth"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09842b4c232a..6082f524c7d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9903,7 +9903,7 @@ in
     inherit (perlPackages) NetSMTP;
   };
 
-  etcd = goPackages.etcd.bin // { outputs = [ "bin" ]; };
+  etcd = callPackage ../servers/etcd { };
 
   ejabberd = callPackage ../servers/xmpp/ejabberd { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3adaf33f8928..df2d9db67962 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -827,14 +827,6 @@ let
     sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
   };
 
-  etcd = buildFromGitHub {
-    rev    = "v2.3.0";
-    owner  = "coreos";
-    repo   = "etcd";
-    sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7";
-    buildInputs = [ pkgs.libpcap tablewriter ];
-  };
-
   fsnotify.v0 = buildGoPackage rec {
     rev = "v0.9.3";
     name = "fsnotify.v0-${rev}";

From 2bee32508cb660db6f46513b20589a51e65d2f05 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 13:01:57 +0200
Subject: [PATCH 059/436] nsq: extracted from goPackages

---
 pkgs/development/go-modules/libs.json | 81 +++++++++++++++++++++++++++
 pkgs/servers/nsq/default.nix          | 20 +++++++
 pkgs/servers/nsq/deps.json            | 16 ++++++
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        | 11 ----
 5 files changed, 118 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/servers/nsq/default.nix
 create mode 100644 pkgs/servers/nsq/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 8fe25540bc51..8e6d3d51e7a0 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -646,5 +646,86 @@
       "rev": "56912fb08d85084aa318edcf2bba735b97cf35c5",
       "sha256": "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"
     }
+  },
+  {
+    "goPackagePath": "github.com/mreiferson/go-snappystream",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mreiferson/go-snappystream",
+      "rev": "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504",
+      "sha256": "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"
+    }
+  },
+  {
+    "goPackagePath": "github.com/bitly/go-nsq",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/bitly/go-nsq",
+      "rev": "22a8bd48c443ec23bb559675b6df8284bbbdab29",
+      "sha256": "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46"
+    }
+  },
+  {
+    "goPackagePath": "github.com/bitly/go-simplejson",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/bitly/go-simplejson",
+      "rev": "fc395a5db941cf38922b1ccbc083640cd76fe4bc",
+      "sha256": "14lhdmzlc1pza10q8g957zqnc4kfqvamw90mj1ndj6s285h80m54"
+    }
+  },
+  {
+    "goPackagePath": "github.com/blang/semver",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/blang/semver",
+      "rev": "9bf7bff48b0388cb75991e58c6df7d13e982f1f2",
+      "sha256": "11sinbf942dpyc9wdpidkhmqn438cfp5n8x3xqnmq9aszkld9hy7"
+    }
+  },
+  {
+    "goPackagePath": "github.com/bmizerany/perks",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/bmizerany/perks",
+      "rev": "6cb9d9d729303ee2628580d9aec5db968da3a607",
+      "sha256": "0cdh84hmn21is6hvv6dy9qjdcg9w3l2k8avlk0881a8cqm09s90j"
+    }
+  },
+  {
+    "goPackagePath": "github.com/BurntSushi/toml",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/BurntSushi/toml",
+      "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4",
+      "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"
+    }
+  },
+  {
+    "goPackagePath": "github.com/bitly/go-hostpool",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/bitly/go-hostpool",
+      "rev": "d0e59c22a56e8dadfed24f74f452cea5a52722d2",
+      "sha256": "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"
+    }
+  },
+  {
+    "goPackagePath": "github.com/bitly/timer_metrics",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/bitly/timer_metrics",
+      "rev": "afad1794bb13e2a094720aeb27c088aa64564895",
+      "sha256": "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mreiferson/go-options",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mreiferson/go-options",
+      "rev": "7c174072188d0cfbe6f01bb457626abb22bdff52",
+      "sha256": "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"
+    }
   }
 ]
diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix
new file mode 100644
index 000000000000..5831340eccd9
--- /dev/null
+++ b/pkgs/servers/nsq/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "nsq-${version}";
+  version = "0.3.5";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/bitly/nsq";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/nsqio/nsq";
+    sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/servers/nsq/deps.json b/pkgs/servers/nsq/deps.json
new file mode 100644
index 000000000000..e23d3e15f669
--- /dev/null
+++ b/pkgs/servers/nsq/deps.json
@@ -0,0 +1,16 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/mreiferson/go-snappystream",
+      "github.com/bitly/go-nsq",
+      "github.com/bitly/go-simplejson",
+      "github.com/blang/semver",
+      "github.com/bmizerany/perks",
+      "github.com/BurntSushi/toml",
+      "github.com/bitly/go-hostpool",
+      "github.com/bitly/timer_metrics",
+      "github.com/mreiferson/go-options"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6082f524c7d4..5464e581794f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10031,7 +10031,7 @@ in
 
   nsd = callPackage ../servers/dns/nsd (config.nsd or {});
 
-  nsq = goPackages.nsq.bin // { outputs = [ "bin" ]; };
+  nsq = callPackage ../servers/nsq { };
 
   oauth2_proxy = goPackages.oauth2_proxy.bin // { outputs = [ "bin" ]; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index df2d9db67962..63e67a9c9727 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2489,17 +2489,6 @@ let
     subPackages = [ "." ];
   };
 
-  nsq = buildFromGitHub {
-    rev = "v0.3.5";
-    owner = "bitly";
-    repo = "nsq";
-    sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f";
-
-    excludedPackages = "bench";
-
-    buildInputs = [ go-nsq go-options semver perks toml go-hostpool timer_metrics ];
-  };
-
   ntp = buildFromGitHub {
     rev    = "0a5264e2563429030eb922f258229ae3fee5b5dc";
     owner  = "beevik";

From 6b41b6b908429b5d6eca05e45eb13a2d6954cfec Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 13:25:34 +0200
Subject: [PATCH 060/436] oauth2_proxy: extracted from goPackages

---
 pkgs/development/go-modules/libs.json | 44 ++++++++++++++++++++++++---
 pkgs/servers/oauth2_proxy/default.nix | 20 ++++++++++++
 pkgs/servers/oauth2_proxy/deps.json   | 16 ++++++++++
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        | 15 ---------
 5 files changed, 77 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/servers/oauth2_proxy/default.nix
 create mode 100644 pkgs/servers/oauth2_proxy/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 8e6d3d51e7a0..32044808f867 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -13,8 +13,8 @@
     "fetch": {
       "type": "git",
       "url": "https://gopkg.in/fsnotify.v1",
-      "rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8",
-      "sha256": "1ljkdzbj9ll3jx1dggslzpm475prvsg22hdpxnb6kxqyk3z8dqdj"
+      "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0",
+      "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"
     }
   },
   {
@@ -670,8 +670,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/bitly/go-simplejson",
-      "rev": "fc395a5db941cf38922b1ccbc083640cd76fe4bc",
-      "sha256": "14lhdmzlc1pza10q8g957zqnc4kfqvamw90mj1ndj6s285h80m54"
+      "rev": "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a",
+      "sha256": "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"
     }
   },
   {
@@ -727,5 +727,41 @@
       "rev": "7c174072188d0cfbe6f01bb457626abb22bdff52",
       "sha256": "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"
     }
+  },
+  {
+    "goPackagePath": "google.golang.org/api",
+    "fetch": {
+      "type": "git",
+      "url": "https://code.googlesource.com/google-api-go-client",
+      "rev": "a5c3e2a4792aff40e59840d9ecdff0542a202a80",
+      "sha256": "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"
+    }
+  },
+  {
+    "goPackagePath": "google.golang.org/cloud",
+    "fetch": {
+      "type": "git",
+      "url": "https://code.googlesource.com/gocloud",
+      "rev": "6335269abf9002cf5a84613c13cda6010842b834",
+      "sha256": "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/oauth2",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/oauth2",
+      "rev": "397fe7649477ff2e8ced8fc0b2696f781e53745a",
+      "sha256": "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"
+    }
+  },
+  {
+    "goPackagePath": "github.com/18F/hmacauth",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/18F/hmacauth",
+      "rev": "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd",
+      "sha256": "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1"
+    }
   }
 ]
diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix
new file mode 100644
index 000000000000..9381db95d77d
--- /dev/null
+++ b/pkgs/servers/oauth2_proxy/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "oauth2_proxy-${version}";
+  version = "20160120-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "10f47e325b782a60b8689653fa45360dee7fbf34";
+  
+  goPackagePath = "github.com/bitly/oauth2_proxy";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/bitly/oauth2_proxy";
+    sha256 = "13f6kaq15f6ial9gqzrsx7i94jhd5j70js2k93qwxcw1vkh1b6si";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/servers/oauth2_proxy/deps.json b/pkgs/servers/oauth2_proxy/deps.json
new file mode 100644
index 000000000000..ac8ac3d8ca21
--- /dev/null
+++ b/pkgs/servers/oauth2_proxy/deps.json
@@ -0,0 +1,16 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "google.golang.org/api",
+      "google.golang.org/cloud",
+      "golang.org/x/oauth2",
+      "github.com/18F/hmacauth",
+      "github.com/mreiferson/go-options",
+      "github.com/BurntSushi/toml",
+      "github.com/bitly/go-simplejson",
+      "golang.org/x/net",
+      "gopkg.in/fsnotify.v1"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5464e581794f..ea012bbc9338 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10033,7 +10033,7 @@ in
 
   nsq = callPackage ../servers/nsq { };
 
-  oauth2_proxy = goPackages.oauth2_proxy.bin // { outputs = [ "bin" ]; };
+  oauth2_proxy = callPackage ../servers/oauth2_proxy { };
 
   openpts = callPackage ../servers/openpts { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 63e67a9c9727..fe3cc14926bb 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2496,21 +2496,6 @@ let
     sha256 = "03fvgbjf2aprjj1s6wdc35wwa7k1w5phkixzvp5n1j21sf6w4h24";
   };
 
-  oauth2_proxy = buildGoPackage {
-    name = "oauth2_proxy";
-    goPackagePath = "github.com/bitly/oauth2_proxy";
-    src = fetchFromGitHub {
-      rev = "10f47e325b782a60b8689653fa45360dee7fbf34";
-      owner = "bitly";
-      repo = "oauth2_proxy";
-      sha256 = "13f6kaq15f6ial9gqzrsx7i94jhd5j70js2k93qwxcw1vkh1b6si";
-    };
-    buildInputs = [
-      go-assert go-options go-simplejson toml fsnotify.v1 oauth2
-      google-api-go-client hmacauth
-    ];
-  };
-
   objx = buildFromGitHub {
     rev    = "cbeaeb16a013161a98496fad62933b1d21786672";
     owner  = "stretchr";

From 4ddfe1fc40ae19efd34dcca0a2f6f179b0320f70 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 13:54:28 +0200
Subject: [PATCH 061/436] serfdom: extracted from goPackages

---
 pkgs/development/go-modules/libs.json | 130 +++++++++++++++++++++++++-
 pkgs/servers/serf/default.nix         |  20 ++++
 pkgs/servers/serf/deps.json           |  23 +++++
 pkgs/top-level/all-packages.nix       |   2 +-
 pkgs/top-level/go-packages.nix        |  13 ---
 5 files changed, 172 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/servers/serf/default.nix
 create mode 100644 pkgs/servers/serf/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 32044808f867..be7440fb7337 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -40,8 +40,8 @@
     "fetch": {
       "type": "git",
       "url": "https://go.googlesource.com/crypto",
-      "rev": "1f22c0103821b9390939b6776727195525381532",
-      "sha256": "05ahvn9g9cj7797n8ryfxv2g26v3lx1pza9d9pg97iw0rvar9i1h"
+      "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+      "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
     }
   },
   {
@@ -763,5 +763,131 @@
       "rev": "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd",
       "sha256": "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1"
     }
+  },
+  {
+    "goPackagePath": "github.com/armon/go-metrics",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/armon/go-metrics",
+      "rev": "b2d95e5291cdbc26997d1301a5e467ecbb240e25",
+      "sha256": "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mattn/go-isatty",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mattn/go-isatty",
+      "rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449",
+      "sha256": "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/logutils",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/logutils",
+      "rev": "0dc08b1671f34c4250ce212759ebd880f743d883",
+      "sha256": "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r"
+    }
+  },
+  {
+    "goPackagePath": "github.com/armon/go-radix",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/armon/go-radix",
+      "rev": "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93",
+      "sha256": "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/go-syslog",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/go-syslog",
+      "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba",
+      "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/memberlist",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/memberlist",
+      "rev": "6025015f2dc659ca2c735112d37e753bda6e329d",
+      "sha256": "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mitchellh/mapstructure",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mitchellh/mapstructure",
+      "rev": "281073eb9eb092240d33ef253c404f1cca550309",
+      "sha256": "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"
+    }
+  },
+  {
+    "goPackagePath": "github.com/armon/circbuf",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/armon/circbuf",
+      "rev": "f092b4f207b6e5cce0569056fba9e1a2735cb6cf",
+      "sha256": "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/mdns",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/mdns",
+      "rev": "2b439d37011456df8ff83a70ffd1cd6046410113",
+      "sha256": "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mitchellh/cli",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mitchellh/cli",
+      "rev": "8102d0ed5ea2709ade1243798785888175f6e415",
+      "sha256": "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2"
+    }
+  },
+  {
+    "goPackagePath": "github.com/ryanuber/columnize",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/ryanuber/columnize",
+      "rev": "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a",
+      "sha256": "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/go-msgpack",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/go-msgpack",
+      "rev": "fa3f63826f7c23912c15263591e65d54d080b458",
+      "sha256": "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/go.net",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/go.net",
+      "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29",
+      "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/crypto",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/go.net",
+      "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29",
+      "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"
+    }
   }
 ]
diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix
new file mode 100644
index 000000000000..5f4c6453de71
--- /dev/null
+++ b/pkgs/servers/serf/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "serf-${version}";
+  version = "20150515-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "668982d8f90f5eff4a766583c1286393c1d27f68";
+
+  goPackagePath = "github.com/hashicorp/serf";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/hashicorp/serf";
+    sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/servers/serf/deps.json b/pkgs/servers/serf/deps.json
new file mode 100644
index 000000000000..3f13d0684797
--- /dev/null
+++ b/pkgs/servers/serf/deps.json
@@ -0,0 +1,23 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/armon/go-metrics",
+      "github.com/mattn/go-isatty",
+      "github.com/hashicorp/logutils",
+      "github.com/armon/go-radix",
+      "github.com/bgentry/speakeasy",
+      "github.com/hashicorp/go-syslog",
+      "github.com/hashicorp/memberlist",
+      "github.com/mitchellh/mapstructure",
+      "github.com/armon/circbuf",
+      "github.com/hashicorp/go-msgpack",
+      "github.com/hashicorp/go.net",
+      "github.com/hashicorp/mdns",
+      "github.com/mitchellh/cli",
+      "github.com/ryanuber/columnize",
+      "github.com/miekg/dns",
+      "golang.org/x/crypto"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea012bbc9338..0afc7bff30ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10274,7 +10274,7 @@ in
 
   shairport-sync = callPackage ../servers/shairport-sync { };
 
-  serfdom = goPackages.serf.bin // { outputs = [ "bin" ]; };
+  serfdom = callPackage ../servers/serf { };
 
   seyren = callPackage ../servers/monitoring/seyren { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index fe3cc14926bb..d1cc66f14497 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3339,19 +3339,6 @@ let
     sha256 = "19ifi0na4cj23q3h8xv89mx7p48y0ciymhmlrq9milm0xz80wk10";
   };
 
-  serf = buildFromGitHub {
-    rev = "668982d8f90f5eff4a766583c1286393c1d27f68";
-    version = "2015-05-15";
-    owner  = "hashicorp";
-    repo   = "serf";
-    sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk";
-
-    buildInputs = [
-      circbuf armon.go-metrics ugorji.go go-syslog logutils mdns memberlist
-      cli mapstructure columnize
-    ];
-  };
-
   sets = buildGoPackage rec {
     rev = "6c54cb57ea406ff6354256a4847e37298194478f";
     name = "sets-${stdenv.lib.strings.substring 0 7 rev}";

From dc2bb06a1b8631539251fd93c88e6bd4bdac2b12 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 14:01:13 +0200
Subject: [PATCH 062/436] gocode: extracted from goPackages

---
 pkgs/development/tools/gocode/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            |  8 --------
 3 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/tools/gocode/default.nix

diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
new file mode 100644
index 000000000000..0a2b908c9fd1
--- /dev/null
+++ b/pkgs/development/tools/gocode/default.nix
@@ -0,0 +1,18 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "gocode-${version}";
+  version = "20150904-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "680a0fbae5119fb0dbea5dca1d89e02747a80de0";
+  
+  goPackagePath = "github.com/nsf/gocode";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/nsf/gocode";
+    sha256 = "1ay2xakz4bcn8r3ylicbj753gjljvv4cj9l4wfly55cj1vjybjpv";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0afc7bff30ba..c206bab50962 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11151,7 +11151,7 @@ in
     inherit (gnome) gtk gtkmm;
   };
 
-  gocode = goPackages.gocode.bin // { outputs = [ "bin" ]; };
+  gocode = callPackage ../development/tools/gocode { };
 
   kgocode = callPackage ../applications/misc/kgocode {
     inherit (pkgs.kde4) kdelibs;
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index d1cc66f14497..cc6df9ddb218 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1063,14 +1063,6 @@ let
     propagatedBuildInputs = [ inf snappy groupcache ];
   };
 
-  gocode = buildFromGitHub {
-    rev = "680a0fbae5119fb0dbea5dca1d89e02747a80de0";
-    version = "2015-09-03";
-    owner = "nsf";
-    repo = "gocode";
-    sha256 = "1ay2xakz4bcn8r3ylicbj753gjljvv4cj9l4wfly55cj1vjybjpv";
-  };
-
   gocolorize = buildGoPackage rec {
     rev = "v1.0.0";
     name = "gocolorize-${rev}";

From ec9edbe1726886c11c3bb2195b87bbda2206f523 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 14:05:53 +0200
Subject: [PATCH 063/436] gotags: extracted from goPackages

---
 pkgs/development/tools/gotags/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            |  8 --------
 3 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/tools/gotags/default.nix

diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
new file mode 100644
index 000000000000..65d0d29e1585
--- /dev/null
+++ b/pkgs/development/tools/gotags/default.nix
@@ -0,0 +1,18 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "gotags-${version}";
+  version = "20150803-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "be986a34e20634775ac73e11a5b55916085c48e7";
+  
+  goPackagePath = "github.com/jstemmer/gotags";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/jstemmer/gotags";
+    sha256 = "071wyq90b06xlb3bb0l4qjz1gf4nnci4bcngiddfcxf2l41w1vja";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c206bab50962..bf451a45ecb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11157,7 +11157,7 @@ in
     inherit (pkgs.kde4) kdelibs;
   };
 
-  gotags = goPackages.gotags.bin // { outputs = [ "bin" ]; };
+  gotags = callPackage ../development/tools/gotags { };
 
   golint = goPackages.lint.bin // { outputs = [ "bin" ]; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index cc6df9ddb218..9c3043f74e14 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1281,14 +1281,6 @@ let
     sha256 = "0dnqbijdzp2dgsf6m934nadixqbv73q0zkqglaa956zzw0pyhcxp";
   };
 
-  gotags = buildFromGitHub {
-    rev    = "be986a34e20634775ac73e11a5b55916085c48e7";
-    version = "2015-08-03";
-    owner  = "jstemmer";
-    repo   = "gotags";
-    sha256 = "071wyq90b06xlb3bb0l4qjz1gf4nnci4bcngiddfcxf2l41w1vja";
-  };
-
   gosnappy = buildFromGitHub {
     rev    = "ce8acff4829e0c2458a67ead32390ac0a381c862";
     owner  = "syndtr";

From 3cf803fca7cd5d9471edd0e9c4049097d32ecba2 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 14:35:09 +0200
Subject: [PATCH 064/436] golant: extracted from goPackages

---
 pkgs/development/go-modules/libs.json     | 11 ++++++++++-
 pkgs/development/tools/golint/default.nix | 21 +++++++++++++++++++++
 pkgs/development/tools/golint/deps.json   |  8 ++++++++
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            | 10 ----------
 5 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/tools/golint/default.nix
 create mode 100644 pkgs/development/tools/golint/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index be7440fb7337..5e6e29ec6b2b 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -889,5 +889,14 @@
       "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29",
       "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"
     }
+  },
+  {
+    "goPackagePath": "golang.org/x/tools",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/tools",
+      "rev": "9ae4729fba20b3533d829a9c6ba8195b068f2abc",
+      "sha256": "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"
+    }
   }
-]
+]
\ No newline at end of file
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
new file mode 100644
index 000000000000..1e63eb73449a
--- /dev/null
+++ b/pkgs/development/tools/golint/default.nix
@@ -0,0 +1,21 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "lint-${version}";
+  version = "20160428-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "c7bacac2b21ca01afa1dee0acf64df3ce047c28f";
+  
+  goPackagePath = "github.com/golang/lint";
+  excludedPackages = "testdata";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/golang/lint";
+    sha256 = "024dllcmpg8lx78cqgq551i6f9w6qlykfcx8l7yazak9kjwhpwjg";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/development/tools/golint/deps.json b/pkgs/development/tools/golint/deps.json
new file mode 100644
index 000000000000..7a751431e816
--- /dev/null
+++ b/pkgs/development/tools/golint/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "pkgs/development/go-modules/libs.json",
+    "packages": [
+      "golang.org/x/tools"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf451a45ecb1..a8fdf35ae079 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11159,7 +11159,7 @@ in
 
   gotags = callPackage ../development/tools/gotags { };
 
-  golint = goPackages.lint.bin // { outputs = [ "bin" ]; };
+  golint = callPackage ../development/tools/golint { };
 
   godep = callPackage ../development/tools/godep { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 9c3043f74e14..2f34ea4d6992 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1864,16 +1864,6 @@ let
     sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z";
   };
 
-  lint = buildFromGitHub {
-    rev = "7b7f4364ff76043e6c3610281525fabc0d90f0e4";
-    version = "2015-06-23";
-    owner = "golang";
-    repo = "lint";
-    sha256 = "1bj7zv534hyh87bp2vsbhp94qijc5nixb06li1dzfz9n0wcmlqw9";
-    excludedPackages = "testdata";
-    buildInputs = [ tools ];
-  };
-
   goquery = buildGoPackage rec {
     rev = "f065786d418c9d22a33cad33decd59277af31471"; #tag v.0.3.2
     name = "goquery-${stdenv.lib.strings.substring 0 7 rev}";

From 7c8852e3559f411d62c18ecdc3ac9897cb3831d9 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 14:50:09 +0200
Subject: [PATCH 065/436] goimports: extracted from goPackages

---
 pkgs/development/tools/goimports/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/goimports/default.nix

diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix
new file mode 100644
index 000000000000..bcc82e80cbfa
--- /dev/null
+++ b/pkgs/development/tools/goimports/default.nix
@@ -0,0 +1,19 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "goimports-${version}";
+  version = "20160519-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
+
+  goPackagePath = "golang.org/x/tools";
+  subPackages = [ "cmd/goimports" ];
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://go.googlesource.com/tools";
+    sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8fdf35ae079..52d00e5a1341 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11163,7 +11163,7 @@ in
 
   godep = callPackage ../development/tools/godep { };
 
-  goimports = goPackages.tools.bin // { outputs = [ "bin" ]; };
+  goimports = callPackage ../development/tools/goimports { };
 
   gogoclient = callPackage ../os-specific/linux/gogoclient { };
 

From 8bfff0f5a6db64664cc4081d4e5bac727070add8 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 19:03:13 +0200
Subject: [PATCH 066/436] i3cat: extracted from goPackages

---
 pkgs/development/go-modules/libs.json |  9 +++++++++
 pkgs/tools/misc/i3cat/default.nix     | 20 ++++++++++++++++++++
 pkgs/tools/misc/i3cat/deps.json       |  8 ++++++++
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        |  9 ---------
 5 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/tools/misc/i3cat/default.nix
 create mode 100644 pkgs/tools/misc/i3cat/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 5e6e29ec6b2b..84093998b513 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -898,5 +898,14 @@
       "rev": "9ae4729fba20b3533d829a9c6ba8195b068f2abc",
       "sha256": "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"
     }
+  },
+  {
+    "goPackagePath": "github.com/vincent-petithory/structfield",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/vincent-petithory/structfield",
+      "rev": "01a738558a47fbf16712994d1737fb31c77e7d11",
+      "sha256": "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw"
+    }
   }
 ]
\ No newline at end of file
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
new file mode 100644
index 000000000000..c0333a14ed47
--- /dev/null
+++ b/pkgs/tools/misc/i3cat/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "i3cat-${version}";
+  version = "20150321-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
+
+  goPackagePath = "github.com/vincent-petithory/i3cat";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/vincent-petithory/i3cat";
+    sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/tools/misc/i3cat/deps.json b/pkgs/tools/misc/i3cat/deps.json
new file mode 100644
index 000000000000..cd4c703aed65
--- /dev/null
+++ b/pkgs/tools/misc/i3cat/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/vincent-petithory/structfield"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52d00e5a1341..195948b2384c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13026,7 +13026,7 @@ in
 
   i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };
 
-  i3cat = goPackages.i3cat.bin // { outputs = [ "bin" ]; };
+  i3cat = callPackage ../tools/misc/i3cat { };
 
   i3lock = callPackage ../applications/window-managers/i3/lock.nix {
     cairo = cairo.override { xcbSupport = true; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 2f34ea4d6992..31f699984547 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2026,15 +2026,6 @@ let
     ];
   };
 
-  i3cat = buildFromGitHub {
-    rev    = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
-    version = "2015-03-21";
-    owner  = "vincent-petithory";
-    repo   = "i3cat";
-    sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72";
-    buildInputs = [ structfield ];
-  };
-
   inf = buildFromGitHub {
     rev    = "c85f1217d51339c0fa3a498cc8b2075de695dae6";
     owner  = "go-inf";

From f473582a754df80197677548b31ed6e074d276a7 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 19:37:12 +0200
Subject: [PATCH 067/436] hologram: extracted from goPackages

---
 pkgs/development/go-modules/libs.json    | 84 ++++++++++++++++++++++--
 pkgs/tools/security/hologram/default.nix | 20 ++++++
 pkgs/tools/security/hologram/deps.json   | 19 ++++++
 pkgs/top-level/all-packages.nix          |  2 +-
 pkgs/top-level/go-packages.nix           | 14 ----
 5 files changed, 118 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/tools/security/hologram/default.nix
 create mode 100644 pkgs/tools/security/hologram/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 84093998b513..c8d09952d238 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -67,8 +67,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/golang/protobuf",
-      "rev": "dda510ac0fd43b39770f22ac6260eb91d377bce3",
-      "sha256": "0bmz87is9zvxvzycp3135l61ippjw6vmpjz0b9pq8gpxx6sj2vj4"
+      "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+      "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
     }
   },
   {
@@ -885,9 +885,9 @@
     "goPackagePath": "golang.org/x/crypto",
     "fetch": {
       "type": "git",
-      "url": "https://github.com/hashicorp/go.net",
-      "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29",
-      "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"
+      "url": "https://go.googlesource.com/crypto",
+      "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+      "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
     }
   },
   {
@@ -907,5 +907,77 @@
       "rev": "01a738558a47fbf16712994d1737fb31c77e7d11",
       "sha256": "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw"
     }
+  },
+  {
+    "goPackagePath": "github.com/aybabtme/rgbterm",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/aybabtme/rgbterm",
+      "rev": "c07e2f009ed2311e9c35bca12ec00b38ccd48283",
+      "sha256": "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam"
+    }
+  },
+  {
+    "goPackagePath": "github.com/vaughan0/go-ini",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/vaughan0/go-ini",
+      "rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1",
+      "sha256": "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mitchellh/go-homedir",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mitchellh/go-homedir",
+      "rev": "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4",
+      "sha256": "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9"
+    }
+  },
+  {
+    "goPackagePath": "github.com/goamz/goamz",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/goamz/goamz",
+      "rev": "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7",
+      "sha256": "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b"
+    }
+  },
+  {
+    "goPackagePath": "github.com/nmcclain/asn1-ber",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-asn1-ber/asn1-ber",
+      "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72",
+      "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/asn1-ber.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-asn1-ber/asn1-ber",
+      "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72",
+      "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"
+    }
+  },
+  {
+    "goPackagePath": "github.com/peterbourgon/g2s",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/peterbourgon/g2s",
+      "rev": "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc",
+      "sha256": "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj"
+    }
+  },
+  {
+    "goPackagePath": "github.com/nmcclain/ldap",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-ldap/ldap",
+      "rev": "83e65426fd1c06626e88aa8a085e5bfed0208e29",
+      "sha256": "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz"
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix
new file mode 100644
index 000000000000..d73827f636b4
--- /dev/null
+++ b/pkgs/tools/security/hologram/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "hologram-${version}";
+  version = "20160209-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "8d86e3fdcbfd967ba58d8de02f5e8173c101212e";
+
+  goPackagePath = "github.com/AdRoll/hologram";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/AdRoll/hologram";
+    sha256 = "0i0p170brdsczfz079mqbc5y7x7mdph04p3wgqsd7xcrddvlkkaf";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/tools/security/hologram/deps.json b/pkgs/tools/security/hologram/deps.json
new file mode 100644
index 000000000000..177c960933e8
--- /dev/null
+++ b/pkgs/tools/security/hologram/deps.json
@@ -0,0 +1,19 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/aybabtme/rgbterm",
+      "github.com/vaughan0/go-ini",
+      "github.com/howeyc/gopass",
+      "github.com/AdRoll/hologram",
+      "github.com/mitchellh/go-homedir",
+      "github.com/goamz/goamz",
+      "github.com/nmcclain/asn1-ber",
+      "gopkg.in/asn1-ber.v1",
+      "github.com/peterbourgon/g2s",
+      "github.com/nmcclain/ldap",
+      "github.com/golang/protobuf",
+      "golang.org/x/crypto"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 195948b2384c..05937021cf4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16180,7 +16180,7 @@ in
     camlp5 = ocamlPackages.camlp5_strict;
   };
 
-  hologram = goPackages.hologram.bin // { outputs = [ "bin" ]; };
+  hologram = callPackage ../tools/security/hologram { };
 
   tini = callPackage ../applications/virtualization/tini {};
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 31f699984547..686520621752 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1977,20 +1977,6 @@ let
     '';
   };
 
-  hologram = buildGoPackage rec {
-    rev  = "8d86e3fdcbfd967ba58d8de02f5e8173c101212e";
-    name = "hologram-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/AdRoll/hologram";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "AdRoll";
-      repo   = "hologram";
-      sha256 = "0i0p170brdsczfz079mqbc5y7x7mdph04p3wgqsd7xcrddvlkkaf";
-    };
-    buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox gopass ];
-  };
-
   http-authentication = buildFromGitHub {
     rev    = "3eca13d6893afd7ecabe15f4445f5d2872a1b012";
     owner  = "jimstudt";

From 9e80bfed89e1fe1a3612ebcea3d0553158fb2791 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 19:46:45 +0200
Subject: [PATCH 068/436] golint: FIX proper link to godeps file

---
 pkgs/development/tools/golint/deps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/golint/deps.json b/pkgs/development/tools/golint/deps.json
index 7a751431e816..bc1b079376a1 100644
--- a/pkgs/development/tools/golint/deps.json
+++ b/pkgs/development/tools/golint/deps.json
@@ -1,8 +1,8 @@
 [
   {
-    "include": "pkgs/development/go-modules/libs.json",
+    "include": "../../libs.json",
     "packages": [
       "golang.org/x/tools"
     ]
   }
-]
\ No newline at end of file
+]

From abcec97b1ec898ce336bc333da4efce97c5c4a16 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 20:20:05 +0200
Subject: [PATCH 069/436] confd: extracted from goPackages

---
 pkgs/development/go-modules/libs.json | 45 +++++++++++++++++++++------
 pkgs/tools/system/confd/default.nix   | 21 +++++++++++++
 pkgs/tools/system/confd/deps.json     | 15 +++++++++
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        | 14 ---------
 5 files changed, 73 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/tools/system/confd/default.nix
 create mode 100644 pkgs/tools/system/confd/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index c8d09952d238..ca1a5e495c7f 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -49,8 +49,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/Sirupsen/logrus",
-      "rev": "a26f43589d737684363ff856c5a0f9f24b946510",
-      "sha256": "13vprfbrsrqky145k26vayl9209gldh2v79614m0qxpx0ln1w2bs"
+      "rev": "be52937128b38f1d99787bb476c789e2af1147f1",
+      "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"
     }
   },
   {
@@ -409,8 +409,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/coreos/go-etcd",
-      "rev": "003851be7bb0694fe3cc457a49529a19388ee7cf",
-      "sha256": "0n78m4lwsjiaqhjizcsp25paj2l2d4fdr7c4i671ldvpggq76lrl"
+      "rev": "9847b93751a5fbaf227b893d172cee0104ac6427",
+      "sha256": "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4"
     }
   },
   {
@@ -445,8 +445,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/ugorji/go",
-      "rev": "c062049c1793b01a3cc3fe786108edabbaf7756b",
-      "sha256": "00cy7flxlm52ahxmqsznv87im5hx6xa9qg09i7cvrm70r74zh58q"
+      "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6",
+      "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"
     }
   },
   {
@@ -867,9 +867,9 @@
     "goPackagePath": "github.com/hashicorp/go-msgpack",
     "fetch": {
       "type": "git",
-      "url": "https://github.com/hashicorp/go-msgpack",
-      "rev": "fa3f63826f7c23912c15263591e65d54d080b458",
-      "sha256": "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k"
+      "url": "https://github.com/ugorji/go",
+      "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6",
+      "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"
     }
   },
   {
@@ -979,5 +979,32 @@
       "rev": "83e65426fd1c06626e88aa8a085e5bfed0208e29",
       "sha256": "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz"
     }
+  },
+  {
+    "goPackagePath": "github.com/kelseyhightower/memkv",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/kelseyhightower/memkv",
+      "rev": "7f9c7f36f45ba80c62fe22779ee78d9b4ca36580",
+      "sha256": "090x65kr3gqh8fc8z4rm9hc2r0v0k7rfm5vsbmhdh21f48ixw540"
+    }
+  },
+  {
+    "goPackagePath": "github.com/armon/consul-api",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/armon/consul-api",
+      "rev": "f79efe463cdbb62f6d5a55f879a63ec554eb13e5",
+      "sha256": "1rkmzfhsazj9p2b6ywvs8yramzvxfxyvplzxi0ldvhcv04887gcp"
+    }
+  },
+  {
+    "goPackagePath": "github.com/garyburd/redigo",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/garyburd/redigo",
+      "rev": "535138d7bcd717d6531c701ef5933d98b1866257",
+      "sha256": "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v"
+    }
   }
 ]
diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix
new file mode 100644
index 000000000000..416c856a5ae4
--- /dev/null
+++ b/pkgs/tools/system/confd/default.nix
@@ -0,0 +1,21 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "confd-${version}";
+  version = "0.9.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/kelseyhightower/confd";
+  subPackages = [ "./" ];
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/kelseyhightower/confd";
+    sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/tools/system/confd/deps.json b/pkgs/tools/system/confd/deps.json
new file mode 100644
index 000000000000..a3d9753927f1
--- /dev/null
+++ b/pkgs/tools/system/confd/deps.json
@@ -0,0 +1,15 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/kelseyhightower/memkv",
+      "github.com/armon/consul-api",
+      "github.com/garyburd/redigo",
+      "github.com/samuel/go-zookeeper",
+      "github.com/BurntSushi/toml",
+      "github.com/Sirupsen/logrus",
+      "github.com/coreos/go-etcd",
+      "github.com/ugorji/go"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05937021cf4f..71f6efc57fbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15059,7 +15059,7 @@ in
 
   cockatrice = qt5.callPackage ../games/cockatrice {  };
 
-  confd = goPackages.confd.bin // { outputs = [ "bin" ]; };
+  confd = callPackage ../tools/system/confd { };
 
   construoBase = lowPrio (callPackage ../games/construo {
     mesa = null;
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 686520621752..c1fb026ce8bf 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -506,20 +506,6 @@ let
     buildInputs = [ reflectwalk ];
   };
 
-  confd = buildGoPackage rec {
-    rev = "v0.9.0";
-    name = "confd-${rev}";
-    goPackagePath = "github.com/kelseyhightower/confd";
-    preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "kelseyhightower";
-      repo = "confd";
-      sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr";
-    };
-    subPackages = [ "./" ];
-  };
-
   config = buildFromGitHub {
     rev    = "0f78529c8c7e3e9a25f15876532ecbc07c7d99e6";
     owner  = "robfig";

From 5db153b7a15a528c5c8269c78bafac1b2c8094f1 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 20:40:56 +0200
Subject: [PATCH 070/436] consul: extracted from goPackages

---
 pkgs/servers/consul/default.nix | 21 +++++++++++++++++++++
 pkgs/servers/consul/ui.nix      |  8 +++++---
 pkgs/top-level/all-packages.nix |  2 +-
 pkgs/top-level/go-packages.nix  | 22 ----------------------
 4 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/servers/consul/default.nix

diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
new file mode 100644
index 000000000000..d5b4e12697e1
--- /dev/null
+++ b/pkgs/servers/consul/default.nix
@@ -0,0 +1,21 @@
+# This file was generated by go2nix.
+{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with go16Packages;
+
+buildGoPackage rec {
+  name = "consul-${version}";
+  version = "0.6.4";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/hashicorp/consul";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/hashicorp/consul";
+    sha256 = "0p6m2rl0d30w418n4fzc4vymqs3vzfa468czmy4znkjmxdl5vp5a";
+  };
+
+  # Keep consul.ui for backward compatability
+  passthru.ui = pkgs.consul-ui;
+}
diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix
index 684412846f01..a61b8baac867 100644
--- a/pkgs/servers/consul/ui.nix
+++ b/pkgs/servers/consul/ui.nix
@@ -1,4 +1,4 @@
-{ stdenv, goPackages, ruby, bundlerEnv, zip }:
+{ stdenv, consul, ruby, bundlerEnv, zip }:
 
 let
   # `sass` et al
@@ -11,12 +11,14 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "consul-ui-${goPackages.consul.rev}";
+  name = "consul-ui-${consul.version}";
 
-  src = goPackages.consul.src;
+  src = consul.src;
 
   buildInputs = [ ruby gems zip ];
 
+  patchPhase = "patchShebangs ./ui/scripts/dist.sh";
+
   buildPhase = ''
     # Build ui static files
     cd ui
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71f6efc57fbb..d71d6d73ccab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -702,7 +702,7 @@ in
 
   clib = callPackage ../tools/package-management/clib { };
 
-  consul = goPackages.consul.bin // { outputs = [ "bin" ]; };
+  consul = callPackage ../servers/consul { };
 
   consul-ui = callPackage ../servers/consul/ui.nix { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index c1fb026ce8bf..9cd4f7639742 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -513,28 +513,6 @@ let
     sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0";
   };
 
-  consul = buildFromGitHub {
-    rev = "v0.6.4";
-    owner = "hashicorp";
-    repo = "consul";
-    sha256 = "0p6m2rl0d30w418n4fzc4vymqs3vzfa468czmy4znkjmxdl5vp5a";
-
-    buildInputs = [
-      circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint
-      ugorji.go go-multierror go-syslog golang-lru hcl logutils memberlist
-      net-rpc-msgpackrpc raft raft-boltdb raft-mdb scada-client serf yamux
-      muxado dns cli mapstructure columnize crypto
-    ];
-
-    # Keep consul.ui for backward compatability
-    passthru.ui = pkgs.consul-ui;
-  };
-
-  consul-api = buildFromGitHub {
-    inherit (consul) rev owner repo sha256;
-    subPackages = [ "api" ];
-  };
-
   consul-alerts = buildFromGitHub {
     rev = "v0.3.3";
     owner = "AcalephStorage";

From 6fe27955fd53a4792e32753029a1ff9c79ceec86 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 21:49:27 +0200
Subject: [PATCH 071/436] consul-alerts: extracted from goPackages

---
 .../monitoring/consul-alerts/default.nix      | 18 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 20 -------------------
 3 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/servers/monitoring/consul-alerts/default.nix

diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix
new file mode 100644
index 000000000000..98cb3a3db48c
--- /dev/null
+++ b/pkgs/servers/monitoring/consul-alerts/default.nix
@@ -0,0 +1,18 @@
+# This file was generated by go2nix.
+{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with go16Packages;
+
+buildGoPackage rec {
+  name = "consul-alerts-${version}";
+  version = "0.3.3";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/AcalephStorage/consul-alerts";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/AcalephStorage/consul-alerts";
+    sha256 = "1w0mb20w1yazyh84sa30bsw271c5nm7lsx2qg0g3gf6mxdb63lpq";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d71d6d73ccab..522a81c0d792 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -706,7 +706,7 @@ in
 
   consul-ui = callPackage ../servers/consul/ui.nix { };
 
-  consul-alerts = goPackages.consul-alerts.bin // { outputs = [ "bin" ]; };
+  consul-alerts = callPackage ../servers/monitoring/consul-alerts { };
 
   consul-template = goPackages.consul-template.bin // { outputs = [ "bin" ]; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 9cd4f7639742..f0bfad95df45 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -513,26 +513,6 @@ let
     sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0";
   };
 
-  consul-alerts = buildFromGitHub {
-    rev = "v0.3.3";
-    owner = "AcalephStorage";
-    repo = "consul-alerts";
-    sha256 = "1w0mb20w1yazyh84sa30bsw271c5nm7lsx2qg0g3gf6mxdb63lpq";
-
-    renameImports = ''
-      # Remove all references to included dependency store
-      rm -rf go/src/github.com/AcalephStorage/consul-alerts/Godeps
-      govers -d -m github.com/AcalephStorage/consul-alerts/Godeps/_workspace/src/ ""
-    '';
-
-    # Temporary fix for name change
-    postPatch = ''
-      sed -i 's,SetApiKey,SetAPIKey,' notifier/opsgenie-notifier.go
-    '';
-
-    buildInputs = [ logrus docopt-go hipchat-go gopherduty consul-api opsgenie-go-sdk influxdb8-client ];
-  };
-
   consul-migrate = buildFromGitHub {
     rev    = "678fb10cdeae25ab309e99e655148f0bf65f9710";
     version = "2015-05-19";

From 9e273d5b29290a26ce28554582ca45ab80cea9fa Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 22:31:11 +0200
Subject: [PATCH 072/436] consul--template: extracted from goPackages

---
 pkgs/tools/system/consul-template/default.nix | 18 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 21 -------------------
 3 files changed, 19 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/tools/system/consul-template/default.nix

diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
new file mode 100644
index 000000000000..989ad2b51a18
--- /dev/null
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -0,0 +1,18 @@
+# This file was generated by go2nix.
+{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with go16Packages;
+
+buildGoPackage rec {
+  name = "consul-template-${version}";
+  version = "0.14.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/hashicorp/consul-template";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/hashicorp/consul-template";
+    sha256 = "15zsax44g3dwjmmm4fpb54mvsjvjf3b6g3ijskgipvhcy0d3j938";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 522a81c0d792..271e1eec2dda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -708,7 +708,7 @@ in
 
   consul-alerts = callPackage ../servers/monitoring/consul-alerts { };
 
-  consul-template = goPackages.consul-template.bin // { outputs = [ "bin" ]; };
+  consul-template = callPackage ../tools/system/consul-template { };
 
   corosync = callPackage ../servers/corosync { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f0bfad95df45..a1085ad0497e 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -522,27 +522,6 @@ let
     buildInputs = [ raft raft-boltdb raft-mdb ];
   };
 
-  consul-template = buildGoPackage rec {
-    rev = "v0.14.0";
-    name = "consul-template-${rev}";
-    goPackagePath = "github.com/hashicorp/consul-template";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "consul-template";
-      sha256 = "15zsax44g3dwjmmm4fpb54mvsjvjf3b6g3ijskgipvhcy0d3j938";
-    };
-
-    # We just want the consul api not all of consul and vault
-    extraSrcs = [
-      { inherit (consul) src goPackagePath; }
-      { inherit (vault) src goPackagePath; }
-    ];
-
-    buildInputs = [ go-multierror go-syslog hcl logutils mapstructure pkgs.zip ];
-  };
-
   context = buildGoPackage rec {
     rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd";
     name = "config-${stdenv.lib.strings.substring 0 7 rev}";

From b70c24f1f23f1f0ecb20cac9e5b8145d9705f73f Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 23:13:30 +0200
Subject: [PATCH 073/436] vault: extracted from goPackages

---
 pkgs/tools/security/vault/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        | 23 -----------------------
 3 files changed, 19 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/tools/security/vault/default.nix

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
new file mode 100644
index 000000000000..18f33da8ea10
--- /dev/null
+++ b/pkgs/tools/security/vault/default.nix
@@ -0,0 +1,18 @@
+# This file was generated by go2nix.
+{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with go16Packages;
+
+buildGoPackage rec {
+  name = "vault-${version}";
+  version = "0.5.2";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/hashicorp/vault";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/hashicorp/vault";
+    sha256 = "085rk5i480wdlkn2p14yxi8zgsc11595nkkda1i77c4vjkllbkdy";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 271e1eec2dda..b9ceacfb948d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16845,7 +16845,7 @@ in
 
   utf8proc = callPackage ../development/libraries/utf8proc { };
 
-  vault = goPackages.vault.bin // { outputs = [ "bin" ]; };
+  vault = callPackage ../tools/security/vault { };
 
   vbam = callPackage ../misc/emulators/vbam {};
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a1085ad0497e..ff1ca2f853e5 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3494,29 +3494,6 @@ let
     sha256 = "0hswk9ihv3js5blp9pk2bpig64zkmyp5p1zhmgydfhb0dr2w8iad";
   };
 
-  vault = buildFromGitHub {
-    rev = "v0.5.2";
-    owner = "hashicorp";
-    repo = "vault";
-    sha256 = "085rk5i480wdlkn2p14yxi8zgsc11595nkkda1i77c4vjkllbkdy";
-
-    #postPatch = ''
-    #  grep -r '/gen/' | awk -F: '{print $1}' | xargs sed -i 's,/gen/,/apis/,g'
-    #'';
-
-    # We just want the consul api not all of consul
-    extraSrcs = [
-      { inherit (consul) src goPackagePath; }
-    ];
-
-    buildInputs = [
-      armon.go-metrics go-radix aws-sdk-go go-etcd structs ldap mysql gocql
-      golang-lru go-github hashicorp.aws-sdk-go errwrap go-multierror go-syslog
-      hcl logutils osext pq cli copystructure go-homedir mapstructure
-      reflectwalk columnize go-zookeeper crypto net oauth2
-    ];
-  };
-
   vcs = buildFromGitHub {
     rev    = "1.4.0";
     owner  = "Masterminds";

From 24e9449450f63dc67abde3356c1b715ca2a5ae71 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 23:24:19 +0200
Subject: [PATCH 074/436] consul: FIX consul-ui reference

---
 pkgs/servers/consul/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index d5b4e12697e1..b98160c6be79 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, go16Packages, consul-ui, fetchFromGitHub }:
 
 with go16Packages;
 
@@ -10,12 +10,13 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/hashicorp/consul";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
+    owner = "hashicorp";
+    repo = "consul";
     inherit rev;
-    url = "https://github.com/hashicorp/consul";
     sha256 = "0p6m2rl0d30w418n4fzc4vymqs3vzfa468czmy4znkjmxdl5vp5a";
   };
 
   # Keep consul.ui for backward compatability
-  passthru.ui = pkgs.consul-ui;
+  passthru.ui = consul-ui;
 }

From 06327d22d68749e03adcb39e731a1027b8867b39 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 10:02:21 +0200
Subject: [PATCH 075/436] syncthing012: extracted from goPackages

---
 .../networking/syncthing012/default.nix       | 27 ++++++
 .../networking/syncthing012/deps.json         | 21 +++++
 pkgs/development/go-modules/libs.json         | 90 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 43 ---------
 5 files changed, 139 insertions(+), 44 deletions(-)
 create mode 100644 pkgs/applications/networking/syncthing012/default.nix
 create mode 100644 pkgs/applications/networking/syncthing012/deps.json

diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix
new file mode 100644
index 000000000000..dcf5e30551c1
--- /dev/null
+++ b/pkgs/applications/networking/syncthing012/default.nix
@@ -0,0 +1,27 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "syncthing-${version}";
+  version = "0.12.15";
+  rev = "v${version}";
+
+  buildFlags = "--tags noupgrade,release";
+  
+  goPackagePath = "github.com/syncthing/syncthing";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/syncthing/syncthing";
+    sha256 = "108w7gvm3nbbsgp3h5p84fj4ba0siaz932i7yyryly486gzvpm43";
+  };
+
+  goDeps = ./deps.json;
+
+  postPatch = ''
+    # Mostly a cosmetic change
+    sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go
+  '';
+}
diff --git a/pkgs/applications/networking/syncthing012/deps.json b/pkgs/applications/networking/syncthing012/deps.json
new file mode 100644
index 000000000000..75e10397017a
--- /dev/null
+++ b/pkgs/applications/networking/syncthing012/deps.json
@@ -0,0 +1,21 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/bkaradzic/go-lz4",
+      "github.com/calmh/luhn",
+      "golang.org/x/text",
+      "github.com/kardianos/osext",
+      "github.com/vitrun/qart",
+      "github.com/calmh/du",
+      "github.com/calmh/xdr",
+      "github.com/juju/ratelimit",
+      "github.com/thejerf/suture",
+      "github.com/golang/snappy",
+      "github.com/rcrowley/go-metrics",
+      "github.com/syndtr/goleveldb",
+      "golang.org/x/crypto",
+      "golang.org/x/net"
+    ]
+  }
+]
diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index ca1a5e495c7f..b0686f3205a3 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1006,5 +1006,95 @@
       "rev": "535138d7bcd717d6531c701ef5933d98b1866257",
       "sha256": "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v"
     }
+  },
+  {
+    "goPackagePath": "github.com/bkaradzic/go-lz4",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/bkaradzic/go-lz4",
+      "rev": "74ddf82598bc4745b965729e9c6a463bedd33049",
+      "sha256": "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"
+    }
+  },
+  {
+    "goPackagePath": "github.com/calmh/luhn",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/calmh/luhn",
+      "rev": "0c8388ff95fa92d4094011e5a04fc99dea3d1632",
+      "sha256": "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/text",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/text",
+      "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e",
+      "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"
+    }
+  },
+  {
+    "goPackagePath": "github.com/vitrun/qart",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/vitrun/qart",
+      "rev": "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0",
+      "sha256": "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8"
+    }
+  },
+  {
+    "goPackagePath": "github.com/calmh/du",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/calmh/du",
+      "rev": "3c0690cca16228b97741327b1b6781397afbdb24",
+      "sha256": "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa"
+    }
+  },
+  {
+    "goPackagePath": "github.com/calmh/xdr",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/calmh/xdr",
+      "rev": "e467b5aeb65ca8516fb3925c84991bf1d7cc935e",
+      "sha256": "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra"
+    }
+  },
+  {
+    "goPackagePath": "github.com/juju/ratelimit",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/juju/ratelimit",
+      "rev": "772f5c38e468398c4511514f4f6aa9a4185bc0a0",
+      "sha256": "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p"
+    }
+  },
+  {
+    "goPackagePath": "github.com/thejerf/suture",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/thejerf/suture",
+      "rev": "99c1f2d613756768fc4299acd9dc621e11ed3fd7",
+      "sha256": "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4"
+    }
+  },
+  {
+    "goPackagePath": "github.com/golang/snappy",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/golang/snappy",
+      "rev": "723cc1e459b8eea2dea4583200fd60757d40097a",
+      "sha256": "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"
+    }
+  },
+  {
+    "goPackagePath": "github.com/syndtr/goleveldb",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/syndtr/goleveldb",
+      "rev": "1a9d62f03ea92815b46fcaab357cfd4df264b1a0",
+      "sha256": "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb"
+    }
   }
 ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9ceacfb948d..801a8d94d70d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14282,7 +14282,7 @@ in
 
   syncthing = callPackage ../applications/networking/syncthing { };
 
-  syncthing012 = goPackages.syncthing012.bin // { outputs = [ "bin" ]; };
+  syncthing012 = callPackage ../applications/networking/syncthing012 { };
 
   # linux only by now
   synergy = callPackage ../applications/misc/synergy { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ff1ca2f853e5..8ac969a88772 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3084,14 +3084,6 @@ let
     sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v";
   };
 
-  relaysrv = buildFromGitHub rec {
-    rev    = "7fe1fdd8c751df165ea825bc8d3e895f118bb236";
-    owner  = "syncthing";
-    repo   = "relaysrv";
-    sha256 = "0qy14pa0z2dq5mix5ylv2raabwxqwj31g5kkz905wzki6d4j5lnp";
-    buildInputs = [ xdr syncthing-protocol011 ratelimit syncthing-lib ];
-  };
-
   reflectwalk = buildFromGitHub {
     rev    = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6";
     owner  = "mitchellh";
@@ -3311,41 +3303,6 @@ let
     sha256 = "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4";
   };
 
-  syncthing012 = buildFromGitHub rec {
-    version = "0.12.25";
-    rev = "v${version}";
-    owner = "syncthing";
-    repo = "syncthing";
-    sha256 = "108w7gvm3nbbsgp3h5p84fj4ba0siaz932i7yyryly486gzvpm43";
-    buildFlags = [ "-tags noupgrade,release" ];
-    disabled = isGo14;
-    buildInputs = [
-      go-lz4 du luhn xdr snappy ratelimit osext
-      goleveldb suture qart crypto net text rcrowley.go-metrics
-    ];
-    postPatch = ''
-      # Mostly a cosmetic change
-      sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go
-    '';
-  };
-
-  syncthing-lib = buildFromGitHub {
-    inherit (syncthing012) rev owner repo sha256;
-    subPackages = [ "lib/sync" ];
-    propagatedBuildInputs = syncthing012.buildInputs;
-  };
-
-  syncthing-protocol = buildFromGitHub {
-    inherit (syncthing012) rev owner repo sha256;
-    subPackages = [ "lib/protocol" ];
-    propagatedBuildInputs = [
-      go-lz4
-      logger
-      luhn
-      xdr
-      text ];
-  };
-
   syncthing-protocol011 = buildFromGitHub {
     rev = "84365882de255d2204d0eeda8dee288082a27f98";
     version = "2015-08-28";

From 50174691971395cc0ea779a84a1acf3f4ae7103e Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 10:18:42 +0200
Subject: [PATCH 076/436] xmpp-client: extracted from goPackages

---
 .../xmpp-client/default.nix                   | 27 +++++++++++++++++++
 .../instant-messengers/xmpp-client/deps.json  |  9 +++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 17 ------------
 4 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/xmpp-client/deps.json

diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
new file mode 100644
index 000000000000..6ce338d3a45e
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
@@ -0,0 +1,27 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "xmpp-client-${version}";
+  version = "20160110-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "525bd26cf5f56ec5aee99464714fd1d019c119ff";
+
+  goPackagePath = "github.com/agl/xmpp-client";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/agl/xmpp-client";
+    sha256 = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253";
+  };
+
+  goDeps = ./deps.json;
+
+  meta = with stdenv.lib; {
+    description = "An XMPP client with OTR support";
+    homepage = https://github.com/agl/xmpp-client;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ codsl ];
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json
new file mode 100644
index 000000000000..a5fd7fc3aa7c
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json
@@ -0,0 +1,9 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "golang.org/x/crypto",
+      "golang.org/x/net"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 801a8d94d70d..d4d89470092c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14867,7 +14867,7 @@ in
     GConf2 = gnome2.GConf;
   };
 
-  xmpp-client = goPackages.xmpp-client.bin // { outputs = [ "bin" ]; };
+  xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { };
 
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 8ac969a88772..9f7bc30f688e 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3490,23 +3490,6 @@ let
     sha256 = "0gljdfxqc94yb1kpqqrm5p94ph9dsxrzcixhdj6m92cwwa7z7p99";
   };
 
-  xmpp-client = buildFromGitHub {
-    rev      = "525bd26cf5f56ec5aee99464714fd1d019c119ff";
-    version  = "2016-01-10";
-    owner    = "agl";
-    repo     = "xmpp-client";
-    sha256   = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253";
-    disabled = isGo14;
-    buildInputs = [ crypto net ];
-
-    meta = with stdenv.lib; {
-      description = "An XMPP client with OTR support";
-      homepage = https://github.com/agl/xmpp-client;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ codsl ];
-    };
-  };
-
   yaml-v1 = buildGoPackage rec {
     name = "yaml-v1-${version}";
     version = "git-2015-05-01";

From 4ce39be8ea25941df935322b514a8c67e7777f9f Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 10:43:36 +0200
Subject: [PATCH 077/436] caddy: extracted from goPackages

---
 pkgs/development/go-modules/libs.json | 81 +++++++++++++++++++++++++++
 pkgs/servers/caddy/default.nix        | 20 +++++++
 pkgs/servers/caddy/deps.json          | 23 ++++++++
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        | 13 -----
 5 files changed, 125 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/servers/caddy/default.nix
 create mode 100644 pkgs/servers/caddy/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index b0686f3205a3..eed4c0e7121c 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1096,5 +1096,86 @@
       "rev": "1a9d62f03ea92815b46fcaab357cfd4df264b1a0",
       "sha256": "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb"
     }
+  },
+  {
+    "goPackagePath": "github.com/flynn/go-shlex",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/flynn/go-shlex",
+      "rev": "3f9db97f856818214da2e1057f8ad84803971cff",
+      "sha256": "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"
+    }
+  },
+  {
+    "goPackagePath": "github.com/xenolf/lego",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/xenolf/lego",
+      "rev": "ca19a90028e242e878585941c2a27c8f3b3efc25",
+      "sha256": "1zkcsbdzbmfzk3kqmcj9l13li8sz228xhrw2wj3ab4a0w6drbw3x"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/natefinch/lumberjack.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/natefinch/lumberjack.v2",
+      "rev": "514cbda263a734ae8caac038dadf05f8f3f9f738",
+      "sha256": "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82"
+    }
+  },
+  {
+    "goPackagePath": "github.com/shurcooL/sanitized_anchor_name",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/shurcooL/sanitized_anchor_name",
+      "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77",
+      "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/square/go-jose.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/square/go-jose.v1",
+      "rev": "40d457b439244b546f023d056628e5184136899b",
+      "sha256": "0asa1kl1qbx0cyayk44jhxxff0awpkwiw6va7yzrzjzhfc5kvg7p"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mholt/archiver",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mholt/archiver",
+      "rev": "85f054813ed511646b0ce5e047697e0651b8e1a4",
+      "sha256": "0b38mrfm3rwgdi7hrp4gjhf0y0f6bw73qjkfrkafxjrdpdg7nyly"
+    }
+  },
+  {
+    "goPackagePath": "github.com/dustin/go-humanize",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/dustin/go-humanize",
+      "rev": "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0",
+      "sha256": "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jimstudt/http-authentication",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jimstudt/http-authentication",
+      "rev": "3eca13d6893afd7ecabe15f4445f5d2872a1b012",
+      "sha256": "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08"
+    }
+  },
+  {
+    "goPackagePath": "github.com/russross/blackfriday",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/russross/blackfriday",
+      "rev": "d18b67ae0afd61dae240896eae1785f00709aa31",
+      "sha256": "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"
+    }
   }
 ]
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
new file mode 100644
index 000000000000..8ae26640f289
--- /dev/null
+++ b/pkgs/servers/caddy/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with go16Packages;
+
+buildGoPackage rec {
+  name = "caddy-${version}";
+  version = "0.8.3";
+  rev = "e2234497b79603388b58ba226abb157aa4aaf065";
+
+  goPackagePath = "github.com/mholt/caddy";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/mholt/caddy";
+    sha256 = "1snijkbz02yr7wij7bcmrj4257709sbklb3nhb5qmy95b9ssffm6";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/servers/caddy/deps.json b/pkgs/servers/caddy/deps.json
new file mode 100644
index 000000000000..dfe81f20ba8d
--- /dev/null
+++ b/pkgs/servers/caddy/deps.json
@@ -0,0 +1,23 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/BurntSushi/toml",
+      "github.com/flynn/go-shlex",
+      "github.com/hashicorp/go-syslog",
+      "gopkg.in/yaml.v2",
+      "github.com/xenolf/lego",
+      "golang.org/x/crypto",
+      "gopkg.in/natefinch/lumberjack.v2",
+      "github.com/shurcooL/sanitized_anchor_name",
+      "gopkg.in/square/go-jose.v1",
+      "github.com/mholt/archiver",
+      "github.com/dustin/go-humanize",
+      "github.com/gorilla/websocket",
+      "github.com/jimstudt/http-authentication",
+      "github.com/miekg/dns",
+      "golang.org/x/net",
+      "github.com/russross/blackfriday"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4d89470092c..b281ac10a2de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -666,7 +666,7 @@ in
 
   cabal2nix = self.haskellPackages.cabal2nix;
 
-  caddy = goPackages.caddy.bin // { outputs = [ "bin" ]; };
+  caddy = callPackage ../servers/caddy { };
 
   capstone = callPackage ../development/libraries/capstone { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 9f7bc30f688e..a2d3dc38ce37 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -397,19 +397,6 @@ let
     propagatedBuildInputs = [ panicwrap revel ];
   };
 
-  caddy = buildFromGitHub {
-    rev     = "e2234497b79603388b58ba226abb157aa4aaf065";
-    version = "v0.8.3";
-    owner   = "mholt";
-    repo    = "caddy";
-    sha256  = "1snijkbz02yr7wij7bcmrj4257709sbklb3nhb5qmy95b9ssffm6";
-    buildInputs = [
-      acme archiver blackfriday crypto go-humanize go-shlex go-syslog
-      http-authentication lumberjack-v2 toml websocket yaml-v2
-    ];
-    disabled = isGo14 || isGo15;
-  };
-
   cascadia = buildGoPackage rec {
     rev = "54abbbf07a45a3ef346ebe903e0715d9a3c19352"; #master
     name = "cascadia-${stdenv.lib.strings.substring 0 7 rev}";

From 826ff3efc2dc78da1d8be355b354ef2a0e59d183 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 10:53:30 +0200
Subject: [PATCH 078/436] glide: extracted from goPackages

---
 pkgs/development/tools/glide/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +-
 pkgs/top-level/go-packages.nix           |  8 --------
 3 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/tools/glide/default.nix

diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
new file mode 100644
index 000000000000..cc63921976f5
--- /dev/null
+++ b/pkgs/development/tools/glide/default.nix
@@ -0,0 +1,18 @@
+# This file was generated by go2nix.
+{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with go16Packages;
+
+buildGoPackage rec {
+  name = "glide-${version}";
+  version = "0.10.2";
+  rev = "${version}";
+  
+  goPackagePath = "github.com/Masterminds/glide";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/Masterminds/glide";
+    sha256 = "1qb2n5i04gabb2snnwfr8wv4ypcp1pdzvgga62m9xkhk4p2w6pwl";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b281ac10a2de..23af18ea0760 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -811,7 +811,7 @@ in
 
   gist = callPackage ../tools/text/gist { };
 
-  glide = goPackages.glide.bin // { outputs = [ "bin" ]; };
+  glide = callPackage ../development/tools/glide { };
 
   gmic = callPackage ../tools/graphics/gmic { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a2d3dc38ce37..0bd9f10f9dd6 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -866,14 +866,6 @@ let
     sha256 = "124hci9whsvlcywsfz5y20kkj3nhy176a1d5s1lkvsga09yxq6wm";
   };
 
-  glide = buildFromGitHub {
-    rev    = "0.10.2";
-    owner  = "Masterminds";
-    repo   = "glide";
-    sha256 = "1qb2n5i04gabb2snnwfr8wv4ypcp1pdzvgga62m9xkhk4p2w6pwl";
-    buildInputs = [ cookoo cli-go go-gypsy vcs ];
-  };
-
   gls = buildFromGitHub {
     rev    = "9a4a02dbe491bef4bab3c24fd9f3087d6c4c6690";
     owner  = "jtolds";

From e89a086f06a2f15a2c476d48b25288936466152e Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 11:16:58 +0200
Subject: [PATCH 079/436] terraform: extracted from goPackages

---
 .../networking/cluster/terraform/default.nix  | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 17 ------------
 3 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/applications/networking/cluster/terraform/default.nix

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
new file mode 100644
index 000000000000..cacfaf15a21d
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -0,0 +1,27 @@
+# This file was generated by go2nix.
+{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with go16Packages;
+
+buildGoPackage rec {
+  name = "terraform-${version}";
+  version = "0.6.15";
+  rev = "v${version}";
+  
+  goPackagePath = "github.com/hashicorp/terraform";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/hashicorp/terraform";
+    sha256 = "1mf98hagb0yp40g2mbar7aw7hmpq01clnil6y9khvykrb33vy0nb";
+  };
+
+  postInstall = ''
+    # prefix all the plugins with "terraform-"
+    for i in $bin/bin/*; do
+      if [[ ! $(basename $i) =~ terraform* ]]; then
+        mv -v $i $bin/bin/terraform-$(basename $i);
+      fi
+    done
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23af18ea0760..a9d29823f499 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16763,7 +16763,7 @@ in
 
   sqsh = callPackage ../development/tools/sqsh { };
 
-  terraform = goPackages.terraform.bin // { outputs = [ "bin" ]; };
+  terraform = callPackage ../applications/networking/cluster/terraform { };
 
   tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 0bd9f10f9dd6..a7699c282729 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3330,23 +3330,6 @@ let
     subPackages = [ "./" ]; # prevent building _demos
   };
 
-  terraform = buildFromGitHub {
-    rev = "v0.6.15";
-    owner = "hashicorp";
-    repo = "terraform";
-    disabled = isGo14 || isGo15;
-    sha256 = "1mf98hagb0yp40g2mbar7aw7hmpq01clnil6y9khvykrb33vy0nb";
-
-    postInstall = ''
-      # prefix all the plugins with "terraform-"
-      for i in $bin/bin/*; do
-        if [[ ! $(basename $i) =~ terraform* ]]; then
-          mv -v $i $bin/bin/terraform-$(basename $i);
-        fi
-      done
-    '';
-  };
-
   testify = buildGoPackage rec {
     rev = "089c7181b8c728499929ff09b62d3fdd8df8adff";
     name = "testify-${stdenv.lib.strings.substring 0 7 rev}";

From 03feac7937c7c2ed89e8dfde8f13a0fa442dca2c Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 11:41:41 +0200
Subject: [PATCH 080/436] pond: extracted from goPackages

---
 .../instant-messengers/pond/default.nix       | 35 ++++++++++++++++++
 .../instant-messengers/pond/deps.json         | 12 +++++++
 pkgs/development/go-modules/libs.json         |  9 +++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 36 -------------------
 5 files changed, 57 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/pond/default.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/pond/deps.json

diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix
new file mode 100644
index 000000000000..f40bf77bb71c
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pond/default.nix
@@ -0,0 +1,35 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3,
+  fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+let
+  isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64;
+  gui = true; # Might be implemented with nixpkgs config.
+in
+buildGoPackage rec {
+  name = "pond-${version}";
+  version = "20150830-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
+
+  goPackagePath = "github.com/agl/pond";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/agl/pond";
+    sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4";
+  };
+
+  goDeps = ./deps.json;
+
+  buildInputs = [ trousers pkgconfig gtk3 gtkspell3 ]
+    ++ stdenv.lib.optional isx86_64 dclxvi
+    ++ stdenv.lib.optionals gui [ wrapGAppsHook ];
+  buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui";
+  excludedPackages = "\\(appengine\\|bn256cgo\\)";
+  postPatch = stdenv.lib.optionalString isx86_64 ''
+    grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \
+      -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \
+      -e "s,bn256\.,bn256cgo.,g"
+  '';
+}
diff --git a/pkgs/applications/networking/instant-messengers/pond/deps.json b/pkgs/applications/networking/instant-messengers/pond/deps.json
new file mode 100644
index 000000000000..53f48df3b553
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pond/deps.json
@@ -0,0 +1,12 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "golang.org/x/net",
+      "github.com/golang/protobuf",
+      "github.com/agl/ed25519",
+      "golang.org/x/crypto",
+      "github.com/agl/go-gtk"
+    ]
+  }
+]
diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index eed4c0e7121c..81ceb71f9351 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1177,5 +1177,14 @@
       "rev": "d18b67ae0afd61dae240896eae1785f00709aa31",
       "sha256": "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"
     }
+  },
+  {
+    "goPackagePath": "github.com/agl/go-gtk",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/agl/go-gtk",
+      "rev": "91c1edb38c241d73129e6b098ca1c9fa83abfc15",
+      "sha256": "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d"
+    }
   }
 ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9d29823f499..3d37992ed544 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13861,7 +13861,7 @@ in
 
   pommed = callPackage ../os-specific/linux/pommed {};
 
-  pond = goPackages.pond.bin // { outputs = [ "bin" ]; };
+  pond = callPackage ../applications/networking/instant-messengers/pond { };
 
   ponymix = callPackage ../applications/audio/ponymix { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a7699c282729..f1f8e33c59bf 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1400,21 +1400,6 @@ let
     propagatedBuildInputs = [ go-querystring ];
   };
 
-  go-gtk-agl = buildFromGitHub {
-    rev = "6937b8d28cf70d583346220b966074cfd3a2e233";
-    owner = "agl";
-    repo = "go-gtk";
-    sha256 = "0jnhsv7ypyhprpy0fndah22v2pbbavr3db6f9wxl1vf34qkns3p4";
-    # Examples require many go libs, and gtksourceview seems ready only for
-    # gtk2
-    preConfigure = ''
-      rm -R example gtksourceview
-    '';
-    nativeBuildInputs = [ pkgs.pkgconfig ];
-    propagatedBuildInputs = [ pkgs.gtk3 ];
-    buildInputs = [ pkgs.gtkspell3 ];
-  };
-
   go-gypsy = buildFromGitHub {
     rev    = "42fc2c7ee9b8bd0ff636cd2d7a8c0a49491044c5";
     owner  = "kylelemons";
@@ -2537,27 +2522,6 @@ let
     sha256 = "139d08cq06jia0arc6cikdnhnaqms07xfay87pzq5ym86fv0agiq";
   };
 
-  pond = let
-      isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64;
-      gui = true; # Might be implemented with nixpkgs config.
-  in buildFromGitHub {
-    rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
-    owner = "agl";
-    repo = "pond";
-    sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4";
-
-    buildInputs = [ net crypto protobuf ed25519 pkgs.trousers ]
-      ++ stdenv.lib.optional isx86_64 pkgs.dclxvi
-      ++ stdenv.lib.optionals gui [ go-gtk-agl pkgs.wrapGAppsHook ];
-    buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui";
-    excludedPackages = "\\(appengine\\|bn256cgo\\)";
-    postPatch = stdenv.lib.optionalString isx86_64 ''
-      grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \
-        -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \
-        -e "s,bn256\.,bn256cgo.,g"
-    '';
-  };
-
   pongo2 = buildFromGitHub {
     rev    = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9";
     version = "2014-10-27";

From a95e0b9385b88e0549a16b1b244de45b77e3e457 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 13:34:18 +0200
Subject: [PATCH 081/436] prometheus: extracted from goPackages

---
 .../servers/monitoring/prometheus/default.nix | 48 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 51 -------------------
 3 files changed, 49 insertions(+), 52 deletions(-)
 create mode 100644 pkgs/servers/monitoring/prometheus/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
new file mode 100644
index 000000000000..d6b82c38d01e
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -0,0 +1,48 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "prometheus-${version}";
+  version = "0.17.0";
+  rev = "${version}";
+
+  goPackagePath = "github.com/prometheus/prometheus";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/prometheus/prometheus";
+    sha256 = "176198krna2i37dfhwsqi7m36sqn175yiny6n52vj27mc9s8ggzx";
+  };
+
+  docheck = true;
+
+  preBuild = ''
+    export GO15VENDOREXPERIMENT=1
+  '';
+
+  buildFlagsArray = let t = "${goPackagePath}/version"; in ''
+    -ldflags=
+       -X ${t}.Version=${version}
+       -X ${t}.Revision=unknown
+       -X ${t}.Branch=unknown
+       -X ${t}.BuildUser=nix@nixpkgs
+       -X ${t}.BuildDate=unknown
+       -X ${t}.GoVersion=${stdenv.lib.getVersion go}
+  '';
+
+  preInstall = ''
+    mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
+    cp -a $src/documentation/* $bin/share/doc/prometheus
+    cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Service monitoring system and time series database";
+    homepage = http://prometheus.io;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d37992ed544..1633c90f8370 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10178,7 +10178,7 @@ in
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
   prom2json = goPackages.prometheus.prom2json.bin // { outputs = [ "bin" ]; };
-  prometheus = goPackages.prometheus.prometheus.bin // { outputs = [ "bin" ]; };
+  prometheus = callPackage ../servers/monitoring/prometheus { };
   prometheus-alertmanager = goPackages.prometheus.alertmanager.bin // { outputs = [ "bin" ]; };
   prometheus-cli = goPackages.prometheus.cli.bin // { outputs = [ "bin" ]; };
   prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin // { outputs = [ "bin" ]; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f1f8e33c59bf..a3a1aaf33714 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2788,57 +2788,6 @@ let
     };
   };
 
-  prometheus.prometheus = buildFromGitHub rec {
-    rev = "0.17.0";
-    owner = "prometheus";
-    repo = "prometheus";
-    sha256 = "176198krna2i37dfhwsqi7m36sqn175yiny6n52vj27mc9s8ggzx";
-
-    buildInputs = [
-      # consul
-      # dns
-      # fsnotify.v1
-      # go-zookeeper
-      # goleveldb
-      # httprouter
-      # logrus
-      # net
-      # prometheus.client_golang
-      # prometheus.log
-      # yaml-v2
-    ];
-
-    docheck = true;
-
-    preBuild = ''
-      export GO15VENDOREXPERIMENT=1
-    '';
-
-    buildFlagsArray = let t = "github.com/${owner}/${repo}/version"; in ''
-      -ldflags=
-         -X ${t}.Version=${rev}
-         -X ${t}.Revision=unknown
-         -X ${t}.Branch=unknown
-         -X ${t}.BuildUser=nix@nixpkgs
-         -X ${t}.BuildDate=unknown
-         -X ${t}.GoVersion=${stdenv.lib.getVersion go}
-    '';
-
-    preInstall = ''
-      mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
-      cp -a $src/documentation/* $bin/share/doc/prometheus
-      cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
-    '';
-
-    meta = with stdenv.lib; {
-      description = "Service monitoring system and time series database";
-      homepage = http://prometheus.io;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ benley ];
-      platforms = platforms.unix;
-    };
-  };
-
   prometheus.pushgateway = buildFromGitHub rec {
     rev = "0.1.1";
     owner = "prometheus";

From 4bf5a93f2dee5628dc5a9a456464aec13c20f438 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 13:44:04 +0200
Subject: [PATCH 082/436] prom2json: extracted from goPackages

---
 pkgs/development/go-modules/libs.json         |  4 +--
 .../monitoring/prometheus/prom2json.nix       | 28 +++++++++++++++++++
 .../monitoring/prometheus/prom2json_deps.json | 11 ++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 21 --------------
 5 files changed, 42 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/servers/monitoring/prometheus/prom2json.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/prom2json_deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 81ceb71f9351..d2564c0be3a1 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -427,8 +427,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/prometheus/client_golang",
-      "rev": "90c15b5efa0dc32a7d259234e02ac9a99e6d3b82",
-      "sha256": "11hbll3x7hm69a7b0pwnhz5diligjy5yykdkqz2rsvs8s1k796zm"
+      "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864",
+      "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"
     }
   },
   {
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix
new file mode 100644
index 000000000000..512cd4ca22ca
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -0,0 +1,28 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "prom2json-${version}";
+  version = "0.1.0";
+  rev = "${version}";
+
+  goPackagePath = "github.com/prometheus/prom2json";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/prometheus/prom2json";
+    sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl";
+  };
+
+  goDeps = ./prom2json_deps.json;
+
+  meta = with stdenv.lib; {
+    description = "Tool to scrape a Prometheus client and dump the result as JSON";
+    homepage = https://github.com/prometheus/prom2json;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/prom2json_deps.json b/pkgs/servers/monitoring/prometheus/prom2json_deps.json
new file mode 100644
index 000000000000..a8569d8a25f8
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/prom2json_deps.json
@@ -0,0 +1,11 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/golang/protobuf",
+      "github.com/matttproud/golang_protobuf_extensions",
+      "github.com/prometheus/client_golang",
+      "github.com/prometheus/client_model"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1633c90f8370..fdf9c1f88b7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10177,7 +10177,7 @@ in
 
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
-  prom2json = goPackages.prometheus.prom2json.bin // { outputs = [ "bin" ]; };
+  prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
   prometheus = callPackage ../servers/monitoring/prometheus { };
   prometheus-alertmanager = goPackages.prometheus.alertmanager.bin // { outputs = [ "bin" ]; };
   prometheus-cli = goPackages.prometheus.cli.bin // { outputs = [ "bin" ]; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a3a1aaf33714..427a2c14c449 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2767,27 +2767,6 @@ let
     sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
   };
 
-  prometheus.prom2json = buildFromGitHub {
-    rev = "0.1.0";
-    owner = "prometheus";
-    repo = "prom2json";
-    sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl";
-
-    buildInputs = [
-      golang_protobuf_extensions
-      prometheus.client_golang
-      protobuf
-    ];
-
-    meta = with stdenv.lib; {
-      description = "Tool to scrape a Prometheus client and dump the result as JSON";
-      homepage = https://github.com/prometheus/prom2json;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ benley ];
-      platforms = platforms.unix;
-    };
-  };
-
   prometheus.pushgateway = buildFromGitHub rec {
     rev = "0.1.1";
     owner = "prometheus";

From a6cd1321b9363ec879d4fc0fc76baf4722f11d19 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 13:58:22 +0200
Subject: [PATCH 083/436] prometheus-alertmanager: extracted from goPackages

---
 .../monitoring/prometheus/alertmanager.nix    | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 40 -----------------
 3 files changed, 44 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/servers/monitoring/prometheus/alertmanager.nix

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
new file mode 100644
index 000000000000..2bed947aad00
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -0,0 +1,43 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "alertmanager-${version}";
+  version = "0.1.0";
+  rev = "${version}";
+
+  goPackagePath = "github.com/prometheus/alertmanager";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/prometheus/alertmanager";
+    sha256 = "1ya465bns6cj2lqbipmfm13wz8kxii5h9mm7lc0ba1xv26xx5zs7";
+  };
+
+  # Tests exist, but seem to clash with the firewall.
+  doCheck = false;
+
+  preBuild = ''
+    export GO15VENDOREXPERIMENT=1
+  '';
+
+  buildFlagsArray = let t = "${goPackagePath}/version"; in ''
+    -ldflags=
+       -X ${t}.Version=${version}
+       -X ${t}.Revision=unknown
+       -X ${t}.Branch=unknown
+       -X ${t}.BuildUser=nix@nixpkgs
+       -X ${t}.BuildDate=unknown
+       -X ${t}.GoVersion=${stdenv.lib.getVersion go}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Alert dispatcher for the Prometheus monitoring system";
+    homepage = https://github.com/prometheus/alertmanager;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fdf9c1f88b7a..9858aa453c83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10179,7 +10179,7 @@ in
 
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
   prometheus = callPackage ../servers/monitoring/prometheus { };
-  prometheus-alertmanager = goPackages.prometheus.alertmanager.bin // { outputs = [ "bin" ]; };
+  prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
   prometheus-cli = goPackages.prometheus.cli.bin // { outputs = [ "bin" ]; };
   prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin // { outputs = [ "bin" ]; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 427a2c14c449..c1cf3388d073 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2564,46 +2564,6 @@ let
     propagatedBuildInputs = [ kr.text ];
   };
 
-  prometheus.alertmanager = buildFromGitHub rec {
-    rev = "0.1.0";
-    owner = "prometheus";
-    repo = "alertmanager";
-    sha256 = "1ya465bns6cj2lqbipmfm13wz8kxii5h9mm7lc0ba1xv26xx5zs7";
-
-    buildInputs = [
-      # fsnotify.v0
-      # httprouter
-      # prometheus.client_golang
-      # prometheus.log
-      # pushover
-    ];
-
-    # Tests exist, but seem to clash with the firewall.
-    doCheck = false;
-
-    preBuild = ''
-      export GO15VENDOREXPERIMENT=1
-    '';
-
-    buildFlagsArray = let t = "github.com/${owner}/${repo}/version"; in ''
-      -ldflags=
-         -X ${t}.Version=${rev}
-         -X ${t}.Revision=unknown
-         -X ${t}.Branch=unknown
-         -X ${t}.BuildUser=nix@nixpkgs
-         -X ${t}.BuildDate=unknown
-         -X ${t}.GoVersion=${stdenv.lib.getVersion go}
-    '';
-
-    meta = with stdenv.lib; {
-      description = "Alert dispatcher for the Prometheus monitoring system";
-      homepage = https://github.com/prometheus/alertmanager;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ benley ];
-      platforms = platforms.unix;
-    };
-  };
-
   prometheus.client_golang = buildFromGitHub {
     rev = "0.7.0";
     owner = "prometheus";

From 2665cae1f4501ea8f219c188a78f7c44d2878d88 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 14:05:27 +0200
Subject: [PATCH 084/436] prometheus-cli: extracted from goPackages

---
 pkgs/servers/monitoring/prometheus/cli.nix    | 28 +++++++++++++++++++
 .../monitoring/prometheus/cli_deps.json       |  8 ++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 20 -------------
 4 files changed, 37 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/servers/monitoring/prometheus/cli.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/cli_deps.json

diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix
new file mode 100644
index 000000000000..5dd7c207f104
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/cli.nix
@@ -0,0 +1,28 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "prometheus_cli-${version}";
+  version = "0.3.0";
+  rev = version;
+
+  goPackagePath = "github.com/prometheus/prometheus_cli";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/prometheus/prometheus_cli";
+    sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn";
+  };
+
+  goDeps = ./cli_deps.json;
+
+  meta = with stdenv.lib; {
+    description = "Command line tool for querying the Prometheus HTTP API";
+    homepage = https://github.com/prometheus/prometheus_cli;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/cli_deps.json b/pkgs/servers/monitoring/prometheus/cli_deps.json
new file mode 100644
index 000000000000..506263b51f24
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/cli_deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/prometheus/client_golang"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9858aa453c83..60c17c0be72b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10180,7 +10180,7 @@ in
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
   prometheus = callPackage ../servers/monitoring/prometheus { };
   prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
-  prometheus-cli = goPackages.prometheus.cli.bin // { outputs = [ "bin" ]; };
+  prometheus-cli = callPackage ../servers/monitoring/prometheus/cli.nix { };
   prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin // { outputs = [ "bin" ]; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index c1cf3388d073..e15da20cf3f9 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2579,26 +2579,6 @@ let
     ];
   };
 
-  prometheus.cli = buildFromGitHub {
-    rev = "0.3.0";
-    owner = "prometheus";
-    repo = "prometheus_cli";
-    sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn";
-
-    buildInputs = [
-      prometheus.client_model
-      prometheus.client_golang
-    ];
-
-    meta = with stdenv.lib; {
-      description = "Command line tool for querying the Prometheus HTTP API";
-      homepage = https://github.com/prometheus/prometheus_cli;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ benley ];
-      platforms = platforms.unix;
-    };
-  };
-
   prometheus.client_model = buildFromGitHub {
     rev    = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
     version = "2015-02-12";

From fc9bc9eba5c4017fbaca19c32f021ee5e976d89c Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 14:58:08 +0200
Subject: [PATCH 085/436] goDeps: support for mercurial repos

---
 pkgs/development/go-modules/generic/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 4f4fa3275175..cc355c6e5d75 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,4 +1,4 @@
-{ go, govers, parallel, lib, fetchgit }:
+{ go, govers, parallel, lib, fetchgit, fetchhg }:
 
 { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
 
@@ -48,7 +48,11 @@ let
         fetchgit {
           inherit (goDep.fetch) url rev sha256;
         }
-        else {};
+      else if goDep.fetch.type == "hg" then
+        fetchhg {
+          inherit (goDep.fetch) url rev sha256;
+        }
+      else {};
     };
 
   importGodeps = { depsFile, filterPackages ? [] }:

From a3cf92fdba05742afe26ca1e0bb8bdc056181175 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 14:59:43 +0200
Subject: [PATCH 086/436] prometheus-collectd-exporter: extracted from
 goPackages

---
 pkgs/development/go-modules/libs.json         | 21 ++++++++++----
 .../prometheus/collectd-exporter.nix          | 28 +++++++++++++++++++
 .../prometheus/collectd-exporter_deps.json    | 14 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 15 ----------
 5 files changed, 58 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/servers/monitoring/prometheus/collectd-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index d2564c0be3a1..5e2e37a858fa 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -400,8 +400,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/beorn7/perks",
-      "rev": "3ac7bf7a47d159a033b107610db8a1b6575507a4",
-      "sha256": "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"
+      "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d",
+      "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"
     }
   },
   {
@@ -418,8 +418,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/matttproud/golang_protobuf_extensions",
-      "rev": "d0c3fe89de86839aecf2e0579c40ba3bb336a453",
-      "sha256": "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r"
+      "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a",
+      "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"
     }
   },
   {
@@ -463,8 +463,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/prometheus/procfs",
-      "rev": "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8",
-      "sha256": "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"
+      "rev": "c91d8eefde16bd047416409eb56353ea84a186e4",
+      "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"
     }
   },
   {
@@ -1186,5 +1186,14 @@
       "rev": "91c1edb38c241d73129e6b098ca1c9fa83abfc15",
       "sha256": "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d"
     }
+  },
+  {
+    "goPackagePath": "bitbucket.org/ww/goautoneg",
+    "fetch": {
+      "type": "hg",
+      "url": "bitbucket.org/ww/goautoneg",
+      "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675",
+      "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"
+    }
   }
 ]
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
new file mode 100644
index 000000000000..3b22fedfd930
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -0,0 +1,28 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "collectd-exporter-${version}";
+  version = "0.1.0";
+  rev = version;
+
+  goPackagePath = "github.com/prometheus/collectd_exporter";
+
+  src= fetchgit {
+    inherit rev;
+    url = "https://github.com/prometheus/collectd_exporter";
+    sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1";
+  };
+
+  goDeps = ./collectd-exporter_deps.json;
+
+  meta = with stdenv.lib; {
+    description = "Relay server for exporting metrics from collectd to Prometheus";
+    homepage = https://github.com/prometheus/alertmanager;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json
new file mode 100644
index 000000000000..ea82d4900ff2
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json
@@ -0,0 +1,14 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/prometheus/client_golang",
+      "github.com/prometheus/client_model",
+      "github.com/prometheus/procfs",
+      "bitbucket.org/ww/goautoneg",
+      "github.com/beorn7/perks",
+      "github.com/golang/protobuf",
+      "github.com/matttproud/golang_protobuf_extensions"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60c17c0be72b..41c3f33fbb53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10181,7 +10181,7 @@ in
   prometheus = callPackage ../servers/monitoring/prometheus { };
   prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
   prometheus-cli = callPackage ../servers/monitoring/prometheus/cli.nix { };
-  prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin // { outputs = [ "bin" ]; };
+  prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
   prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin // { outputs = [ "bin" ]; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index e15da20cf3f9..a0f0bf0efc75 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2588,21 +2588,6 @@ let
     buildInputs = [ protobuf ];
   };
 
-  prometheus.collectd-exporter = buildFromGitHub {
-    rev = "0.1.0";
-    owner = "prometheus";
-    repo = "collectd_exporter";
-    sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1";
-    buildInputs = [ prometheus.client_golang ];
-    meta = with stdenv.lib; {
-      description = "Relay server for exporting metrics from collectd to Prometheus";
-      homepage = https://github.com/prometheus/alertmanager;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ benley ];
-      platforms = platforms.unix;
-    };
-  };
-
   prometheus.haproxy-exporter = buildFromGitHub {
     rev = "0.4.0";
     owner = "prometheus";

From fdebbdb88909a7e004b0262fb9d18791e161633e Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 15:16:50 +0200
Subject: [PATCH 087/436] prometheus-haproxy-exporter: extracted from
 goPackages

---
 .../prometheus/haproxy-exporter.nix           | 28 +++++++++++++++++++
 .../prometheus/haproxy-exporter_deps.json     | 14 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 15 ----------
 4 files changed, 43 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json

diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
new file mode 100644
index 000000000000..efb5abd9f9f7
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -0,0 +1,28 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "haproxy_exporter-${version}";
+  version = "0.4.0";
+  rev = version;
+
+  goPackagePath = "github.com/prometheus/haproxy_exporter";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/prometheus/haproxy_exporter";
+    sha256 = "0cwls1d4hmzjkwc50mjkxjb4sa4q6yq581wlc5sg9mdvl6g91zxr";
+  };
+
+  goDeps = ./haproxy-exporter_deps.json;
+
+  meta = with stdenv.lib; {
+    description = "HAProxy Exporter for the Prometheus monitoring system";
+    homepage = https://github.com/prometheus/haproxy_exporter;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json
new file mode 100644
index 000000000000..20a46eb370cf
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json
@@ -0,0 +1,14 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/prometheus/client_golang",
+      "github.com/prometheus/client_model",
+      "github.com/matttproud/golang_protobuf_extensions",
+      "github.com/prometheus/procfs",
+      "github.com/beorn7/perks",
+      "github.com/golang/protobuf",
+      "bitbucket.org/ww/goautoneg"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41c3f33fbb53..ae05d14076e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10182,7 +10182,7 @@ in
   prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
   prometheus-cli = callPackage ../servers/monitoring/prometheus/cli.nix { };
   prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
-  prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin // { outputs = [ "bin" ]; };
+  prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
   prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-nginx-exporter = goPackages.prometheus.nginx-exporter.bin // { outputs = [ "bin" ]; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a0f0bf0efc75..b221cc2dd04d 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2588,21 +2588,6 @@ let
     buildInputs = [ protobuf ];
   };
 
-  prometheus.haproxy-exporter = buildFromGitHub {
-    rev = "0.4.0";
-    owner = "prometheus";
-    repo = "haproxy_exporter";
-    sha256 = "0cwls1d4hmzjkwc50mjkxjb4sa4q6yq581wlc5sg9mdvl6g91zxr";
-    buildInputs = [ prometheus.client_golang ];
-    meta = with stdenv.lib; {
-      description = "HAProxy Exporter for the Prometheus monitoring system";
-      homepage = https://github.com/prometheus/haproxy_exporter;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ benley ];
-      platforms = platforms.unix;
-    };
-  };
-
   prometheus.log = buildFromGitHub {
     rev    = "439e5db48fbb50ebbaf2c816030473a62f505f55";
     version = "2015-05-29";

From 485ad053e05097851c1298af8aa8db0a7845a467 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 15:26:09 +0200
Subject: [PATCH 088/436] prometheus-mesos-exporter: extracted from goPackages

---
 pkgs/development/go-modules/libs.json         |  9 ++++++
 .../monitoring/prometheus/mesos-exporter.nix  | 28 +++++++++++++++++++
 .../prometheus/mesos-exporter_deps.json       | 16 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 27 ------------------
 5 files changed, 54 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/servers/monitoring/prometheus/mesos-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 5e2e37a858fa..68d1283f9e40 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1195,5 +1195,14 @@
       "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675",
       "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"
     }
+  },
+  {
+    "goPackagePath": "github.com/antonlindstrom/mesos_stats",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/antonlindstrom/mesos_stats",
+      "rev": "0c6ea494c19bedc67ebb85ce3d187ec21050e920",
+      "sha256": "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"
+    }
   }
 ]
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
new file mode 100644
index 000000000000..a06c9671f817
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
@@ -0,0 +1,28 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "mesos_exporter-${version}";
+  version = "0.1.0";
+  rev = version;
+
+  goPackagePath = "github.com/prometheus/mesos_exporter";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/prometheus/mesos_exporter";
+    sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm";
+  };
+
+  goDeps = ./mesos-exporter_deps.json;
+
+  meta = with stdenv.lib; {
+    description = "Export Mesos metrics to Prometheus";
+    homepage = https://github.com/prometheus/mesos_exporter;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json
new file mode 100644
index 000000000000..c250fb0495ee
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json
@@ -0,0 +1,16 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/golang/glog",
+      "github.com/prometheus/client_golang",
+      "github.com/prometheus/client_model",
+      "github.com/antonlindstrom/mesos_stats",
+      "github.com/beorn7/perks",
+      "github.com/golang/protobuf",
+      "github.com/matttproud/golang_protobuf_extensions",
+      "github.com/prometheus/procfs",
+      "bitbucket.org/ww/goautoneg"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae05d14076e3..98344946a2ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10183,7 +10183,7 @@ in
   prometheus-cli = callPackage ../servers/monitoring/prometheus/cli.nix { };
   prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
   prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
-  prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin // { outputs = [ "bin" ]; };
+  prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };
   prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-nginx-exporter = goPackages.prometheus.nginx-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-node-exporter = goPackages.prometheus.node-exporter.bin // { outputs = [ "bin" ]; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index b221cc2dd04d..389a90dca60d 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2184,18 +2184,6 @@ let
     propagatedBuildInputs = [ ugorji.go armon.go-metrics ];
   };
 
-  mesos-stats = buildGoPackage rec {
-    rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920";
-    name = "mesos-stats-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/antonlindstrom/mesos_stats";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "antonlindstrom";
-      repo = "mesos_stats";
-      sha256 = "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4";
-    };
-  };
-
   mgo = buildFromGitHub {
     rev = "r2015.06.03";
     owner = "go-mgo";
@@ -2597,21 +2585,6 @@ let
     propagatedBuildInputs = [ logrus ];
   };
 
-  prometheus.mesos-exporter = buildFromGitHub {
-    rev = "0.1.0";
-    owner = "prometheus";
-    repo = "mesos_exporter";
-    sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm";
-    buildInputs = [ mesos-stats prometheus.client_golang glog ];
-    meta = with stdenv.lib; {
-      description = "Export Mesos metrics to Prometheus";
-      homepage = https://github.com/prometheus/mesos_exporter;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ benley ];
-      platforms = platforms.unix;
-    };
-  };
-
   prometheus.mysqld-exporter = buildFromGitHub {
     rev = "0.1.0";
     owner = "prometheus";

From f44b55747643489f0d1e20ee824c106c326849e3 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 15:33:36 +0200
Subject: [PATCH 089/436] prometheus-mysqld-exporter: extracted from goPackages

---
 pkgs/development/go-modules/libs.json         |  9 ++++++
 .../monitoring/prometheus/mysqld-exporter.nix | 28 +++++++++++++++++++
 .../prometheus/mysqld-exporter_deps.json      | 15 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 15 ----------
 5 files changed, 53 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 68d1283f9e40..8ac830e9c8d5 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1204,5 +1204,14 @@
       "rev": "0c6ea494c19bedc67ebb85ce3d187ec21050e920",
       "sha256": "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"
     }
+  },
+  {
+    "goPackagePath": "github.com/go-sql-driver/mysql",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-sql-driver/mysql",
+      "rev": "fb7299726d2e68745a8805b14f2ff44b5c2cfa84",
+      "sha256": "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w"
+    }
   }
 ]
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
new file mode 100644
index 000000000000..29bf6bdb3bb2
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@@ -0,0 +1,28 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "mysqld_exporter-${version}";
+  version = "0.1.0";
+  rev = version;
+
+  goPackagePath = "github.com/prometheus/mysqld_exporter";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/prometheus/mysqld_exporter";
+    sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9";
+  };
+
+  goDeps = ./mysqld-exporter_deps.json;
+
+  meta = with stdenv.lib; {
+    description = "Prometheus exporter for MySQL server metrics";
+    homepage = https://github.com/prometheus/mysqld_exporter;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json
new file mode 100644
index 000000000000..42e2f263c53b
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json
@@ -0,0 +1,15 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/prometheus/client_golang",
+      "github.com/prometheus/client_model",
+      "github.com/matttproud/golang_protobuf_extensions",
+      "github.com/prometheus/procfs",
+      "github.com/beorn7/perks",
+      "github.com/golang/protobuf",
+      "bitbucket.org/ww/goautoneg",
+      "github.com/go-sql-driver/mysql"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98344946a2ca..8dfa3d490c10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10184,7 +10184,7 @@ in
   prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
   prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
   prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };
-  prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin // { outputs = [ "bin" ]; };
+  prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { };
   prometheus-nginx-exporter = goPackages.prometheus.nginx-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-node-exporter = goPackages.prometheus.node-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-pushgateway = goPackages.prometheus.pushgateway.bin // { outputs = [ "bin" ]; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 389a90dca60d..44dc1260c37d 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2585,21 +2585,6 @@ let
     propagatedBuildInputs = [ logrus ];
   };
 
-  prometheus.mysqld-exporter = buildFromGitHub {
-    rev = "0.1.0";
-    owner = "prometheus";
-    repo = "mysqld_exporter";
-    sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9";
-    buildInputs = [ mysql prometheus.client_golang ];
-    meta = with stdenv.lib; {
-      description = "Prometheus exporter for MySQL server metrics";
-      homepage = https://github.com/prometheus/mysqld_exporter;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ benley ];
-      platforms = platforms.unix;
-    };
-  };
-
   prometheus.nginx-exporter = buildFromGitHub {
     rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b";
     version = "2015-06-01";

From 0f13eab7c836d99a3aa9f59d6dd70fbfa8db7d0b Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 15:42:10 +0200
Subject: [PATCH 090/436] prometheus-nginx-exporter: extracted from goPackages

---
 pkgs/development/go-modules/libs.json         |  9 ++++++
 .../monitoring/prometheus/nginx-exporter.nix  | 28 +++++++++++++++++++
 .../prometheus/nginx-exporter_deps.json       | 16 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 16 -----------
 5 files changed, 54 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/servers/monitoring/prometheus/nginx-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 8ac830e9c8d5..deec3354f97b 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1213,5 +1213,14 @@
       "rev": "fb7299726d2e68745a8805b14f2ff44b5c2cfa84",
       "sha256": "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w"
     }
+  },
+  {
+    "goPackagePath": "github.com/prometheus/log",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/prometheus/log",
+      "rev": "439e5db48fbb50ebbaf2c816030473a62f505f55",
+      "sha256": "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"
+    }
   }
 ]
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
new file mode 100644
index 000000000000..5da457c0a190
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -0,0 +1,28 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "nginx_exporter-${version}";
+  version = "20160524-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b";
+  
+  goPackagePath = "github.com/discordianfish/nginx_exporter";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/discordianfish/nginx_exporter";
+    sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc";
+  };
+
+  goDeps = ./nginx-exporter_deps.json;
+
+  meta = with stdenv.lib; {
+    description = "Metrics relay from nginx stats to Prometheus";
+    homepage = https://github.com/discordianfish/nginx_exporter;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json
new file mode 100644
index 000000000000..c7a2b3d1f6c6
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json
@@ -0,0 +1,16 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/prometheus/log",
+      "github.com/prometheus/client_golang",
+      "github.com/prometheus/client_model",
+      "github.com/prometheus/procfs",
+      "github.com/Sirupsen/logrus",
+      "github.com/beorn7/perks",
+      "github.com/golang/protobuf",
+      "github.com/matttproud/golang_protobuf_extensions",
+      "bitbucket.org/ww/goautoneg"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8dfa3d490c10..2f491659d08b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10185,7 +10185,7 @@ in
   prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
   prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };
   prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { };
-  prometheus-nginx-exporter = goPackages.prometheus.nginx-exporter.bin // { outputs = [ "bin" ]; };
+  prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { };
   prometheus-node-exporter = goPackages.prometheus.node-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-pushgateway = goPackages.prometheus.pushgateway.bin // { outputs = [ "bin" ]; };
   prometheus-statsd-bridge = goPackages.prometheus.statsd-bridge.bin // { outputs = [ "bin" ]; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 44dc1260c37d..8542cde5392e 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2585,22 +2585,6 @@ let
     propagatedBuildInputs = [ logrus ];
   };
 
-  prometheus.nginx-exporter = buildFromGitHub {
-    rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b";
-    version = "2015-06-01";
-    owner = "discordianfish";
-    repo = "nginx_exporter";
-    sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc";
-    buildInputs = [ prometheus.client_golang prometheus.log ];
-    meta = with stdenv.lib; {
-      description = "Metrics relay from nginx stats to Prometheus";
-      homepage = https://github.com/discordianfish/nginx_exporter;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ benley ];
-      platforms = platforms.unix;
-    };
-  };
-
   prometheus.node-exporter = buildFromGitHub {
     rev = "0.11.0";
     owner = "prometheus";

From 28b6e9863ca979d51506dd3823b9d80f5859354b Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 15:52:16 +0200
Subject: [PATCH 091/436] prometheus-node-exporter: extracted from goPackages

---
 pkgs/development/go-modules/libs.json         | 18 +++++++++++
 .../monitoring/prometheus/node-exporter.nix   | 30 +++++++++++++++++++
 .../prometheus/node-exporter_deps.json        | 18 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/monitoring/prometheus/node-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/node-exporter_deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index deec3354f97b..731e43300da4 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1222,5 +1222,23 @@
       "rev": "439e5db48fbb50ebbaf2c816030473a62f505f55",
       "sha256": "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"
     }
+  },
+  {
+    "goPackagePath": "github.com/soundcloud/go-runit",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/soundcloud/go-runit",
+      "rev": "a9148323a615e2e1c93b7a9893914a360b4945c8",
+      "sha256": "00f2rfhsaqj2wjanh5qp73phx7x12a5pwd7lc0rjfv68l6sgpg2v"
+    }
+  },
+  {
+    "goPackagePath": "github.com/beevik/ntp",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/beevik/ntp",
+      "rev": "0a5264e2563429030eb922f258229ae3fee5b5dc",
+      "sha256": "03fvgbjf2aprjj1s6wdc35wwa7k1w5phkixzvp5n1j21sf6w4h24"
+    }
   }
 ]
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
new file mode 100644
index 000000000000..276ff73d0fcc
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -0,0 +1,30 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "node_exporter-${version}";
+  version = "0.11.0";
+  rev = version;
+  
+  goPackagePath = "github.com/prometheus/node_exporter";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/prometheus/node_exporter";
+    sha256 = "149fs9yxnbiyd4ww7bxsv730mcskblpzb3cs4v12jnq2v84a4kk4";
+  };
+
+  goDeps = ./node-exporter_deps.json;
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Prometheus exporter for machine metrics";
+    homepage = https://github.com/prometheus/node_exporter;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter_deps.json b/pkgs/servers/monitoring/prometheus/node-exporter_deps.json
new file mode 100644
index 000000000000..68020e73b1ce
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/node-exporter_deps.json
@@ -0,0 +1,18 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/soundcloud/go-runit",
+      "github.com/beevik/ntp",
+      "github.com/prometheus/client_golang",
+      "github.com/prometheus/client_model",
+      "bitbucket.org/ww/goautoneg",
+      "github.com/Sirupsen/logrus",
+      "github.com/beorn7/perks",
+      "github.com/matttproud/golang_protobuf_extensions",
+      "github.com/prometheus/log",
+      "github.com/golang/protobuf",
+      "github.com/prometheus/procfs"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f491659d08b..16724f7edfc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10186,7 +10186,7 @@ in
   prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };
   prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { };
   prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { };
-  prometheus-node-exporter = goPackages.prometheus.node-exporter.bin // { outputs = [ "bin" ]; };
+  prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { };
   prometheus-pushgateway = goPackages.prometheus.pushgateway.bin // { outputs = [ "bin" ]; };
   prometheus-statsd-bridge = goPackages.prometheus.statsd-bridge.bin // { outputs = [ "bin" ]; };
 

From 5fec17a3e25dfc816b98a21c6589d79808eb0048 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 16:11:11 +0200
Subject: [PATCH 092/436] prometheus-pushgateway: extracted from goPackages

---
 pkgs/development/go-modules/libs.json         |  9 +++
 pkgs/development/tools/go-bindata/default.nix | 28 ++++++++
 .../monitoring/prometheus/pushgateway.nix     | 47 ++++++++++++++
 .../prometheus/pushgateway_deps.json          | 15 +++++
 pkgs/top-level/all-packages.nix               |  4 +-
 pkgs/top-level/go-packages.nix                | 64 -------------------
 6 files changed, 102 insertions(+), 65 deletions(-)
 create mode 100644 pkgs/development/tools/go-bindata/default.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/pushgateway.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/pushgateway_deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 731e43300da4..e571d246c8e3 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1240,5 +1240,14 @@
       "rev": "0a5264e2563429030eb922f258229ae3fee5b5dc",
       "sha256": "03fvgbjf2aprjj1s6wdc35wwa7k1w5phkixzvp5n1j21sf6w4h24"
     }
+  },
+  {
+    "goPackagePath": "github.com/julienschmidt/httprouter",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/julienschmidt/httprouter",
+      "rev": "6aacfd5ab513e34f7e64ea9627ab9670371b34e7",
+      "sha256": "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl"
+    }
   }
 ]
diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix
new file mode 100644
index 000000000000..cb9e51dfdfbc
--- /dev/null
+++ b/pkgs/development/tools/go-bindata/default.nix
@@ -0,0 +1,28 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "go-bindata-${version}";
+  version = "20151023-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "a0ff2567cfb70903282db057e799fd826784d41d";
+  
+  goPackagePath = "github.com/jteeuwen/go-bindata";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/jteeuwen/go-bindata";
+    sha256 = "0d6zxv0hgh938rf59p1k5lj0ymrb8kcps2vfrb9kaarxsvg7y69v";
+  };
+
+  excludedPackages = "testdata";
+
+  meta = with stdenv.lib; {
+    homepage    = "https://github.com/jteeuwen/go-bindata";
+    description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program";
+    maintainers = with maintainers; [ cstrahan ];
+    license     = licenses.cc0 ;
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
new file mode 100644
index 000000000000..751748783e47
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -0,0 +1,47 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, go-bindata, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "pushgateway-${version}";
+  version = "0.1.1";
+  rev = version;
+  
+  goPackagePath = "github.com/prometheus/pushgateway";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/prometheus/pushgateway";
+    sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230";
+  };
+
+  goDeps = ./pushgateway_deps.json;
+
+  buildInputs = [ go-bindata ];
+
+  preBuild = ''
+  (
+    cd "go/src/$goPackagePath"
+    go-bindata ./resources/
+  )
+  '';
+
+  buildFlagsArray = ''
+    -ldflags=
+        -X main.buildVersion=${version}
+        -X main.buildRev=${rev}
+        -X main.buildBranch=master
+        -X main.buildUser=nix@nixpkgs
+        -X main.buildDate=20150101-00:00:00
+        -X main.goVersion=${stdenv.lib.getVersion go}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Allows ephemeral and batch jobs to expose metrics to Prometheus";
+    homepage = https://github.com/prometheus/pushgateway;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway_deps.json b/pkgs/servers/monitoring/prometheus/pushgateway_deps.json
new file mode 100644
index 000000000000..15e2815e0e2f
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/pushgateway_deps.json
@@ -0,0 +1,15 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/julienschmidt/httprouter",
+      "github.com/prometheus/client_golang",
+      "github.com/prometheus/client_model",
+      "bitbucket.org/ww/goautoneg",
+      "github.com/golang/protobuf",
+      "github.com/matttproud/golang_protobuf_extensions",
+      "github.com/prometheus/procfs",
+      "github.com/beorn7/perks"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16724f7edfc1..75f454f3a8b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10187,7 +10187,7 @@ in
   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-pushgateway = goPackages.prometheus.pushgateway.bin // { outputs = [ "bin" ]; };
+  prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { };
   prometheus-statsd-bridge = goPackages.prometheus.statsd-bridge.bin // { outputs = [ "bin" ]; };
 
   psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
@@ -11151,6 +11151,8 @@ in
     inherit (gnome) gtk gtkmm;
   };
 
+  go-bindata = callPackage ../development/tools/go-bindata { };
+
   gocode = callPackage ../development/tools/gocode { };
 
   kgocode = callPackage ../applications/misc/kgocode {
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 8542cde5392e..b5b4563cd035 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1264,30 +1264,6 @@ let
     };
   };
 
-  go-bindata = buildGoPackage rec {
-    rev = "a0ff2567cfb70903282db057e799fd826784d41d";
-    date = "2015-10-23";
-    version = "${date}-${stdenv.lib.strings.substring 0 7 rev}";
-    name = "go-bindata-${version}";
-    goPackagePath = "github.com/jteeuwen/go-bindata";
-    src = fetchFromGitHub {
-      inherit rev;
-      repo = "go-bindata";
-      owner = "jteeuwen";
-      sha256 = "0d6zxv0hgh938rf59p1k5lj0ymrb8kcps2vfrb9kaarxsvg7y69v";
-    };
-
-    subPackages = [ "./" "go-bindata" ]; # don't build testdata
-
-    meta = with stdenv.lib; {
-      homepage    = "https://github.com/jteeuwen/go-bindata";
-      description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program";
-      maintainers = with maintainers; [ cstrahan ];
-      license     = licenses.cc0 ;
-      platforms   = platforms.all;
-    };
-  };
-
   go-bindata-assetfs = buildFromGitHub {
     rev     = "d5cac425555ca5cf00694df246e04f05e6a55150";
     owner   = "elazarl";
@@ -2619,46 +2595,6 @@ let
     sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
   };
 
-  prometheus.pushgateway = buildFromGitHub rec {
-    rev = "0.1.1";
-    owner = "prometheus";
-    repo = "pushgateway";
-    sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230";
-
-    buildInputs = [
-      protobuf
-      httprouter
-      golang_protobuf_extensions
-      prometheus.client_golang
-    ];
-
-    nativeBuildInputs = [ go-bindata.bin ];
-    preBuild = ''
-    (
-      cd "go/src/$goPackagePath"
-      go-bindata ./resources/
-    )
-    '';
-
-    buildFlagsArray = ''
-      -ldflags=
-          -X main.buildVersion=${rev}
-          -X main.buildRev=${rev}
-          -X main.buildBranch=master
-          -X main.buildUser=nix@nixpkgs
-          -X main.buildDate=20150101-00:00:00
-          -X main.goVersion=${stdenv.lib.getVersion go}
-    '';
-
-    meta = with stdenv.lib; {
-      description = "Allows ephemeral and batch jobs to expose metrics to Prometheus";
-      homepage = https://github.com/prometheus/pushgateway;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ benley ];
-      platforms = platforms.unix;
-    };
-  };
-
   prometheus.statsd-bridge = buildFromGitHub {
     rev = "0.1.0";
     owner = "prometheus";

From 5d3f8fec7cfc732f8548ae4d27f88a19b58905b2 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 16:25:07 +0200
Subject: [PATCH 093/436] prometheus-statsd-bridge: extracted from goPackages

---
 pkgs/development/go-modules/libs.json         |  9 ++++++
 .../monitoring/prometheus/statsd-bridge.nix   | 28 +++++++++++++++++++
 .../prometheus/statsd-bridge_deps.json        | 15 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 15 ----------
 5 files changed, 53 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/servers/monitoring/prometheus/statsd-bridge.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index e571d246c8e3..42a52185a1ff 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1249,5 +1249,14 @@
       "rev": "6aacfd5ab513e34f7e64ea9627ab9670371b34e7",
       "sha256": "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl"
     }
+  },
+  {
+    "goPackagePath": "github.com/howeyc/fsnotify",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/fsnotify/fsnotify",
+      "rev": "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6",
+      "sha256": "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9"
+    }
   }
 ]
diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
new file mode 100644
index 000000000000..4458b668a197
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
@@ -0,0 +1,28 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "statsd_bridge-${version}";
+  version = "0.1.0";
+  rev = version;
+  
+  goPackagePath = "github.com/prometheus/statsd_bridge";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/prometheus/statsd_bridge";
+    sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr";
+  };
+
+  goDeps = ./statsd-bridge_deps.json;
+
+  meta = with stdenv.lib; {
+    description = "Receives StatsD-style metrics and exports them to Prometheus";
+    homepage = https://github.com/prometheus/statsd_bridge;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json
new file mode 100644
index 000000000000..cda65257317d
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json
@@ -0,0 +1,15 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/howeyc/fsnotify",
+      "github.com/prometheus/client_golang",
+      "github.com/prometheus/client_model",
+      "bitbucket.org/ww/goautoneg",
+      "github.com/beorn7/perks",
+      "github.com/golang/protobuf",
+      "github.com/matttproud/golang_protobuf_extensions",
+      "github.com/prometheus/procfs"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75f454f3a8b1..891472ae4c90 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10188,7 +10188,7 @@ in
   prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { };
   prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { };
   prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { };
-  prometheus-statsd-bridge = goPackages.prometheus.statsd-bridge.bin // { outputs = [ "bin" ]; };
+  prometheus-statsd-bridge = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { };
 
   psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index b5b4563cd035..3602c68d908f 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2595,21 +2595,6 @@ let
     sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
   };
 
-  prometheus.statsd-bridge = buildFromGitHub {
-    rev = "0.1.0";
-    owner = "prometheus";
-    repo = "statsd_bridge";
-    sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr";
-    buildInputs = [ fsnotify.v0 prometheus.client_golang ];
-    meta = with stdenv.lib; {
-      description = "Receives StatsD-style metrics and exports them to Prometheus";
-      homepage = https://github.com/prometheus/statsd_bridge;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ benley ];
-      platforms = platforms.unix;
-    };
-  };
-
   properties = buildFromGitHub {
     rev    = "v1.5.6";
     owner  = "magiconair";

From fc88548b5d792c3ba4ac0cd2a127cdae52db0420 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 16:41:51 +0200
Subject: [PATCH 094/436] go2nix: extracted from goPackages

---
 pkgs/development/go-modules/libs.json     | 36 +++++++++++++++++++++++
 pkgs/development/tools/go2nix/default.nix | 32 ++++++++++++++++++++
 pkgs/development/tools/go2nix/deps.json   | 11 +++++++
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            | 19 ------------
 5 files changed, 80 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/tools/go2nix/default.nix
 create mode 100644 pkgs/development/tools/go2nix/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 42a52185a1ff..b83ed703f5f8 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1258,5 +1258,41 @@
       "rev": "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6",
       "sha256": "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9"
     }
+  },
+  {
+    "goPackagePath": "github.com/alecthomas/template",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/alecthomas/template",
+      "rev": "14fd436dd20c3cc65242a9f396b61bfc8a3926fc",
+      "sha256": "19rzvvcgvr1z2wz9xpqsmlm8syizbpxjp5zbzgakvrqlajpbjvx2"
+    }
+  },
+  {
+    "goPackagePath": "github.com/alecthomas/units",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/alecthomas/units",
+      "rev": "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a",
+      "sha256": "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/alecthomas/kingpin.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/alecthomas/kingpin.v2",
+      "rev": "21551c2a6259a8145110ca80a36e25c9d7624032",
+      "sha256": "1zhpqc4qxsw9lc1b4dwk5r42k9r702ihzrabs3mnsphvm9jx4l59"
+    }
+  },
+  {
+    "goPackagePath": "github.com/Masterminds/vcs",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/Masterminds/vcs",
+      "rev": "9c0db6583837118d5df7c2ae38ab1c194e434b35",
+      "sha256": "0590ww2av4407y7zy3bcmnr8i74fv00k9zzcxcpjxivl6qszna0d"
+    }
   }
 ]
diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
new file mode 100644
index 000000000000..bb0000d9e736
--- /dev/null
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -0,0 +1,32 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, go-bindata, goimports, nix-prefetch-git, git, makeWrapper,
+  fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "go2nix-${version}";
+  version = "20160307-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "4c552dadd855e3694ed3499feb46dca9cd855f60";
+
+  goPackagePath = "github.com/kamilchm/go2nix";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/kamilchm/go2nix";
+    sha256 = "1pwnm1vrjxvgl17pk9n1k5chmhgwxkrwp2s1bzi64xf12anibj63";
+  };
+
+  goDeps = ./deps.json;
+
+  buildInputs = [ go-bindata goimports makeWrapper ];
+  preBuild = ''go generate ./...'';
+
+  postInstall = ''
+    wrapProgram $bin/bin/go2nix \
+      --prefix PATH : ${nix-prefetch-git}/bin \
+      --prefix PATH : ${git}/bin
+  '';
+
+  allowGoReference = true;
+}
diff --git a/pkgs/development/tools/go2nix/deps.json b/pkgs/development/tools/go2nix/deps.json
new file mode 100644
index 000000000000..8e7fefb17ee2
--- /dev/null
+++ b/pkgs/development/tools/go2nix/deps.json
@@ -0,0 +1,11 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/alecthomas/template",
+      "github.com/alecthomas/units",
+      "gopkg.in/alecthomas/kingpin.v2",
+      "github.com/Masterminds/vcs"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 891472ae4c90..41a2534b4e67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9628,7 +9628,7 @@ in
 
   goPackages = go16Packages;
 
-  go2nix = goPackages.go2nix.bin // { outputs = [ "bin" ]; };
+  go2nix = callPackage ../development/tools/go2nix { };
 
   ### DEVELOPMENT / LISP MODULES
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3602c68d908f..521452b55064 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3241,25 +3241,6 @@ let
     goPackageAliases = [ "gopkg.in/alecthomas/kingpin.v2" ];
   };
 
-  go2nix = buildFromGitHub rec {
-    rev = "4c552dadd855e3694ed3499feb46dca9cd855f60";
-    owner = "kamilchm";
-    repo = "go2nix";
-    sha256 = "1pwnm1vrjxvgl17pk9n1k5chmhgwxkrwp2s1bzi64xf12anibj63";
-
-    buildInputs = [ pkgs.makeWrapper go-bindata.bin tools.bin vcs go-spew gls go-difflib assertions goconvey testify kingpin ];
-
-    preBuild = ''go generate ./...'';
-
-    postInstall = ''
-      wrapProgram $bin/bin/go2nix \
-        --prefix PATH : ${pkgs.nix-prefetch-git}/bin \
-        --prefix PATH : ${pkgs.git}/bin
-    '';
-
-    allowGoReference = true;
-  };
-
   godotenv = buildFromGitHub rec {
     rev    = "4ed13390c0acd2ff4e371e64d8b97c8954138243";
     version = "2015-09-07";

From 7b4e868173c66e58f3d200e7cc5b5bcbbe35a4d0 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 16:48:15 +0200
Subject: [PATCH 095/436] govers: extracted from goPackages

---
 pkgs/development/tools/govers/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  5 ++---
 pkgs/top-level/go-packages.nix            |  9 ---------
 3 files changed, 22 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/tools/govers/default.nix

diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
new file mode 100644
index 000000000000..b3e2b921bd2e
--- /dev/null
+++ b/pkgs/development/tools/govers/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "govers-${version}";
+  version = "20150109-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
+  
+  goPackagePath = "github.com/rogpeppe/govers";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/rogpeppe/govers";
+    sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc";
+  };
+
+  dontRenameImports = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41a2534b4e67..d37594c67c25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9603,7 +9603,6 @@ in
     go = go_1_4;
     buildGoPackage = callPackage ../development/go-modules/generic {
       go = go_1_4;
-      govers = go14Packages.govers.bin;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   };
@@ -9612,7 +9611,6 @@ in
     go = go_1_5;
     buildGoPackage = callPackage ../development/go-modules/generic {
       go = go_1_5;
-      govers = go15Packages.govers.bin;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   };
@@ -9621,7 +9619,6 @@ in
     go = go_1_6;
     buildGoPackage = callPackage ../development/go-modules/generic {
       go = go_1_6;
-      govers = go16Packages.govers.bin;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   };
@@ -11167,6 +11164,8 @@ in
 
   goimports = callPackage ../development/tools/goimports { };
 
+  govers = callPackage ../development/tools/govers { };
+
   gogoclient = callPackage ../os-specific/linux/gogoclient { };
 
   nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 521452b55064..d38aea502b5a 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1020,15 +1020,6 @@ let
     sha256  = "1l1w4mczqmah0c154vb1daw5l3cc7vn5gmy5s67p3ad1lnz5l79x";
   };
 
-  govers = buildFromGitHub {
-    rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
-    version = "2015-01-09";
-    owner = "rogpeppe";
-    repo = "govers";
-    sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc";
-    dontRenameImports = true;
-  };
-
   golang-lru = buildFromGitHub {
     rev    = "7f9ef20a0256f494e24126014135cf893ab71e9e";
     owner  = "hashicorp";

From 6d9b9681f9dc3eeaae822b5d11d42478b385b1e6 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 17:16:34 +0200
Subject: [PATCH 096/436] ngrok: FIX go-bindata moved to all-packages

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

diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok/default.nix
index 5344a4ec46bc..d7c4bcf04378 100644
--- a/pkgs/tools/networking/ngrok/default.nix
+++ b/pkgs/tools/networking/ngrok/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, lib, pkgconfig, goPackages, fetchFromGitHub }:
+{ stdenv, lib, pkgconfig, goPackages, go-bindata, fetchFromGitHub }:
 
 with goPackages;
 

From 6f51fdd81c4983574644ca1c86333cdf0d0dc467 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 5 Jun 2016 23:30:28 +0200
Subject: [PATCH 097/436] drive: extracted from goPackges

---
 .../applications/networking/drive/default.nix |  21 ++++
 pkgs/applications/networking/drive/deps.json  |  26 ++++
 pkgs/development/go-modules/libs.json         | 117 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +-
 pkgs/top-level/go-packages.nix                |  14 ---
 5 files changed, 165 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/applications/networking/drive/default.nix
 create mode 100644 pkgs/applications/networking/drive/deps.json

diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
new file mode 100644
index 000000000000..a85247f7e1ea
--- /dev/null
+++ b/pkgs/applications/networking/drive/default.nix
@@ -0,0 +1,21 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "drive-${version}";
+  version = "20151025-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "6dc2f1e83032ea3911fa6147b846ee93f18dc544";
+
+  goPackagePath = "github.com/odeke-em/drive";
+  subPackages = [ "cmd/drive" ];
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/odeke-em/drive";
+    sha256 = "07s4nhfcr6vznf1amvl3a4wq2hn9zq871rcppfi4i6zs7iw2ay1v";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/applications/networking/drive/deps.json b/pkgs/applications/networking/drive/deps.json
new file mode 100644
index 000000000000..3d71a76de8a6
--- /dev/null
+++ b/pkgs/applications/networking/drive/deps.json
@@ -0,0 +1,26 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/boltdb/bolt",
+      "github.com/cheggaaa/pb",
+      "github.com/odeke-em/cli-spinner",
+      "github.com/odeke-em/statos",
+      "golang.org/x/oauth2",
+      "github.com/odeke-em/exponential-backoff",
+      "github.com/odeke-em/extractor",
+      "github.com/odeke-em/meddler",
+      "github.com/odeke-em/xon",
+      "github.com/odeke-em/cache",
+      "github.com/odeke-em/drive",
+      "github.com/odeke-em/command",
+      "github.com/odeke-em/log",
+      "github.com/odeke-em/pretty-words",
+      "github.com/skratchdot/open-golang",
+      "google.golang.org/cloud",
+      "google.golang.org/api",
+      "github.com/mattn/go-isatty",
+      "golang.org/x/net"
+    ]
+  }
+]
diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index b83ed703f5f8..84a211e68e02 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1294,5 +1294,122 @@
       "rev": "9c0db6583837118d5df7c2ae38ab1c194e434b35",
       "sha256": "0590ww2av4407y7zy3bcmnr8i74fv00k9zzcxcpjxivl6qszna0d"
     }
+  },
+  {
+    "goPackagePath": "github.com/boltdb/bolt",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/boltdb/bolt",
+      "rev": "957d850b5158a4eebf915476058e720f43459584",
+      "sha256": "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf"
+    }
+  },
+  {
+    "goPackagePath": "github.com/cheggaaa/pb",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/cheggaaa/pb",
+      "rev": "e648e12b78cedf14ebb2fc1855033f07b034cfbb",
+      "sha256": "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam"
+    }
+  },
+  {
+    "goPackagePath": "github.com/odeke-em/cli-spinner",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/odeke-em/cli-spinner",
+      "rev": "610063bb4aeef25f7645b3e6080456655ec0fb33",
+      "sha256": "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c"
+    }
+  },
+  {
+    "goPackagePath": "github.com/odeke-em/statos",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/odeke-em/statos",
+      "rev": "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6",
+      "sha256": "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs"
+    }
+  },
+  {
+    "goPackagePath": "github.com/odeke-em/exponential-backoff",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/odeke-em/exponential-backoff",
+      "rev": "96e25d36ae36ad09ac02cbfe653b44c4043a8e09",
+      "sha256": "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6"
+    }
+  },
+  {
+    "goPackagePath": "github.com/odeke-em/extractor",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/odeke-em/extractor",
+      "rev": "801861aedb854c7ac5e1329e9713023e9dc2b4d4",
+      "sha256": "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1"
+    }
+  },
+  {
+    "goPackagePath": "github.com/odeke-em/meddler",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/odeke-em/meddler",
+      "rev": "d2b51d2b40e786ab5f810d85e65b96404cf33570",
+      "sha256": "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x"
+    }
+  },
+  {
+    "goPackagePath": "github.com/odeke-em/xon",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/odeke-em/xon",
+      "rev": "d580be739d723da4f6378083128f93017b8ab295",
+      "sha256": "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc"
+    }
+  },
+  {
+    "goPackagePath": "github.com/odeke-em/cache",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/odeke-em/cache",
+      "rev": "b51b08cb6cf889deda6c941a5205baecfd16f3eb",
+      "sha256": "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4"
+    }
+  },
+  {
+    "goPackagePath": "github.com/odeke-em/command",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/odeke-em/command",
+      "rev": "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561",
+      "sha256": "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62"
+    }
+  },
+  {
+    "goPackagePath": "github.com/odeke-em/log",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/odeke-em/log",
+      "rev": "cad53c4565a0b0304577bd13f3862350bdc5f907",
+      "sha256": "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w"
+    }
+  },
+  {
+    "goPackagePath": "github.com/odeke-em/pretty-words",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/odeke-em/pretty-words",
+      "rev": "9d37a7fcb4ae6f94b288d371938482994458cecb",
+      "sha256": "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl"
+    }
+  },
+  {
+    "goPackagePath": "github.com/skratchdot/open-golang",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/skratchdot/open-golang",
+      "rev": "c8748311a7528d0ba7330d302adbc5a677ef9c9e",
+      "sha256": "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac"
+    }
   }
 ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d37594c67c25..2db3a392fc84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1356,7 +1356,7 @@ in
 
   doomseeker = callPackage ../applications/misc/doomseeker { };
 
-  drive = self.go14Packages.drive.bin // { outputs = [ "bin" ]; };
+  drive = callPackage ../applications/networking/drive { };
 
   driftnet = callPackage ../tools/networking/driftnet {};
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index d38aea502b5a..ea3635894238 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -598,20 +598,6 @@ let
     sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i";
   };
 
-  drive = buildFromGitHub {
-    rev = "6dc2f1e83032ea3911fa6147b846ee93f18dc544";
-    owner = "odeke-em";
-    repo = "drive";
-    sha256 = "07s4nhfcr6vznf1amvl3a4wq2hn9zq871rcppfi4i6zs7iw2ay1v";
-    subPackages = [ "cmd/drive" ];
-    buildInputs = [
-      pb go-isatty command dts odeke-em.log statos xon odeke-em.google-api-go-client
-      cli-spinner oauth2 text net pretty-words meddler open-golang extractor
-      exponential-backoff cache bolt
-    ];
-    disabled = !isGo14;
-  };
-
   dropbox = buildFromGitHub {
     rev    = "58f839b21094d5e0af7caf613599830589233d20";
     owner  = "stacktic";

From 70b0f3128d4b9aa72467ae52bba86f9c431457ed Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 7 Jun 2016 10:50:54 -0700
Subject: [PATCH 098/436] rakudo: 2016.01 -> 2016.04

Updating Rakudo (Perl 6 compiler) to 2016.04
---
 pkgs/development/interpreters/rakudo/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index e1d1ccba4712..04e06d83d139 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "rakudo-star-${version}";
-  version = "2016.01";
+  version = "2016.04";
 
   src = fetchurl {
     url    = "http://rakudo.org/downloads/star/${name}.tar.gz";
-    sha256 = "feb385c5d05166061f413882e442d3a0ec53884918768940d3f00bb63bc85497";
+    sha256 = "11xzgwy155xpagrn3gzg8vqnqgjxwar70a3gzzmc9sica5064pva";
   };
 
   buildInputs = [ icu zlib gmp readline perl ];
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
       "--gen-nqp"
     ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A Perl 6 implementation";
     homepage    = "http://www.rakudo.org";
-    license     = stdenv.lib.licenses.artistic2;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = licenses.artistic2;
+    platforms   = platforms.unix;
+    maintainers = [ maintainers.thoughtpolice ];
   };
 }

From 3b28b5673b67670ee61212f2043ef641c7d70dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 9 Jun 2016 08:05:14 -0300
Subject: [PATCH 099/436] enlightenment: 0.20.8 -> 0.20.9

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

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 4dd20a9d3afa..1f802385bd8b 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -4,10 +4,10 @@ libffi, pam, alsaLib, luajit, bzip2, libuuid, libpthreadstubs, gdbm, libcap, mes
 
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
-  version = "0.20.8";
+  version = "0.20.9";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
-    sha256 = "17fi3frq4a73i0x7v7244g9m0fbjfamw0cfb4zhqs2rp1z8nq1iy";
+    sha256 = "1gniy7i3mg3q9cgqf004lvnv397yncdr2b7w1gzj69bvv7a2lyfv";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 7eb671ebcdd41d86980aa4826fa7b06f31a2ea0a Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 6 Jun 2016 02:28:52 +0200
Subject: [PATCH 100/436] no more goPackages

---
 pkgs/applications/misc/wego/default.nix       |   5 +-
 .../networking/cluster/terraform/default.nix  |   7 +-
 .../applications/networking/drive/default.nix |   5 +-
 .../instant-messengers/pond/default.nix       |   4 +-
 .../xmpp-client/default.nix                   |   5 +-
 .../networking/syncthing012/default.nix       |   5 +-
 .../git-and-tools/default.nix                 |   2 +-
 .../git-annex-remote-b2/default.nix           |  17 +++
 .../git-annex-remote-b2/deps.json             |   9 ++
 .../version-management/git-lfs/default.nix    |   5 +-
 pkgs/build-support/docker/default.nix         |   4 +-
 .../go-modules/generic/default.nix            |   2 +-
 pkgs/development/go-modules/libs.json         | 119 +++++++++++++++++-
 pkgs/development/tools/deis/default.nix       |   5 +-
 pkgs/development/tools/glide/default.nix      |   6 +-
 pkgs/development/tools/go-bindata/default.nix |   5 +-
 .../tools/go-repo-root/default.nix            |   7 +-
 pkgs/development/tools/go2nix/default.nix     |   5 +-
 pkgs/development/tools/gocode/default.nix     |   5 +-
 pkgs/development/tools/goimports/default.nix  |   5 +-
 pkgs/development/tools/golint/default.nix     |   5 +-
 pkgs/development/tools/gotags/default.nix     |   5 +-
 pkgs/development/tools/gotools/default.nix    |  44 +++++++
 pkgs/development/tools/gotools/deps.json      |   8 ++
 pkgs/development/tools/govers/default.nix     |   5 +-
 pkgs/development/tools/gox/default.nix        |   5 +-
 pkgs/development/tools/packer/default.nix     |   6 +-
 pkgs/development/tools/packer/deps.nix        |   7 +-
 pkgs/development/tools/pup/default.nix        |   5 +-
 pkgs/development/tools/remarshal/default.nix  |   6 +-
 pkgs/development/tools/remarshal/deps.json    |   9 ++
 pkgs/development/tools/textql/default.nix     |   5 +-
 pkgs/servers/caddy/default.nix                |   7 +-
 pkgs/servers/consul/default.nix               |   7 +-
 pkgs/servers/etcd/default.nix                 |   5 +-
 pkgs/servers/gotty/default.nix                |   5 +-
 pkgs/servers/interlock/default.nix            |   5 +-
 pkgs/servers/mesos-dns/default.nix            |   5 +-
 pkgs/servers/monitoring/bosun/default.nix     |   4 +-
 .../monitoring/consul-alerts/default.nix      |   7 +-
 pkgs/servers/monitoring/grafana/default.nix   |   4 +-
 pkgs/servers/monitoring/heapster/default.nix  |   4 +-
 .../monitoring/prometheus/alertmanager.nix    |   5 +-
 pkgs/servers/monitoring/prometheus/cli.nix    |   5 +-
 .../prometheus/collectd-exporter.nix          |   5 +-
 .../servers/monitoring/prometheus/default.nix |   5 +-
 .../prometheus/haproxy-exporter.nix           |   5 +-
 .../monitoring/prometheus/mesos-exporter.nix  |   5 +-
 .../monitoring/prometheus/mysqld-exporter.nix |   5 +-
 .../monitoring/prometheus/nginx-exporter.nix  |   5 +-
 .../monitoring/prometheus/node-exporter.nix   |   5 +-
 .../monitoring/prometheus/prom2json.nix       |   5 +-
 .../monitoring/prometheus/pushgateway.nix     |   5 +-
 .../monitoring/prometheus/statsd-bridge.nix   |   5 +-
 pkgs/servers/nosql/influxdb/default.nix       |   9 +-
 pkgs/servers/nosql/influxdb/deps.json         |  21 ++++
 pkgs/servers/nsq/default.nix                  |   5 +-
 pkgs/servers/oauth2_proxy/default.nix         |   5 +-
 pkgs/servers/serf/default.nix                 |   5 +-
 pkgs/servers/skydns/default.nix               |   5 +-
 pkgs/servers/skydns/deps.json                 |   1 +
 pkgs/shells/oh/default.nix                    |   5 +-
 pkgs/tools/X11/go-sct/default.nix             |   5 +-
 pkgs/tools/admin/lxd/default.nix              |   5 +-
 pkgs/tools/filesystems/go-mtpfs/default.nix   |   5 +-
 pkgs/tools/misc/asciinema/default.nix         |   5 +-
 pkgs/tools/misc/fzf/default.nix               |   5 +-
 pkgs/tools/misc/gawp/default.nix              |   4 +-
 pkgs/tools/misc/i3cat/default.nix             |   5 +-
 pkgs/tools/misc/mongodb-tools/default.nix     |   5 +-
 pkgs/tools/misc/upower-notify/default.nix     |   5 +-
 pkgs/tools/networking/flannel/default.nix     |   5 +-
 pkgs/tools/networking/ngrok/default.nix       |   5 +-
 pkgs/tools/networking/s3gof3r/default.nix     |   5 +-
 pkgs/tools/security/hologram/default.nix      |   5 +-
 pkgs/tools/security/vault/default.nix         |   7 +-
 pkgs/tools/system/confd/default.nix           |   5 +-
 pkgs/tools/system/consul-template/default.nix |   7 +-
 pkgs/tools/text/platinum-searcher/default.nix |  49 +-------
 pkgs/tools/text/platinum-searcher/deps.json   |  16 +++
 pkgs/top-level/all-packages.nix               |  26 +---
 81 files changed, 340 insertions(+), 340 deletions(-)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json
 create mode 100644 pkgs/development/tools/gotools/default.nix
 create mode 100644 pkgs/development/tools/gotools/deps.json
 create mode 100644 pkgs/development/tools/remarshal/deps.json
 create mode 100644 pkgs/servers/nosql/influxdb/deps.json
 create mode 100644 pkgs/tools/text/platinum-searcher/deps.json

diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix
index 2ce62783100a..5918f3ef3788 100644
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "wego-${version}";
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index cacfaf15a21d..44e6a10963a9 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,9 +1,6 @@
-# This file was generated by go2nix.
-{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
-with go16Packages;
-
-buildGoPackage rec {
+buildGo16Package rec {
   name = "terraform-${version}";
   version = "0.6.15";
   rev = "v${version}";
diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
index a85247f7e1ea..3b64d7af43bb 100644
--- a/pkgs/applications/networking/drive/default.nix
+++ b/pkgs/applications/networking/drive/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "drive-${version}";
diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix
index f40bf77bb71c..3b7b96b778f0 100644
--- a/pkgs/applications/networking/instant-messengers/pond/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pond/default.nix
@@ -1,8 +1,6 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3,
+{ stdenv, lib, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3,
   fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
-with goPackages;
 let
   isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64;
   gui = true; # Might be implemented with nixpkgs config.
diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
index 6ce338d3a45e..de8d0c19b4f8 100644
--- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
+++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "xmpp-client-${version}";
diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix
index dcf5e30551c1..6f6336eef709 100644
--- a/pkgs/applications/networking/syncthing012/default.nix
+++ b/pkgs/applications/networking/syncthing012/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "syncthing-${version}";
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index ab111a7f2f71..0732b0d7329f 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -40,7 +40,7 @@ rec {
   git-annex = pkgs.haskell.packages.lts.git-annex-with-assistant;
   gitAnnex = git-annex;
 
-  git-annex-remote-b2 = pkgs.goPackages.git-annex-remote-b2;
+  git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { };
 
   # support for bugzilla
   git-bz = callPackage ./git-bz { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
new file mode 100644
index 000000000000..4ede1b352ea6
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "git-annex-remote-b2-${version}";
+  version = "20151212-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";
+
+  goPackagePath = "github.com/encryptio/git-annex-remote-b2";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/encryptio/git-annex-remote-b2";
+    sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json
new file mode 100644
index 000000000000..b04422768a5f
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json
@@ -0,0 +1,9 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/pquerna/ffjson",
+      "gopkg.in/kothar/go-backblaze.v0"
+    ]
+  }
+]
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 5186d2a5ba90..089997342c0e 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "git-lfs-${version}";
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 5ead82dee8b5..4c5378ea73f3 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, callPackage, runCommand, writeReferencesToFile, writeText, vmTools, writeScript
-, docker, shadow, utillinux, coreutils, jshon, e2fsprogs, goPackages, pigz }:
+, docker, shadow, utillinux, coreutils, jshon, e2fsprogs, go, pigz }:
 
 # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future.
   
@@ -10,7 +10,7 @@ rec {
   # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
   # And we cannot untar it, because then we cannot preserve permissions ecc.
   tarsum = runCommand "tarsum" {
-    buildInputs = [ goPackages.go ];
+    buildInputs = [ go ];
   } ''
     mkdir tarsum
     cd tarsum
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index cc355c6e5d75..07cc42cfcdf0 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -52,7 +52,7 @@ let
         fetchhg {
           inherit (goDep.fetch) url rev sha256;
         }
-      else {};
+      else abort "Unrecognized package fetch type";
     };
 
   importGodeps = { depsFile, filterPackages ? [] }:
diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 84a211e68e02..520c1fd8e5c0 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -32,7 +32,7 @@
       "type": "git",
       "url": "https://github.com/docopt/docopt-go",
       "rev": "784ddc588536785e7299f7272f39101f7faccc3f",
-      "sha256": "13x00cnady5znysfwca3x59dl04m8rvnk2yprgyqqpg2y4v0xmbf"
+      "sha256": "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"
     }
   },
   {
@@ -1411,5 +1411,122 @@
       "rev": "c8748311a7528d0ba7330d302adbc5a677ef9c9e",
       "sha256": "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac"
     }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/raft",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/raft",
+      "rev": "a8065f298505708bf60f518c09178149f3c06f21",
+      "sha256": "122mjijphas7ybbvssxv1r36sb8i907gdr9kvplnx6yg9w52j3mn"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/raft-boltdb",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/raft-boltdb",
+      "rev": "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee",
+      "sha256": "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia"
+    }
+  },
+  {
+    "goPackagePath": "github.com/rakyll/statik",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/rakyll/statik",
+      "rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465",
+      "sha256": "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/fatih/pool.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/fatih/pool.v2",
+      "rev": "cba550ebf9bce999a02e963296d4bc7a486cb715",
+      "sha256": "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0"
+    }
+  },
+  {
+    "goPackagePath": "github.com/bmizerany/pat",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/bmizerany/pat",
+      "rev": "b8a35001b773c267eb260a691f4e5499a3531600",
+      "sha256": "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz"
+    }
+  },
+  {
+    "goPackagePath": "github.com/kimor79/gollectd",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/kimor79/gollectd",
+      "rev": "cf6dec97343244b5d8a5485463675d42f574aa2d",
+      "sha256": "1f3ml406cprzjc192csyr2af4wcadkc74kg8n4c0zdzglxxfsqxa"
+    }
+  },
+  {
+    "goPackagePath": "github.com/monochromegane/conflag",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/monochromegane/conflag",
+      "rev": "6d68c9aa4183844ddc1655481798fe4d90d483e9",
+      "sha256": "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa"
+    }
+  },
+  {
+    "goPackagePath": "github.com/monochromegane/go-home",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/monochromegane/go-home",
+      "rev": "25d9dda593924a11ea52e4ffbc8abdb0dbe96401",
+      "sha256": "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww"
+    }
+  },
+  {
+    "goPackagePath": "github.com/monochromegane/terminal",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/monochromegane/terminal",
+      "rev": "2da212063ce19aed90ee5bbb00ad1ad7393d7f48",
+      "sha256": "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh"
+    }
+  },
+  {
+    "goPackagePath": "github.com/monochromegane/go-gitignore",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/monochromegane/go-gitignore",
+      "rev": "38717d0a108ca0e5af632cd6845ca77d45b50729",
+      "sha256": "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7"
+    }
+  },
+  {
+    "goPackagePath": "github.com/shiena/ansicolor",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/shiena/ansicolor",
+      "rev": "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b",
+      "sha256": "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p"
+    }
+  },
+  {
+    "goPackagePath": "github.com/pquerna/ffjson",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/pquerna/ffjson",
+      "rev": "674bc015b5b3f50f9bb2561179778586b9af68c5",
+      "sha256": "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/kothar/go-backblaze.v0",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/kothar/go-backblaze.v0",
+      "rev": "373819725fc560fa962c6cd883b533d2ebec4844",
+      "sha256": "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx"
+    }
   }
 ]
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index 5336a14c5a17..449af618cb18 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "deis-${version}";
diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
index cc63921976f5..9489f5a7bac8 100644
--- a/pkgs/development/tools/glide/default.nix
+++ b/pkgs/development/tools/glide/default.nix
@@ -1,9 +1,7 @@
 # This file was generated by go2nix.
-{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
-with go16Packages;
-
-buildGoPackage rec {
+buildGo16Package rec {
   name = "glide-${version}";
   version = "0.10.2";
   rev = "${version}";
diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix
index cb9e51dfdfbc..4b87e74a6308 100644
--- a/pkgs/development/tools/go-bindata/default.nix
+++ b/pkgs/development/tools/go-bindata/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "go-bindata-${version}";
diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix
index 15aa1504d93c..d6ae032f0782 100644
--- a/pkgs/development/tools/go-repo-root/default.nix
+++ b/pkgs/development/tools/go-repo-root/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, gotools, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "go-repo-root-${version}";
@@ -16,5 +13,5 @@ buildGoPackage rec {
     sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4";
   };
 
-  buildInputs = [ tools ];
+  buildInputs = [ gotools ];
 }
diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index bb0000d9e736..757dc8cb379f 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -1,9 +1,6 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, go-bindata, goimports, nix-prefetch-git, git, makeWrapper,
+{ stdenv, lib, buildGoPackage, go-bindata, goimports, nix-prefetch-git, git, makeWrapper,
   fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
-with goPackages;
-
 buildGoPackage rec {
   name = "go2nix-${version}";
   version = "20160307-${stdenv.lib.strings.substring 0 7 rev}";
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index 0a2b908c9fd1..8485a2c346b4 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "gocode-${version}";
diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix
index bcc82e80cbfa..5c69f34e28b3 100644
--- a/pkgs/development/tools/goimports/default.nix
+++ b/pkgs/development/tools/goimports/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "goimports-${version}";
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
index 1e63eb73449a..29e5b28ad57f 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "lint-${version}";
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
index 65d0d29e1585..ad22d4ea4079 100644
--- a/pkgs/development/tools/gotags/default.nix
+++ b/pkgs/development/tools/gotags/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "gotags-${version}";
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
new file mode 100644
index 000000000000..f00794a7eb0f
--- /dev/null
+++ b/pkgs/development/tools/gotools/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "gotools-${version}";
+  version = "20160519-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
+
+  goPackagePath = "golang.org/x/tools";
+  goPackageAliases = [ "code.google.com/p/go.tools" ];
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://go.googlesource.com/tools";
+    sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
+  };
+
+  goDeps = ./deps.json;
+
+  preConfigure = ''
+    # Make the builtin tools available here
+    mkdir -p $bin/bin
+    eval $(go env | grep GOTOOLDIR)
+    find $GOTOOLDIR -type f | while read x; do
+      ln -sv "$x" "$bin/bin"
+    done
+    export GOTOOLDIR=$bin/bin
+  '';
+
+  excludedPackages = "\\("
+    + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ])
+    + "\\)";
+
+  # Do not copy this without a good reason for enabling
+  # In this case tools is heavily coupled with go itself and embeds paths.
+  allowGoReference = true;
+
+  # Set GOTOOLDIR for derivations adding this to buildInputs
+  postInstall = ''
+    mkdir -p $bin/nix-support
+    substituteAll ${../../go-modules/tools/setup-hook.sh} $bin/nix-support/setup-hook.tmp
+    cat $bin/nix-support/setup-hook.tmp >> $bin/nix-support/setup-hook
+    rm $bin/nix-support/setup-hook.tmp
+  '';
+}
diff --git a/pkgs/development/tools/gotools/deps.json b/pkgs/development/tools/gotools/deps.json
new file mode 100644
index 000000000000..76e8fd93aa7d
--- /dev/null
+++ b/pkgs/development/tools/gotools/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "golang.org/x/net"
+    ]
+  }
+]
diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
index b3e2b921bd2e..bd4dd28f599b 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "govers-${version}";
diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
index 7b58bafcd627..030a59ed20c5 100644
--- a/pkgs/development/tools/gox/default.nix
+++ b/pkgs/development/tools/gox/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "gox-${version}";
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index fc8ef5ff964a..7d566254633b 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, gox, goPackages, fetchFromGitHub
+{ stdenv, lib, go, gox, gotools, buildGoPackage, fetchFromGitHub
 , fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 stdenv.mkDerivation rec {
@@ -6,10 +6,10 @@ stdenv.mkDerivation rec {
   version = "0.10.1";
 
   src = import ./deps.nix {
-    inherit stdenv lib go gox goPackages fetchgit fetchhg fetchbzr fetchsvn;
+    inherit stdenv lib go gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn;
   };
 
-  buildInputs = [ go gox goPackages.tools ];
+  buildInputs = [ go gox gotools ];
 
   configurePhase = ''
     export GOPATH=$PWD/share/go
diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix
index 2be1911cf91b..5ed606ad6c6b 100644
--- a/pkgs/development/tools/packer/deps.nix
+++ b/pkgs/development/tools/packer/deps.nix
@@ -1,14 +1,11 @@
-# This file was generated by go2nix.
-{ stdenv, lib, go, gox, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, go, gox, gotools, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "packer-${version}";
   version = "20160507-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0";
 
-  buildInputs = [ go gox goPackages.tools ];
+  buildInputs = [ go gox gotools ];
   
   goPackagePath = "github.com/mitchellh/packer";
 
diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix
index 23ced868bd3e..772178dd84c1 100644
--- a/pkgs/development/tools/pup/default.nix
+++ b/pkgs/development/tools/pup/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "pup-${version}";
diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix
index 048604beab9a..49de886654c8 100644
--- a/pkgs/development/tools/remarshal/default.nix
+++ b/pkgs/development/tools/remarshal/default.nix
@@ -1,6 +1,6 @@
-{ lib, goPackages, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
-goPackages.buildGoPackage rec {
+buildGoPackage rec {
   name = "remarshal-${rev}";
   rev = "0.3.0";
   goPackagePath = "github.com/dbohdan/remarshal";
@@ -12,7 +12,7 @@ goPackages.buildGoPackage rec {
     sha256 = "0lhsqca3lq3xvdwsmrngv4p6b7k2lkbfnxnk5qj6jdd5y7f4b496";
   };
 
-  buildInputs = with goPackages; [ toml yaml-v2 ];
+  goDeps = ./deps.json;
 
   meta = with lib; {
     description = "Convert between TOML, YAML and JSON";
diff --git a/pkgs/development/tools/remarshal/deps.json b/pkgs/development/tools/remarshal/deps.json
new file mode 100644
index 000000000000..3b43c0e5ff60
--- /dev/null
+++ b/pkgs/development/tools/remarshal/deps.json
@@ -0,0 +1,9 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/BurntSushi/toml",
+      "gopkg.in/yaml.v2"
+    ]
+  }
+]
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix
index abc9312c9e2d..65fbbcb9e043 100644
--- a/pkgs/development/tools/textql/default.nix
+++ b/pkgs/development/tools/textql/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "textql-${version}";
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 8ae26640f289..2b0ae98c4641 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,9 +1,6 @@
-# This file was generated by go2nix.
-{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
-with go16Packages;
-
-buildGoPackage rec {
+buildGo16Package rec {
   name = "caddy-${version}";
   version = "0.8.3";
   rev = "e2234497b79603388b58ba226abb157aa4aaf065";
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index b98160c6be79..7dfd8b2a32ed 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,9 +1,6 @@
-# This file was generated by go2nix.
-{ stdenv, lib, go16Packages, consul-ui, fetchFromGitHub }:
+{ stdenv, lib, buildGo16Package, consul-ui, fetchFromGitHub }:
 
-with go16Packages;
-
-buildGoPackage rec {
+buildGo16Package rec {
   name = "consul-${version}";
   version = "0.6.4";
   rev = "v${version}";
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index 05bb61049693..8bb672c286db 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, libpcap, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, libpcap, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "etcd-${version}";
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index c826180d7585..5716779fb9a3 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "gotty-${version}";
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index 9b49f051ac21..23131553539c 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/pkgs/servers/interlock/default.nix
@@ -1,8 +1,5 @@
-# This file was generated by go2nix.
 { stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup,
-  goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+  buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "interlock-${version}";
diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix
index 1fa2a6101788..d67aa337476b 100644
--- a/pkgs/servers/mesos-dns/default.nix
+++ b/pkgs/servers/mesos-dns/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "mesos-dns-${version}";
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
index 77271b26a8de..5b5593d55142 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/pkgs/servers/monitoring/bosun/default.nix
@@ -1,6 +1,6 @@
-{ lib, fetchFromGitHub, goPackages }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
-goPackages.buildGoPackage rec {
+buildGoPackage rec {
   name = "bosun";
   rev = "0.5.0-alpha";
 
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix
index 98cb3a3db48c..ee904dec6eba 100644
--- a/pkgs/servers/monitoring/consul-alerts/default.nix
+++ b/pkgs/servers/monitoring/consul-alerts/default.nix
@@ -1,9 +1,6 @@
-# This file was generated by go2nix.
-{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
-with go16Packages;
-
-buildGoPackage rec {
+buildGo16Package rec {
   name = "consul-alerts-${version}";
   version = "0.3.3";
   rev = "v${version}";
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 55ef139624c4..28bf83a247fc 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,6 +1,6 @@
-{ lib, goPackages, fetchurl, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchurl, fetchFromGitHub }:
 
-goPackages.buildGoPackage rec {
+buildGoPackage rec {
   version = "3.0.1";
   name = "grafana-v${version}";
   goPackagePath = "github.com/grafana/grafana";
diff --git a/pkgs/servers/monitoring/heapster/default.nix b/pkgs/servers/monitoring/heapster/default.nix
index f50a52fe2804..db3c518c7296 100644
--- a/pkgs/servers/monitoring/heapster/default.nix
+++ b/pkgs/servers/monitoring/heapster/default.nix
@@ -1,6 +1,6 @@
-{ lib, goPackages, fetchFromGitHub, docker }:
+{ lib, buildGoPackage, fetchFromGitHub, docker }:
 
-goPackages.buildGoPackage rec {
+buildGoPackage rec {
   rev = "3057a2c07061c8d9ffaf77e5442ffd7512ac0133";
   name = "heapster-${lib.strings.substring 0 7 rev}";
   goPackagePath = "k8s.io/heapster";
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 2bed947aad00..846d1d57277d 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "alertmanager-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix
index 5dd7c207f104..20f6e7249abf 100644
--- a/pkgs/servers/monitoring/prometheus/cli.nix
+++ b/pkgs/servers/monitoring/prometheus/cli.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "prometheus_cli-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index 3b22fedfd930..49701505aa61 100644
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "collectd-exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index d6b82c38d01e..aa76fdc455ae 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "prometheus-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index efb5abd9f9f7..140bde2c0cbf 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "haproxy_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
index a06c9671f817..0fdff08ca1da 100644
--- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "mesos_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
index 29bf6bdb3bb2..d0c1c2073f5b 100644
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "mysqld_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index 5da457c0a190..c3b25e2fcc56 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "nginx_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 276ff73d0fcc..3b8d6fe16664 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "node_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix
index 512cd4ca22ca..5f45c63d96e6 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "prom2json-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 751748783e47..83ef4e209311 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, go-bindata, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, go, buildGoPackage, go-bindata, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "pushgateway-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
index 4458b668a197..90a35bf4592d 100644
--- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "statsd_bridge-${version}";
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 50abc70bfb71..1372b6a3fc36 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -1,6 +1,6 @@
-{ lib, goPackages, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
-goPackages.buildGoPackage rec {
+buildGoPackage rec {
   name = "influxdb-${rev}";
   rev = "v0.9.4";
   goPackagePath = "github.com/influxdb/influxdb";
@@ -14,10 +14,7 @@ goPackages.buildGoPackage rec {
 
   excludedPackages = "test";
 
-  propagatedBuildInputs = with goPackages; [
-    raft raft-boltdb snappy crypto gogo.protobuf pool pat toml
-    gollectd statik liner
-  ];
+  goDeps = ./deps.json;
 
   meta = with lib; {
     description = "An open-source distributed time series database";
diff --git a/pkgs/servers/nosql/influxdb/deps.json b/pkgs/servers/nosql/influxdb/deps.json
new file mode 100644
index 000000000000..f091b58e8dc4
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb/deps.json
@@ -0,0 +1,21 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/peterh/liner",
+      "github.com/BurntSushi/toml",
+      "github.com/kimor79/gollectd",
+      "github.com/bmizerany/pat",
+      "gopkg.in/fatih/pool.v2",
+      "github.com/rakyll/statik",
+      "github.com/armon/go-metrics",
+      "github.com/boltdb/bolt",
+      "github.com/golang/snappy",
+      "github.com/hashicorp/go-msgpack",
+      "github.com/hashicorp/raft-boltdb",
+      "golang.org/x/crypto",
+      "github.com/gogo/protobuf",
+      "github.com/hashicorp/raft"
+    ]
+  }
+]
diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix
index 5831340eccd9..b716a0425771 100644
--- a/pkgs/servers/nsq/default.nix
+++ b/pkgs/servers/nsq/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "nsq-${version}";
diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix
index 9381db95d77d..3e3bcea46a25 100644
--- a/pkgs/servers/oauth2_proxy/default.nix
+++ b/pkgs/servers/oauth2_proxy/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "oauth2_proxy-${version}";
diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix
index 5f4c6453de71..4a37213846a1 100644
--- a/pkgs/servers/serf/default.nix
+++ b/pkgs/servers/serf/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "serf-${version}";
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
index fc4c82f50429..b02373ef51c9 100644
--- a/pkgs/servers/skydns/default.nix
+++ b/pkgs/servers/skydns/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "skydns-${version}";
diff --git a/pkgs/servers/skydns/deps.json b/pkgs/servers/skydns/deps.json
index 9ddbfa3c4347..446f60f3279d 100644
--- a/pkgs/servers/skydns/deps.json
+++ b/pkgs/servers/skydns/deps.json
@@ -5,6 +5,7 @@
       "github.com/miekg/dns",
       "github.com/prometheus/client_golang",
       "github.com/prometheus/client_model",
+      "bitbucket.org/ww/goautoneg",
       "github.com/prometheus/common",
       "github.com/prometheus/procfs",
       "github.com/coreos/go-systemd",
diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix
index 3c8b2c89524d..c6d3ad06df46 100644
--- a/pkgs/shells/oh/default.nix
+++ b/pkgs/shells/oh/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "oh-${version}";
diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix
index 18877917d0d3..197a7b80af36 100644
--- a/pkgs/tools/X11/go-sct/default.nix
+++ b/pkgs/tools/X11/go-sct/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, xorg, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, xorg, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "go-sct-${version}";
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index e1adb6ccf90d..c8717ad1f6cb 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, pkgconfig, lxc, goPackages, fetchFromGitHub }:
-
-with goPackages;
+{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "lxd-${version}";
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix
index 55be2dd9e73b..0bb92f14e15c 100644
--- a/pkgs/tools/filesystems/go-mtpfs/default.nix
+++ b/pkgs/tools/filesystems/go-mtpfs/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, pkgconfig, libusb1, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, pkgconfig, libusb1, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "go-mtpfs-${version}";
diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix
index 9a1269815afb..cee4ec925c01 100644
--- a/pkgs/tools/misc/asciinema/default.nix
+++ b/pkgs/tools/misc/asciinema/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "asciinema-${version}";
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index d1fd3ac0afce..f9cf313b7748 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, ncurses, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, ncurses, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "fzf-${version}";
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index 552d01041310..618d6c752e6e 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -1,8 +1,6 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit }:
+{ stdenv, lib, buildGoPackage, fetchgit }:
 
 with builtins;
-with goPackages;
 
 buildGoPackage rec {
   name = "gawp-${version}";
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
index c0333a14ed47..1cda3149bb42 100644
--- a/pkgs/tools/misc/i3cat/default.nix
+++ b/pkgs/tools/misc/i3cat/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "i3cat-${version}";
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
index 74240a859c89..723410183f1b 100644
--- a/pkgs/tools/misc/mongodb-tools/default.nix
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 let
   tools = [
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix
index fef1707d5052..d02e2865c8f5 100644
--- a/pkgs/tools/misc/upower-notify/default.nix
+++ b/pkgs/tools/misc/upower-notify/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix:
 #
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index be2f10b3a35e..c80f5d36567d 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "flannel-${version}";
diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok/default.nix
index d7c4bcf04378..9644fa069722 100644
--- a/pkgs/tools/networking/ngrok/default.nix
+++ b/pkgs/tools/networking/ngrok/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, pkgconfig, goPackages, go-bindata, fetchFromGitHub }:
-
-with goPackages;
+{ stdenv, lib, pkgconfig, buildGoPackage, go-bindata, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "ngrok-${version}";
diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix
index e751d991542d..6231d5005dc9 100644
--- a/pkgs/tools/networking/s3gof3r/default.nix
+++ b/pkgs/tools/networking/s3gof3r/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "s3gof3r-${version}";
diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix
index d73827f636b4..5e8d260d6936 100644
--- a/pkgs/tools/security/hologram/default.nix
+++ b/pkgs/tools/security/hologram/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "hologram-${version}";
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 18f33da8ea10..8470441f530b 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,9 +1,6 @@
-# This file was generated by go2nix.
-{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
-with go16Packages;
-
-buildGoPackage rec {
+buildGo16Package rec {
   name = "vault-${version}";
   version = "0.5.2";
   rev = "v${version}";
diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix
index 416c856a5ae4..5e5e0edcfe58 100644
--- a/pkgs/tools/system/confd/default.nix
+++ b/pkgs/tools/system/confd/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "confd-${version}";
diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
index 989ad2b51a18..7c4bda8a5699 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -1,9 +1,6 @@
-# This file was generated by go2nix.
-{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
-with go16Packages;
-
-buildGoPackage rec {
+buildGo16Package rec {
   name = "consul-template-${version}";
   version = "0.14.0";
   rev = "v${version}";
diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix
index ca4ac0b8a9a5..9eae37c6d1a7 100644
--- a/pkgs/tools/text/platinum-searcher/default.nix
+++ b/pkgs/tools/text/platinum-searcher/default.nix
@@ -1,14 +1,10 @@
-{ stdenv, lib, go, goPackages, fetchFromGitHub }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "the_platinum_searcher-${version}";
   version = "2.1.1";
   rev = "v2.1.1";
 
-  buildInputs = [ go go-flags ansicolor text toml yaml-v2 ];
-
   goPackagePath = "github.com/monochromegane/the_platinum_searcher";
 
   src = fetchFromGitHub {
@@ -18,48 +14,7 @@ buildGoPackage rec {
     sha256 = "06cs936w3l64ikszcysdm9ijn52kwgi1ffjxkricxbdb677gsk23";
   };
 
-  extraSrcs = [
-    {
-      goPackagePath = "github.com/monochromegane/conflag";
-
-      src = fetchFromGitHub {
-        owner = "monochromegane";
-        repo = "conflag";
-        rev = "6d68c9aa4183844ddc1655481798fe4d90d483e9";
-        sha256 = "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa";
-      };
-    }
-    {
-      goPackagePath = "github.com/monochromegane/go-gitignore";
-
-      src = fetchFromGitHub {
-        owner = "monochromegane";
-        repo = "go-gitignore";
-        rev = "38717d0a108ca0e5af632cd6845ca77d45b50729";
-        sha256 = "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7";
-      };
-    }
-    {
-      goPackagePath = "github.com/monochromegane/go-home";
-
-      src = fetchFromGitHub {
-        owner = "monochromegane";
-        repo = "go-home";
-        rev = "25d9dda593924a11ea52e4ffbc8abdb0dbe96401";
-        sha256 = "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww";
-      };
-    }
-    {
-      goPackagePath = "github.com/monochromegane/terminal";
-
-      src = fetchFromGitHub {
-        owner = "monochromegane";
-        repo = "terminal";
-        rev = "2da212063ce19aed90ee5bbb00ad1ad7393d7f48";
-        sha256 = "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh";
-      };
-    }
-  ];
+  goDeps = ./deps.json;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/monochromegane/the_platinum_searcher;
diff --git a/pkgs/tools/text/platinum-searcher/deps.json b/pkgs/tools/text/platinum-searcher/deps.json
new file mode 100644
index 000000000000..fc137e262983
--- /dev/null
+++ b/pkgs/tools/text/platinum-searcher/deps.json
@@ -0,0 +1,16 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/BurntSushi/toml",
+      "github.com/monochromegane/conflag",
+      "github.com/monochromegane/go-home",
+      "github.com/monochromegane/terminal",
+      "github.com/monochromegane/go-gitignore",
+      "github.com/shiena/ansicolor",
+      "golang.org/x/text",
+      "gopkg.in/yaml.v2",
+      "github.com/jessevdk/go-flags"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2db3a392fc84..f856d938e593 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7086,8 +7086,6 @@ in
 
   gio-sharp = callPackage ../development/libraries/gio-sharp { };
 
-  icon-lang = callPackage ../development/interpreters/icon-lang { };
-
   libgit2 = callPackage ../development/libraries/git2 (
     stdenv.lib.optionalAttrs stdenv.isDarwin {
       inherit (darwin) libiconv;
@@ -9418,8 +9416,6 @@ in
 
   xgboost = callPackage ../development/libraries/xgboost { };
 
-  xgeometry-select = callPackage ../tools/X11/xgeometry-select { };
-
   # Avoid using this. It isn't really a wrapper anymore, but we keep the name.
   xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper {
     packages = [
@@ -9599,31 +9595,19 @@ in
 
   ### DEVELOPMENT / GO MODULES
 
-  go14Packages = callPackage ./go-packages.nix {
+  buildGo14Package = callPackage ../development/go-modules/generic {
     go = go_1_4;
-    buildGoPackage = callPackage ../development/go-modules/generic {
-      go = go_1_4;
-    };
-    overrides = (config.goPackageOverrides or (p: {})) pkgs;
   };
 
-  go15Packages = callPackage ./go-packages.nix {
+  buildGo15Package = callPackage ../development/go-modules/generic {
     go = go_1_5;
-    buildGoPackage = callPackage ../development/go-modules/generic {
-      go = go_1_5;
-    };
-    overrides = (config.goPackageOverrides or (p: {})) pkgs;
   };
 
-  go16Packages = callPackage ./go-packages.nix {
+  buildGo16Package = callPackage ../development/go-modules/generic {
     go = go_1_6;
-    buildGoPackage = callPackage ../development/go-modules/generic {
-      go = go_1_6;
-    };
-    overrides = (config.goPackageOverrides or (p: {})) pkgs;
   };
 
-  goPackages = go16Packages;
+  buildGoPackage = buildGo15Package;
 
   go2nix = callPackage ../development/tools/go2nix { };
 
@@ -11166,6 +11150,8 @@ in
 
   govers = callPackage ../development/tools/govers { };
 
+  gotools = callPackage ../development/tools/gotools { };
+
   gogoclient = callPackage ../os-specific/linux/gogoclient { };
 
   nss_ldap = callPackage ../os-specific/linux/nss_ldap { };

From 30acfc3b45834d3cf12bf4802955491608457ff1 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 6 Jun 2016 02:46:06 +0200
Subject: [PATCH 101/436] ipfs: extracted from goPackages

---
 pkgs/applications/networking/ipfs/default.nix | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/ipfs/default.nix

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
new file mode 100644
index 000000000000..694166cc2428
--- /dev/null
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, lib, buildGoPackage, consul-ui, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "ipfs-${version}";
+  version = "i20160112--${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "7070b4d878baad57dcc8da80080dd293aa46cabd";
+
+  goPackagePath = "github.com/ipfs/go-ipfs";
+
+  src = fetchFromGitHub {
+    owner = "ipfs";
+    repo = "go-ipfs";
+    inherit rev;
+    sha256 = "1b7aimnbz287fy7p27v3qdxnz514r5142v3jihqxanbk9g384gcd";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A global, versioned, peer-to-peer filesystem";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f856d938e593..9545ce0eb85b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2063,7 +2063,7 @@ in
   iperf3 = callPackage ../tools/networking/iperf/3.nix { };
   iperf = self.iperf3;
 
-  ipfs = self.goPackages.ipfs.bin // { outputs = [ "bin" ]; };
+  ipfs = callPackage ../applications/networking/ipfs { };
 
   ipmitool = callPackage ../tools/system/ipmitool {
     static = false;

From 9683f5751f5699ca3a03a677f87647e534fe1c56 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 6 Jun 2016 08:56:13 +0200
Subject: [PATCH 102/436] FIX: deis and gawp shas

---
 pkgs/development/tools/deis/default.nix | 9 +++++----
 pkgs/tools/misc/gawp/default.nix        | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index 449af618cb18..471cc80663da 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "deis-${version}";
@@ -14,10 +14,11 @@ buildGoPackage rec {
     fi
   '';
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/deis/deis";
-    sha256 = "1fblg3gf7dh5hhm4ajq7yl7iy6gw8p5xlh4z8kvfy542m1fzr0dc";
+    owner = "deis";
+    repo = "deis";
+    sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw";
   };
 
   goDeps = ./deps.json;
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index 618d6c752e6e..6e3fe1223fc4 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -12,7 +12,7 @@ buildGoPackage rec {
   src = fetchgit {
     inherit rev;
     url = "https://github.com/martingallagher/gawp";
-    sha256 = "0r4bp4w3s9rkmg3cz9jb7d6ngh7vfj31p9kbim6mhilxvmgjk4ly";
+    sha256 = "0bbmbb1xxdgvqvg1ssn9d4j213li7bbbx3y42iz4fs10xv7x4r0c";
   };
 
   goDeps = ./deps.json;

From 8dc356c731a8478af4b6509f18d7c79489121433 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 6 Jun 2016 10:05:20 +0200
Subject: [PATCH 103/436] prometheus-alertmanager: fetchgit -> fetchFromGitHub

---
 pkgs/servers/monitoring/prometheus/alertmanager.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 846d1d57277d..fc204fc3f152 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "alertmanager-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/prometheus/alertmanager";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/prometheus/alertmanager";
+    owner = "prometheus";
+    repo = "alertmanager";
     sha256 = "1ya465bns6cj2lqbipmfm13wz8kxii5h9mm7lc0ba1xv26xx5zs7";
   };
 

From bbc37e0eb7bf9d97f6d3e796833968180606cfaf Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 6 Jun 2016 12:26:56 +0200
Subject: [PATCH 104/436] Moving from fetchgit generated by go2nix to
 fetchFromGitHub where rev is a tag

---
 pkgs/applications/networking/syncthing012/default.nix    | 9 +++++----
 pkgs/applications/version-management/git-lfs/default.nix | 7 ++++---
 pkgs/development/tools/textql/default.nix                | 7 ++++---
 pkgs/servers/etcd/default.nix                            | 7 ++++---
 pkgs/servers/gotty/default.nix                           | 9 +++++----
 pkgs/servers/interlock/default.nix                       | 9 +++++----
 pkgs/servers/mesos-dns/default.nix                       | 7 ++++---
 pkgs/servers/monitoring/prometheus/cli.nix               | 7 ++++---
 pkgs/servers/monitoring/prometheus/collectd-exporter.nix | 7 ++++---
 pkgs/servers/monitoring/prometheus/default.nix           | 7 ++++---
 pkgs/servers/monitoring/prometheus/haproxy-exporter.nix  | 7 ++++---
 pkgs/servers/monitoring/prometheus/mesos-exporter.nix    | 7 ++++---
 pkgs/servers/monitoring/prometheus/mysqld-exporter.nix   | 7 ++++---
 pkgs/servers/monitoring/prometheus/node-exporter.nix     | 7 ++++---
 pkgs/servers/monitoring/prometheus/prom2json.nix         | 7 ++++---
 pkgs/servers/monitoring/prometheus/pushgateway.nix       | 7 ++++---
 pkgs/servers/monitoring/prometheus/statsd-bridge.nix     | 7 ++++---
 pkgs/servers/nsq/default.nix                             | 7 ++++---
 pkgs/servers/skydns/default.nix                          | 7 ++++---
 pkgs/tools/misc/fzf/default.nix                          | 7 ++++---
 pkgs/tools/misc/mongodb-tools/default.nix                | 7 ++++---
 pkgs/tools/networking/flannel/default.nix                | 7 ++++---
 pkgs/tools/system/confd/default.nix                      | 7 ++++---
 23 files changed, 95 insertions(+), 72 deletions(-)

diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix
index 6f6336eef709..9f436d21bc3d 100644
--- a/pkgs/applications/networking/syncthing012/default.nix
+++ b/pkgs/applications/networking/syncthing012/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "syncthing-${version}";
@@ -9,10 +9,11 @@ buildGoPackage rec {
   
   goPackagePath = "github.com/syncthing/syncthing";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/syncthing/syncthing";
-    sha256 = "108w7gvm3nbbsgp3h5p84fj4ba0siaz932i7yyryly486gzvpm43";
+    owner = "syncthing";
+    repo = "syncthing";
+    sha256 = "0g4sj509h45iq6g7b0pl88rbbn7c7s01774yjc6bl376x1xrl6a1";
   };
 
   goDeps = ./deps.json;
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 089997342c0e..e5fc8173919d 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "git-lfs-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
   
   goPackagePath = "github.com/github/git-lfs";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/github/git-lfs";
+    owner = "github";
+    repo = "git-lfs";
     sha256 = "0z8giavcvfpzmhnxxsqvsgabjfq5gpka8jy4qvadf60yibxds9fp";
   };
 
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix
index 65fbbcb9e043..4caa659c17a3 100644
--- a/pkgs/development/tools/textql/default.nix
+++ b/pkgs/development/tools/textql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "textql-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
   
   goPackagePath = "github.com/dinedal/textql";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/dinedal/textql";
+    owner = "dinedal";
+    repo = "textql";
     sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3";
   };
 
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index 8bb672c286db..782d7001deec 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, libpcap, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, libpcap, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "etcd-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
   
   goPackagePath = "github.com/coreos/etcd";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/coreos/etcd";
+    owner = "coreos";
+    repo = "etcd";
     sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7";
   };
 
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index 5716779fb9a3..b8718898f4bc 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "gotty-${version}";
@@ -7,10 +7,11 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/yudai/gotty";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/yudai/gotty";
-    sha256 = "1jc620j4y2r8706r6qn7g2nghiidaaj7f8m2vjgq2gwv288qjafd";
+    owner = "yudai";
+    repo = "gotty";
+    sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09";
   };
 
   goDeps = ./deps.json;
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index 23131553539c..5842495e323e 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/pkgs/servers/interlock/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup,
-  buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+  buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "interlock-${version}";
@@ -10,10 +10,11 @@ buildGoPackage rec {
 
   subPackages = [ "./cmd/interlock" ];
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/inversepath/interlock";
-    sha256 = "1lnaz0vdg0k21wipc6w8h580cbpymiyasah98yzyzrmwraclb2bb";
+    owner = "inversepath";
+    repo = "interlock";
+    sha256 = "06aqx3jy744yx29xyg8ips0dw16186hfqbxdv3hfrmwxmaxhl4lz";
   };
 
   goDeps = ./deps.json;
diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix
index d67aa337476b..86944c036e49 100644
--- a/pkgs/servers/mesos-dns/default.nix
+++ b/pkgs/servers/mesos-dns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "mesos-dns-${version}";
@@ -10,9 +10,10 @@ buildGoPackage rec {
   # Avoid including the benchmarking test helper in the output:
   subPackages = [ "." ];
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/mesosphere/mesos-dns";
+    owner = "mesosphere";
+    repo = "mesos-dns";
     sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix
index 20f6e7249abf..21bc242ec467 100644
--- a/pkgs/servers/monitoring/prometheus/cli.nix
+++ b/pkgs/servers/monitoring/prometheus/cli.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "prometheus_cli-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/prometheus/prometheus_cli";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/prometheus/prometheus_cli";
+    owner = "prometheus";
+    repo = "prometheus_cli";
     sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index 49701505aa61..bcb1889224c2 100644
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "collectd-exporter-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/prometheus/collectd_exporter";
 
-  src= fetchgit {
+  src= fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/prometheus/collectd_exporter";
+    owner = "prometheus";
+    repo = "collectd_exporter";
     sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index aa76fdc455ae..1345914c4f5f 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "prometheus-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/prometheus/prometheus";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/prometheus/prometheus";
+    owner = "prometheus";
+    repo = "prometheus";
     sha256 = "176198krna2i37dfhwsqi7m36sqn175yiny6n52vj27mc9s8ggzx";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index 140bde2c0cbf..7de99ecd3950 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "haproxy_exporter-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/prometheus/haproxy_exporter";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/prometheus/haproxy_exporter";
+    owner = "prometheus";
+    repo = "haproxy_exporter";
     sha256 = "0cwls1d4hmzjkwc50mjkxjb4sa4q6yq581wlc5sg9mdvl6g91zxr";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
index 0fdff08ca1da..ddd7a17364bf 100644
--- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "mesos_exporter-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/prometheus/mesos_exporter";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/prometheus/mesos_exporter";
+    owner = "prometheus";
+    repo = "mesos_exporter";
     sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
index d0c1c2073f5b..f7256287955d 100644
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "mysqld_exporter-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/prometheus/mysqld_exporter";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/prometheus/mysqld_exporter";
+    owner = "prometheus";
+    repo = "mysqld_exporter";
     sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 3b8d6fe16664..a5dd161b55e4 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "node_exporter-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
   
   goPackagePath = "github.com/prometheus/node_exporter";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/prometheus/node_exporter";
+    owner = "prometheus";
+    repo = "node_exporter";
     sha256 = "149fs9yxnbiyd4ww7bxsv730mcskblpzb3cs4v12jnq2v84a4kk4";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix
index 5f45c63d96e6..19148ec1cb40 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "prom2json-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/prometheus/prom2json";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/prometheus/prom2json";
+    owner = "prometheus";
+    repo = "prom2json";
     sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 83ef4e209311..a1944608ce0a 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, buildGoPackage, go-bindata, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, go, buildGoPackage, go-bindata, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "pushgateway-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
   
   goPackagePath = "github.com/prometheus/pushgateway";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/prometheus/pushgateway";
+    owner = "prometheus";
+    repo = "pushgateway";
     sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
index 90a35bf4592d..0d9f0bb98856 100644
--- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "statsd_bridge-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
   
   goPackagePath = "github.com/prometheus/statsd_bridge";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/prometheus/statsd_bridge";
+    owner = "prometheus";
+    repo = "statsd_bridge";
     sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr";
   };
 
diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix
index b716a0425771..334b78c91289 100644
--- a/pkgs/servers/nsq/default.nix
+++ b/pkgs/servers/nsq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "nsq-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/bitly/nsq";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/nsqio/nsq";
+    owner = "bitly";
+    repo = "nsq";
     sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f";
   };
 
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
index b02373ef51c9..657352634efc 100644
--- a/pkgs/servers/skydns/default.nix
+++ b/pkgs/servers/skydns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "skydns-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
   
   goPackagePath = "github.com/skynetservices/skydns";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/skynetservices/skydns";
+    owner = "skynetservices";
+    repo = "skydns";
     sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7";
   };
 
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index f9cf313b7748..eaf1f1869d6e 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, ncurses, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "fzf-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/junegunn/fzf";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/junegunn/fzf";
+    owner = "junegunn";
+    repo = "fzf";
     sha256 = "02qqcnijv8z3736iczbx082yizpqk02g5k746k7sdgfkgyxydppk";
   };
 
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
index 723410183f1b..113b8b2b4cec 100644
--- a/pkgs/tools/misc/mongodb-tools/default.nix
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 let
   tools = [
@@ -14,9 +14,10 @@ buildGoPackage rec {
   goPackagePath = "github.com/mongodb/mongo-tools";
   subPackages = map (t: t + "/main") tools;
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/mongodb/mongo-tools";
+    owner = "mongodb";
+    repo = "mongo-tools";
     sha256 = "142vxgniri1mfy2xmfgxhbdp6k6h8c5milv454krv1b51v43hsbm";
   };
 
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index c80f5d36567d..53b5e4839ba1 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "flannel-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/coreos/flannel";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/coreos/flannel";
+    owner = "coreos";
+    repo = "flannel";
     sha256 = "19nrilcc41411rag2qm22vdna4kpqm933ry9m82wkd7sqzb50fpw";
   };
 }
diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix
index 5e5e0edcfe58..5da87f4ce46e 100644
--- a/pkgs/tools/system/confd/default.nix
+++ b/pkgs/tools/system/confd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "confd-${version}";
@@ -8,9 +8,10 @@ buildGoPackage rec {
   goPackagePath = "github.com/kelseyhightower/confd";
   subPackages = [ "./" ];
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/kelseyhightower/confd";
+    owner = "kelseyhightower";
+    repo = "confd";
     sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr";
   };
 

From 734d15297721cf241df361d4a98be58c13fc75af Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 6 Jun 2016 12:56:28 +0200
Subject: [PATCH 105/436] buildGo16Packages: fetchgit -> fetchFromGitHub

---
 .../applications/networking/cluster/terraform/default.nix | 7 ++++---
 pkgs/development/tools/glide/default.nix                  | 8 ++++----
 pkgs/servers/caddy/default.nix                            | 7 ++++---
 pkgs/servers/monitoring/consul-alerts/default.nix         | 7 ++++---
 pkgs/tools/security/vault/default.nix                     | 7 ++++---
 pkgs/tools/system/consul-template/default.nix             | 7 ++++---
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 44e6a10963a9..803bf1e95cce 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
 
 buildGo16Package rec {
   name = "terraform-${version}";
@@ -7,9 +7,10 @@ buildGo16Package rec {
   
   goPackagePath = "github.com/hashicorp/terraform";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/hashicorp/terraform";
+    owner = "hashicorp";
+    repo = "terraform";
     sha256 = "1mf98hagb0yp40g2mbar7aw7hmpq01clnil6y9khvykrb33vy0nb";
   };
 
diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
index 9489f5a7bac8..8378f9eabf4f 100644
--- a/pkgs/development/tools/glide/default.nix
+++ b/pkgs/development/tools/glide/default.nix
@@ -1,5 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
 
 buildGo16Package rec {
   name = "glide-${version}";
@@ -8,9 +7,10 @@ buildGo16Package rec {
   
   goPackagePath = "github.com/Masterminds/glide";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/Masterminds/glide";
+    owner = "Masterminds";
+    repo = "glide";
     sha256 = "1qb2n5i04gabb2snnwfr8wv4ypcp1pdzvgga62m9xkhk4p2w6pwl";
   };
 }
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 2b0ae98c4641..774e57fc8911 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
 
 buildGo16Package rec {
   name = "caddy-${version}";
@@ -7,9 +7,10 @@ buildGo16Package rec {
 
   goPackagePath = "github.com/mholt/caddy";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/mholt/caddy";
+    owner = "mholt";
+    repo = "caddy";
     sha256 = "1snijkbz02yr7wij7bcmrj4257709sbklb3nhb5qmy95b9ssffm6";
   };
 
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix
index ee904dec6eba..01848e93b257 100644
--- a/pkgs/servers/monitoring/consul-alerts/default.nix
+++ b/pkgs/servers/monitoring/consul-alerts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
 
 buildGo16Package rec {
   name = "consul-alerts-${version}";
@@ -7,9 +7,10 @@ buildGo16Package rec {
 
   goPackagePath = "github.com/AcalephStorage/consul-alerts";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/AcalephStorage/consul-alerts";
+    owner = "AcalephStorage";
+    repo = "consul-alerts";
     sha256 = "1w0mb20w1yazyh84sa30bsw271c5nm7lsx2qg0g3gf6mxdb63lpq";
   };
 }
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 8470441f530b..5aeefa980185 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
 
 buildGo16Package rec {
   name = "vault-${version}";
@@ -7,9 +7,10 @@ buildGo16Package rec {
 
   goPackagePath = "github.com/hashicorp/vault";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/hashicorp/vault";
+    owner = "hashicorp";
+    repo = "vault";
     sha256 = "085rk5i480wdlkn2p14yxi8zgsc11595nkkda1i77c4vjkllbkdy";
   };
 }
diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
index 7c4bda8a5699..9e4e220d052c 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
 
 buildGo16Package rec {
   name = "consul-template-${version}";
@@ -7,9 +7,10 @@ buildGo16Package rec {
 
   goPackagePath = "github.com/hashicorp/consul-template";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/hashicorp/consul-template";
+    owner = "hashicorp";
+    repo = "consul-template";
     sha256 = "15zsax44g3dwjmmm4fpb54mvsjvjf3b6g3ijskgipvhcy0d3j938";
   };
 }

From 8cd1d4cda5dad34ff8db3c6d9814dc50ee01cde0 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Tue, 7 Jun 2016 22:32:34 +0200
Subject: [PATCH 106/436] buildGoPackage: use Go 1.6 by default

---
 pkgs/applications/networking/cluster/terraform/default.nix | 4 ++--
 pkgs/applications/networking/syncthing/default.nix         | 2 --
 pkgs/development/tools/glide/default.nix                   | 4 ++--
 pkgs/servers/caddy/default.nix                             | 4 ++--
 pkgs/servers/consul/default.nix                            | 4 ++--
 pkgs/servers/monitoring/consul-alerts/default.nix          | 4 ++--
 pkgs/servers/monitoring/prometheus/alertmanager.nix        | 4 ----
 pkgs/servers/monitoring/prometheus/default.nix             | 4 ----
 pkgs/tools/security/vault/default.nix                      | 4 ++--
 pkgs/tools/system/consul-template/default.nix              | 4 ++--
 pkgs/top-level/all-packages.nix                            | 2 +-
 11 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 803bf1e95cce..1ce86cac5c5f 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGo16Package rec {
+buildGoPackage rec {
   name = "terraform-${version}";
   version = "0.6.15";
   rev = "v${version}";
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 3de4133e7945..83e5f2bd3289 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
     mkdir -p src/github.com/syncthing
     ln -s $(pwd) src/github.com/syncthing/syncthing
     export GOPATH=$(pwd)
-    # Required for Go 1.5, can be removed for Go 1.6+
-    export GO15VENDOREXPERIMENT=1
 
     # Syncthing's build.go script expects this working directory
     cd src/github.com/syncthing/syncthing
diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
index 8378f9eabf4f..c3d9104018df 100644
--- a/pkgs/development/tools/glide/default.nix
+++ b/pkgs/development/tools/glide/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGo16Package rec {
+buildGoPackage rec {
   name = "glide-${version}";
   version = "0.10.2";
   rev = "${version}";
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 774e57fc8911..68ce9440f4f4 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGo16Package rec {
+buildGoPackage rec {
   name = "caddy-${version}";
   version = "0.8.3";
   rev = "e2234497b79603388b58ba226abb157aa4aaf065";
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 7dfd8b2a32ed..5254aa8e94b4 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGo16Package, consul-ui, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, consul-ui, fetchFromGitHub }:
 
-buildGo16Package rec {
+buildGoPackage rec {
   name = "consul-${version}";
   version = "0.6.4";
   rev = "v${version}";
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix
index 01848e93b257..ad840dfd607f 100644
--- a/pkgs/servers/monitoring/consul-alerts/default.nix
+++ b/pkgs/servers/monitoring/consul-alerts/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGo16Package rec {
+buildGoPackage rec {
   name = "consul-alerts-${version}";
   version = "0.3.3";
   rev = "v${version}";
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index fc204fc3f152..330a528ef2f5 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -17,10 +17,6 @@ buildGoPackage rec {
   # Tests exist, but seem to clash with the firewall.
   doCheck = false;
 
-  preBuild = ''
-    export GO15VENDOREXPERIMENT=1
-  '';
-
   buildFlagsArray = let t = "${goPackagePath}/version"; in ''
     -ldflags=
        -X ${t}.Version=${version}
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 1345914c4f5f..1fbcd50d733e 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -16,10 +16,6 @@ buildGoPackage rec {
 
   docheck = true;
 
-  preBuild = ''
-    export GO15VENDOREXPERIMENT=1
-  '';
-
   buildFlagsArray = let t = "${goPackagePath}/version"; in ''
     -ldflags=
        -X ${t}.Version=${version}
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 5aeefa980185..1197c840fc9a 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGo16Package rec {
+buildGoPackage rec {
   name = "vault-${version}";
   version = "0.5.2";
   rev = "v${version}";
diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
index 9e4e220d052c..772c7e6d34b3 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGo16Package, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGo16Package rec {
+buildGoPackage rec {
   name = "consul-template-${version}";
   version = "0.14.0";
   rev = "v${version}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9545ce0eb85b..51f4ada13743 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9607,7 +9607,7 @@ in
     go = go_1_6;
   };
 
-  buildGoPackage = buildGo15Package;
+  buildGoPackage = buildGo16Package;
 
   go2nix = callPackage ../development/tools/go2nix { };
 

From 1dfae0678d33f88c787d249cd360d30717411a1a Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 9 Jun 2016 11:25:27 +0200
Subject: [PATCH 107/436] nomad: extracted from goPackages

---
 .../networking/cluster/nomad/default.nix      | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                |  8 ------
 3 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/applications/networking/cluster/nomad/default.nix

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
new file mode 100644
index 000000000000..b718447e8f80
--- /dev/null
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "nomad-${version}";
+  version = "0.3.2";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/hashicorp/nomad";
+  subPackages = [ "." ];
+
+  src = fetchFromGitHub {
+    owner = "hashicorp";
+    repo = "nomad";
+    inherit rev;
+    sha256 = "1m2pdragpzrq0xbmnba039iiyhb16wirj3n1s52z5r8r0mr7drai";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://www.nomadproject.io/;
+    license = licenses.mpl20;
+    description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ rushmorem ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51f4ada13743..3ed2ea1eeaee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2611,7 +2611,7 @@ in
 
   noip = callPackage ../tools/networking/noip { };
 
-  nomad = goPackages.nomad.bin // { outputs = [ "bin" ]; };
+  nomad = callPackage ../applications/networking/cluster/nomad { };
 
   milu = callPackage ../applications/misc/milu { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ea3635894238..25f31085da1f 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2260,14 +2260,6 @@ let
     sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib";
   };
 
-  nomad = buildFromGitHub {
-    rev    = "v0.3.2";
-    owner  = "hashicorp";
-    repo   = "nomad";
-    sha256 = "1m2pdragpzrq0xbmnba039iiyhb16wirj3n1s52z5r8r0mr7drai";
-    subPackages = [ "." ];
-  };
-
   ntp = buildFromGitHub {
     rev    = "0a5264e2563429030eb922f258229ae3fee5b5dc";
     owner  = "beevik";

From 08575ee8d09fb6a9cb7c39ccc45fb3022ded168e Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 9 Jun 2016 11:27:10 +0200
Subject: [PATCH 108/436] goPackages: not needed now

---
 pkgs/top-level/go-packages.nix | 3272 --------------------------------
 1 file changed, 3272 deletions(-)
 delete mode 100644 pkgs/top-level/go-packages.nix

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
deleted file mode 100644
index 25f31085da1f..000000000000
--- a/pkgs/top-level/go-packages.nix
+++ /dev/null
@@ -1,3272 +0,0 @@
-/* This file defines the composition for Go packages. */
-
-{ overrides, stdenv, go, buildGoPackage, git
-, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchFromBitbucket, fetchbzr, pkgs }:
-
-let
-  isGo14 = go.meta.branch == "1.4";
-  isGo15 = go.meta.branch == "1.5";
-  isGo16 = go.meta.branch == "1.6";
-
-  self = _self // overrides; _self = with self; {
-
-  inherit go buildGoPackage;
-
-  buildFromGitHub = { rev, version ? null, owner, repo, sha256, name ? repo, goPackagePath ? "github.com/${owner}/${repo}", ... }@args: buildGoPackage (args // {
-    inherit rev goPackagePath;
-    name = "${name}-${if version != null then version else if builtins.stringLength rev != 40 then rev else stdenv.lib.strings.substring 0 7 rev}";
-    src  = fetchFromGitHub { inherit rev owner repo sha256; };
-  });
-
-  ## OFFICIAL GO PACKAGES
-
-  crypto = buildFromGitHub {
-    rev      = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
-    version  = "2015-08-29";
-    owner    = "golang";
-    repo     = "crypto";
-    sha256   = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
-    goPackagePath = "golang.org/x/crypto";
-    goPackageAliases = [
-      "code.google.com/p/go.crypto"
-      "github.com/golang/crypto"
-    ];
-  };
-
-  glog = buildFromGitHub {
-    rev    = "fca8c8854093a154ff1eb580aae10276ad6b1b5f";
-    version = "2015-07-31";
-    owner  = "golang";
-    repo   = "glog";
-    sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8";
-  };
-
-  codesearch = buildFromGitHub {
-    rev    = "a45d81b686e85d01f2838439deaf72126ccd5a96";
-    version = "2015-06-17";
-    owner  = "google";
-    repo   = "codesearch";
-    sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny";
-  };
-
-  image = buildFromGitHub {
-    rev = "8ab1ac6834edd43d91cbe24272897a87ce7e835e";
-    version = "2015-08-23";
-    owner = "golang";
-    repo = "image";
-    sha256 = "1ckr7yh5dx2kbvp9mis7i090ss9qcz46sazrj9f2hw4jj5g3y7dr";
-    goPackagePath = "golang.org/x/image";
-    goPackageAliases = [ "github.com/golang/image" ];
-  };
-
-  net_go15 = buildFromGitHub {
-    rev    = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";
-    version = "2015-11-04";
-    owner  = "golang";
-    repo   = "net";
-    sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";
-    goPackagePath = "golang.org/x/net";
-    goPackageAliases = [
-      "code.google.com/p/go.net"
-      "github.com/hashicorp/go.net"
-      "github.com/golang/net"
-    ];
-    propagatedBuildInputs = [ text crypto ];
-    disabled = isGo14;
-  };
-
-  net_go14 = buildFromGitHub {
-    rev    = "ea47fc708ee3e20177f3ca3716217c4ab75942cb";
-    version = "2015-08-29";
-    owner  = "golang";
-    repo   = "net";
-    sha256 = "0x1pmg97n7l62vak9qnjdjrrfl98jydhv6j0w3jkk4dycdlzn30d";
-    goPackagePath = "golang.org/x/net";
-    goPackageAliases = [
-      "code.google.com/p/go.net"
-      "github.com/hashicorp/go.net"
-      "github.com/golang/net"
-    ];
-    propagatedBuildInputs = [ text ];
-    disabled = !isGo14;
-  };
-
-  net = if isGo14 then net_go14 else net_go15;
-
-  oauth2 = buildFromGitHub {
-    rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a";
-    version = "2015-06-23";
-    owner = "golang";
-    repo = "oauth2";
-    sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8";
-    goPackagePath = "golang.org/x/oauth2";
-    goPackageAliases = [ "github.com/golang/oauth2" ];
-    propagatedBuildInputs = [ net gcloud-golang-compute-metadata ];
-  };
-
-
-  protobuf = buildFromGitHub {
-    rev = "59b73b37c1e45995477aae817e4a653c89a858db";
-    version = "2015-08-23";
-    owner = "golang";
-    repo = "protobuf";
-    sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
-    goPackagePath = "github.com/golang/protobuf";
-    goPackageAliases = [ "code.google.com/p/goprotobuf" ];
-  };
-
-  snappy = buildFromGitHub {
-    rev    = "723cc1e459b8eea2dea4583200fd60757d40097a";
-    version = "2015-07-21";
-    owner  = "golang";
-    repo   = "snappy";
-    sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h";
-    goPackageAliases = [ "code.google.com/p/snappy-go/snappy" ];
-  };
-
-  sys = buildFromGitHub {
-    rev    = "d9157a9621b69ad1d8d77a1933590c416593f24f";
-    version = "2015-02-01";
-    owner  = "golang";
-    repo   = "sys";
-    sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931";
-    goPackagePath = "golang.org/x/sys";
-    goPackageAliases = [
-      "github.com/golang/sys"
-    ];
-  };
-
-  text = buildFromGitHub {
-    rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e";
-    version = "2015-08-27";
-    owner = "golang";
-    repo = "text";
-    sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14";
-    goPackagePath = "golang.org/x/text";
-    goPackageAliases = [ "github.com/golang/text" ];
-  };
-
-  tools = buildFromGitHub {
-    rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
-    version = "2016-05-19";
-    owner = "golang";
-    repo = "tools";
-    sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
-    goPackagePath = "golang.org/x/tools";
-    goPackageAliases = [ "code.google.com/p/go.tools" ];
-
-    preConfigure = ''
-      # Make the builtin tools available here
-      mkdir -p $bin/bin
-      eval $(go env | grep GOTOOLDIR)
-      find $GOTOOLDIR -type f | while read x; do
-        ln -sv "$x" "$bin/bin"
-      done
-      export GOTOOLDIR=$bin/bin
-    '';
-
-    excludedPackages = "\\("
-      + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ])
-      + "\\)";
-
-    buildInputs = [ net ];
-
-    # Do not copy this without a good reason for enabling
-    # In this case tools is heavily coupled with go itself and embeds paths.
-    allowGoReference = true;
-
-    # Set GOTOOLDIR for derivations adding this to buildInputs
-    postInstall = ''
-      mkdir -p $bin/nix-support
-      substituteAll ${../development/go-modules/tools/setup-hook.sh} $bin/nix-support/setup-hook.tmp
-      cat $bin/nix-support/setup-hook.tmp >> $bin/nix-support/setup-hook
-      rm $bin/nix-support/setup-hook.tmp
-    '';
-  };
-
-
-  ## THIRD PARTY
-
-  ace = buildFromGitHub {
-    rev    = "899eede6af0d99400b2c8886d86fd8d351074d37";
-    owner  = "yosssi";
-    repo   = "ace";
-    sha256 = "0xdzqfzaipyaa973j41yq9lbijw36kyaz523sw05kci4r5ivq4f5";
-    buildInputs = [ gohtml ];
-  };
-
-  acme = buildFromGitHub {
-    rev    = "v0.3.0";
-    owner  = "xenolf";
-    repo   = "lego";
-    sha256 = "0hlnqdn793j4s43bhnmpi2lxgmjxs1ccg26alxnrcyw5x7p2vvdn";
-
-    subPackages = [ "acme" ];
-    propagatedBuildInputs = [ crypto dns go-jose-v1 net ];
-  };
-
-  adapted = buildFromGitHub {
-    rev = "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978";
-    version = "2016-04-10";
-    owner = "michaelmacinnis";
-    repo = "adapted";
-    sha256 = "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv";
-    propagatedBuildInputs = [ sys ];
-  };
-
-  afero = buildFromGitHub {
-    rev    = "90b5a9bd18a72dbf3e27160fc47acfaac6c08389";
-    owner  = "spf13";
-    repo   = "afero";
-    sha256 = "1xqvbwny61j85psymcs8hggmqyyg4yq3q4cssnvnvbsl3aq8kn4k";
-    propagatedBuildInputs = [ text ];
-  };
-
-  airbrake-go = buildFromGitHub {
-    rev    = "5b5e269e1bc398d43f67e43dafff3414a59cd5a2";
-    owner  = "tobi";
-    repo   = "airbrake-go";
-    sha256 = "1bps4y3vpphpj63mshjg2aplh579cvqac0hz7qzvac0d1fqcgkdz";
-  };
-
-  amber = buildFromGitHub {
-    rev    = "144da19a9994994c069f0693294a66dd310e14a4";
-    owner  = "eknkc";
-    repo   = "amber";
-    sha256 = "079wwdq4cn9i1vx5zik16z4bmghkc7zmmvbrp1q6y4cnpmq95rqk";
-  };
-
-  ansicolor = buildFromGitHub {
-    rev    = "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b";
-    owner  = "shiena";
-    repo   = "ansicolor";
-    sha256 = "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p";
-  };
-
-  archiver = buildFromGitHub {
-    rev = "85f054813ed511646b0ce5e047697e0651b8e1a4";
-    owner = "mholt";
-    repo = "archiver";
-    sha256 = "0b38mrfm3rwgdi7hrp4gjhf0y0f6bw73qjkfrkafxjrdpdg7nyly";
-  };
-
-  asmfmt = buildFromGitHub {
-    rev = "7971758b0c6584f67d745c62d006814ae7b44e9d";
-    owner = "klauspost";
-    repo = "asmfmt";
-    sha256 = "07i3f8jzs4yvfpm16s2c2hd65r3q729m0agg8q1i3lwbs3fimyj5";
-    buildInputs = [ tools goreturns ];
-  };
-
-  asn1-ber = buildGoPackage rec {
-    rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72";
-    name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/go-asn1-ber/asn1-ber";
-    goPackageAliases = [
-      "github.com/nmcclain/asn1-ber"
-      "github.com/vanackere/asn1-ber"
-      "gopkg.in/asn1-ber.v1"
-    ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "go-asn1-ber";
-      repo   = "asn1-ber";
-      sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9";
-    };
-  };
-
-  assertions = buildGoPackage rec {
-    version = "1.5.0";
-    name = "assertions-${version}";
-    goPackagePath = "github.com/smartystreets/assertions";
-    src = fetchurl {
-      name = "${name}.tar.gz";
-      url = "https://github.com/smartystreets/assertions/archive/${version}.tar.gz";
-      sha256 = "1s4b0v49yv7jmy4izn7grfqykjrg7zg79dg5hsqr3x40d5n7mk02";
-    };
-    buildInputs = [ oglematchers ];
-    propagatedBuildInputs = [ goconvey ];
-    doCheck = false;
-  };
-
-  aws-sdk-go = buildFromGitHub {
-    rev    = "d85fa529a99a833067e11c0a838b9db7a5d5ea71";
-    version = "1.1.24";
-    owner  = "aws";
-    repo   = "aws-sdk-go";
-    sha256 = "0lh3z3l551siqwrwvl9ky820ckpsvm8zpnb9p6622cnf6xkq533x";
-    goPackageAliases = [
-      "github.com/awslabs/aws-sdk-go"
-    ];
-    buildInputs = [ gucumber testify ];
-    propagatedBuildInputs = [ ini go-jmespath tools];
-  };
-
-  azure-sdk-for-go = buildFromGitHub {
-    rev   = "v2.0.0-beta";
-    owner = "Azure";
-    repo  = "azure-sdk-for-go";
-    sha256 = "04bixwh4bzgysa79azis1p755rb6zxjjzhpskpvpmvkv49baharc";
-    propagatedBuildInputs = [ go-autorest cli-go ];
-  };
-
-  azure-vhd-tools-for-go = buildFromGitHub {
-    rev    = "7db4795475aeab95590f8643969e06b633ead4ec";
-    owner  = "Microsoft";
-    repo   = "azure-vhd-utils-for-go";
-    sha256 = "0xg6a1qw8jjxqhgvy9zlvq5b8xnnvfkjnkjz9f8g4y1kcw09lird";
-
-    propagatedBuildInputs = [ azure-sdk-for-go ];
-  };
-
-  hashicorp.aws-sdk-go = buildFromGitHub {
-    rev    = "e6ea0192eee4640f32ec73c0cbb71f63e4f2b65a";
-    owner  = "hashicorp";
-    repo   = "aws-sdk-go";
-    sha256 = "1qrc2jl38marbarnl31sag7s0h18j2wx1cxkcqin5m1pqg62p4cn";
-    propagatedBuildInputs = [ go-ini ];
-    subPackages = [
-      "./aws"
-      "./gen/ec2"
-      "./gen/endpoints"
-      "./gen/iam"
-    ];
-  };
-
-  bleve = buildFromGitHub {
-    rev    = "fc34a97875840b2ae24517e7d746b69bdae9be90";
-    version = "2016-01-19";
-    owner  = "blevesearch";
-    repo   = "bleve";
-    sha256 = "0ny7nvilrxmmzcdvpivwyrjkynnhc22c5gdrxzs421jly35jw8jx";
-    buildFlags = [ "-tags all" ];
-    propagatedBuildInputs = [ protobuf goleveldb kagome gtreap bolt text
-     rcrowley.go-metrics bitset segment go-porterstemmer ];
-  };
-
-  binarydist = buildFromGitHub {
-    rev    = "9955b0ab8708602d411341e55fffd7e0700f86bd";
-    owner  = "kr";
-    repo   = "binarydist";
-    sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3";
-  };
-
-  bitset = buildFromGitHub {
-    rev    = "bb0da3785c4fe9d26f6029c77c8fce2aa4d0b291";
-    version = "2016-01-13";
-    owner  = "willf";
-    repo   = "bitset";
-    sha256 = "1d4z2hjjs9jk6aysi4mf50p8lbbzag4ir4y1f0z4sz8gkwagh7b7";
-  };
-
-  blackfriday = buildFromGitHub {
-    rev    = "d18b67ae0afd61dae240896eae1785f00709aa31";
-    owner  = "russross";
-    repo   = "blackfriday";
-    sha256 = "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf";
-    propagatedBuildInputs = [ sanitized_anchor_name ];
-  };
-
-  bolt = buildFromGitHub {
-    rev    = "957d850b5158a4eebf915476058e720f43459584";
-    owner  = "boltdb";
-    repo   = "bolt";
-    sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf";
-  };
-
-  bufio = buildFromGitHub {
-    rev    = "24e7e48f60fc2d9e99e43c07485d9fff42051e66";
-    owner  = "vmihailenco";
-    repo   = "bufio";
-    sha256 = "0x46qnf2f15v7m0j2dcb16raxjamk5rdc7hqwgyxfr1sqmmw3983";
-  };
-
-  bugsnag-go = buildGoPackage rec {
-    rev = "v1.0.3";
-    name = "bugsnag-go-${rev}";
-    goPackagePath = "github.com/bugsnag/bugsnag-go";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "bugsnag";
-      repo   = "bugsnag-go";
-      sha256 = "1ymi5hrvd2nyfwfd12xll43gn00ii3bjb5ma9dfhaaxv2asi3ajx";
-    };
-
-    propagatedBuildInputs = [ panicwrap revel ];
-  };
-
-  cascadia = buildGoPackage rec {
-    rev = "54abbbf07a45a3ef346ebe903e0715d9a3c19352"; #master
-    name = "cascadia-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/andybalholm/cascadia";
-    goPackageAliases = [ "code.google.com/p/cascadia" ];
-    propagatedBuildInputs = [ net ];
-    buildInputs = propagatedBuildInputs;
-    doCheck = true;
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "andybalholm";
-      repo = "cascadia";
-      sha256 = "1z21w6p5bp7mi2pvicvcqc871k9s8a6262pkwyjm2qfc859c203m";
-    };
-  };
-
-  cast = buildFromGitHub {
-    rev    = "ee815aaf958c707ad07547cd62150d973710f747";
-    owner  = "spf13";
-    repo   = "cast";
-    sha256 = "144xwvmjbrv59zjj1gnq5j9qpy62dgyfamxg5l3smdwfwa8vpf5i";
-    buildInputs = [ jwalterweatherman ];
-  };
-
-  check-v1 = buildGoPackage rec {
-    rev = "871360013c92e1c715c2de6d06b54899468a8a2d";
-    name = "check-v1-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "gopkg.in/check.v1";
-    src = fetchgit {
-      inherit rev;
-      url = "https://github.com/go-check/check.git";
-      sha256 = "1qhji81yxz3map937bf8lyp8j2qpwlbnag5pr5pf0qw3li2nciah";
-    };
-  };
-
-  circbuf = buildFromGitHub {
-    rev    = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf";
-    owner  = "armon";
-    repo   = "circbuf";
-    sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s";
-  };
-
-  cli = buildFromGitHub {
-    rev = "8102d0ed5ea2709ade1243798785888175f6e415";
-    owner = "mitchellh";
-    repo = "cli";
-    sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2";
-    propagatedBuildInputs = [ crypto ];
-  };
-
-  cli-spinner = buildFromGitHub {
-    rev    = "610063bb4aeef25f7645b3e6080456655ec0fb33";
-    owner  = "odeke-em";
-    repo   = "cli-spinner";
-    sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c";
-  };
-
-  cobra = buildFromGitHub {
-    rev    = "ee6224d01f6a83f543ae90f881b703cf195782ba";
-    owner  = "spf13";
-    repo   = "cobra";
-    sha256 = "0skmq1lmkh2xzl731a2sfcnl2xbcy9v1050pcf10dahwqzsbx6ij";
-    propagatedBuildInputs = [ pflag-spf13 mousetrap go-md2man viper ];
-  };
-
-  cli-go = buildFromGitHub {
-    rev    = "71f57d300dd6a780ac1856c005c4b518cfd498ec";
-    owner  = "codegangsta";
-    repo   = "cli";
-    sha256 = "1fxznirkvank5461789dm5aw5z8aqi0jvwligvz44659rfl376p3";
-    propagatedBuildInputs = [ yaml-v2 ];
-  };
-
-  columnize = buildFromGitHub {
-    rev    = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a";
-    owner  = "ryanuber";
-    repo   = "columnize";
-    sha256 = "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9";
-  };
-
-  command = buildFromGitHub {
-    rev    = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561";
-    owner  = "odeke-em";
-    repo   = "command";
-    sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62";
-  };
-
-  copystructure = buildFromGitHub {
-    rev = "6fc66267e9da7d155a9d3bd489e00dad02666dc6";
-    owner = "mitchellh";
-    repo = "copystructure";
-    sha256 = "193s5vhw68d8npjyf5yvc5j24crazvy7d5dk316hl7590qrmbxrd";
-    buildInputs = [ reflectwalk ];
-  };
-
-  config = buildFromGitHub {
-    rev    = "0f78529c8c7e3e9a25f15876532ecbc07c7d99e6";
-    owner  = "robfig";
-    repo   = "config";
-    sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0";
-  };
-
-  consul-migrate = buildFromGitHub {
-    rev    = "678fb10cdeae25ab309e99e655148f0bf65f9710";
-    version = "2015-05-19";
-    owner  = "hashicorp";
-    repo   = "consul-migrate";
-    sha256 = "18zqyzbc3pny700fnh4hi45i5mlsramqykikcr7lgyx7id6alf16";
-    buildInputs = [ raft raft-boltdb raft-mdb ];
-  };
-
-  context = buildGoPackage rec {
-    rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd";
-    name = "config-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/gorilla/context";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "gorilla";
-      repo = "context";
-      sha256 = "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g";
-    };
-  };
-
-  cookoo = buildFromGitHub {
-    rev    = "v1.2.0";
-    owner  = "Masterminds";
-    repo   = "cookoo";
-    sha256 = "1mxqnxddny43k1shsvd39sfzfs0d20gv3vm9lcjp04g3b0rplck1";
-  };
-
-  crypt = buildFromGitHub {
-    rev    = "749e360c8f236773f28fc6d3ddfce4a470795227";
-    owner  = "xordataexchange";
-    repo   = "crypt";
-    sha256 = "17g9122b8bmbdpshyzhl7cxsp0nvhk0rc6syc92djavggmbpl6ig";
-    preBuild = ''
-      substituteInPlace go/src/github.com/xordataexchange/crypt/backend/consul/consul.go \
-        --replace 'github.com/armon/consul-api' 'github.com/hashicorp/consul/api' \
-        --replace 'consulapi' 'api'
-    '';
-    propagatedBuildInputs = [ go-etcd consul-api crypto ];
-  };
-
-  cssmin = buildFromGitHub {
-    rev    = "fb8d9b44afdc258bfff6052d3667521babcb2239";
-    owner  = "dchest";
-    repo   = "cssmin";
-    sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s";
-  };
-
-  dbus-old-2015-05-19 = buildFromGitHub {
-    rev    = "a5942dec6340eb0d57f43f2003c190ce06e43dea";
-    version = "2015-05-19";
-    owner  = "godbus";
-    repo   = "dbus";
-    sha256 = "1vk31wal7ncvjwvnb8q1myrkihv1np46f3q8dndi5k0csflbxxdf";
-  };
-
-  dbus = buildFromGitHub {
-    rev    = "230e4b23db2fd81c53eaa0073f76659d4849ce51";
-    version = "2016-03-02";
-    owner  = "godbus";
-    repo   = "dbus";
-    sha256 = "1wxv2cbihzcsz2z7iycyzl7f3arhhgagcc5kqln1k1mkm4l85z0q";
-  };
-
-  dns = buildFromGitHub {
-    rev     = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa";
-    version = "2016-03-28";
-    owner   = "miekg";
-    repo    = "dns";
-    sha256  = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl";
-  };
-
-  docopt-go = buildFromGitHub {
-    rev    = "854c423c810880e30b9fecdabb12d54f4a92f9bb";
-    owner  = "docopt";
-    repo   = "docopt-go";
-    sha256 = "1sddkxgl1pwlipfvmv14h8vg9b9wq1km427j1gjarhb5yfqhh3l1";
-  };
-
-  docker.docker = buildFromGitHub {
-    rev = "cb87b6eb6a955e5a66b17e0a15557f37f76b85c0";
-    version = "2016-04-14";
-    owner = "docker";
-    repo = "docker";
-    sha256 = "1hkah4scs8a589jhp82kw5wcx21nhq41asfq8icwy6bzdz1bq0j0";
-    buildInputs = [ docker.go-units ];
-    subPackages = [ "pkg/term" "pkg/symlink" "pkg/system" "pkg/mount" ];
-  };
-
-  docker.go-units = buildFromGitHub {
-    rev = "5d2041e26a699eaca682e2ea41c8f891e1060444";
-    version = "2016-01-25";
-    owner = "docker";
-    repo = "go-units";
-    sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i";
-  };
-
-  dropbox = buildFromGitHub {
-    rev    = "58f839b21094d5e0af7caf613599830589233d20";
-    owner  = "stacktic";
-    repo   = "dropbox";
-    sha256 = "1psmxpnn40ri9bgjvivljnd4p977f635mh3w7m5mglxxgc9392pi";
-    propagatedBuildInputs = [ oauth2 net ];
-  };
-
-  cache = buildFromGitHub {
-    rev = "b51b08cb6cf889deda6c941a5205baecfd16f3eb";
-    owner = "odeke-em";
-    repo = "cache";
-    sha256 = "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4";
-  };
-
-  ethereum = buildFromGitHub rec {
-    name = "ethereum";
-    rev = "v1.4.1";
-    goPackagePath = "github.com/ethereum/go-ethereum";
-    owner = "ethereum";
-    repo = "go-ethereum";
-    sha256 = "0z6yzkk72g41dzqa52fizxqxqh349y1m9s3byfh9ixq5xy5fnjn3";
-    preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
-    postBuild = "rm $NIX_BUILD_TOP/go/bin/*test";
-    meta = with stdenv.lib; {
-      homepage = "https://ethereum.github.io/go-ethereum/";
-      description = "Official golang implementation of the Ethereum protocol";
-      license = with licenses; [ lgpl3 gpl3 ];
-    };
-  };
-
-  ewma = buildFromGitHub {
-    rev    = "2f8aa9741ab4b5b80945c750b871131b88ef5b7f";
-    version = "1.0";
-    owner  = "VividCortex";
-    repo   = "ewma";
-    sha256 = "0g1pv0zyjkriqmwc8iqv437j0f450sk8g48jycmv78ziwy7wf92h";
-  };
-
-  exercism = buildFromGitHub {
-    rev = "v2.2.1";
-    name = "exercism";
-    owner = "exercism";
-    repo = "cli";
-    sha256 = "13kwcxd7m3xv42j50nlm9dd08865dxji41glfvnb4wwq9yicyn4g";
-    buildInputs = [ net cli-go osext ];
-  };
-
-  exponential-backoff = buildFromGitHub {
-    rev = "96e25d36ae36ad09ac02cbfe653b44c4043a8e09";
-    owner = "odeke-em";
-    repo = "exponential-backoff";
-    sha256 = "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6";
-  };
-
-  extractor = buildFromGitHub {
-    rev = "801861aedb854c7ac5e1329e9713023e9dc2b4d4";
-    owner = "odeke-em";
-    repo = "extractor";
-    sha256 = "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1";
-  };
-
-  open-golang = buildFromGitHub {
-    rev = "c8748311a7528d0ba7330d302adbc5a677ef9c9e";
-    owner = "skratchdot";
-    repo = "open-golang";
-    sha256 = "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac";
-  };
-
-  pretty-words = buildFromGitHub {
-    rev = "9d37a7fcb4ae6f94b288d371938482994458cecb";
-    owner = "odeke-em";
-    repo = "pretty-words";
-    sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl";
-  };
-
-  meddler = buildFromGitHub {
-    rev = "d2b51d2b40e786ab5f810d85e65b96404cf33570";
-    owner = "odeke-em";
-    repo = "meddler";
-    sha256 = "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x";
-  };
-
-  dts = buildFromGitHub {
-    rev    = "ec2daabf2f9078e887405f7bcddb3d79cb65502d";
-    owner  = "odeke-em";
-    repo   = "dts";
-    sha256 = "0vq3cz4ab9vdsz9s0jjlp7z27w218jjabjzsh607ps4i8m5d441s";
-  };
-
-  du = buildFromGitHub {
-    rev    = "3c0690cca16228b97741327b1b6781397afbdb24";
-    version = "2015-08-05";
-    owner  = "calmh";
-    repo   = "du";
-    sha256 = "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa";
-  };
-
-  ed25519 = buildGoPackage rec {
-    rev = "d2b94fd789ea21d12fac1a4443dd3a3f79cda72c";
-    name = "ed25519-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/agl/ed25519";
-    src = fetchgit {
-      inherit rev;
-      url = "git://${goPackagePath}.git";
-      sha256 = "83e3010509805d1d315c7aa85a356fda69d91b51ff99ed98a503d63adb3613e9";
-    };
-  };
-
-  errcheck = buildFromGitHub {
-    rev = "8e25ad9d46f6c5d4e994edf82c57eb773a9aa73d";
-    owner = "kisielk";
-    repo = "errcheck";
-    sha256 = "1089qf05q8db8h6ayn1c1iaq4fcpv18z3k94dr27v31k6f73dzhg";
-    excludedPackages = [ "testdata" ];
-    buildInputs = [ gotool tools ];
-  };
-
-  errwrap = buildFromGitHub {
-    rev    = "7554cd9344cec97297fa6649b055a8c98c2a1e55";
-    owner  = "hashicorp";
-    repo   = "errwrap";
-    sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
-  };
-
-  fsnotify.v0 = buildGoPackage rec {
-    rev = "v0.9.3";
-    name = "fsnotify.v0-${rev}";
-    goPackagePath = "gopkg.in/fsnotify.v0";
-    goPackageAliases = [ "github.com/howeyc/fsnotify" ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "go-fsnotify";
-      repo = "fsnotify";
-      sha256 = "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9";
-    };
-  };
-
-  fsnotify.v1 = buildGoPackage rec {
-    rev = "v1.2.0";
-    name = "fsnotify.v1-${rev}";
-    goPackagePath = "gopkg.in/fsnotify.v1";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "go-fsnotify";
-      repo = "fsnotify";
-      sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2";
-    };
-  };
-
-  fsync = buildFromGitHub {
-    rev    = "c2544e79b93fda5653255f907a30fba1c2ac2638";
-    owner  = "spf13";
-    repo   = "fsync";
-    sha256 = "0hzfk2f8pm756j10zgsk8b8gbfylcf8h6q4djz0ka9zpg76s26lz";
-    buildInputs = [ afero ];
-  };
-
-  g2s = buildFromGitHub {
-    rev    = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc";
-    owner  = "peterbourgon";
-    repo   = "g2s";
-    sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj";
-  };
-
-  gcloud-golang = buildFromGitHub {
-    rev = "6335269abf9002cf5a84613c13cda6010842b834";
-    owner = "GoogleCloudPlatform";
-    repo = "gcloud-golang";
-    sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf";
-    goPackagePath = "google.golang.org/cloud";
-    buildInputs = [ net oauth2 protobuf google-api-go-client grpc ];
-    excludedPackages = "oauth2";
-    meta.hydraPlatforms = [ ];
-  };
-
-  gcloud-golang-compute-metadata = buildGoPackage rec {
-    inherit (gcloud-golang) rev name goPackagePath src;
-    subPackages = [ "compute/metadata" ];
-    buildInputs = [ net ];
-  };
-
-  gettext-go = buildFromGitHub {
-    rev    = "783c0fb3da95b06dd89c4ba2771f1dc289ecc27c";
-    owner  = "chai2010";
-    repo   = "gettext-go";
-    sha256 = "1iz4wjxc3zkj0xkfs88ig670gb08p1sd922l0ig2cxpjcfjp1y99";
-  };
-
-  gojsonpointer = buildFromGitHub {
-    rev = "e0fe6f68307607d540ed8eac07a342c33fa1b54a";
-    version = "2015-11-27";
-    owner = "xeipuuv";
-    repo = "gojsonpointer";
-    sha256 = "0yfbisaas3w3ygh0cvb82mj6c1f8adqmnwmyid8l5p12r55531f8";
-  };
-
-  gojsonreference = buildFromGitHub {
-    rev = "e02fc20de94c78484cd5ffb007f8af96be030a45";
-    version = "2015-08-08";
-    owner = "xeipuuv";
-    repo = "gojsonreference";
-    sha256 = "195in5zr3bhb3r1iins2h610kz339naj284b3839xmrhc15wqxzq";
-    propagatedBuildInputs = [ gojsonpointer ];
-  };
-
-  gojsonschema = buildFromGitHub {
-    rev = "93e72a773fade158921402d6a24c819b48aba29d";
-    version = "2016-03-23";
-    owner = "xeipuuv";
-    repo = "gojsonschema";
-    sha256 = "0hqpcy4xgm9xw16dxbs1skrh6ga60bwfjv5dyz5zh86xsxpln3nr";
-    propagatedBuildInputs = [ gojsonreference ];
-  };
-
-  gosexy.gettext = buildFromGitHub {
-    rev    = "4a979356fe964fec12e18326a32a89661f93dea7";
-    version = "2016-02-20";
-    owner  = "gosexy";
-    repo   = "gettext";
-    sha256 = "07f3dmq4qsdykbn3fkha3v1w61hic6xw82dvdmvzhf0m41jxsgy6";
-    buildInputs = [ pkgs.gettext go-flags ];
-  };
-
-  ginkgo = buildGoPackage rec {
-    rev = "5ed93e443a4b7dfe9f5e95ca87e6082e503021d2";
-    name = "ginkgo-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/onsi/ginkgo";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "onsi";
-      repo = "ginkgo";
-      sha256 = "0ghrx5qmgvgb8cbvsj53v1ir4j9agilg4wyhpk5ikqdv6mmqly4h";
-    };
-    subPackages = [ "./" ];  # don't try to build test fixtures
-  };
-
-  git-annex-remote-b2 = buildFromGitHub {
-    buildInputs = [ go go-backblaze ];
-    owner = "encryptio";
-    repo = "git-annex-remote-b2";
-    rev = "v0.2";
-    sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2";
-  };
-
-  git-appraise = buildFromGitHub {
-    rev = "v0.3";
-    owner = "google";
-    repo = "git-appraise";
-    sha256 = "124hci9whsvlcywsfz5y20kkj3nhy176a1d5s1lkvsga09yxq6wm";
-  };
-
-  gls = buildFromGitHub {
-    rev    = "9a4a02dbe491bef4bab3c24fd9f3087d6c4c6690";
-    owner  = "jtolds";
-    repo   = "gls";
-    sha256 = "1gvgkx7llklz6plapb95fcql7d34i6j7anlvksqhdirpja465jnm";
-  };
-
-  ugorji.go = buildGoPackage rec {
-    rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6";
-    name = "ugorji-go-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/ugorji/go";
-    goPackageAliases = [ "github.com/hashicorp/go-msgpack" ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "ugorji";
-      repo = "go";
-      sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v";
-    };
-  };
-
-  goamz = buildGoPackage rec {
-    rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7";
-    name = "goamz-${rev}";
-    goPackagePath = "github.com/goamz/goamz";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "goamz";
-      repo   = "goamz";
-      sha256 = "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b";
-    };
-    propagatedBuildInputs = [ go-ini ];
-
-    # These might need propagating too, but I haven't tested the entire library
-    buildInputs = [ sets go-simplejson check-v1 ];
-  };
-
-  goautoneg = buildGoPackage rec {
-    rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675";
-    name = "goautoneg-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "bitbucket.org/ww/goautoneg";
-
-    src = fetchhg {
-      inherit rev;
-      url = "https://${goPackagePath}";
-      sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
-    };
-  };
-
-  dgnorton.goback = buildFromGitHub {
-    rev    = "a49ca3c0a18f50ae0b8a247e012db4385e516cf4";
-    owner  = "dgnorton";
-    repo   = "goback";
-    sha256 = "1nyg6sckwd0iafs9vcmgbga2k3hid2q0avhwj29qbdhj3l78xi47";
-  };
-
-  gocapability = buildFromGitHub {
-    rev    = "2c00daeb6c3b45114c80ac44119e7b8801fdd852";
-    version = "2015-07-16";
-    owner  = "syndtr";
-    repo   = "gocapability";
-    sha256 = "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l";
-  };
-
-  goconfig = buildFromGitHub {
-    rev    = "5f601ca6ef4d5cea8d52be2f8b3a420ee4b574a5";
-    version = "20160216";
-    owner  = "Unknwon";
-    repo   = "goconfig";
-    sha256 = "0kgmxvkkb8qa63k6wlm13c6dq203gb3lx1klhswx6cg0nfjp9z9j";
-  };
-
-  gocryptfs = buildFromGitHub {
-    rev = "v0.5";
-    owner = "rfjakob";
-    repo = "gocryptfs";
-    sha256 = "0jsdz8y7a1fkyrfwg6353c9r959qbqnmf2cjh57hp26w1za5bymd";
-    buildInputs = [ crypto go-fuse openssl-spacemonkey ];
-  };
-
-  gocheck = buildGoPackage rec {
-    rev = "87";
-    name = "gocheck-${rev}";
-    goPackagePath = "launchpad.net/gocheck";
-    src = fetchbzr {
-      inherit rev;
-      url = "https://${goPackagePath}";
-      sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0";
-    };
-  };
-
-  gocql = buildFromGitHub {
-    rev    = "53ea371a152ac188443fd3479f822ffecb0e9363";
-    owner  = "gocql";
-    repo   = "gocql";
-    sha256 = "0rqykhqgx7lrggcjyh053c3qddf130sgvsm27gndjv29rjrm874f";
-    propagatedBuildInputs = [ inf snappy groupcache ];
-  };
-
-  gocolorize = buildGoPackage rec {
-    rev = "v1.0.0";
-    name = "gocolorize-${rev}";
-    goPackagePath = "github.com/agtorre/gocolorize";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "agtorre";
-      repo = "gocolorize";
-      sha256 = "1dj7s8bgw9qky344d0k9gz661c0m317a08a590184drw7m51hy9p";
-    };
-  };
-
-  goconvey = buildGoPackage rec {
-    version = "1.5.0";
-    name = "goconvey-${version}";
-    goPackagePath = "github.com/smartystreets/goconvey";
-    src = fetchurl {
-      name = "${name}.tar.gz";
-      url = "https://github.com/smartystreets/goconvey/archive/${version}.tar.gz";
-      sha256 = "0g3965cb8kg4kf9b0klx4pj9ycd7qwbw1jqjspy6i5d4ccd6mby4";
-    };
-    buildInputs = [ oglematchers ];
-    doCheck = false; # please check again
-  };
-
-  gohtml = buildFromGitHub {
-    rev    = "ccf383eafddde21dfe37c6191343813822b30e6b";
-    owner  = "yosssi";
-    repo   = "gohtml";
-    sha256 = "1cghwgnx0zjdrqxzxw71riwiggd2rjs2i9p2ljhh76q3q3fd4s9f";
-    propagatedBuildInputs = [ net ];
-  };
-
-  gomdb = buildFromGitHub {
-    rev    = "151f2e08ef45cb0e57d694b2562f351955dff572";
-    owner  = "armon";
-    repo   = "gomdb";
-    sha256 = "02wdhgfarmmwfbc75snd1dh6p9k9c1y2135apdm6mkr062qlxx61";
-  };
-
-  influx.gomdb = buildFromGitHub {
-    rev    = "29fe330c5ab33c4e48470bd4b980bf522471190a";
-    owner  = "influxdb";
-    repo   = "gomdb";
-    sha256 = "0yg1jpr7lcaqh6i8n9wbs9r128kk541qjv06r9a6fp9vj56rqr3m";
-  };
-
-  gotool = buildFromGitHub {
-    rev = "58a7a198f2ec6ea7af221fd216e7f559d663ce02";
-    owner = "kisielk";
-    repo = "gotool";
-    sha256  = "1l1w4mczqmah0c154vb1daw5l3cc7vn5gmy5s67p3ad1lnz5l79x";
-  };
-
-  golang-lru = buildFromGitHub {
-    rev    = "7f9ef20a0256f494e24126014135cf893ab71e9e";
-    owner  = "hashicorp";
-    repo   = "golang-lru";
-    sha256 = "165x0p8plr3fwn4r1d11m3pxa3r8dhyk98z7x6ah35lf63jm2cwv";
-  };
-
-  golang-petname = buildFromGitHub {
-    rev    = "13f8b3a4326b9a6579358543cffe82713c1d6ce4";
-    owner  = "dustinkirkland";
-    repo   = "golang-petname";
-    sha256 = "1xx6lpv1r2sji8m9w35a2fkr9v4vsgvxrrahcq9bdg75qvadq91d";
-  };
-
-  golang_protobuf_extensions = buildFromGitHub {
-    rev    = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
-    version = "2015-04-06";
-    owner  = "matttproud";
-    repo   = "golang_protobuf_extensions";
-    sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
-    buildInputs = [ protobuf ];
-  };
-
-  goleveldb = buildFromGitHub {
-    rev = "1a9d62f03ea92815b46fcaab357cfd4df264b1a0";
-    version = "2015-08-19";
-    owner = "syndtr";
-    repo = "goleveldb";
-    sha256 = "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb";
-    propagatedBuildInputs = [ ginkgo gomega snappy ];
-  };
-
-  gollectd = buildFromGitHub {
-    rev    = "cf6dec97343244b5d8a5485463675d42f574aa2d";
-    owner  = "kimor79";
-    repo   = "gollectd";
-    sha256 = "1f3ml406cprzjc192csyr2af4wcadkc74kg8n4c0zdzglxxfsqxa";
-  };
-
-  gomega = buildFromGitHub {
-    rev    = "8adf9e1730c55cdc590de7d49766cb2acc88d8f2";
-    owner  = "onsi";
-    repo   = "gomega";
-    sha256 = "1rf6cxn50d1pji3pv4q372s395r5nxwcgp405z2r2mfdkri4v3w4";
-  };
-
-  gomemcache = buildFromGitHub {
-    rev    = "72a68649ba712ee7c4b5b4a943a626bcd7d90eb8";
-    owner  = "bradfitz";
-    repo   = "gomemcache";
-    sha256 = "1r8fpzwhakq8fsppc33n4iivq1pz47xhs0h6bv4x5qiip5mswwvg";
-  };
-
-  gometalinter = buildFromGitHub {
-    rev = "be87b7414dc44dbea2fee33ccb8bd8a859ebcaf1";
-    owner = "alecthomas";
-    repo = "gometalinter";
-    sha256 = "05n852kf11gq5k7b4h6kz85z99qfa46dy6b6fqkg9xfk2bmvdxms";
-    buildInputs = [ shlex kingpin testify ];
-  };
-
-  google-api-go-client = buildFromGitHub {
-    rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80";
-    version = "2015-08-19";
-    owner = "google";
-    repo = "google-api-go-client";
-    sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8";
-    goPackagePath = "google.golang.org/api";
-    goPackageAliases = [ "github.com/google/google-api-client" ];
-    buildInputs = [ net ];
-  };
-
-  gore = buildFromGitHub {
-    rev = "v0.2.5";
-    owner = "motemen";
-    repo = "gore";
-    sha256 = "1kg14ps6yw0715rlbcfk1bmrszzgsqgb0r2p3ra1qwxbhj1jd44y";
-    buildInputs = [ go-homedir go-quickfix liner tools pkgs.makeWrapper ];
-
-    # Gore is a Go REPL, so it needs to be able to use the Go compiler.
-    allowGoReference = true;
-
-    # Gore seems to only work with Go 1.5. Not sure if it doesn't support
-    # other versions or if I just haven't figured out how to get them working.
-    disabled = !isGo15;
-
-    postInstall = ''
-      mkdir -p $out/bin
-      cp $NIX_BUILD_TOP/go/bin/gore $out/bin
-      wrapProgram $out/bin/gore --set GOROOT ${self.go}/share/go
-    '';
-
-    meta = with stdenv.lib; {
-      homepage = "https://github.com/motemen/gore";
-      description = "Yet another Go REPL that works nicely. Featured with line editing, code completion, and more.";
-      license = licenses.mit;
-    };
-  };
-
-  goreturns = buildFromGitHub {
-    rev = "b368f1f77f2950c753e05a6a29acfc487fa7a959";
-    owner = "sqs";
-    repo = "goreturns";
-    sha256 = "0qllmcvg3xd43pymn24zrjn7vb39zj83ayq3sg7kzgxvba0ylb05";
-    goPackagePath = "sourcegraph.com/sqs/goreturns";
-    buildInputs = [ tools ];
-  };
-
-  odeke-em.google-api-go-client = buildGoPackage rec {
-    rev = "30f4c144b02321ebbc712f35dc95c3e72a5a7fdc";
-    name = "odeke-em-google-api-go-client-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/odeke-em/google-api-go-client";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "odeke-em";
-      repo = "google-api-go-client";
-      sha256 = "1fidlljxnd82i2r9yia0b9gh0vv3hwb5k65papnvw7sqpc4sriby";
-    };
-    buildInputs = [ net ];
-    propagatedBuildInputs = [ google-api-go-client ];
-  };
-
-  gopass = buildFromGitHub {
-    rev = "10b54de414cc9693221d5ff2ae14fd2fbf1b0ac1";
-    owner = "howeyc";
-    repo = "gopass";
-    sha256 = "0lsi89zx1i2f5vhm66zqn2drs7xi7ff8r1xlp6m58r99dddws57s";
-    propagatedBuildInputs = [ crypto ];
-  };
-
-  gopherduty = buildFromGitHub {
-    rev    = "f4906ce7e59b33a50bfbcba93e2cf58778c11fb9";
-    owner  = "darkcrux";
-    repo   = "gopherduty";
-    sha256 = "11w1yqc16fxj5q1y5ha5m99j18fg4p9lyqi542x2xbrmjqqialcf";
-  };
-
-  goproxy = buildFromGitHub {
-    rev    = "2624781dc373cecd1136cafdaaaeba6c9bb90e96";
-    version = "2015-07-26";
-    owner  = "elazarl";
-    repo   = "goproxy";
-    sha256 = "1zz425y8byjaa9i7mslc9anz9w2jc093fjl0562rmm5hh4rc5x5f";
-    buildInputs = [ go-charset ];
-  };
-
-  goreq = buildFromGitHub {
-    rev    = "72c51a544272e007ab3da4f7d9ac959b7af7af03";
-    version = "2015-08-18";
-    owner  = "franela";
-    repo   = "goreq";
-    sha256 = "0dnqbijdzp2dgsf6m934nadixqbv73q0zkqglaa956zzw0pyhcxp";
-  };
-
-  gosnappy = buildFromGitHub {
-    rev    = "ce8acff4829e0c2458a67ead32390ac0a381c862";
-    owner  = "syndtr";
-    repo   = "gosnappy";
-    sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7";
-  };
-
-  gosu = buildFromGitHub {
-    rev = "1.7";
-    owner = "tianon";
-    repo = "gosu";
-    sha256 = "02vln88yyhj8k8cyzac0sgw84626vshmzdrrc1jpl4k4sc27vcbp";
-    buildInputs = [ opencontainers.runc ];
-  };
-
-  gozim = buildFromGitHub {
-    rev    = "ea9b7c39cb1d13bd8bf19ba4dc4e2a16bab52f14";
-    version = "2016-01-15";
-    owner  = "akhenakh";
-    repo   = "gozim";
-    sha256 = "1n50fdd56r3s1sgjbpa72nvdh50gfpf6fq55c077w2p3bxn6p8k6";
-    propagatedBuildInputs = [ bleve go-liblzma groupcache go-rice goquery ];
-    buildInputs = [ pkgs.zip ];
-    postInstall = ''
-      pushd $NIX_BUILD_TOP/go/src/$goPackagePath/cmd/gozimhttpd
-      ${go-rice.bin}/bin/rice append --exec $bin/bin/gozimhttpd
-      popd
-    '';
-    dontStrip = true;
-  };
-
-  go-acd = buildFromGitHub {
-    rev    = "0bd73ce86fffd8afeafe4e46f419f1a8ce6324b9";
-    version = "20160130";
-    owner  = "ncw";
-    repo   = "go-acd";
-    sha256 = "1vgcglk2pf325hs1319fk73akzi9hd75kwhjq0j4s6l1p7ybj0l7";
-    propagatedBuildInputs = [ go-querystring ];
-  };
-
-  go-assert = buildGoPackage rec {
-    rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3";
-    name = "assert-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/bmizerany/assert";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "bmizerany";
-      repo = "assert";
-      sha256 = "1lfrvqqmb09y6pcr76yjv4r84cshkd4s7fpmiy7268kfi2cvqnpc";
-    };
-    propagatedBuildInputs = [ pretty ];
-  };
-
-  go-autorest = buildFromGitHub {
-    rev = "v6.0.0";
-    owner = "Azure";
-    repo = "go-autorest";
-    sha256 = "07zrbw8p3jc5xfjwn0qj1hrn1r7nbnryc5zmvk42qgximyxsls26";
-    propagatedBuildInputs = [ jwt-go crypto ];
-  };
-
-  go-backblaze = buildFromGitHub {
-    buildInputs = [ go-flags go-humanize uilive uiprogress ];
-    goPackagePath = "gopkg.in/kothar/go-backblaze.v0";
-    rev = "373819725fc560fa962c6cd883b533d2ebec4844";
-    owner = "kothar";
-    repo = "go-backblaze";
-    sha256 = "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx";
-  };
-
-  go-bencode = buildGoPackage rec {
-    version = "1.1.1";
-    name = "go-bencode-${version}";
-    goPackagePath = "github.com/ehmry/go-bencode";
-
-    src = fetchurl {
-      url = "https://${goPackagePath}/archive/v${version}.tar.gz";
-      sha256 = "0y2kz2sg1f7mh6vn70kga5d0qhp04n01pf1w7k6s8j2nm62h24j6";
-    };
-  };
-
-  go-bindata-assetfs = buildFromGitHub {
-    rev     = "d5cac425555ca5cf00694df246e04f05e6a55150";
-    owner   = "elazarl";
-    repo    = "go-bindata-assetfs";
-    sha256  = "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17";
-    version = "2015-08-13";
-
-    meta = with stdenv.lib; {
-      description = "Serves embedded files from jteeuwen/go-bindata with net/http";
-      homepage = "https://github.com/elazarl/go-bindata-assetfs";
-      maintainers = with maintainers; [ matthiasbeyer ];
-      license = licenses.bsd2;
-    };
-  };
-
-  pmylund.go-cache = buildGoPackage rec {
-    rev = "93d85800f2fa6bd0a739e7bd612bfa3bc008b72d";
-    name = "go-cache-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/pmylund/go-cache";
-    goPackageAliases = [
-      "github.com/robfig/go-cache"
-      "github.com/influxdb/go-cache"
-    ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "pmylund";
-      repo = "go-cache";
-      sha256 = "08wfwm7nk381lv6a95p0hfgqwaksn0vhzz1xxdncjdw6w71isyy7";
-    };
-  };
-
-  robfig.go-cache = buildFromGitHub {
-    rev    = "9fc39e0dbf62c034ec4e45e6120fc69433a3ec51";
-    owner  = "robfig";
-    repo   = "go-cache";
-    sha256 = "032nh3y43bpzpcm7bdkxfh55aydvzc2jzhigvy5gd9f648m4j9ha";
-  };
-
-  go-charset = buildFromGitHub {
-    rev    = "61cdee49014dc952076b5852ce4707137eb36b64";
-    version = "2014-07-13";
-    owner  = "paulrosania";
-    repo   = "go-charset";
-    sha256 = "0jp6rwxlgl66dipk6ssk8ly55jxncvsxs7jc3abgdrhr3rzccab8";
-    goPackagePath = "code.google.com/p/go-charset";
-
-    preBuild = ''
-      find go/src/$goPackagePath -name \*.go | xargs sed -i 's,github.com/paulrosania/go-charset,code.google.com/p/go-charset,g'
-    '';
-  };
-
-  go-checkpoint = buildFromGitHub {
-    rev    = "88326f6851319068e7b34981032128c0b1a6524d";
-    owner  = "hashicorp";
-    repo   = "go-checkpoint";
-    sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4";
-  };
-
-  go-colorable = buildFromGitHub {
-    rev    = "40e4aedc8fabf8c23e040057540867186712faa5";
-    owner  = "mattn";
-    repo   = "go-colorable";
-    sha256 = "0pwc0s5lvz209dcyamv1ba1xl0c1r5hpxwlq0w5j2xcz8hzrcwkl";
-  };
-
-  go-colortext = buildFromGitHub {
-    rev    = "13eaeb896f5985a1ab74ddea58707a73d875ba57";
-    owner  = "daviddengcn";
-    repo   = "go-colortext";
-    sha256 = "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x";
-  };
-
-  go-etcd = buildGoPackage rec {
-    rev = "9847b93751a5fbaf227b893d172cee0104ac6427";
-    name = "go-etcd-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/coreos/go-etcd";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "coreos";
-      repo = "go-etcd";
-      sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4";
-    };
-
-    propagatedBuildInputs = [ ugorji.go ];
-  };
-
-  go-flags = buildFromGitHub {
-    rev    = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539";
-    owner  = "jessevdk";
-    repo   = "go-flags";
-    sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680";
-  };
-
-  go-fuse = buildFromGitHub rec {
-    rev = "bd746dd8bcc8c059a9d953a786a6156eb83f398e";
-    version = "2016-05-29";
-    owner = "hanwen";
-    repo = "go-fuse";
-    sha256 = "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56";
-  };
-
-  go-github = buildFromGitHub {
-    rev = "34fb8ee07214d23c3035c95691fe9069705814d6";
-    owner = "google";
-    repo = "go-github";
-    sha256 = "0ygh0f6p679r095l4bym8q4l45w2l3d8r3hx9xrnnppxq59i2395";
-    buildInputs = [ oauth2 ];
-    propagatedBuildInputs = [ go-querystring ];
-  };
-
-  go-gypsy = buildFromGitHub {
-    rev    = "42fc2c7ee9b8bd0ff636cd2d7a8c0a49491044c5";
-    owner  = "kylelemons";
-    repo   = "go-gypsy";
-    sha256 = "04iy8rdk19n7i18bqipknrcb8lsy1vr4d1iqyxsxq6rmb7298iwj";
-  };
-
-  go-homedir = buildFromGitHub {
-    rev    = "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4";
-    owner  = "mitchellh";
-    repo   = "go-homedir";
-    sha256 = "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9";
-  };
-
-  go-hostpool = buildFromGitHub {
-    rev    = "d0e59c22a56e8dadfed24f74f452cea5a52722d2";
-    version = "2015-03-31";
-    owner  = "bitly";
-    repo   = "go-hostpool";
-    sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g";
-  };
-
-  go-httpclient = buildFromGitHub {
-    rev    = "63fe23f7434723dc904c901043af07931f293c47";
-    version = "20151014";
-    owner  = "mreiferson";
-    repo   = "go-httpclient";
-    sha256 = "1xp8n4dkvpdphzjj3f547kgpclf5nzci9w09m95bci7pa7nax0hf";
-  };
-
-  go-humanize = buildFromGitHub {
-    rev = "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0";
-    owner = "dustin";
-    repo = "go-humanize";
-    sha256 = "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0";
-  };
-
-  go-ini = buildFromGitHub {
-    rev    = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
-    owner  = "vaughan0";
-    repo   = "go-ini";
-    sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
-  };
-
-  go-incremental = buildFromGitHub {
-    rev    = "92fd0ce4a694213e8b3dfd2d39b16e51d26d0fbf";
-    version = "2015-02-20";
-    owner  = "GeertJohan";
-    repo   = "go.incremental";
-    sha256 = "160cspmq73bk6cvisa6kq1dwrrp1yqpkrpq8dl69wcnaf91cbnml";
-  };
-
-  go-isatty = buildFromGitHub {
-    rev    = "ae0b1f8f8004be68d791a576e3d8e7648ab41449";
-    owner  = "mattn";
-    repo   = "go-isatty";
-    sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj";
-  };
-
-  go-jose-v1 = buildFromGitHub {
-    rev    = "v1.0.1";
-    owner  = "square";
-    repo   = "go-jose";
-    sha256 = "0asa1kl1qbx0cyayk44jhxxff0awpkwiw6va7yzrzjzhfc5kvg7p";
-    propagatedBuildInputs = [ cli-go ];
-    goPackagePath = "gopkg.in/square/go-jose.v1";
-    goPackageAliases = [ "github.com/square/go-jose" ];
-  };
-
-  go-jmespath = buildFromGitHub {
-    rev    = "0.2.2";
-    owner  = "jmespath";
-    repo   = "go-jmespath";
-    sha256 = "0f4j0m44limnjd6q5fk152g6jq2a5cshcdms4p3a1br8pl9wp5fb";
-  };
-
-  go-liblzma = buildFromGitHub {
-    rev    = "e74be71c3c60411922b5424e875d7692ea638b78";
-    version = "2016-01-01";
-    owner  = "remyoudompheng";
-    repo   = "go-liblzma";
-    sha256 = "12lwjmdcv2l98097rhvjvd2yz8jl741hxcg29i1c18grwmwxa7nf";
-    propagatedBuildInputs = [ pkgs.lzma ];
-  };
-
-  go-log = buildGoPackage rec {
-    rev = "70d039bee4b0e389e5be560491d8291708506f59";
-    name = "go-log-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/coreos/go-log";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "coreos";
-      repo = "go-log";
-      sha256 = "1s95xmmhcgw4ascf4zr8c4ij2n4s3mr881nxcpmc61g0gb722b13";
-    };
-
-    propagatedBuildInputs = [ osext go-systemd ];
-  };
-
-  go-lz4 = buildFromGitHub {
-    rev    = "74ddf82598bc4745b965729e9c6a463bedd33049";
-    owner  = "bkaradzic";
-    repo   = "go-lz4";
-    sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1";
-  };
-
-  rcrowley.go-metrics = buildFromGitHub {
-    rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3";
-    version = "2015-08-22";
-    owner = "rcrowley";
-    repo = "go-metrics";
-    sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa";
-    propagatedBuildInputs = [ stathat ];
-  };
-
-  appengine = buildFromGitHub {
-    rev = "72f4367c4f14a20a98dcc8b762953b40788407be";
-    owner = "golang";
-    repo = "appengine";
-    sha256 = "1phjkb0f0xp08db3irbf5wzdsxzsddsig5wv70wvmnr44ijllh4f";
-    goPackagePath = "google.golang.org/appengine";
-    buildInputs = [ protobuf net ];
-  };
-
-  armon.go-metrics = buildGoPackage rec {
-    rev = "b2d95e5291cdbc26997d1301a5e467ecbb240e25";
-    name = "armon.go-metrics-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/armon/go-metrics";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "armon";
-      repo = "go-metrics";
-      sha256 = "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck";
-    };
-
-    propagatedBuildInputs = [ prometheus.client_golang ];
-  };
-
-  go-md2man = buildFromGitHub {
-    rev    = "71acacd42f85e5e82f70a55327789582a5200a90";
-    owner  = "cpuguy83";
-    repo   = "go-md2man";
-    sha256 = "0hmkrq4gdzb6mwllmh4p1y7vrz7hyr8xqagpk9nyr5dhygvnnq2v";
-    propagatedBuildInputs = [ blackfriday ];
-  };
-
-  go-multierror = buildFromGitHub {
-    rev    = "56912fb08d85084aa318edcf2bba735b97cf35c5";
-    owner  = "hashicorp";
-    repo   = "go-multierror";
-    sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r";
-  };
-
-  go-nsq = buildFromGitHub {
-    rev = "v1.0.4";
-    owner = "nsqio";
-    repo = "go-nsq";
-    sha256 = "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46";
-    propagatedBuildInputs = [ go-simplejson go-snappystream ];
-    goPackageAliases = [ "github.com/bitly/go-nsq" ];
-  };
-
-  go-options = buildFromGitHub {
-    rev    = "7c174072188d0cfbe6f01bb457626abb22bdff52";
-    version = "2014-12-20";
-    owner  = "mreiferson";
-    repo   = "go-options";
-    sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm";
-  };
-
-  go-porterstemmer = buildFromGitHub {
-    rev    = "23a2c8e5cf1f380f27722c6d2ae8896431dc7d0e";
-    version = "2014-12-30";
-    owner  = "blevesearch";
-    repo   = "go-porterstemmer";
-    sha256 = "0rcfbrad79xd114h3dhy5d3zs3b5bcgqwm3h5ih1lk69zr9wi91d";
-  };
-
-  go-querystring = buildFromGitHub {
-    rev    = "547ef5ac979778feb2f760cdb5f4eae1a2207b86";
-    owner  = "google";
-    repo   = "go-querystring";
-    sha256 = "00ani7fhydcmlsm3n93nmj1hcqp2wmzvihnb1gdzynif1hw0530y";
-  };
-
-  go-quickfix = buildFromGitHub {
-    rev = "a5d4c82f7428280897ef403a87aa78b9c5924a47";
-    sha256 = "0m1vclhqygnylfyhzpw5myi3f4qz30a3h9mbssxdsgn67s7l666y";
-    owner = "motemen";
-    repo = "go-quickfix";
-    buildInputs = [ tools ];
-    excludedPackages = "testdata";
-
-    meta = with stdenv.lib; {
-      homepage = "https://github.com/motemen/go-quickfix";
-      description = ''Quick fix non-compiling well-typed Go source code e.g. "x declared and not used."'';
-      license = licenses.mit;
-    };
-  };
-
-  go-radix = buildFromGitHub {
-    rev    = "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93";
-    owner  = "armon";
-    repo   = "go-radix";
-    sha256 = "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c";
-  };
-
-  jp = buildFromGitHub {
-    rev = "0.1.2";
-    owner = "jmespath";
-    repo = "jp";
-    sha256 = "1i0jl0c062crigkxqx8zpyqliz8j4d37y95cna33jl777kx42r6h";
-    meta = with stdenv.lib; {
-      description = "A command line to JMESPath, an expression language for manipulating JSON";
-      license = licenses.asl20;
-      homepage = http://jmespath.org;
-      maintainers = with maintainers; [ cransom ];
-      platforms = platforms.unix;
-    };
-  };
-
-  mattn.go-runewidth = buildFromGitHub {
-    rev    = "d6bea18f789704b5f83375793155289da36a3c7f";
-    version = "2016-03-15";
-    owner  = "mattn";
-    repo   = "go-runewidth";
-    sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
-  };
-
-  go-restful = buildFromGitHub {
-    rev    = "892402ba11a2e2fd5e1295dd633481f27365f14d";
-    owner  = "emicklei";
-    repo   = "go-restful";
-    sha256 = "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x";
-  };
-
-  go-rice = buildFromGitHub {
-    rev    = "4f3c5af2322e393f305d9674845bc36cd1dea589";
-    version = "2016-01-04";
-    owner  = "GeertJohan";
-    repo   = "go.rice";
-    sha256 = "01q2d5iwibwdl68gn8sg6dm7byc42hax3zmiqgmdw63ir1fsv4ag";
-    propagatedBuildInputs = [ osext go-spew go-flags go-zipexe rsrc
-      go-incremental ];
-  };
-
-  go-runit = buildFromGitHub {
-    rev    = "a9148323a615e2e1c93b7a9893914a360b4945c8";
-    owner  = "soundcloud";
-    repo   = "go-runit";
-    sha256 = "00f2rfhsaqj2wjanh5qp73phx7x12a5pwd7lc0rjfv68l6sgpg2v";
-  };
-
-  go-shlex = buildFromGitHub {
-    rev    = "3f9db97f856818214da2e1057f8ad84803971cff";
-    owner  = "flynn";
-    repo   = "go-shlex";
-    sha256 = "2a6a6f8eb150260cd60881ec5f027b7d1d2946ee22c627b450773eaf3d1de4c8";
-  };
-
-  go-simplejson = buildFromGitHub {
-    rev    = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a";
-    version = "2015-03-31";
-    owner  = "bitly";
-    repo   = "go-simplejson";
-    sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy";
-  };
-
-  go-snappystream = buildFromGitHub {
-    rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504";
-    version = "2015-04-16";
-    owner = "mreiferson";
-    repo = "go-snappystream";
-    sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6";
-  };
-
-  go-spew = buildFromGitHub {
-    rev    = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d";
-    version = "2015-11-05";
-    owner  = "davecgh";
-    repo   = "go-spew";
-    sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk";
-  };
-
-  go-sqlite3 = buildFromGitHub {
-    rev    = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
-    version = "2015-07-29";
-    owner  = "mattn";
-    repo   = "go-sqlite3";
-    sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
-  };
-
-  go-syslog = buildFromGitHub {
-    rev    = "42a2b573b664dbf281bd48c3cc12c086b17a39ba";
-    owner  = "hashicorp";
-    repo   = "go-syslog";
-    sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3";
-  };
-
-  go-systemd = buildFromGitHub {
-    rev    = "7b2428fec40033549c68f54e26e89e7ca9a9ce31";
-    version = "2016-03-10";
-    owner  = "coreos";
-    repo   = "go-systemd";
-    sha256 = "0kfbxvm9zsjgvgmiq2jl807y4s5z0rya65rm399llr5rr7vz1lxd";
-    nativeBuildInputs = [ pkgs.pkgconfig pkgs.systemd ];
-    propagatedBuildInputs = [ dbus ];
-  };
-
-  go-update-v0 = buildFromGitHub {
-    rev = "d8b0b1d421aa1cbf392c05869f8abbc669bb7066";
-    owner = "inconshreveable";
-    repo = "go-update";
-    sha256 = "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa";
-    goPackagePath = "gopkg.in/inconshreveable/go-update.v0";
-    buildInputs = [ osext binarydist ];
-  };
-
-  go-uuid = buildFromGitHub {
-    rev    = "6b8e5b55d20d01ad47ecfe98e5171688397c61e9";
-    version = "2015-07-22";
-    owner  = "satori";
-    repo   = "go.uuid";
-    sha256 = "0injxzds41v8nc0brvyrrjl66fk3hycz6im38s5r9ccbwlp68p44";
-  };
-
-  go-vhost = buildFromGitHub {
-    rev    = "c4c28117502e4bf00960c8282b2d1c51c865fe2c";
-    owner  = "inconshreveable";
-    repo   = "go-vhost";
-    sha256 = "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32";
-  };
-
-  go-zipexe = buildFromGitHub {
-    rev    = "a5fe2436ffcb3236e175e5149162b41cd28bd27d";
-    version = "2015-03-29";
-    owner  = "daaku";
-    repo   = "go.zipexe";
-    sha256 = "0vi5pskhifb6zw78w2j97qbhs09zmrlk4b48mybgk5b3sswp6510";
-  };
-
-  go-zookeeper = buildFromGitHub {
-    rev    = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4";
-    version = "2015-06-02";
-    owner  = "samuel";
-    repo   = "go-zookeeper";
-    sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z";
-  };
-
-  goquery = buildGoPackage rec {
-    rev = "f065786d418c9d22a33cad33decd59277af31471"; #tag v.0.3.2
-    name = "goquery-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/PuerkitoBio/goquery";
-    propagatedBuildInputs = [ cascadia net ];
-    buildInputs = [ cascadia net ];
-    doCheck = true;
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "PuerkitoBio";
-      repo = "goquery";
-      sha256 = "0bskm3nja1v3pmg7g8nqjkmpwz5p72h1h81y076x1z17zrjaw585";
-    };
-  };
-
-  groupcache = buildFromGitHub {
-    rev    = "604ed5785183e59ae2789449d89e73f3a2a77987";
-    owner  = "golang";
-    repo   = "groupcache";
-    sha256 = "1jh862mmgss71wls4yxv633agr7dk7y6h36npwqxbmhbz5c2q28l";
-    buildInputs = [ protobuf ];
-  };
-
-  grpc = buildFromGitHub {
-    rev = "d455e65570c07e6ee7f23275063fbf34660ea616";
-    version = "2015-08-29";
-    owner = "grpc";
-    repo = "grpc-go";
-    sha256 = "08vra95hc8ihnj353680zhiqrv3ssw5yywkrifzb1zwl0l3cs2hr";
-    goPackagePath = "google.golang.org/grpc";
-    goPackageAliases = [ "github.com/grpc/grpc-go" ];
-    propagatedBuildInputs = [ http2 net protobuf oauth2 glog etcd ];
-    excludedPackages = "\\(test\\|benchmark\\)";
-  };
-
-  gtreap = buildFromGitHub {
-    rev = "0abe01ef9be25c4aedc174758ec2d917314d6d70";
-    version = "2015-08-07";
-    owner = "steveyen";
-    repo = "gtreap";
-    sha256 = "03z5j8myrpmd0jk834l318xnyfm0n4rg15yq0d35y7j1aqx26gvk";
-    goPackagePath = "github.com/steveyen/gtreap";
-  };
-
-  gucumber = buildGoPackage rec {
-    rev = "e8116c9c66e641e9f81fc0a79fac923dfc646378";
-    name = "gucumber-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/lsegal/gucumber";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "lsegal";
-      repo = "gucumber";
-      sha256 = "1ic1lsv05da6qv8xmf94lpbmaisxi8mwbv7bh2k1y78lh43yncah";
-    };
-
-    buildInputs = [ testify ];
-    propagatedBuildInputs = [ ansicolor ];
-  };
-
-  hcl = buildFromGitHub {
-    rev  = "54864211433d45cb780682431585b3e573b49e4a";
-    owner  = "hashicorp";
-    repo   = "hcl";
-    sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950";
-    buildInputs = [ go-multierror ];
-  };
-
-  hipchat-go = buildGoPackage rec {
-    rev = "1dd13e154219c15e2611fe46adbb6bf65db419b7";
-    name = "hipchat-go-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/tbruyelle/hipchat-go";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "tbruyelle";
-      repo = "hipchat-go";
-      sha256 = "060wg5yjlh28v03mvm80kwgxyny6cyj7zjpcdg032b8b1sz9z81s";
-    };
-  };
-
-  hmacauth = buildGoPackage {
-    name = "hmacauth";
-    goPackagePath = "github.com/18F/hmacauth";
-    src = fetchFromGitHub {
-      rev = "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd";
-      owner = "18F";
-      repo = "hmacauth";
-      sha256 = "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1";
-    };
-  };
-
-  hound = buildGoPackage rec {
-    rev  = "0a364935ba9db53e6f3f5563b02fcce242e0930f";
-    name = "hound-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/etsy/hound";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "etsy";
-      repo   = "hound";
-      sha256 = "0jhnjskpm15nfa1cvx0h214lx72zjvnkjwrbgwgqqyn9afrihc7q";
-    };
-    buildInputs = [ go-bindata.bin pkgs.nodejs pkgs.nodePackages.react-tools pkgs.python pkgs.rsync ];
-    postInstall = ''
-      pushd go
-      python src/github.com/etsy/hound/tools/setup
-      sed -i 's|bin/go-bindata||' Makefile
-      sed -i 's|$<|#go-bindata|' Makefile
-      make
-    '';
-  };
-
-  http-authentication = buildFromGitHub {
-    rev    = "3eca13d6893afd7ecabe15f4445f5d2872a1b012";
-    owner  = "jimstudt";
-    repo   = "http-authentication";
-    sha256 = "08601600811a172d7f806b541f05691e4bef812ed8a68f7de65fde9ee11a3cb7";
-  };
-
-  http2 = buildFromGitHub rec {
-    rev = "f8202bc903bda493ebba4aa54922d78430c2c42f";
-    owner = "bradfitz";
-    repo = "http2";
-    sha256 = "0cza2126jbji5vijwk4dxs05hifnff04xcr0vhxvafs6hz3sacvr";
-    buildInputs = [ crypto ];
-  };
-
-  httprouter = buildFromGitHub {
-    rev    = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7";
-    version = "2015-07-08";
-    owner  = "julienschmidt";
-    repo   = "httprouter";
-    sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl";
-  };
-
-  hugo = buildFromGitHub {
-    rev    = "v0.15";
-    owner  = "spf13";
-    repo   = "hugo";
-    sha256 = "1v0z9ar5kakhib3c3c43ddwd1ga4b8icirg6kk3cnaqfckd638l5";
-    buildInputs = [
-      mapstructure text websocket cobra osext fsnotify.v1 afero
-      jwalterweatherman cast viper yaml-v2 ace purell mmark blackfriday amber
-      cssmin nitro inflect fsync
-    ];
-  };
-
-  inf = buildFromGitHub {
-    rev    = "c85f1217d51339c0fa3a498cc8b2075de695dae6";
-    owner  = "go-inf";
-    repo   = "inf";
-    sha256 = "1ykdk410vca8i35db2fp6qqcfx0bmx95k0xqd15wzsl0xjmyjk3y";
-    goPackagePath = "gopkg.in/inf.v0";
-    goPackageAliases = [ "github.com/go-inf/inf" ];
-  };
-
-  inflect = buildGoPackage {
-    name = "inflect-2013-08-29";
-    goPackagePath = "bitbucket.org/pkg/inflect";
-    src = fetchFromBitbucket {
-      rev    = "8961c3750a47b8c0b3e118d52513b97adf85a7e8";
-      owner  = "pkg";
-      repo   = "inflect";
-      sha256 = "11qdyr5gdszy24ai1bh7sf0cgrb4q7g7fsd11kbpgj5hjiigxb9a";
-    };
-  };
-
-  influxdb8-client = buildFromGitHub{
-    rev = "v0.8.8";
-    owner = "influxdb";
-    repo = "influxdb";
-    sha256 = "0xpigp76rlsxqj93apjzkbi98ha5g4678j584l6hg57p711gqsdv";
-    subPackages = [ "client" ];
-  };
-
-  ini = buildFromGitHub {
-    rev    = "12f418cc7edc5a618a51407b7ac1f1f512139df3";
-    version = "1.11.0";
-    owner  = "go-ini";
-    repo   = "ini";
-    sha256 = "0j13iaag3vjb9p4b6nly1y7rw14akfdkv4mkzbj9sil2s75wsx7p";
-  };
-
-  eckardt.influxdb-go = buildGoPackage rec {
-    rev = "8b71952efc257237e077c5d0672e936713bad38f";
-    name = "influxdb-go-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/eckardt/influxdb-go";
-    src = fetchgit {
-      inherit rev;
-      url = "https://${goPackagePath}.git";
-      sha256 = "5318c7e1131ba2330c90a1b67855209e41d3c77811b1d212a96525b42d391f6e";
-    };
-  };
-
-  flagfile = buildFromGitHub {
-    rev    = "871ce569c29360f95d7596f90aa54d5ecef75738";
-    owner  = "spacemonkeygo";
-    repo   = "flagfile";
-    sha256 = "1y6wf1s51c90qc1aki8qikkw1wqapzjzr690xrmnrngsfpdyvkrc";
-  };
-
-  ipfs = buildFromGitHub{
-    rev = "7070b4d878baad57dcc8da80080dd293aa46cabd";
-    version = "2016-01-12";
-    owner  = "ipfs";
-    repo   = "go-ipfs";
-    sha256 = "1b7aimnbz287fy7p27v3qdxnz514r5142v3jihqxanbk9g384gcd";
-    disabled = isGo14;
-    meta = with stdenv.lib; {
-      description = "A global, versioned, peer-to-peer filesystem";
-      license = licenses.mit;
-    };
-  };
-
-  json2csv = buildFromGitHub{
-    rev = "d82e60e6dc2a7d3bcf15314d1ecbebeffaacf0c6";
-    owner  = "jehiah";
-    repo   = "json2csv";
-    sha256 = "1fw0qqaz2wj9d4rj2jkfj7rb25ra106p4znfib69p4d3qibfjcsn";
-  };
-
-  jwalterweatherman = buildFromGitHub {
-    rev    = "c2aa07df593850a04644d77bb757d002e517a296";
-    owner  = "spf13";
-    repo   = "jwalterweatherman";
-    sha256 = "0m8867afsvka5gp2idrmlarpjg7kxx7qacpwrz1wl8y3zxyn3945";
-  };
-
-  jwt-go  = buildFromGitHub {
-    rev = "v2.4.0";
-    owner = "dgrijalva";
-    repo = "jwt-go";
-    sha256 = "00rvv1d2f62svd6311dkr8j56ysx8wgk9yfkb9vqf2mp5ix37dc0";
-  };
-
-  kagome = buildFromGitHub {
-    rev = "1bbdbdd590e13a8c2f4508c67a079113cd7b9f51";
-    version = "2016-01-19";
-    owner = "ikawaha";
-    repo = "kagome";
-    sha256 = "1isnjdkn9hnrkp5g37p2k5bbsrx0ma32v3icwlmwwyc5mppa4blb";
-
-    # I disable the parallel building, because otherwise each
-    # spawned compile takes over 1.5GB of RAM.
-    buildFlags = "-p 1";
-    enableParallelBuilding = false;
-
-    goPackagePath = "github.com/ikawaha/kagome";
-  };
-
-  ldap = buildGoPackage rec {
-    rev = "83e65426fd1c06626e88aa8a085e5bfed0208e29";
-    name = "ldap-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/go-ldap/ldap";
-    goPackageAliases = [
-      "github.com/nmcclain/ldap"
-      "github.com/vanackere/ldap"
-    ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "go-ldap";
-      repo   = "ldap";
-      sha256 = "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz";
-    };
-
-    propagatedBuildInputs = [ asn1-ber ];
-  };
-
-  levigo = buildGoPackage rec {
-    rev = "1ddad808d437abb2b8a55a950ec2616caa88969b";
-    name = "levigo-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/jmhodges/levigo";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "jmhodges";
-      repo = "levigo";
-      sha256 = "1lmafyk7nglhig3n471jq4hmnqf45afj5ldb2jx0253f5ii4r2yq";
-    };
-
-    buildInputs = [ pkgs.leveldb ];
-  };
-
-  liner = buildFromGitHub {
-    rev    = "ad1edfd30321d8f006ccf05f1e0524adeb943060";
-    owner  = "peterh";
-    repo   = "liner";
-    sha256 = "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317";
-  };
-
-  odeke-em.log = buildFromGitHub {
-    rev    = "cad53c4565a0b0304577bd13f3862350bdc5f907";
-    owner  = "odeke-em";
-    repo   = "log";
-    sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w";
-  };
-
-  log15 = buildFromGitHub {
-    rev    = "dc7890abeaadcb6a79a9a5ee30bc1897bbf97713";
-    owner  = "inconshreveable";
-    repo   = "log15";
-    sha256 = "15wgicl078h931n90rksgbqmfixvbfxywk3m8qkaln34v69x4vgp";
-    goPackagePath = "gopkg.in/inconshreveable/log15.v2";
-    propagatedBuildInputs = [ go-colorable ];
-  };
-
-  log4go = buildGoPackage rec {
-    rev = "cb4cc51cd03958183d3b637d0750497d88c2f7a8";
-    name = "log4go-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/ccpaging/log4go";
-    goPackageAliases = [
-      "github.com/alecthomas/log4go"
-      "code.google.com/p/log4go"
-    ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "ccpaging";
-      repo = "log4go";
-      sha256 = "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2";
-    };
-
-    propagatedBuildInputs = [ go-colortext ];
-  };
-
-  logger = buildFromGitHub {
-    rev = "c96f6a1a8c7b6bf2f4860c667867d90174799eb2";
-    version = "2015-05-23";
-    owner = "calmh";
-    repo = "logger";
-    sha256 = "1f67xbvvf210g5cqa84l12s00ynfbkjinhl8y6m88yrdb025v1vg";
-  };
-
-  logrus = buildFromGitHub rec {
-    rev = "v0.9.0";
-    owner = "Sirupsen";
-    repo = "logrus";
-    sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4";
-    propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ];
-  };
-
-  logutils = buildFromGitHub {
-    rev    = "0dc08b1671f34c4250ce212759ebd880f743d883";
-    owner  = "hashicorp";
-    repo   = "logutils";
-    sha256 = "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r";
-  };
-
-  luhn = buildFromGitHub {
-    rev    = "0c8388ff95fa92d4094011e5a04fc99dea3d1632";
-    version = "2015-01-13";
-    owner  = "calmh";
-    repo   = "luhn";
-    sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs";
-  };
-
-  lumberjack-v2 = buildFromGitHub {
-    rev    = "v2.0";
-    owner  = "natefinch";
-    repo   = "lumberjack";
-    sha256 = "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82";
-    goPackagePath = "gopkg.in/natefinch/lumberjack.v2";
-    goPackageAliases = [ "github.com/natefinch/lumberjack" ];
-  };
-
-  manners = buildFromGitHub {
-    rev = "0.4.0";
-    owner = "braintree";
-    repo = "manners";
-    sha256 = "07985pbfhwlhbglr9zwh2wx8kkp0wzqr1lf0xbbxbhga4hn9q3ak";
-
-    meta = with stdenv.lib; {
-      description = "A polite Go HTTP server that shuts down gracefully";
-      homepage = "https://github.com/braintree/manners";
-      maintainers = with maintainers; [ matthiasbeyer ];
-      license = licenses.mit;
-    };
-  };
-
-  mapstructure = buildFromGitHub {
-    rev    = "281073eb9eb092240d33ef253c404f1cca550309";
-    owner  = "mitchellh";
-    repo   = "mapstructure";
-    sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
-  };
-
-  mdns = buildGoPackage rec {
-    rev = "2b439d37011456df8ff83a70ffd1cd6046410113";
-    name = "mdns-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/mdns";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "mdns";
-      sha256 = "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96";
-    };
-
-    propagatedBuildInputs = [ net dns ];
-  };
-
-  memberlist = buildGoPackage rec {
-    rev = "6025015f2dc659ca2c735112d37e753bda6e329d";
-    name = "memberlist-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/memberlist";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "memberlist";
-      sha256 = "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7";
-    };
-
-    propagatedBuildInputs = [ ugorji.go armon.go-metrics ];
-  };
-
-  memberlist_v2 = buildGoPackage rec {
-    rev = "165267096ca647f00cc0b59a8f1ede9a96cbfbb1";
-    name = "memberlist-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/memberlist";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "memberlist";
-      sha256 = "09lh79xqy7q0gy23x22lpfwihb5acr750vxl2fx0i4b88kq1vrzh";
-    };
-
-    propagatedBuildInputs = [ ugorji.go armon.go-metrics ];
-  };
-
-  mgo = buildFromGitHub {
-    rev = "r2015.06.03";
-    owner = "go-mgo";
-    repo = "mgo";
-    sha256 = "1bwqbngdy0ghwpvarsz8rlrirdmjrda44aghihpfmin06hxy3zcd";
-    goPackagePath = "gopkg.in/mgo.v2";
-    goPackageAliases = [ "github.com/go-mgo/mgo" ];
-    buildInputs = [ pkgs.cyrus_sasl tomb ];
-  };
-
-  mmark = buildFromGitHub {
-    rev    = "eacb2132c31a489033ebb068432892ba791a2f1b";
-    owner  = "miekg";
-    repo   = "mmark";
-    sha256 = "0wsi6fb6f1qi1a8yv858bkgn8pmsspw2k6dx5fx38kvg8zsb4l1a";
-    buildInputs = [ toml ];
-  };
-
-  motion = buildFromGitHub {
-    rev = "e09baac69ad86bff1de868e8d6c4327eb0a918d7";
-    owner = "fatih";
-    repo = "motion";
-    sha256 = "0yay4a1b5l9f4zmwkcsmr5plnp7a9b66bczy1xz4nzhl20bal6sx";
-    excludedPackages = [ "testdata" ];
-  };
-
-  mousetrap = buildFromGitHub {
-    rev    = "9dbb96d2c3a964935b0870b5abaea13c98b483aa";
-    owner  = "inconshreveable";
-    repo   = "mousetrap";
-    sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b";
-  };
-
-  msgpack = buildGoPackage rec {
-    rev = "9dbd4ac30c0b67927f0fb5557fb8341047bd35f7";
-    name = "msgpack-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "gopkg.in/vmihailenco/msgpack.v2";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "vmihailenco";
-      repo = "msgpack";
-      sha256 = "0nq9yb85hi3c35kwyl38ywv95vd8n7aywmj78wwylglld22nfmw2";
-    };
-  };
-
-  mux = buildFromGitHub {
-    rev = "5a8a0400500543e28b2886a8c52d21a435815411";
-    version = "2015-08-05";
-    owner = "gorilla";
-    repo = "mux";
-    sha256 = "15w1bw14vx157r6v98fhy831ilnbzdsm5xzvs23j8hw6gnknzaw1";
-    propagatedBuildInputs = [ context ];
-  };
-
-  muxado = buildFromGitHub {
-    rev    = "f693c7e88ba316d1a0ae3e205e22a01aa3ec2848";
-    owner  = "inconshreveable";
-    repo   = "muxado";
-    sha256 = "1vgiwwxhgx9c899f6ikvrs0w6vfsnypzalcqyr0mqm2w816r9hhs";
-  };
-
-  mysql = buildFromGitHub {
-    rev    = "fb7299726d2e68745a8805b14f2ff44b5c2cfa84";
-    owner  = "go-sql-driver";
-    repo   = "mysql";
-    sha256 = "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w";
-  };
-
-  net-rpc-msgpackrpc = buildGoPackage rec {
-    rev = "d377902b7aba83dd3895837b902f6cf3f71edcb2";
-    name = "net-rpc-msgpackrpc-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/net-rpc-msgpackrpc";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "net-rpc-msgpackrpc";
-      sha256 = "05q8qlf42ygafcp8zdyx7y7kv9vpjrxnp8ak4qcszz9kgl2cg969";
-    };
-
-    propagatedBuildInputs = [ ugorji.go ];
-  };
-
-  netlink = buildFromGitHub {
-    rev = "a632d6dc2806fa19d2f7693017d3fb79d3d8fa03";
-    version = "2016-04-05";
-    owner = "vishvananda";
-    repo = "netlink";
-    sha256 = "1m1aanxlsb1zqqxmdi528ma8c5k2h0hp6vk2nmplm6rldcnvyr4v";
-  };
-
-  ngrok = buildFromGitHub {
-    rev = "1.7.1";
-    owner = "inconshreveable";
-    repo = "ngrok";
-    sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4";
-    goPackagePath = "ngrok";
-
-    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
-    '';
-
-    buildInputs = [
-      git log4go websocket go-vhost mousetrap termbox-go rcrowley.go-metrics
-      yaml-v1 go-bindata.bin go-update-v0 binarydist osext
-    ];
-
-    buildFlags = [ "-tags release" ];
-  };
-
-  nitro = buildFromGitHub {
-    rev    = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8";
-    owner  = "spf13";
-    repo   = "nitro";
-    sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib";
-  };
-
-  ntp = buildFromGitHub {
-    rev    = "0a5264e2563429030eb922f258229ae3fee5b5dc";
-    owner  = "beevik";
-    repo   = "ntp";
-    sha256 = "03fvgbjf2aprjj1s6wdc35wwa7k1w5phkixzvp5n1j21sf6w4h24";
-  };
-
-  objx = buildFromGitHub {
-    rev    = "cbeaeb16a013161a98496fad62933b1d21786672";
-    owner  = "stretchr";
-    repo   = "objx";
-    sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1";
-  };
-
-  oglematchers = buildGoPackage rec {
-    rev = "4fc24f97b5b74022c2a3f4ca7eed57ca29083d3e";
-    name = "oglematchers-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/jacobsa/oglematchers";
-    src = fetchgit {
-      inherit rev;
-      url = "https://${goPackagePath}.git";
-      sha256 = "1jjvss4cmcd505aqhsyag15lmzjycgwwml9mfdigprxv3v8f3pnq";
-    };
-    #goTestInputs = [ ogletest ];
-    doCheck = false; # infinite recursion
-  };
-
-  oglemock = buildGoPackage rec {
-    rev = "d054ecee522bdce4481690cdeb09d1b4c44da4e1";
-    name = "oglemock-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/jacobsa/oglemock";
-    src = fetchgit {
-      inherit rev;
-      url = "https://${goPackagePath}.git";
-      sha256 = "1sn6hj34c54x0svr68vcgm2l725x03ccpq6h3ypi3hrvzg349ykw";
-    };
-    buildInputs = [ oglematchers ];
-    #goTestInputs = [ ogletest ];
-    doCheck = false; # infinite recursion
-  };
-
-  ogletest = buildGoPackage rec {
-    rev = "7de485607c3f215cf92c1f793b5d5a7de46ec3c7";
-    name = "ogletest-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/jacobsa/ogletest";
-    src = fetchgit {
-      inherit rev;
-      url = "https://${goPackagePath}.git";
-      sha256 = "0y4y20a84rhmp66x9d7nzlygiabky98wlbvx56h1hknm08gpskiz";
-    };
-    buildInputs = [ oglemock oglematchers ];
-    doCheck = false; # check this again
-  };
-
-  openssl = buildFromGitHub {
-    rev = "4c6dbafa5ec35b3ffc6a1b1e1fe29c3eba2053ec";
-    owner = "10gen";
-    repo = "openssl";
-    sha256 = "1033c9vgv9lf8ks0qjy0ylsmx1hizqxa6izalma8vi30np6ka6zn";
-    goPackageAliases = [ "github.com/spacemonkeygo/openssl" ];
-    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ pkgs.openssl ];
-    propagatedBuildInputs = [ spacelog ];
-
-    preBuild = ''
-      find go/src/$goPackagePath -name \*.go | xargs sed -i 's,spacemonkeygo/openssl,10gen/openssl,g'
-    '';
-  };
-
-  # reintroduced for gocrytpfs as I don't understand the 10gen/spacemonkey split
-  openssl-spacemonkey = buildFromGitHub rec {
-    rev = "71f9da2a482c2b7bc3507c3fabaf714d6bb8b75d";
-    name = "openssl-${stdenv.lib.strings.substring 0 7 rev}";
-    owner = "spacemonkeygo";
-    repo = "openssl";
-    sha256 = "1byxwiq4mcbsj0wgaxqmyndp6jjn5gm8fjlsxw9bg0f33a3kn5jk";
-    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ pkgs.openssl ];
-    propagatedBuildInputs = [ spacelog ];
-  };
-
-  opencontainers.runtime-spec = buildFromGitHub {
-    rev = "53f0da5e98284a39b3aaa04d5be6730924380686";
-    version = "2016-04-14";
-    owner = "opencontainers";
-    repo = "runtime-spec";
-    sha256 = "1vxhbp8rcws4kix1v0pmrbg4x1k7zmsyq1an9526q4jdrdckp7kb";
-    propagatedBuildInputs = [ gojsonschema ];
-  };
-
-  opencontainers.runc = buildFromGitHub {
-    rev = "d1e00150320329da347de8ec830618c697c3df79";
-    version = "2016-04-14";
-    owner = "opencontainers";
-    repo = "runc";
-    sha256 = "18dhbb1d25s4cpikrari2ws3w7x92r6yxj4si64h9y177wmn6kml";
-    propagatedBuildInputs = [
-      go-systemd opencontainers.runtime-spec protobuf gocapability
-      docker.go-units logrus docker.docker netlink cli-go
-    ];
-  };
-
-  opsgenie-go-sdk = buildFromGitHub {
-    rev = "c6e1235dfed2126eb9b562c4d776baf55ccd23e3";
-    version = "2015-08-24";
-    owner = "opsgenie";
-    repo = "opsgenie-go-sdk";
-    sha256 = "1prvnjiqmhnp9cggp9f6882yckix2laqik35fcj32117ry26p4jm";
-    propagatedBuildInputs = [ seelog go-querystring goreq ];
-    excludedPackages = "samples";
-  };
-
-  osext = buildFromGitHub {
-    rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc";
-    owner = "kardianos";
-    repo = "osext";
-    sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a";
-    goPackageAliases = [
-      "github.com/bugsnag/osext"
-      "bitbucket.org/kardianos/osext"
-    ];
-  };
-
-  pat = buildFromGitHub {
-    rev    = "b8a35001b773c267eb260a691f4e5499a3531600";
-    owner  = "bmizerany";
-    repo   = "pat";
-    sha256 = "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz";
-  };
-
-  pathtree = buildFromGitHub {
-    rev    = "41257a1839e945fce74afd070e02bab2ea2c776a";
-    owner  = "robfig";
-    repo   = "pathtree";
-    sha256 = "087hvskjx1zw815h1617i135vwsn5288v579mz6yral91wbn0kvi";
-  };
-
-  panicwrap = buildGoPackage rec {
-    rev = "e5f9854865b9778a45169fc249e99e338d4d6f27";
-    name = "panicwrap-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/bugsnag/panicwrap";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "bugsnag";
-      repo = "panicwrap";
-      sha256 = "01afviklmgm25i82c0z9xkjgbrh0j1fm9a1adqfd2jqv0cm41k9d";
-    };
-
-    propagatedBuildInputs = [ osext ];
-  };
-
-  pb = buildFromGitHub {
-    rev    = "e648e12b78cedf14ebb2fc1855033f07b034cfbb";
-    owner  = "cheggaaa";
-    repo   = "pb";
-    sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam";
-  };
-
-  perks = buildFromGitHub rec {
-    version = "2014-07-16";
-    owner  = "bmizerany";
-    repo   = "perks";
-    rev    = "d9a9656a3a4b1c2864fdb44db2ef8619772d92aa";
-    sha256 = "0f39b3zfm1zd6xcvlm6szgss026qs84n2j9y5bnb3zxzdkxb9w9n";
-  };
-
-  beorn7.perks = buildFromGitHub rec {
-    version = "2015-02-23";
-    owner  = "beorn7";
-    repo   = "perks";
-    rev    = "b965b613227fddccbfffe13eae360ed3fa822f8d";
-    sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
-  };
-
-  pflag = buildGoPackage rec {
-    version = "20131112";
-    rev = "94e98a55fb412fcbcfc302555cb990f5e1590627";
-    name = "pflag-${version}-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/spf13/pflag";
-    src = fetchgit {
-      inherit rev;
-      url = "https://${goPackagePath}.git";
-      sha256 = "0z8nzdhj8nrim8fz11magdl0wxnisix9p2kcvn5kkb3bg8wmxhbg";
-    };
-    doCheck = false; # bad import path in tests
-  };
-
-  pflag-spf13 = buildFromGitHub rec {
-    rev    = "08b1a584251b5b62f458943640fc8ebd4d50aaa5";
-    owner  = "spf13";
-    repo   = "pflag";
-    sha256 = "139d08cq06jia0arc6cikdnhnaqms07xfay87pzq5ym86fv0agiq";
-  };
-
-  pongo2 = buildFromGitHub {
-    rev    = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9";
-    version = "2014-10-27";
-    owner  = "flosch";
-    repo   = "pongo2";
-    sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8";
-    goPackagePath = "gopkg.in/flosch/pongo2.v3";
-  };
-
-  pool = buildGoPackage rec {
-    rev = "v2.0.0";
-    name = "pq-${rev}";
-    goPackagePath = "gopkg.in/fatih/pool.v2";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "fatih";
-      repo = "pool";
-      sha256 = "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0";
-    };
-  };
-
-  pq = buildFromGitHub {
-    rev    = "0dad96c0b94f8dee039aa40467f767467392a0af";
-    owner  = "lib";
-    repo   = "pq";
-    sha256 = "06c38iy37251mh8jy9s8n97b01pjnqpq8ii77nnmqh1dsph37jz4";
-  };
-
-  pretty = buildGoPackage rec {
-    rev = "bc9499caa0f45ee5edb2f0209fbd61fbf3d9018f";
-    name = "pretty-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/kr/pretty";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "kr";
-      repo = "pretty";
-      sha256 = "1m61y592qsnwsqn76v54mm6h2pcvh4wlzbzscc1ag645x0j33vvl";
-    };
-    propagatedBuildInputs = [ kr.text ];
-  };
-
-  prometheus.client_golang = buildFromGitHub {
-    rev = "0.7.0";
-    owner = "prometheus";
-    repo = "client_golang";
-    sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna";
-    propagatedBuildInputs = [
-      goautoneg
-      protobuf
-      golang_protobuf_extensions
-      prometheus.client_model
-      prometheus.procfs
-      beorn7.perks
-    ];
-  };
-
-  prometheus.client_model = buildFromGitHub {
-    rev    = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
-    version = "2015-02-12";
-    owner  = "prometheus";
-    repo   = "client_model";
-    sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
-    buildInputs = [ protobuf ];
-  };
-
-  prometheus.log = buildFromGitHub {
-    rev    = "439e5db48fbb50ebbaf2c816030473a62f505f55";
-    version = "2015-05-29";
-    owner  = "prometheus";
-    repo   = "log";
-    sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv";
-    propagatedBuildInputs = [ logrus ];
-  };
-
-  prometheus.node-exporter = buildFromGitHub {
-    rev = "0.11.0";
-    owner = "prometheus";
-    repo = "node_exporter";
-    sha256 = "149fs9yxnbiyd4ww7bxsv730mcskblpzb3cs4v12jnq2v84a4kk4";
-
-    buildInputs = [
-      go-runit
-      ntp
-      prometheus.client_golang
-      prometheus.client_model
-      prometheus.log
-      protobuf
-    ];
-
-    doCheck = true;
-
-    meta = with stdenv.lib; {
-      description = "Prometheus exporter for machine metrics";
-      homepage = https://github.com/prometheus/node_exporter;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ benley ];
-      platforms = platforms.unix;
-    };
-  };
-
-  prometheus.procfs = buildFromGitHub {
-    rev    = "c91d8eefde16bd047416409eb56353ea84a186e4";
-    version = "2015-06-16";
-    owner  = "prometheus";
-    repo   = "procfs";
-    sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
-  };
-
-  properties = buildFromGitHub {
-    rev    = "v1.5.6";
-    owner  = "magiconair";
-    repo   = "properties";
-    sha256 = "043jhba7qbbinsij3yc475s1i42sxaqsb82mivh9gncpvnmnf6cl";
-  };
-
-  gogo.protobuf = buildFromGitHub {
-    rev = "932b70afa8b0bf4a8e167fdf0c3367cebba45903";
-    owner = "gogo";
-    repo = "protobuf";
-    sha256 = "1djhv9ckqhyjnnqajjv8ivcwpmjdnml30l6zhgbjcjwdyz3nyzhx";
-    excludedPackages = "test";
-    goPackageAliases = [
-      "code.google.com/p/gogoprotobuf"
-    ];
-  };
-
-  pty = buildFromGitHub {
-    rev    = "67e2db24c831afa6c64fc17b4a143390674365ef";
-    owner  = "kr";
-    repo   = "pty";
-    sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d";
-  };
-
-  purell = buildFromGitHub {
-    rev    = "d69616f51cdfcd7514d6a380847a152dfc2a749d";
-    owner  = "PuerkitoBio";
-    repo   = "purell";
-    sha256 = "0nma5i25j0y223ns7482lx4klcfhfwdr8v6r9kzrs0pwlq64ghs0";
-    propagatedBuildInputs = [ urlesc ];
-  };
-
-  pushover = buildFromGitHub {
-    rev    = "a8420a1935479cc266bda685cee558e86dad4b9f";
-    owner  = "thorduri";
-    repo   = "pushover";
-    sha256 = "0j4k43ppka20hmixlwhhz5mhv92p6wxbkvdabs4cf7k8jpk5argq";
-  };
-
-  qart = buildFromGitHub {
-    rev    = "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0";
-    owner  = "vitrun";
-    repo   = "qart";
-    sha256 = "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8";
-  };
-
-  raft = buildGoPackage rec {
-    rev = "a8065f298505708bf60f518c09178149f3c06f21";
-    name = "raft-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/raft";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "hashicorp";
-      repo   = "raft";
-      sha256 = "122mjijphas7ybbvssxv1r36sb8i907gdr9kvplnx6yg9w52j3mn";
-    };
-
-    propagatedBuildInputs = [ armon.go-metrics ugorji.go ];
-  };
-
-  raft-boltdb = buildGoPackage rec {
-    rev = "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee";
-    name = "raft-boltdb-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/raft-boltdb";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "hashicorp";
-      repo   = "raft-boltdb";
-      sha256 = "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia";
-    };
-
-    propagatedBuildInputs = [ bolt ugorji.go raft ];
-  };
-
-  raft-mdb = buildGoPackage rec {
-    rev = "4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0";
-    name = "raft-mdb-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/raft-mdb";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "hashicorp";
-      repo   = "raft-mdb";
-      sha256 = "15l4n6zygwn3h118m2945h9jxkryaxxcgy8xij2rxjhzrzpfyj3i";
-    };
-
-    propagatedBuildInputs = [ gomdb ugorji.go raft ];
-  };
-
-  ratelimit = buildFromGitHub {
-    rev    = "772f5c38e468398c4511514f4f6aa9a4185bc0a0";
-    version = "2015-06-19";
-    owner  = "juju";
-    repo   = "ratelimit";
-    sha256 = "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p";
-  };
-
-  raw = buildFromGitHub {
-    rev    = "724aedf6e1a5d8971aafec384b6bde3d5608fba4";
-    owner  = "feyeleanor";
-    repo   = "raw";
-    sha256 = "0z4dcnadgk0fbxxd14dqa1wzzr0v3ksqlzd0swzs2mipim5wjgsz";
-  };
-
-  raven-go = buildFromGitHub {
-    rev    = "74c334d7b8aaa4fd1b4fc6aa428c36fed1699e28";
-    version = "2015-07-21";
-    owner  = "getsentry";
-    repo   = "raven-go";
-    sha256 = "1356a7h8zp1mcywnr0y83w0h4qdblp65rcf9slbx667n8x2rzda8";
-  };
-
-  rclone = buildFromGitHub {
-    rev    = "157d7d45f501238ffb891a78b3eaeda81a42861c";
-    version = "1.29";
-    owner  = "ncw";
-    repo   = "rclone";
-    sha256 = "1mwpf6a27c4lcyrrpyas1k17ijs4a6q29048hhh1hg791f781b21";
-
-    buildInputs = [ config pflag open-golang oauth2 aws-sdk-go hashicorp.aws-sdk-go errwrap go-httpclient tb ewma swift
-                    goconfig go-acd google-api-go-client dropbox ];
-  };
-
-  redigo = buildFromGitHub {
-    rev    = "535138d7bcd717d6531c701ef5933d98b1866257";
-    owner  = "garyburd";
-    repo   = "redigo";
-    sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v";
-  };
-
-  reflectwalk = buildFromGitHub {
-    rev    = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6";
-    owner  = "mitchellh";
-    repo   = "reflectwalk";
-    sha256 = "1nm2ig7gwlmf04w7dbqd8d7p64z2030fnnfbgnd56nmd7dz8gpxq";
-  };
-
-  revel = buildGoPackage rec {
-    rev = "v0.12.0";
-    name = "revel-${rev}";
-    goPackagePath = "github.com/revel/revel";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "revel";
-      repo   = "revel";
-      sha256 = "1g88fw5lqh3a9qmx182s64zk3h1s1mx8bljyghissmd9z505pbzf";
-    };
-
-    # Using robfig's old go-cache due to compilation errors.
-    # Try to switch to pmylund.go-cache after v0.12.0
-    propagatedBuildInputs = [
-      gocolorize config net pathtree fsnotify.v1 robfig.go-cache redigo gomemcache
-    ];
-  };
-
-  restic = buildFromGitHub {
-    rev    = "4d7e802c44369b40177cd52938bc5b0930bd2be1";
-    version = "2016-01-17";
-    owner  = "restic";
-    repo   = "restic";
-    sha256 = "0lf40539dy2xa5l1xy1kyn1vk3w0fmapa1h65ciksrdhn89ilrxv";
-    # Using its delivered dependencies. Easier.
-    preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/$goPackagePath/Godeps/_workspace";
-  };
-
-  rgbterm = buildFromGitHub {
-    rev    = "c07e2f009ed2311e9c35bca12ec00b38ccd48283";
-    owner  = "aybabtme";
-    repo   = "rgbterm";
-    sha256 = "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam";
-  };
-
-  ripper = buildFromGitHub {
-    rev    = "bd1a682568fcb8a480b977bb5851452fc04f9ccb";
-    owner  = "odeke-em";
-    repo   = "ripper";
-    sha256 = "010jsclnmkaywdlyfqdmq372q7kh3qbz2zra0c4wn91qnkmkrnw1";
-  };
-
-  rsrc = buildFromGitHub {
-    rev    = "ba14da1f827188454a4591717fff29999010887f";
-    version = "2015-11-03";
-    owner  = "akavel";
-    repo   = "rsrc";
-    sha256 = "0g9fj10xnxcv034c8hpcgbhswv6as0d8l176c5nfgh1lh6klmmzc";
-  };
-
-  sandblast = buildGoPackage rec {
-    rev = "694d24817b9b7b8bacb6d458b7989b30d7fe3555";
-    name = "sandblast-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/aarzilli/sandblast";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "aarzilli";
-      repo   = "sandblast";
-      sha256 = "1pj0bic3x89v44nr8ycqxwnafkiz3cr5kya4wfdfj5ldbs5xnq9l";
-    };
-
-    buildInputs = [ net text ];
-  };
-
-  # This is the upstream package name, underscores and all. I don't like it
-  # but it seems wrong to change their name when packaging it.
-  sanitized_anchor_name = buildFromGitHub {
-    rev    = "10ef21a441db47d8b13ebcc5fd2310f636973c77";
-    owner  = "shurcooL";
-    repo   = "sanitized_anchor_name";
-    sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01";
-  };
-
-  scada-client = buildGoPackage rec {
-    rev = "c26580cfe35393f6f4bf1b9ba55e6afe33176bae";
-    name = "scada-client-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/scada-client";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "hashicorp";
-      repo   = "scada-client";
-      sha256 = "0s8xg49fa7d2d0vv8pi37f43rjrgkb7w6x6ydkikz1v8ccg05p3b";
-    };
-
-    buildInputs = [ armon.go-metrics net-rpc-msgpackrpc yamux ];
-  };
-
-  seelog = buildFromGitHub {
-    rev = "c510775bb50d98213cfafca75a4bc5e3fddc8d8f";
-    version = "2015-05-26";
-    owner = "cihub";
-    repo = "seelog";
-    sha256 = "1f0rwgqlffv1a7b05736a4gf4l9dn80wsfyqcnz6qd2skhwnzv29";
-  };
-
-  segment = buildFromGitHub {
-    rev    = "db70c57796cc8c310613541dfade3dce627d09c7";
-    version = "2016-01-05";
-    owner  = "blevesearch";
-    repo   = "segment";
-    sha256 = "09xfdlcc6bsrr5grxp6fgnw9p4cf6jc0wwa9049fd1l0zmhj2m1g";
-  };
-
-  semver = buildFromGitHub {
-    rev = "31b736133b98f26d5e078ec9eb591666edfd091f";
-    version = "2015-07-20";
-    owner = "blang";
-    repo = "semver";
-    sha256 = "19ifi0na4cj23q3h8xv89mx7p48y0ciymhmlrq9milm0xz80wk10";
-  };
-
-  sets = buildGoPackage rec {
-    rev = "6c54cb57ea406ff6354256a4847e37298194478f";
-    name = "sets-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/feyeleanor/sets";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "feyeleanor";
-      repo   = "sets";
-      sha256 = "1l3hyl8kmwb9k6qi8x4w54g2cmydap0g3cqvs47bhvm47rg1j1zc";
-    };
-    propagatedBuildInputs = [ slices ];
-  };
-
-  shlex = buildFromGitHub {
-    rev = "6f45313302b9c56850fc17f99e40caebce98c716";
-    owner = "google";
-    repo = "shlex";
-    sha256 = "0ybz1w3hndma8myq3pxan36533hy9f4w598hsv4hnj21l4br8jpx";
-  };
-
-  slices = buildGoPackage rec {
-    rev = "bb44bb2e4817fe71ba7082d351fd582e7d40e3ea";
-    name = "slices-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/feyeleanor/slices";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "feyeleanor";
-      repo   = "slices";
-      sha256 = "1miqhzqgww41d8xbvmxfzx9rsfxgw742nqz96mhjkxpadrxg870v";
-    };
-    propagatedBuildInputs = [ raw ];
-  };
-
-  spacelog = buildFromGitHub {
-    rev = "ae95ccc1eb0c8ce2496c43177430efd61930f7e4";
-    owner = "spacemonkeygo";
-    repo = "spacelog";
-    sha256 = "1i1awivsix0ch0vg6rwvx0536ziyw6phcx45b1rmrclp6b6dyacy";
-    buildInputs = [ flagfile ];
-  };
-
-  stathat = buildGoPackage rec {
-    rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77";
-    name = "stathat-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/stathat/go";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "stathat";
-      repo = "go";
-      sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi";
-    };
-  };
-
-  statos = buildFromGitHub {
-    rev    = "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6";
-    owner  = "odeke-em";
-    repo   = "statos";
-    sha256 = "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs";
-  };
-
-  statik = buildGoPackage rec {
-    rev = "274df120e9065bdd08eb1120e0375e3dc1ae8465";
-    name = "statik-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/rakyll/statik";
-
-    excludedPackages = "example";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "rakyll";
-      repo = "statik";
-      sha256 = "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp";
-    };
-  };
-
-  structfield = buildFromGitHub {
-    rev    = "01a738558a47fbf16712994d1737fb31c77e7d11";
-    version = "2014-08-01";
-    owner  = "vincent-petithory";
-    repo   = "structfield";
-    sha256 = "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw";
-  };
-
-  structs = buildFromGitHub {
-    rev    = "a9f7daa9c2729e97450c2da2feda19130a367d8f";
-    owner  = "fatih";
-    repo   = "structs";
-    sha256 = "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50";
-  };
-
-  suture = buildFromGitHub rec {
-    version = "1.0.1";
-    rev    = "v${version}";
-    owner  = "thejerf";
-    repo   = "suture";
-    sha256 = "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4";
-  };
-
-  syncthing-protocol011 = buildFromGitHub {
-    rev = "84365882de255d2204d0eeda8dee288082a27f98";
-    version = "2015-08-28";
-    owner = "syncthing";
-    repo = "protocol";
-    sha256 = "07xjs43lpd51pc339f8x487yhs39riysj3ifbjxsx329kljbflwx";
-    propagatedBuildInputs = [ go-lz4 logger luhn xdr text ];
-  };
-
-  swift = buildFromGitHub {
-    rev    = "aaed45e6d8b38e37e6085a8e5541a11496f160bd";
-    version = "20160216";
-    owner  = "ncw";
-    repo   = "swift";
-    sha256 = "1sh4lnqh934g4jws3g7vh0w7n882jwybc95jgnnpyk8k1zmifbv2";
-  };
-
-  tablewriter = buildFromGitHub {
-    rev    = "cca8bbc0798408af109aaaa239cbd2634846b340";
-    version = "2016-01-15";
-    owner  = "olekukonko";
-    repo   = "tablewriter";
-    sha256 = "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48";
-    propagatedBuildInputs = [ mattn.go-runewidth ];
-  };
-
-  tb = buildFromGitHub {
-    rev    = "19f4c3d79d2bd67d0911b2e310b999eeea4454c1";
-    version = "20151208";
-    owner  = "tsenart";
-    repo   = "tb";
-    sha256 = "148vy4xij5qm8dq5plyczx2wbpi4gpg8ksr5r3b4m8j0z1kjws8y";
-  };
-
-  termbox-go = buildGoPackage rec {
-    rev = "9aecf65084a5754f12d27508fa2e6ed56851953b";
-    name = "termbox-go-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/nsf/termbox-go";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "nsf";
-      repo = "termbox-go";
-      sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh";
-    };
-
-    subPackages = [ "./" ]; # prevent building _demos
-  };
-
-  testify = buildGoPackage rec {
-    rev = "089c7181b8c728499929ff09b62d3fdd8df8adff";
-    name = "testify-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/stretchr/testify";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "stretchr";
-      repo = "testify";
-      sha256 = "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p";
-    };
-
-    buildInputs = [ objx ];
-  };
-
-  kr.text = buildGoPackage rec {
-    rev = "6807e777504f54ad073ecef66747de158294b639";
-    name = "kr.text-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/kr/text";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "kr";
-      repo = "text";
-      sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698";
-    };
-    propagatedBuildInputs = [ pty ];
-  };
-
-  timer_metrics = buildFromGitHub {
-    rev = "afad1794bb13e2a094720aeb27c088aa64564895";
-    version = "2015-02-02";
-    owner = "bitly";
-    repo = "timer_metrics";
-    sha256 = "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c";
-  };
-
-  tomb = buildFromGitHub {
-    rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8";
-    owner = "go-tomb";
-    repo = "tomb";
-    sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5";
-    goPackagePath = "gopkg.in/tomb.v2";
-    goPackageAliases = [ "github.com/go-tomb/tomb" ];
-  };
-
-  toml = buildFromGitHub {
-    rev    = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
-    version = "2015-05-01";
-    owner  = "BurntSushi";
-    repo   = "toml";
-    sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
-  };
-
-  uilive = buildFromGitHub {
-    rev = "1b9b73fa2b2cc24489b1aba4d29a82b12cd0a71f";
-    owner = "gosuri";
-    repo = "uilive";
-    sha256 = "0669f21hd5cw74irrfakdpvxn608cd5xy6s2nyp5kgcy2ijrq4ab";
-  };
-
-  uiprogress = buildFromGitHub {
-    buildInputs = [ uilive ];
-    rev = "fd1c82df78a6c1f5ddbd3b6ec46407ea0acda1ad";
-    owner = "gosuri";
-    repo = "uiprogress";
-    sha256 = "1s61vp2h6n1d8y1zqr2ca613ch5n18rx28waz6a8im94sgzzawp7";
-  };
-
-  urlesc = buildFromGitHub {
-    rev    = "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587";
-    owner  = "opennota";
-    repo   = "urlesc";
-    sha256 = "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni";
-  };
-
-  uuid = buildFromGitHub {
-    rev = "cccd189d45f7ac3368a0d127efb7f4d08ae0b655";
-    version = "2015-08-24";
-    owner = "pborman";
-    repo = "uuid";
-    sha256 = "0hswk9ihv3js5blp9pk2bpig64zkmyp5p1zhmgydfhb0dr2w8iad";
-  };
-
-  vcs = buildFromGitHub {
-    rev    = "1.4.0";
-    owner  = "Masterminds";
-    repo   = "vcs";
-    sha256 = "0590ww2av4407y7zy3bcmnr8i74fv00k9zzcxcpjxivl6qszna0d";
-  };
-
-  viper = buildFromGitHub {
-    rev    = "e37b56e207dda4d79b9defe0548e960658ee8b6b";
-    owner  = "spf13";
-    repo   = "viper";
-    sha256 = "0q0hkla23hgvc3ab6qdlrfwxa8lnhy2s2mh2c8zrh632gp8d6prl";
-    propagatedBuildInputs = [
-      mapstructure yaml-v2 jwalterweatherman crypt fsnotify.v1 cast properties
-      pretty toml pflag-spf13
-    ];
-  };
-
-  vulcand = buildGoPackage rec {
-    rev = "v0.8.0-beta.3";
-    name = "vulcand-${rev}";
-    goPackagePath = "github.com/mailgun/vulcand";
-    preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "mailgun";
-      repo = "vulcand";
-      sha256 = "08mal9prwlsav63r972q344zpwqfql6qw6v4ixbn1h3h32kk3ic6";
-    };
-    subPackages = [ "./" ];
-  };
-
-  websocket = buildFromGitHub {
-    rev    = "6eb6ad425a89d9da7a5549bc6da8f79ba5c17844";
-    owner  = "gorilla";
-    repo   = "websocket";
-    sha256 = "0gljdfxqc94yb1kpqqrm5p94ph9dsxrzcixhdj6m92cwwa7z7p99";
-  };
-
-  yaml-v1 = buildGoPackage rec {
-    name = "yaml-v1-${version}";
-    version = "git-2015-05-01";
-    goPackagePath = "gopkg.in/yaml.v1";
-    src = fetchFromGitHub {
-      rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a";
-      owner = "go-yaml";
-      repo = "yaml";
-      sha256 = "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy";
-    };
-  };
-
-  yaml-v2 = buildFromGitHub {
-    rev = "7ad95dd0798a40da1ccdff6dff35fd177b5edf40";
-    version = "2015-06-24";
-    owner = "go-yaml";
-    repo = "yaml";
-    sha256 = "0d4jh46jq2yjg5dp00l7yl9ilhly7k4mfvi4harafd5ap5k9wnpb";
-    goPackagePath = "gopkg.in/yaml.v2";
-  };
-
-  yamux = buildFromGitHub {
-    rev    = "b2e55852ddaf823a85c67f798080eb7d08acd71d";
-    owner  = "hashicorp";
-    repo   = "yamux";
-    sha256 = "0mr87my5m8lgc0byjcddlclxg34d07cpi9p78ps3rhzq7p37g533";
-  };
-
-  xdr = buildFromGitHub {
-    rev    = "e467b5aeb65ca8516fb3925c84991bf1d7cc935e";
-    version = "2015-04-08";
-    owner  = "calmh";
-    repo   = "xdr";
-    sha256 = "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra";
-  };
-
-  xon = buildFromGitHub {
-    rev    = "d580be739d723da4f6378083128f93017b8ab295";
-    owner  = "odeke-em";
-    repo   = "xon";
-    sha256 = "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc";
-  };
-
-  ninefans = buildFromGitHub {
-    rev    = "65b8cf069318223b1e722b4b36e729e5e9bb9eab";
-    version = "2015-10-24";
-    owner  = "9fans";
-    repo   = "go";
-    sha256 = "0kzyxhs2xf0339nlnbm9gc365b2svyyjxnr86rphx5m072r32ims";
-    goPackagePath = "9fans.net/go";
-    goPackageAliases = [
-      "github.com/9fans/go"
-    ];
-    excludedPackages = "\\(plan9/client/cat\\|acme/Watch\\)";
-    buildInputs = [ net ];
-  };
-
-  godef = buildFromGitHub {
-    rev    = "ea14e800fd7d16918be88dae9f0195f7bd688586";
-    version = "2015-10-24";
-    owner  = "rogpeppe";
-    repo   = "godef";
-    sha256 = "1wkvsz8nqwyp36wbm8vcw4449sfs46894nskrfj9qbsrjijvamyc";
-    excludedPackages = "\\(go/printer/testdata\\)";
-    buildInputs = [ ninefans ];
-    subPackages = [ "./" ];
-  };
-
-  godep = buildFromGitHub rec {
-    version = "71";
-    rev    = "v${version}";
-    owner  = "tools";
-    repo   = "godep";
-    sha256 = "08dndq9lakw7civz4h44mwmmnc6qflsfhp8c7c21l95zvmavbly7";
-  };
-
-  color = buildFromGitHub {
-    rev      = "9aae6aaa22315390f03959adca2c4d395b02fcef";
-    owner    = "fatih";
-    repo     = "color";
-    sha256   = "1vjcgx4xc0h4870qzz4mrh1l0f07wr79jm8pnbp6a2yd41rm8wjp";
-    propagatedBuildInputs = [ net go-isatty ];
-    buildInputs = [ ansicolor go-colorable ];
-  };
-
-  textsecure = buildFromGitHub rec {
-    rev = "505e129c42fc4c5cb2d105520cef7c04fa3a6b64";
-    owner = "janimo";
-    repo = "textsecure";
-    sha256 = "0sdcqd89dlic0bllb6mjliz4x54rxnm1r3xqd5qdp936n7xs3mc6";
-    propagatedBuildInputs = [ crypto protobuf ed25519 yaml-v2 logrus ];
-    disabled = isGo14;
-  };
-
-  template = buildFromGitHub {
-    rev = "14fd436dd20c3cc65242a9f396b61bfc8a3926fc";
-    owner = "alecthomas";
-    repo = "template";
-    sha256 = "19rzvvcgvr1z2wz9xpqsmlm8syizbpxjp5zbzgakvrqlajpbjvx2";
-  };
-
-  units = buildFromGitHub {
-    rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
-    owner = "alecthomas";
-    repo = "units";
-    sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
-  };
-
-  go-difflib = buildFromGitHub {
-    rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d";
-    owner = "pmezard";
-    repo = "go-difflib";
-    sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs";
-  };
-
-  kingpin = buildFromGitHub {
-    rev = "21551c2a6259a8145110ca80a36e25c9d7624032";
-    owner = "alecthomas";
-    repo = "kingpin";
-    sha256 = "1zhpqc4qxsw9lc1b4dwk5r42k9r702ihzrabs3mnsphvm9jx4l59";
-    propagatedBuildInputs = [ template units ];
-    goPackageAliases = [ "gopkg.in/alecthomas/kingpin.v2" ];
-  };
-
-  godotenv = buildFromGitHub rec {
-    rev    = "4ed13390c0acd2ff4e371e64d8b97c8954138243";
-    version = "2015-09-07";
-    owner  = "joho";
-    repo   = "godotenv";
-    sha256 = "1wzgws4dnlavi14aw3jzdl3mdr348skgqaq8xx4j8l68irfqyh0p";
-    buildInputs = [ go-colortext yaml-v2 ];
-  };
-
-  goreman = buildFromGitHub rec {
-    version = "0.0.8-rc0";
-    rev    = "d3e62509ccf23e47a390447886c51b1d89d0934b";
-    owner  = "mattn";
-    repo   = "goreman";
-    sha256 = "153hf4dq4jh1yv35pv30idmxhc917qzl590qy5394l48d4rapgb5";
-    buildInputs = [ go-colortext yaml-v2 godotenv ];
-  };
-
-  # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix:
-  #
-  # service.xserver.displayManager.sessionCommands = ''
-  #   ${pkgs.dunst}/bin/dunst -shrink -geometry 0x0-50-50 -key space & # ...if don't already have a dbus notification display app
-  #   (sleep 3; exec ${pkgs.yeshup}/bin/yeshup ${pkgs.go-upower-notify}/bin/upower-notify) &
-  # '';
-  upower-notify = buildFromGitHub rec {
-    rev    = "14c581e683a7e90ec9fa6d409413c16599a5323c";
-    version = "2016-03-10";
-    owner  = "omeid";
-    repo   = "upower-notify";
-    sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw";
-    propagatedBuildInputs = [ dbus ];
-  };
-
-  ingo = buildFromGitHub rec {
-    rev     = "fab41e4e62cbef5d92998746ec25f7e195100f38";
-    version = "2016-04-07";
-    owner   = "schachmat";
-    repo    = "ingo";
-    sha256  = "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb";
-    propagatedBuildInputs = [ ];
-  };
-
-  gopsutil = buildFromGitHub rec {
-    version = "1.0.0";
-    rev = "37d89088411de59a4ef9fc340afa0e89dfcb4ea9";
-    owner = "shirou";
-    repo = "gopsutil";
-    sha256 = "13bi1d9hw8vr6qjpblryhglm0ikzpijbwhpp6rx7f5yd7sxsswhm";
-    propagatedBuildInputs = [ ];
-  };
-
-  gohai = buildFromGitHub rec {
-    rev = "94685629c66fe481bfb499175b448fb401a41781";
-    version = "2016-04-14";
-    owner = "DataDog";
-    repo = "gohai";
-    sha256 = "0dvrv7skc0k8zd83gbwml8c02wjwldhxhhgzmwdfvvaqc00qz2c0";
-    propagatedBuildInputs = [ seelog gopsutil ];
-  };
-}; in self

From 31f4a9b5590fdef5412f13e16888d2fa94f6f5f7 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Mon, 30 May 2016 00:10:28 +0100
Subject: [PATCH 109/436] xfce.thunar: patch to avoid error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

«the desktop file … is in an insecure location»
which pops up when invoking desktop files that are
symlinks to the /nix/store

this error was added by this commit:

https://github.com/xfce-mirror/thunar/commit/1ec8ff89ec5a3314fcd6a57f1475654ddecc9875

«Only allow direct execution of desktop files in an
XDG directory and if they are executable.»
---
 pkgs/desktops/xfce/core/thunar-build.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix
index 7a69295d34dd..a68686219ba9 100644
--- a/pkgs/desktops/xfce/core/thunar-build.nix
+++ b/pkgs/desktops/xfce/core/thunar-build.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
 
   patches = [ ./thunarx_plugins_directory.patch ];
 
+  postPatch = ''
+    sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c
+  '';
+
   buildInputs = [
     pkgconfig intltool
     gtk dbus_glib libstartup_notification libnotify libexif pcre udev
@@ -35,4 +39,4 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.eelco ];
   };
-}
\ No newline at end of file
+}

From c860de987d5eb97a2c8d41e9e1a311c3cf988988 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 7 Jun 2016 23:51:28 -0700
Subject: [PATCH 110/436] io: 2013.12.04 -> 2015.11.11

Updating IO language to latest version
---
 pkgs/development/interpreters/io/default.nix | 48 ++++++++++++++------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix
index 4f4880aaca72..8ed50b886876 100644
--- a/pkgs/development/interpreters/io/default.nix
+++ b/pkgs/development/interpreters/io/default.nix
@@ -1,32 +1,52 @@
-{ stdenv, fetchurl, cmake, zlib, sqlite, gmp, libffi, cairo, ncurses,
-  freetype, mesa, libpng, libtiff, libjpeg, readline, libsndfile, libxml2,
-  freeglut, libsamplerate, pcre, libevent, libedit, yajl,
-  python, openssl, glfw
+{ stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
+  ncurses, freetype, mesa, libpng, libtiff, libjpeg, readline, libsndfile,
+  libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl,
+  python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached
 }:
 
 stdenv.mkDerivation {
-  name = "io-2013.12.04";
-  src = fetchurl {
-    url = http://github.com/stevedekorte/io/tarball/2013.12.04;
-    name = "io-2013.12.04.tar.gz";
-    sha256 = "0kvwr32xdpcr32rnv301xr5l89185dsisbj4v465m68isas0gjm5";
+  name = "io-2015.11.11";
+  src = fetchFromGitHub {
+    owner = "stevedekorte";
+    repo = "io";
+    rev = "1fc725e0a8635e2679cbb20521f4334c25273caa";
+    sha256 = "0ll2kd72zy8vf29sy0nnx3awk7nywpwpv21rvninjjaqkygrc0qw";
   };
 
   buildInputs = [
-    cmake zlib sqlite gmp libffi cairo ncurses freetype mesa
-    libpng libtiff libjpeg readline libsndfile libxml2
+    cmake zlib sqlite gmp libffi cairo ncurses freetype
+    mesa libpng libtiff libjpeg readline libsndfile libxml2
     freeglut libsamplerate pcre libevent libedit yajl
+    pkgconfig glfw openssl libpthreadstubs libXdmcp
+    libmemcached python3
   ];
 
+  configurePhase=''
+  # The Addon generation (AsyncRequest and a others checked) seems to have
+  # trouble with building on Virtual machines. Disabling them until it
+  # can be fully investigated.
+  sed -ie \
+        "s/add_subdirectory(addons)/#add_subdirectory(addons)/g" \
+        CMakeLists.txt
+  mkdir build
+  cd build
+  cmake  -DCMAKE_INSTALL_PREFIX="$out" ..
+  '';
+
+  installPhase=''
+  make install
+  '';
+
   # for gcc5; c11 inline semantics breaks the build
   NIX_CFLAGS_COMPILE = "-fgnu89-inline";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Io programming language";
-    maintainers = with stdenv.lib.maintainers; [
+    maintainers = with maintainers; [
       raskin
       z77z
+      vrthra
     ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }

From 35c544e6d4e685af7d3ef5cfc4294c094199e57f Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Thu, 9 Jun 2016 04:19:00 -0700
Subject: [PATCH 111/436] factor: disable build on i686-linux

The factor language should be built only on x86_64 machines.
---
 pkgs/development/compilers/factor-lang/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix
index 6b7096dad723..ca3e9c6956d8 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@@ -89,6 +89,6 @@ stdenv.mkDerivation rec {
     description = "A concatenative, stack-based programming language";
 
     maintainers = [ maintainers.vrthra ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }

From 376ba5f17f81a33be8ee6db6b43bd2b08e5a2491 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 9 Jun 2016 13:52:26 +0200
Subject: [PATCH 112/436] dnscrypt-proxy service: update resolver list

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

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 2a6161ee873a..227e38acc4a6 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -89,8 +89,8 @@ in
         '';
         example = literalExample "${pkgs.dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv";
         default = pkgs.fetchurl {
-          url = "https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv";
-          sha256 = "0lac20qhcgjxxiiz8jzcn3hkqj4ywl58hahp5n2i6vf9akfyqp7c";
+          url = https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv;
+          sha256 = "171zvdqcqqvcw3zr7wl9h1wmdmk6m3h55xr4gq2z1j7a0x0ba2in";
         };
         defaultText = "pkgs.fetchurl { url = ...; sha256 = ...; }";
       };

From 9876769698037d9eddac3bc136bfcf207a72ec9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Jun 2016 14:06:18 +0200
Subject: [PATCH 113/436] ffmpeg_3: 3.0 -> 3.0.2

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

diff --git a/pkgs/development/libraries/ffmpeg/3.0.nix b/pkgs/development/libraries/ffmpeg/3.0.nix
index e7d28bfc4388..14c29f36bed7 100644
--- a/pkgs/development/libraries/ffmpeg/3.0.nix
+++ b/pkgs/development/libraries/ffmpeg/3.0.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}";
+  version = "${branch}.2";
   branch = "3.0";
-  sha256 = "1h0k05cj6j0nd2i16z7hc5scpwsbg3sfx68lvm0nlwvz5xxgg7zi";
+  sha256 = "0dpx15001ha9p8h8vfg1lm9pggbc96kmb546hz88wdac5xycgqrh";
 })

From 9bf611414740807312d05d8f782a02a471fe8e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Jun 2016 14:07:39 +0200
Subject: [PATCH 114/436] ffmpeg: use 2 as the default for now

---
 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 d7d70795530d..852c9acb5abb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6724,7 +6724,7 @@ let
   ffmpeg_1 = ffmpeg_1_2;
   ffmpeg_2 = ffmpeg_2_8;
   ffmpeg_3 = ffmpeg_3_0;
-  ffmpeg = ffmpeg_3;
+  ffmpeg = ffmpeg_2;
 
   ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
     # The following need to be fixed on Darwin

From d4babc49dcf0db770cc49f6e1cda7b89fdf0fca7 Mon Sep 17 00:00:00 2001
From: Marc Scholten <marc@pedigital.de>
Date: Wed, 8 Jun 2016 22:37:06 +0200
Subject: [PATCH 115/436] php: Now builds on darwin

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 8aea0f4d23f2..5d20a0ee8c8d 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -2,7 +2,7 @@
 , mysql, libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
-, uwimap, pam, gmp, apacheHttpd }:
+, uwimap, pam, gmp, apacheHttpd, libiconv }:
 
 let
 
@@ -21,7 +21,10 @@ let
 
       buildInputs = [ flex bison pkgconfig ];
 
-      configureFlags = ["EXTENSION_DIR=$(out)/lib/php/extensions"];
+      configureFlags = [
+        "EXTENSION_DIR=$(out)/lib/php/extensions"
+        "--with-iconv=${libiconv}"
+      ];
 
       flags = {
 
@@ -49,9 +52,9 @@ let
             "LDAP_DIR=${openldap.dev}"
             "LDAP_INCDIR=${openldap.dev}/include"
             "LDAP_LIBDIR=${openldap.out}/lib"
-            "--with-ldap-sasl=${cyrus_sasl.dev}"
+            (lib.optional stdenv.isLinux "--with-ldap-sasl=${cyrus_sasl.dev}")
             ];
-          buildInputs = [openldap cyrus_sasl openssl];
+          buildInputs = [openldap openssl] ++ lib.optional stdenv.isLinux cyrus_sasl;
         };
 
         mhash = {
@@ -218,14 +221,14 @@ let
       };
 
       cfg = {
-        imapSupport = config.php.imap or true;
+        imapSupport = config.php.imap or (!stdenv.isDarwin);
         ldapSupport = config.php.ldap or true;
         mhashSupport = config.php.mhash or true;
         mysqlSupport = (!php7) && (config.php.mysql or true);
         mysqliSupport = config.php.mysqli or true;
         pdo_mysqlSupport = config.php.pdo_mysql or true;
         libxml2Support = config.php.libxml2 or true;
-        apxs2Support = config.php.apxs2 or true;
+        apxs2Support = config.php.apxs2 or (!stdenv.isDarwin);
         bcmathSupport = config.php.bcmath or true;
         socketsSupport = config.php.sockets or true;
         curlSupport = config.php.curl or true;
@@ -287,6 +290,10 @@ let
 
       patches = if !php7 then [ ./fix-paths.patch ] else [ ./fix-paths-php7.patch ];
 
+      postPatch = lib.optional stdenv.isDarwin ''
+        substituteInPlace configure --replace "-lstdc++" "-lc++"
+      '';
+
     });
 
 in {

From b54fa1e351074531628178cd4da7dccc7c334824 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 4 Jun 2016 13:43:43 -0700
Subject: [PATCH 116/436] zsnes: add desktop item

add desktop item so zsnes can be used without the terminal
add icons
---
 pkgs/misc/emulators/zsnes/default.nix | 30 +++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
index 23930ac624ce..be7666487b95 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -1,6 +1,18 @@
-{stdenv, fetchurl, fetchpatch, nasm, SDL, zlib, libpng, ncurses, mesa}:
+{stdenv, fetchurl, fetchpatch, nasm, SDL, zlib, libpng, ncurses, mesa
+, makeDesktopItem }:
 
-stdenv.mkDerivation {
+let
+  desktopItem = makeDesktopItem {
+    name = "zsnes";
+    exec = "zsnes";
+    icon = "zsnes";
+    comment = "A SNES emulator";
+    desktopName = "zsnes";
+    genericName = "zsnes";
+    categories = "Game;";
+  };
+
+in stdenv.mkDerivation {
   name = "zsnes-1.51";
 
   src = fetchurl {
@@ -39,6 +51,20 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--enable-release" ];
 
+  postInstall = ''
+    function installIcon () {
+        mkdir -p $out/share/icons/hicolor/$1/apps/
+        cp icons/$1x32.png $out/share/icons/hicolor/$1/apps/zsnes.png
+    }
+    installIcon "16x16"
+    installIcon "32x32"
+    installIcon "48x48"
+    installIcon "64x64"
+
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
   meta = {
     description = "A Super Nintendo Entertainment System Emulator";
     license = stdenv.lib.licenses.gpl2Plus;

From edc36a0091c61cc60d3607d5e73ad22e078f8307 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 9 Jun 2016 15:40:06 +0200
Subject: [PATCH 117/436] grsecurity: 4.5.6-201606051644 -> 4.5.7-201606080852

---
 pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix
index 94561ed2e549..63db17790147 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.5.6";
+  version = "4.5.7";
   extraMeta.branch = "4.5";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1bdyviimgnc4zbgd9v1xk87sj9h8cprjykifriddwslqxyr2yh0y";
+    sha256 = "0azvh7lf9kak1xcs5f9smlvx4gkf45vyandizmxhx0zyjlhacw60";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 59fa93480cfd..877e51565ac2 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -95,9 +95,9 @@ rec {
   grsecurity_4_5 = grsecPatch
     { kernel    = pkgs.grsecurity_base_linux_4_5;
       patches   = [ grsecurity_fix_path_4_5 ];
-      kversion  = "4.5.6";
-      revision  = "201606051644";
-      sha256    = "1ympym3kpaychd1qsb10hn5ffv8w83ccfmb631hj4jk69xwrry9m";
+      kversion  = "4.5.7";
+      revision  = "201606080852";
+      sha256    = "1vgc314nh6bd7zw9r927lnbjq29z32g0s02jgvf635y9zz550nsh";
     };
 
   grsecurity_latest = grsecurity_4_5;

From 58599744ee9673d309d5e4d8415077c242545e8d Mon Sep 17 00:00:00 2001
From: Jonathan Lange <jml@mumak.net>
Date: Fri, 6 May 2016 20:54:51 +0100
Subject: [PATCH 118/436] Add module for oauth2_proxy

---
 nixos/modules/module-list.nix                 |   1 +
 .../services/security/oauth2_proxy.nix        | 528 ++++++++++++++++++
 2 files changed, 529 insertions(+)
 create mode 100644 nixos/modules/services/security/oauth2_proxy.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f3e9cd75a950..77ced054b0fd 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -430,6 +430,7 @@
   ./services/security/haveged.nix
   ./services/security/hologram.nix
   ./services/security/munge.nix
+  ./services/security/oauth2_proxy.nix
   ./services/security/physlock.nix
   ./services/security/torify.nix
   ./services/security/tor.nix
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
new file mode 100644
index 000000000000..aa962743f855
--- /dev/null
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -0,0 +1,528 @@
+# NixOS module for oauth2_proxy.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.services.oauth2_proxy;
+
+  # Use like:
+  #   repeatedArgs (arg: "--arg=${arg}") args
+  repeatedArgs = concatMapStringsSep " ";
+
+  # 'toString' doesn't quite do what we want for bools.
+  fromBool = x: if x then "true" else "false";
+
+  # oauth2_proxy provides many options that are only relevant if you are using
+  # a certain provider. This set maps from provider name to a function that
+  # takes the configuration and returns a string that can be inserted into the
+  # command-line to launch oauth2_proxy.
+  providerSpecificOptions = {
+    azure = cfg: ''
+      --azure-tenant=${cfg.azure.tenant} \
+      --resource=${cfg.azure.resource} \
+    '';
+
+    github = cfg: ''
+      $(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) \
+    '';
+  };
+
+  authenticatedEmailsFile = pkgs.writeText "authenticated-emails" cfg.email.addresses;
+
+  getProviderOptions = cfg: provider:
+    if providerSpecificOptions ? provider then providerSpecificOptions.provider cfg else "";
+
+  mkCommandLine = cfg: ''
+    --provider='${cfg.provider}' \
+    ${optionalString (!isNull cfg.email.addresses) "--authenticated-emails-file='${authenticatedEmailsFile}'"} \
+    --approval-prompt='${cfg.approvalPrompt}' \
+    ${optionalString (cfg.passBasicAuth && !isNull cfg.basicAuthPassword) "--basic-auth-password='${cfg.basicAuthPassword}'"} \
+    --client-id='${cfg.clientID}' \
+    --client-secret='${cfg.clientSecret}' \
+    ${optionalString (!isNull cfg.cookie.domain) "--cookie-domain='${cfg.cookie.domain}'"} \
+    --cookie-expire='${cfg.cookie.expire}' \
+    --cookie-httponly=${fromBool cfg.cookie.httpOnly} \
+    --cookie-name='${cfg.cookie.name}' \
+    --cookie-secret='${cfg.cookie.secret}' \
+    --cookie-secure=${fromBool cfg.cookie.secure} \
+    ${optionalString (!isNull cfg.cookie.refresh) "--cookie-refresh='${cfg.cookie.refresh}'"} \
+    ${optionalString (!isNull cfg.customTemplatesDir) "--custom-templates-dir='${cfg.customTemplatesDir}'"} \
+    ${repeatedArgs (x: "--email-domain='${x}'") cfg.email.domains} \
+    --http-address='${cfg.httpAddress}' \
+    ${optionalString (!isNull cfg.htpasswd.file) "--htpasswd-file='${cfg.htpasswd.file}' --display-htpasswd-form=${fromBool cfg.htpasswd.displayForm}"} \
+    ${optionalString (!isNull cfg.loginURL) "--login-url='${cfg.loginURL}'"} \
+    --pass-access-token=${fromBool cfg.passAccessToken} \
+    --pass-basic-auth=${fromBool cfg.passBasicAuth} \
+    --pass-host-header=${fromBool cfg.passHostHeader} \
+    --proxy-prefix='${cfg.proxyPrefix}' \
+    ${optionalString (!isNull cfg.profileURL) "--profile-url='${cfg.profileURL}'"} \
+    ${optionalString (!isNull cfg.redeemURL) "--redeem-url='${cfg.redeemURL}'"} \
+    ${optionalString (!isNull cfg.redirectURL) "--redirect-url='${cfg.redirectURL}'"} \
+    --request-logging=${fromBool cfg.requestLogging} \
+    ${optionalString (!isNull cfg.scope) "--scope='${cfg.scope}'"} \
+    ${repeatedArgs (x: "--skip-auth-regex='${x}'") cfg.skipAuthRegexes} \
+    ${optionalString (!isNull cfg.signatureKey) "--signature-key='${cfg.signatureKey}'"} \
+    --upstream='${cfg.upstream}' \
+    ${optionalString (!isNull cfg.validateURL) "--validate-url='${cfg.validateURL}'"} \
+    ${optionalString cfg.tls.enable "--tls-cert='${cfg.tls.certificate}' --tls-key='${cfg.tls.key}' --https-address='${cfg.tls.httpsAddress}'"} \
+  '' + getProviderOptions cfg cfg.provider;
+in
+{
+  options.services.oauth2_proxy = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to run oauth2_proxy.
+      '';
+    };
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.oauth2_proxy;
+      description = ''
+        The package that provides oauth2_proxy.
+      '';
+    };
+
+    ##############################################
+    # PROVIDER configuration
+    provider = mkOption {
+      type = types.enum [
+        "google"
+        "github"
+        "azure"
+        "gitlab"
+        "linkedin"
+        "myusa"
+      ];
+      default = "google";
+      description = ''
+        OAuth provider.
+      '';
+    };
+
+    approvalPrompt = mkOption {
+      type = types.enum ["force" "auto"];
+      default = "force";
+      description = ''
+        OAuth approval_prompt.
+      '';
+    };
+
+    clientID = mkOption {
+      type = types.str;
+      description = ''
+        The OAuth Client ID.
+      '';
+      example = "123456.apps.googleusercontent.com";
+    };
+
+    clientSecret = mkOption {
+      type = types.str;
+      description = ''
+        The OAuth Client Secret.
+      '';
+    };
+
+    skipAuthRegexes = mkOption {
+     type = types.listOf types.str;
+     default = [];
+     description = ''
+       List of regular expressions which will bypass authentication when
+       requests path's match.
+     '';
+    };
+
+    # XXX: Not clear whether these two options are mutually exclusive or not.
+    email = {
+      domains = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Authenticate emails with the specified domains. Use * to authenticate any email.
+        '';
+      };
+
+      addresses = mkOption {
+        type = types.nullOr types.lines;
+        default = null;
+        description = ''
+          Line-separated email addresses that are allowed to authenticate.
+        '';
+      };
+    };
+
+    loginURL = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        Authentication endpoint.
+
+        You only need to set this if you are using a self-hosted provider (e.g.
+        Github Enterprise). If you're using a publicly hosted provider
+        (e.g github.com), then the default works.
+      '';
+      example = "https://provider.example.com/oauth/authorize";
+    };
+
+    redeemURL = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+     	Token redemption endpoint.
+
+        You only need to set this if you are using a self-hosted provider (e.g.
+        Github Enterprise). If you're using a publicly hosted provider
+        (e.g github.com), then the default works.
+      '';
+      example = "https://provider.example.com/oauth/token";
+    };
+
+    validateURL = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        Access token validation endpoint.
+
+        You only need to set this if you are using a self-hosted provider (e.g.
+        Github Enterprise). If you're using a publicly hosted provider
+        (e.g github.com), then the default works.
+      '';
+      example = "https://provider.example.com/user/emails";
+    };
+
+    redirectURL = mkOption {
+      # XXX: jml suspects this is always necessary, but the command-line
+      # doesn't require it so making it optional.
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        The OAuth2 redirect URL.
+      '';
+      example = "https://internalapp.yourcompany.com/oauth2/callback";
+    };
+
+    azure = {
+      tenant = mkOption {
+        type = types.str;
+        default = "common";
+        description = ''
+          Go to a tenant-specific or common (tenant-independent) endpoint.
+        '';
+      };
+
+      resource = mkOption {
+        type = types.str;
+        description = ''
+          The resource that is protected.
+        '';
+      };
+    };
+
+    google = {
+      adminEmail = mkOption {
+        type = types.str;
+        description = ''
+          The Google Admin to impersonate for API calls.
+
+          Only users with access to the Admin APIs can access the Admin SDK
+          Directory API, thus the service account needs to impersonate one of
+          those users to access the Admin SDK Directory API.
+
+          See <link xlink="https://developers.google.com/admin-sdk/directory/v1/guides/delegation#delegate_domain-wide_authority_to_your_service_account" />
+        '';
+      };
+
+      groups = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Restrict logins to members of these Google groups.
+        '';
+      };
+
+      serviceAccountJSON = mkOption {
+        type = types.path;
+        description = ''
+          The path to the service account JSON credentials.
+        '';
+      };
+    };
+
+    github = {
+      org = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Restrict logins to members of this organisation.
+        '';
+      };
+
+      team = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Restrict logins to members of this team.
+        '';
+      };
+    };
+
+
+    ####################################################
+    # UPSTREAM Configuration
+    upstream = mkOption {
+      type = types.commas;
+      description = ''
+        The http url(s) of the upstream endpoint or file:// paths for static
+        files. Routing is based on the path.
+      '';
+    };
+
+    passAccessToken = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Pass OAuth access_token to upstream via X-Forwarded-Access-Token header.
+      '';
+    };
+
+    passBasicAuth = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Pass HTTP Basic Auth, X-Forwarded-User and X-Forwarded-Email information to upstream.
+      '';
+    };
+
+    basicAuthPassword = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        The password to set when passing the HTTP Basic Auth header.
+      '';
+    };
+
+    passHostHeader = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Pass the request Host Header to upstream.
+      '';
+    };
+
+    signatureKey = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        GAP-Signature request signature key.
+      '';
+      example = "sha1:secret0";
+    };
+
+    cookie = {
+      domain = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          An optional cookie domain to force cookies to.
+        '';
+        example = ".yourcompany.com";
+      };
+
+      expire = mkOption {
+        type = types.str;
+        default = "168h0m0s";
+        description = ''
+          Expire timeframe for cookie.
+        '';
+      };
+
+      httpOnly = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Set HttpOnly cookie flag.
+        '';
+      };
+
+      name = mkOption {
+        type = types.str;
+        default = "_oauth2_proxy";
+        description = ''
+          The name of the cookie that the oauth_proxy creates.
+        '';
+      };
+
+      refresh = mkOption {
+        # XXX: Unclear what the behavior is when this is not specified.
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Refresh the cookie after this duration; 0 to disable.
+        '';
+        example = "168h0m0s";
+      };
+
+      secret = mkOption {
+        type = types.str;
+        description = ''
+          The seed string for secure cookies.
+        '';
+      };
+
+      secure = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Set secure (HTTPS) cookie flag.
+        '';
+      };
+    };
+
+    ####################################################
+    # OAUTH2 PROXY configuration
+
+    httpAddress = mkOption {
+      type = types.str;
+      default = "127.0.0.1:4180";
+      description = ''
+        [http://]<addr>:<port> or unix://<path> to listen on for HTTP clients.
+
+        This module does *not* expose the port by default. If you want this URL
+        to be accessible to other machines, please add the port to
+        networking.firewall.allowedTCPPorts.
+      '';
+    };
+
+    htpasswd = {
+      file = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = ''
+          Additionally authenticate against a htpasswd file. Entries must be
+          created with "htpasswd -s" for SHA encryption.
+        '';
+      };
+
+      displayForm = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Display username / password login form if an htpasswd file is provided.
+        '';
+      };
+    };
+
+    customTemplatesDir = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        Path to custom HTML templates.
+      '';
+    };
+
+    proxyPrefix = mkOption {
+      type = types.str;
+      default = "/oauth2";
+      description = ''
+        The url root path that this proxy should be nested under (e.g. /<oauth2>/sign_in);
+      '';
+    };
+
+    tls = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to serve over TLS.
+        '';
+      };
+
+      certificate = mkOption {
+        type = types.path;
+        description = ''
+          Path to certificate file.
+        '';
+      };
+
+      key = mkOption {
+        type = types.path;
+        description = ''
+          Path to private key file.
+        '';
+      };
+
+      httpsAddress = mkOption {
+        type = types.str;
+        default = ":443";
+        description = ''
+          <addr>:<port> to listen on for HTTPS clients.
+
+          Remember to add <port> to allowedTCPPorts if you want other machines
+          to be able to connect to it.
+        '';
+      };
+    };
+
+    requestLogging = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Log requests to stdout.
+      '';
+    };
+
+    ####################################################
+    # UNKNOWN
+
+    # XXX: Is this mandatory? Is it part of another group? Is it part of the provider specification?
+    scope = mkOption {
+      # XXX: jml suspects this is always necessary, but the command-line
+      # doesn't require it so making it optional.
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        OAuth scope specification.
+      '';
+    };
+
+    profileURL = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+      	Profile access endpoint.
+      '';
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers.oauth2_proxy = {
+      description = "OAuth2 Proxy";
+    };
+
+    systemd.services.oauth2_proxy = {
+      description = "OAuth2 Proxy";
+      path = [ cfg.package ];
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
+
+      serviceConfig = {
+        User = "oauth2_proxy";
+        Restart = "always";
+        ExecStart = "${cfg.package}/bin/oauth2_proxy ${mkCommandLine cfg}";
+      };
+    };
+
+  };
+}

From 3a41ffe8aad4a7bd3fb7b133507f805d6545a602 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 9 Jun 2016 15:43:35 +0200
Subject: [PATCH 119/436] ipfs: build fails with Go 1.6, revert to 1.5

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

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index 694166cc2428..a08a347ab284 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, buildGoPackage, consul-ui, fetchFromGitHub }:
+{ stdenv, buildGo15Package, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGo15Package rec {
   name = "ipfs-${version}";
   version = "i20160112--${stdenv.lib.strings.substring 0 7 rev}";
   rev = "7070b4d878baad57dcc8da80080dd293aa46cabd";

From f870d6aeb6cf14e4af9c7e77a1340ec68d882933 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 9 Jun 2016 14:47:12 +0100
Subject: [PATCH 120/436] goBuildPackage: export go

This is useful to make sure to use the same version of go in further
derivations.
---
 pkgs/development/go-modules/generic/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 07cc42cfcdf0..e6373c1d50ec 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -188,7 +188,9 @@ go.stdenv.mkDerivation (
   disallowedReferences = lib.optional (!allowGoReference) go
     ++ lib.optional (!dontRenameImports) govers;
 
-  passthru = passthru // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
+  passthru = passthru //
+    { inherit go; } //
+    lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
 
   enableParallelBuilding = enableParallelBuilding;
 

From 943d59268a384f7bec2ac4ecbd837932a109c65a Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 9 Jun 2016 14:47:51 +0100
Subject: [PATCH 121/436] packer: fix compilation

* Remove duplicate "packer" source
* Use the same version of go everywhere
---
 pkgs/development/tools/packer/default.nix |  6 +++---
 pkgs/development/tools/packer/deps.nix    | 13 ++-----------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 7d566254633b..5b8c13e3baf9 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, gox, gotools, buildGoPackage, fetchFromGitHub
+{ stdenv, lib, gox, gotools, buildGoPackage, fetchFromGitHub
 , fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 stdenv.mkDerivation rec {
@@ -6,10 +6,10 @@ stdenv.mkDerivation rec {
   version = "0.10.1";
 
   src = import ./deps.nix {
-    inherit stdenv lib go gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn;
+    inherit stdenv lib gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn;
   };
 
-  buildInputs = [ go gox gotools ];
+  buildInputs = [ src.go gox gotools ];
 
   configurePhase = ''
     export GOPATH=$PWD/share/go
diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix
index 5ed606ad6c6b..25098219ea28 100644
--- a/pkgs/development/tools/packer/deps.nix
+++ b/pkgs/development/tools/packer/deps.nix
@@ -1,11 +1,11 @@
-{ stdenv, lib, go, gox, gotools, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, gox, gotools, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "packer-${version}";
   version = "20160507-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0";
 
-  buildInputs = [ go gox gotools ];
+  buildInputs = [ gox gotools ];
   
   goPackagePath = "github.com/mitchellh/packer";
 
@@ -376,15 +376,6 @@ buildGoPackage rec {
         sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3";
       };
     }
-    {
-      goPackagePath = "github.com/mitchellh/packer";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/packer";
-        rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0";
-        sha256 = "1a61f022h4ygnkp1lyr7vhq5w32a3f061dymgkqmz4c3b8fzcc10";
-      };
-    }
     {
       goPackagePath = "github.com/mitchellh/panicwrap";
 

From a5a1d45636e87e8872d94d6e86e43af44eb8c3ba Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 9 Jun 2016 15:00:11 +0100
Subject: [PATCH 122/436] git-lfs: 1.2.0 -> 2016-06-07

Fixes import issues after go1.5+
---
 pkgs/applications/version-management/git-lfs/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index e5fc8173919d..52075be8484f 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -2,8 +2,9 @@
 
 buildGoPackage rec {
   name = "git-lfs-${version}";
-  version = "1.2.0";
-  rev = "v${version}";
+  # NOTE: use versions after 1.2.1
+  version = "2016-06-07";
+  rev = "12fe249f2eebb56608a825fdb4a68c00f090bc91";
   
   goPackagePath = "github.com/github/git-lfs";
 
@@ -11,7 +12,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "github";
     repo = "git-lfs";
-    sha256 = "0z8giavcvfpzmhnxxsqvsgabjfq5gpka8jy4qvadf60yibxds9fp";
+    sha256 = "0cj7xbgvj706r1cyxqlcwfvy5zg2d19al04d441sxa6spr6xa4v6";
   };
 
   # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block'

From de842765bec692a5b1bf00063bc98406599d07b2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 9 Jun 2016 09:14:06 -0500
Subject: [PATCH 123/436] qt56.qtbase: propagate build inputs correctly

---
 .../libraries/qt-5/5.6/qtbase/setup-hook.sh   | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
index 4d2119bd0bcb..8d1a453787fb 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
@@ -24,7 +24,7 @@ propagateOnce() {
     addToSearchPathOnceWithCustomDelimiter ' ' "$@"
 }
 
-_qtPropagateRuntimeDependencies() {
+_qtPropagate() {
     for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
         if [ -d "$1/$dir" ]; then
             propagateOnce propagatedBuildInputs "$1"
@@ -37,7 +37,26 @@ _qtPropagateRuntimeDependencies() {
     addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
 }
 
-envHooks+=(_qtPropagateRuntimeDependencies)
+crossEnvHooks+=(_qtPropagate)
+
+_qtPropagateNative() {
+    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+        if [ -d "$1/$dir" ]; then
+            propagateOnce propagatedNativeBuildInputs "$1"
+            if [ -z "$crossConfig" ]; then
+                propagateOnce propagatedUserEnvPkgs "$1"
+            fi
+            break
+        fi
+    done
+    if [ -z "$crossConfig" ]; then
+        addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"
+        addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"
+        addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
+    fi
+}
+
+envHooks+=(_qtPropagateNative)
 
 _qtMultioutDevs() {
     # This is necessary whether the package is a Qt module or not

From 98bb89b9d0265eeaa71538dba1783a383c24d97e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 9 Jun 2016 09:14:20 -0500
Subject: [PATCH 124/436] kde5.extra-cmake-modules: propagate build inputs
 correctly

---
 .../extra-cmake-modules/setup-hook.sh         | 54 ++++++++++++-------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/setup-hook.sh
index 49ac5d0c8b5f..aab0625bf61a 100644
--- a/pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/setup-hook.sh
@@ -4,29 +4,48 @@ _ecmSetXdgDirs() {
     addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg"
 }
 
-_ecmPropagateSharedData() {
-    local sharedPaths=( \
-        "config.cfg" \
-        "kconf_update" \
-        "kservices5" \
-        "kservicetypes5" \
-        "knotifications5" \
-        "applications" \
-        "desktop-directories" \
-        "mime" \
-        "dbus-1" \
-        "interfaces" \
-        "services" \
-        "system-services" )
-    for dir in ${sharedPaths[@]}; do
+_ecmSharePaths=( \
+    "config.cfg" \
+    "kconf_update" \
+    "kservices5" \
+    "kservicetypes5" \
+    "knotifications5" \
+    "applications" \
+    "desktop-directories" \
+    "mime" \
+    "dbus-1" \
+    "interfaces" \
+    "services" \
+    "system-services" )
+
+_ecmPropagateNative() {
+    for dir in ${_ecmSharePaths[@]}; do
         if [ -d "$1/share/$dir" ]; then
-            addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
-            propagateOnce propagatedUserEnvPkgs "$1"
+            propagateOnce propagatedNativeBuildInputs "$1"
+            if [ -z "$crossConfig" ]; then
+                propagateOnce propagatedUserEnvPkgs "$1"
+                addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
+            fi
             break
         fi
     done
 }
 
+envHooks+=(_ecmSetXdgDirs _ecmPropagate)
+
+_ecmPropagate() {
+    for dir in ${_ecmSharePaths[@]}; do
+        if [ -d "$1/share/$dir" ]; then
+            propagateOnce propagatedBuildInputs "$1"
+            propagateOnce propagatedUserEnvPkgs "$1"
+            addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
+            break
+        fi
+    done
+}
+
+crossEnvHooks+=(_ecmPropagate)
+
 _ecmConfig() {
     # Because we need to use absolute paths here, we must set *all* the paths.
     cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
@@ -70,5 +89,4 @@ _ecmConfig() {
     cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
 }
 
-envHooks+=(_ecmSetXdgDirs _ecmPropagateSharedData)
 preConfigureHooks+=(_ecmConfig)

From 4d2cf4baaccf093a63b7e76793bffdc339f2379d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 9 Jun 2016 09:39:55 -0500
Subject: [PATCH 125/436] qt56: 5.6.0 -> 5.6.1

---
 .../libraries/qt-5/5.6/fetchsrcs.sh           |   2 +-
 pkgs/development/libraries/qt-5/5.6/srcs.nix  | 446 +++++++++---------
 2 files changed, 224 insertions(+), 224 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh b/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
index c499c70ea2ca..1ba357a6b1ca 100755
--- a/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
+++ b/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/"
+RELEASE_URL="http://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp
diff --git a/pkgs/development/libraries/qt-5/5.6/srcs.nix b/pkgs/development/libraries/qt-5/5.6/srcs.nix
index 9ddbbbde078f..0e005418ae23 100644
--- a/pkgs/development/libraries/qt-5/5.6/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.6/srcs.nix
@@ -2,260 +2,260 @@
 { fetchurl, mirror }:
 
 {
-  qttools = {
-    version = "5.6.0";
+  qtwinextras = {
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qttools-opensource-src-5.6.0.tar.xz";
-      sha256 = "1791c9a1vxv0q2ywr00ya5rxaggidsq81s8h8fwmql75pdhlq90d";
-      name = "qttools-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtwebengine = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebengine-opensource-src-5.6.0.tar.xz";
-      sha256 = "00vaqx3mypqlnjkfwhx54r6ygfs07amkwc4rma0sg64zdjnvb8la";
-      name = "qtwebengine-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtserialbus = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtserialbus-opensource-src-5.6.0.tar.xz";
-      sha256 = "13hbmj9pilh5gkbbngfbp225qvc650pnzvpzawpnf69zwl757jlc";
-      name = "qtserialbus-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtwayland = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwayland-opensource-src-5.6.0.tar.xz";
-      sha256 = "1k5zsgz54wlkxm3ici55lbbz286bk2791vri02bjgja5y9102pdm";
-      name = "qtwayland-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qt5 = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qt5-opensource-src-5.6.0.tar.xz";
-      sha256 = "195dl9pk9slbiy6mgwwpc70vaw62sdhxc3lxmlnyddk99widqa3k";
-      name = "qt5-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtimageformats = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtimageformats-opensource-src-5.6.0.tar.xz";
-      sha256 = "1nmsh682idxl0642q7376r9qfxkx0736q9pl4jx179c9lrsl519c";
-      name = "qtimageformats-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtactiveqt = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtactiveqt-opensource-src-5.6.0.tar.xz";
-      sha256 = "0xrjr9jwkxxcv46a8vj77px3v1p36nm6rpvyxma0wb4xhpippp3a";
-      name = "qtactiveqt-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtdoc = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtdoc-opensource-src-5.6.0.tar.xz";
-      sha256 = "1z69yl8nkvp21arjhzl34gr8gvxm5b03d58lwnddl4mkaxbi4vap";
-      name = "qtdoc-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtsensors = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtsensors-opensource-src-5.6.0.tar.xz";
-      sha256 = "0blwqmkh0hn1716d5fvy0vnh56y9iikl34ayz6ksl0ayxhpkk3si";
-      name = "qtsensors-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtwebchannel = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebchannel-opensource-src-5.6.0.tar.xz";
-      sha256 = "0ky1njksczyfb7y7p5kfgzbx9vgajzy51g2y3vrpfvl6bs9j8m62";
-      name = "qtwebchannel-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtmacextras = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtmacextras-opensource-src-5.6.0.tar.xz";
-      sha256 = "1jkmwppapvymdr1kwdrbjlxhcafcn4jb23ssnhrvvgcq3lnl5lhj";
-      name = "qtmacextras-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtwebsockets = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebsockets-opensource-src-5.6.0.tar.xz";
-      sha256 = "17vi3n27gx3f3c2lii3b70pzz6mpblam3236v6mj439xzrlvi2i6";
-      name = "qtwebsockets-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtconnectivity = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtconnectivity-opensource-src-5.6.0.tar.xz";
-      sha256 = "1ss0ibabiv7n5hakkxmkc4msrwgqcvfffdjajnv5jrq0030v0p0c";
-      name = "qtconnectivity-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtscript = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtscript-opensource-src-5.6.0.tar.xz";
-      sha256 = "0hjhkh4lia1i0iir1i8dr57gizi74h73j0phhir3q3wsglcpax5c";
-      name = "qtscript-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qttranslations = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qttranslations-opensource-src-5.6.0.tar.xz";
-      sha256 = "0jfdfj2z0nvf1xblmdxaphn0psjycrb5g3jxxcddkci214gka2cq";
-      name = "qttranslations-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtlocation = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtlocation-opensource-src-5.6.0.tar.xz";
-      sha256 = "1jakjrwic01b5vyij6hfzdfpipandpkj9li3d7wf9bzws0cia3in";
-      name = "qtlocation-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtserialport = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtserialport-opensource-src-5.6.0.tar.xz";
-      sha256 = "07rwhmh9y7b3ycvx4d4d1j32nahf8nhsb9qj99kxz5xrdfv7zvhn";
-      name = "qtserialport-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwinextras-opensource-src-5.6.1.tar.xz";
+      sha256 = "1db3lcrj8af0z8lnh99lfbwz1cq9il7rr27rk9l38dff65qkssm8";
+      name = "qtwinextras-opensource-src-5.6.1.tar.xz";
     };
   };
   qtsvg = {
-    version = "5.6.0";
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtsvg-opensource-src-5.6.0.tar.xz";
-      sha256 = "07v4bzxd31dhkhp52y4g2ii0sslmk48cqkkz32v41frqj4qrk1vr";
-      name = "qtsvg-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtsvg-opensource-src-5.6.1.tar.xz";
+      sha256 = "08ca5g46g75acy27jfnvnalmcias5hxmjp7491v3y4k9y7a4ybpi";
+      name = "qtsvg-opensource-src-5.6.1.tar.xz";
     };
   };
-  qtwebview = {
-    version = "5.6.0";
+  qtactiveqt = {
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebview-opensource-src-5.6.0.tar.xz";
-      sha256 = "0mqbh125bq37xybwslhri4pl861r26cnraiz9ivh4881kqzab3x4";
-      name = "qtwebview-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtactiveqt-opensource-src-5.6.1.tar.xz";
+      sha256 = "0a2p0w03d04hqg71hlihj9mr6aasvb0h8jfa5rnq8b5rkm8haf4f";
+      name = "qtactiveqt-opensource-src-5.6.1.tar.xz";
     };
   };
-  qtcanvas3d = {
-    version = "5.6.0";
+  qtwayland = {
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtcanvas3d-opensource-src-5.6.0.tar.xz";
-      sha256 = "1kwykm1ffgpjgb3ggd4h2d2x3yhp9jsc0gnwlks620bahagdbbb6";
-      name = "qtcanvas3d-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwayland-opensource-src-5.6.1.tar.xz";
+      sha256 = "1jgghjfrg0wwyfzfwgwhagwxz9k936ylv3w2l9bwlpql8rgm8d11";
+      name = "qtwayland-opensource-src-5.6.1.tar.xz";
     };
   };
-  qtwinextras = {
-    version = "5.6.0";
+  qtlocation = {
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwinextras-opensource-src-5.6.0.tar.xz";
-      sha256 = "14xvm081wjyild2wi7pcilqxdkhc8b0lf9yn7yf7zp576i9ir5aq";
-      name = "qtwinextras-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtlocation-opensource-src-5.6.1.tar.xz";
+      sha256 = "0qahs7a2n3l4h0bl8bnwci9mzy1vra3zncnzr40csic9ys67ddfk";
+      name = "qtlocation-opensource-src-5.6.1.tar.xz";
     };
   };
-  qtgraphicaleffects = {
-    version = "5.6.0";
+  qtmacextras = {
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtgraphicaleffects-opensource-src-5.6.0.tar.xz";
-      sha256 = "1s0n8hrmrfs53cmm7i45p8zavvmsl0aisd5sgj93p8c5rzyi3s81";
-      name = "qtgraphicaleffects-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtmacextras-opensource-src-5.6.1.tar.xz";
+      sha256 = "147yhv7fb0yaakrffqiw6xz8ycqdc7qsnxvnpr6j8rarw5xmdc73";
+      name = "qtmacextras-opensource-src-5.6.1.tar.xz";
     };
   };
-  qtxmlpatterns = {
-    version = "5.6.0";
+  qttranslations = {
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtxmlpatterns-opensource-src-5.6.0.tar.xz";
-      sha256 = "1m0rr0m9zg2d6rdban2p5qyx8rdnjnjsfk3bm72bh47hscxipvds";
-      name = "qtxmlpatterns-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtquickcontrols2 = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols2-opensource-src-5.6.0.tar.xz";
-      sha256 = "1q7yp7l32jd3p28587ldxzkj58z1aad9gcs80w6vqc9952i6xv2r";
-      name = "qtquickcontrols2-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtbase = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtbase-opensource-src-5.6.0.tar.xz";
-      sha256 = "0ynnvcs5idivzldsq5ciqg9myg82b3l3906l4vjv54lyamf8mykf";
-      name = "qtbase-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qttranslations-opensource-src-5.6.1.tar.xz";
+      sha256 = "008wyk00mqz116pigm0qq78rvg28v6ykjnjxppkjnk0yd6i2vmb9";
+      name = "qttranslations-opensource-src-5.6.1.tar.xz";
     };
   };
   qt3d = {
-    version = "5.6.0";
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qt3d-opensource-src-5.6.0.tar.xz";
-      sha256 = "17a37xhav5mxspx2c9wsgvcilv7ys40q6minmlqd1gnfmsfphqdr";
-      name = "qt3d-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qt3d-opensource-src-5.6.1.tar.xz";
+      sha256 = "03d81sls30a20yna6940np15112ciwy5024f8n5imaxicm8h34xd";
+      name = "qt3d-opensource-src-5.6.1.tar.xz";
     };
   };
-  qtenginio = {
-    version = "1.6.0";
+  qtquickcontrols2 = {
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtenginio-opensource-src-1.6.0.tar.xz";
-      sha256 = "033z2jncci64s7s9ml5rsfsnrkdmhx1g5dfvr61imv63pzxxqzb2";
-      name = "qtenginio-opensource-src-1.6.0.tar.xz";
-    };
-  };
-  qtx11extras = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtx11extras-opensource-src-5.6.0.tar.xz";
-      sha256 = "099lc7kxcxgp5s01ddnd6n955fc8866caark43xfs2dw0a6pdva7";
-      name = "qtx11extras-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtdeclarative = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtdeclarative-opensource-src-5.6.0.tar.xz";
-      sha256 = "0k70zlyx1nh35caiav4s3jvg5l029pvilm6sarxmfj73y19z0mcc";
-      name = "qtdeclarative-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtmultimedia = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtmultimedia-opensource-src-5.6.0.tar.xz";
-      sha256 = "11h66xcr3y3w8hhvx801r66yirvf1kppasjlhm25qvr6rpb9jgqh";
-      name = "qtmultimedia-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtquickcontrols = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols-opensource-src-5.6.0.tar.xz";
-      sha256 = "12vqkxpz5y2bbh083lpsxcianykl8x7am49pmc4x221a5xwrc27c";
-      name = "qtquickcontrols-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtquickcontrols2-opensource-src-5.6.1.tar.xz";
+      sha256 = "13zbiv63b76ifpjalx5616nixfwjk48q977bzb1xxj363b7xv85v";
+      name = "qtquickcontrols2-opensource-src-5.6.1.tar.xz";
     };
   };
   qtandroidextras = {
-    version = "5.6.0";
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtandroidextras-opensource-src-5.6.0.tar.xz";
-      sha256 = "1qhrn8vhfn0z73bc2ls1b4zfvr7r5gn7b5xdmjp26hi338j55vp0";
-      name = "qtandroidextras-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtandroidextras-opensource-src-5.6.1.tar.xz";
+      sha256 = "0prkpb57j0s8k36sba47k2bhs3ajf01rdwc7qf5gkvhs991rwckc";
+      name = "qtandroidextras-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtimageformats = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtimageformats-opensource-src-5.6.1.tar.xz";
+      sha256 = "020v1148433zx4g87z2r8fgff32n0laajxqqsja1l3yzz7jbrwvl";
+      name = "qtimageformats-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtxmlpatterns = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtxmlpatterns-opensource-src-5.6.1.tar.xz";
+      sha256 = "0q412jv3xbg7v05b8pbahifwx17gzlp96s90akh6zwhpm8i6xx34";
+      name = "qtxmlpatterns-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtdeclarative = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdeclarative-opensource-src-5.6.1.tar.xz";
+      sha256 = "1d2217kxk85kpi7ls08b41hqzy26hvch8m4cgzq6km5sqi5zvz0j";
+      name = "qtdeclarative-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtconnectivity = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtconnectivity-opensource-src-5.6.1.tar.xz";
+      sha256 = "06fr9321f52kf0nda9zjjfzp5694hbnx0y0v315iw28mnpvandas";
+      name = "qtconnectivity-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtbase = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtbase-opensource-src-5.6.1.tar.xz";
+      sha256 = "0r3jrqymnnxrig4f11xvs33c26f0kzfakbp3kcbdpv795gpc276h";
+      name = "qtbase-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtdoc = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdoc-opensource-src-5.6.1.tar.xz";
+      sha256 = "0yg7903vk4w3h6jjyanssfcig0s2s660q11sj14nw6gcjs7kfa5z";
+      name = "qtdoc-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwebchannel = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebchannel-opensource-src-5.6.1.tar.xz";
+      sha256 = "01q80917a1048hdhaii4v50dqs84h16lc9w3v99r9xvspk8vab7q";
+      name = "qtwebchannel-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtserialport = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtserialport-opensource-src-5.6.1.tar.xz";
+      sha256 = "1hp63cgqhps6y1k041lzhcb2b0rcpcmszabnn293q5ilbvla4x0b";
+      name = "qtserialport-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtx11extras = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtx11extras-opensource-src-5.6.1.tar.xz";
+      sha256 = "0l736qiz8adrnh267xz63hv4sph6nhy90h836qfnnmv3p78ipsz8";
+      name = "qtx11extras-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtserialbus = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtserialbus-opensource-src-5.6.1.tar.xz";
+      sha256 = "1h683dkvnf2rdgxgisybnp8miqgn2gpi597rgx5zc7qk2k8kyidz";
+      name = "qtserialbus-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtmultimedia = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtmultimedia-opensource-src-5.6.1.tar.xz";
+      sha256 = "058523c2qra3d8fq46ygcndnkrbwlh316zy28s2cr5pjr5gmnjyj";
+      name = "qtmultimedia-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtsensors = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtsensors-opensource-src-5.6.1.tar.xz";
+      sha256 = "0bll7ll6s5g8w89knyrc0famjwqyfzwpn512m1f96bf6xwacs967";
+      name = "qtsensors-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtenginio = {
+    version = "1.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtenginio-opensource-src-1.6.1.tar.xz";
+      sha256 = "1iq4lnz3s6mfdgml61b9lsjisky55bbvsdj72kh003j94mzrc3l5";
+      name = "qtenginio-opensource-src-1.6.1.tar.xz";
+    };
+  };
+  qtgraphicaleffects = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtgraphicaleffects-opensource-src-5.6.1.tar.xz";
+      sha256 = "1n0i2drfr7fvydgg810dcij8mxnygdpvqcqv7l1a9a1kv9ap3sap";
+      name = "qtgraphicaleffects-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtdeclarative-render2d = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdeclarative-render2d-opensource-src-5.6.1.tar.xz";
+      sha256 = "1m08x8x355545r9wgrjl5p26zjhp5q1yh3h25dww8pk25v6cn8dg";
+      name = "qtdeclarative-render2d-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtcanvas3d = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtcanvas3d-opensource-src-5.6.1.tar.xz";
+      sha256 = "0q17hwmj893pk0lhxmibxmgk6h1gy4ksqfi62rkfzcf81bg2q7hr";
+      name = "qtcanvas3d-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwebengine = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebengine-opensource-src-5.6.1.tar.xz";
+      sha256 = "0yv0cflgywsyfn84vv2vc9rwpm8j7hin61rxqjqh498nnl2arw5x";
+      name = "qtwebengine-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtscript = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtscript-opensource-src-5.6.1.tar.xz";
+      sha256 = "17zp5dlfplrnzlw233lzapj55drjqchvayajd02qsggzms3yzchw";
+      name = "qtscript-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtquickcontrols = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtquickcontrols-opensource-src-5.6.1.tar.xz";
+      sha256 = "14d68ryn7r7rs7klpldnavcsccvyyg0xhwqkvjlm5wwplv2acah1";
+      name = "qtquickcontrols-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwebsockets = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebsockets-opensource-src-5.6.1.tar.xz";
+      sha256 = "0fkj52i4yi6gmq4jfjgdij08cspxspac6mbpf0fknnllimmkl7jm";
+      name = "qtwebsockets-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwebview = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebview-opensource-src-5.6.1.tar.xz";
+      sha256 = "0q869wl61vidds551w3z49ysx88xqyn6igbz07zxac7d0gwgwpda";
+      name = "qtwebview-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qttools = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qttools-opensource-src-5.6.1.tar.xz";
+      sha256 = "0wbzq60d7lkvlb7b5lqcw87qgy6kyjz1npjavz8f4grdxsaqi8vp";
+      name = "qttools-opensource-src-5.6.1.tar.xz";
     };
   };
 }

From 75ea0523c41372cea4450f748c5ef59b0d01702e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 9 Jun 2016 18:20:56 +0300
Subject: [PATCH 126/436] doc: update buildFHSUserEnv documentation

---
 doc/functions.xml | 84 +++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 51 deletions(-)

diff --git a/doc/functions.xml b/doc/functions.xml
index e6bb6b7deefb..73b178b061f9 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -171,42 +171,18 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
 
 
 <section xml:id="sec-fhs-environments">
-  <title>buildFHSChrootEnv/buildFHSUserEnv</title>
+  <title>buildFHSUserEnv</title>
 
   <para>
-    <function>buildFHSChrootEnv</function> and
-    <function>buildFHSUserEnv</function> provide a way to build and run
-    FHS-compatible lightweight sandboxes. They get their own isolated root with
-    binded <filename>/nix/store</filename>, so their footprint in terms of disk
+    <function>buildFHSUserEnv</function> provides a way to build and run
+    FHS-compatible lightweight sandboxes. It creates an isolated root with
+    bound <filename>/nix/store</filename>, so its footprint in terms of disk
     space needed is quite small. This allows one to run software which is hard or
     unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions,
     games distributed as tarballs, software with integrity checking and/or external
-    self-updated binaries.
-  </para>
-
-  <para>
-    <function>buildFHSChrootEnv</function> allows to create persistent
-    environments, which can be constructed, deconstructed and entered by
-    multiple users at once. A downside is that it requires
-    <literal>root</literal> access for both those who create and destroy and
-    those who enter it. It can be useful to create environments for daemons that
-    one can enter and observe.
-  </para>
-
-  <para>
-    <function>buildFHSUserEnv</function> uses Linux namespaces feature to create
+    self-updated binaries. It uses Linux namespaces feature to create
     temporary lightweight environments which are destroyed after all child
-    processes exit. It does not require root access, and can be useful to create
-    sandboxes and wrap applications.
-  </para>
-
-  <para>
-    Those functions both rely on <function>buildFHSEnv</function>, which creates
-    an actual directory structure given a list of necessary packages and extra
-    build commands.
-    <function>buildFHSChrootEnv</function> and <function>buildFHSUserEnv</function>
-    both accept those arguments which are passed to
-    <function>buildFHSEnv</function>:
+    processes exit, without root user rights requirement. Accepted arguments are:
   </para>
 
   <variablelist>
@@ -220,14 +196,16 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
     <term><literal>targetPkgs</literal></term>
 
     <listitem><para>Packages to be installed for the main host's architecture
-    (i.e. x86_64 on x86_64 installations).</para></listitem>
+    (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also
+    installed.</para></listitem>
     </varlistentry>
 
     <varlistentry>
     <term><literal>multiPkgs</literal></term>
 
     <listitem><para>Packages to be installed for all architectures supported by
-    a host (i.e. i686 and x86_64 on x86_64 installations).</para></listitem>
+    a host (i.e. i686 and x86_64 on x86_64 installations). Only libraries are
+    installed by default.</para></listitem>
     </varlistentry>
 
     <varlistentry>
@@ -240,29 +218,33 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
     <varlistentry>
     <term><literal>extraBuildCommandsMulti</literal></term>
 
-    <listitem><para>Like <literal>extraBuildCommandsMulti</literal>, but
+    <listitem><para>Like <literal>extraBuildCommands</literal>, but
     executed only on multilib architectures.</para></listitem>
     </varlistentry>
+
+    <varlistentry>
+    <term><literal>extraOutputsToInstall</literal></term>
+
+    <listitem><para>Additional derivation outputs to be linked for both
+    target and multi-architecture packages.</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+    <term><literal>extraInstallCommands</literal></term>
+
+    <listitem><para>Additional commands to be executed for finalizing the
+    derivation with runner script.</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+    <term><literal>runScript</literal></term>
+
+    <listitem><para>A command that would be executed inside the sandbox and
+    passed all the command line arguments. It defaults to
+    <literal>bash</literal>.</para></listitem>
+    </varlistentry>
   </variablelist>
 
-  <para>
-    Additionally, <function>buildFHSUserEnv</function> accepts
-    <literal>runScript</literal> parameter, which is a command that would be
-    executed inside the sandbox and passed all the command line arguments. It
-    default to <literal>bash</literal>.
-  </para>
-  <para>
-    It also uses <literal>CHROOTENV_EXTRA_BINDS</literal> environment variable
-    for binding extra directories in the sandbox to outside places. The format of
-    the variable is <literal>/mnt=test-mnt:/data</literal>, where
-    <literal>/mnt</literal> would be mounted as <literal>/test-mnt</literal>
-    and <literal>/data</literal> would be mounted as <literal>/data</literal>.
-    <literal>extraBindMounts</literal> array argument to
-    <function>buildFHSUserEnv</function> function is prepended to this variable.
-    Latter entries take priority if defined several times -- i.e. in case of
-    <literal>/data=data1:/data=data2</literal> the actual bind path would be
-    <literal>/data2</literal>.
-  </para>
   <para>
     One can create a simple environment using a <literal>shell.nix</literal>
     like that:

From 45d4d6212274acd80cf2c6a8bcbca2ba1107d313 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 9 Jun 2016 16:36:09 +0200
Subject: [PATCH 127/436] luaPackages.luaexpat: fix case of LUA_LDIR make flag

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index ce8ef3cef4b4..c90a8452c25b 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -101,7 +101,7 @@ let
 
     preBuild = ''
       makeFlagsArray=(
-        lua_ldir="$out/share/lua/${lua.luaversion}"
+        LUA_LDIR="$out/share/lua/${lua.luaversion}"
         LUA_INC="-I${lua}/include" LUA_CDIR="$out/lib/lua/${lua.luaversion}"
         EXPAT_INC="-I${expat.dev}/include");
     '';

From a0996c2c60faa1644a0f35b002a35d5f52ba7a37 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 9 Jun 2016 16:39:11 +0200
Subject: [PATCH 128/436] libressl: 2.3.4 -> 2.3.5

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

diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix
index a5052a9b499d..32869e0b4720 100644
--- a/pkgs/development/libraries/libressl/2.3.nix
+++ b/pkgs/development/libraries/libressl/2.3.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.3.4";
+  version = "2.3.5";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "1ag65pbvdikqj5y1w780jicl3ngi9ld2332ki6794y0gcar3a4bs";
+    sha256 = "0fvmifz61zfq6byy4dh1qqdg9fpbdsyldjwx5hlcgg6ywxf2f9gl";
   };
 
   enableParallelBuilding = true;

From 09d63127de6ed74be5947322f8af3b0c8b393374 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 9 Jun 2016 10:42:39 -0500
Subject: [PATCH 129/436] Revert "qt56: 5.6.0 -> 5.6.1"

This reverts commit 4d2cf4baaccf093a63b7e76793bffdc339f2379d.
---
 .../libraries/qt-5/5.6/fetchsrcs.sh           |   2 +-
 pkgs/development/libraries/qt-5/5.6/srcs.nix  | 464 +++++++++---------
 2 files changed, 233 insertions(+), 233 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh b/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
index 1ba357a6b1ca..c499c70ea2ca 100755
--- a/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
+++ b/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/"
+RELEASE_URL="http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp
diff --git a/pkgs/development/libraries/qt-5/5.6/srcs.nix b/pkgs/development/libraries/qt-5/5.6/srcs.nix
index 0e005418ae23..9ddbbbde078f 100644
--- a/pkgs/development/libraries/qt-5/5.6/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.6/srcs.nix
@@ -2,260 +2,260 @@
 { fetchurl, mirror }:
 
 {
-  qtwinextras = {
-    version = "5.6.1";
+  qttools = {
+    version = "5.6.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwinextras-opensource-src-5.6.1.tar.xz";
-      sha256 = "1db3lcrj8af0z8lnh99lfbwz1cq9il7rr27rk9l38dff65qkssm8";
-      name = "qtwinextras-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtsvg = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtsvg-opensource-src-5.6.1.tar.xz";
-      sha256 = "08ca5g46g75acy27jfnvnalmcias5hxmjp7491v3y4k9y7a4ybpi";
-      name = "qtsvg-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtactiveqt = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtactiveqt-opensource-src-5.6.1.tar.xz";
-      sha256 = "0a2p0w03d04hqg71hlihj9mr6aasvb0h8jfa5rnq8b5rkm8haf4f";
-      name = "qtactiveqt-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtwayland = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwayland-opensource-src-5.6.1.tar.xz";
-      sha256 = "1jgghjfrg0wwyfzfwgwhagwxz9k936ylv3w2l9bwlpql8rgm8d11";
-      name = "qtwayland-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtlocation = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtlocation-opensource-src-5.6.1.tar.xz";
-      sha256 = "0qahs7a2n3l4h0bl8bnwci9mzy1vra3zncnzr40csic9ys67ddfk";
-      name = "qtlocation-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtmacextras = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtmacextras-opensource-src-5.6.1.tar.xz";
-      sha256 = "147yhv7fb0yaakrffqiw6xz8ycqdc7qsnxvnpr6j8rarw5xmdc73";
-      name = "qtmacextras-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qttranslations = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qttranslations-opensource-src-5.6.1.tar.xz";
-      sha256 = "008wyk00mqz116pigm0qq78rvg28v6ykjnjxppkjnk0yd6i2vmb9";
-      name = "qttranslations-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qt3d = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qt3d-opensource-src-5.6.1.tar.xz";
-      sha256 = "03d81sls30a20yna6940np15112ciwy5024f8n5imaxicm8h34xd";
-      name = "qt3d-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtquickcontrols2 = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtquickcontrols2-opensource-src-5.6.1.tar.xz";
-      sha256 = "13zbiv63b76ifpjalx5616nixfwjk48q977bzb1xxj363b7xv85v";
-      name = "qtquickcontrols2-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtandroidextras = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtandroidextras-opensource-src-5.6.1.tar.xz";
-      sha256 = "0prkpb57j0s8k36sba47k2bhs3ajf01rdwc7qf5gkvhs991rwckc";
-      name = "qtandroidextras-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtimageformats = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtimageformats-opensource-src-5.6.1.tar.xz";
-      sha256 = "020v1148433zx4g87z2r8fgff32n0laajxqqsja1l3yzz7jbrwvl";
-      name = "qtimageformats-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtxmlpatterns = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtxmlpatterns-opensource-src-5.6.1.tar.xz";
-      sha256 = "0q412jv3xbg7v05b8pbahifwx17gzlp96s90akh6zwhpm8i6xx34";
-      name = "qtxmlpatterns-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtdeclarative = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdeclarative-opensource-src-5.6.1.tar.xz";
-      sha256 = "1d2217kxk85kpi7ls08b41hqzy26hvch8m4cgzq6km5sqi5zvz0j";
-      name = "qtdeclarative-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtconnectivity = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtconnectivity-opensource-src-5.6.1.tar.xz";
-      sha256 = "06fr9321f52kf0nda9zjjfzp5694hbnx0y0v315iw28mnpvandas";
-      name = "qtconnectivity-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtbase = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtbase-opensource-src-5.6.1.tar.xz";
-      sha256 = "0r3jrqymnnxrig4f11xvs33c26f0kzfakbp3kcbdpv795gpc276h";
-      name = "qtbase-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtdoc = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdoc-opensource-src-5.6.1.tar.xz";
-      sha256 = "0yg7903vk4w3h6jjyanssfcig0s2s660q11sj14nw6gcjs7kfa5z";
-      name = "qtdoc-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtwebchannel = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebchannel-opensource-src-5.6.1.tar.xz";
-      sha256 = "01q80917a1048hdhaii4v50dqs84h16lc9w3v99r9xvspk8vab7q";
-      name = "qtwebchannel-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtserialport = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtserialport-opensource-src-5.6.1.tar.xz";
-      sha256 = "1hp63cgqhps6y1k041lzhcb2b0rcpcmszabnn293q5ilbvla4x0b";
-      name = "qtserialport-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtx11extras = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtx11extras-opensource-src-5.6.1.tar.xz";
-      sha256 = "0l736qiz8adrnh267xz63hv4sph6nhy90h836qfnnmv3p78ipsz8";
-      name = "qtx11extras-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtserialbus = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtserialbus-opensource-src-5.6.1.tar.xz";
-      sha256 = "1h683dkvnf2rdgxgisybnp8miqgn2gpi597rgx5zc7qk2k8kyidz";
-      name = "qtserialbus-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtmultimedia = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtmultimedia-opensource-src-5.6.1.tar.xz";
-      sha256 = "058523c2qra3d8fq46ygcndnkrbwlh316zy28s2cr5pjr5gmnjyj";
-      name = "qtmultimedia-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtsensors = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtsensors-opensource-src-5.6.1.tar.xz";
-      sha256 = "0bll7ll6s5g8w89knyrc0famjwqyfzwpn512m1f96bf6xwacs967";
-      name = "qtsensors-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtenginio = {
-    version = "1.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtenginio-opensource-src-1.6.1.tar.xz";
-      sha256 = "1iq4lnz3s6mfdgml61b9lsjisky55bbvsdj72kh003j94mzrc3l5";
-      name = "qtenginio-opensource-src-1.6.1.tar.xz";
-    };
-  };
-  qtgraphicaleffects = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtgraphicaleffects-opensource-src-5.6.1.tar.xz";
-      sha256 = "1n0i2drfr7fvydgg810dcij8mxnygdpvqcqv7l1a9a1kv9ap3sap";
-      name = "qtgraphicaleffects-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtdeclarative-render2d = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdeclarative-render2d-opensource-src-5.6.1.tar.xz";
-      sha256 = "1m08x8x355545r9wgrjl5p26zjhp5q1yh3h25dww8pk25v6cn8dg";
-      name = "qtdeclarative-render2d-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtcanvas3d = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtcanvas3d-opensource-src-5.6.1.tar.xz";
-      sha256 = "0q17hwmj893pk0lhxmibxmgk6h1gy4ksqfi62rkfzcf81bg2q7hr";
-      name = "qtcanvas3d-opensource-src-5.6.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qttools-opensource-src-5.6.0.tar.xz";
+      sha256 = "1791c9a1vxv0q2ywr00ya5rxaggidsq81s8h8fwmql75pdhlq90d";
+      name = "qttools-opensource-src-5.6.0.tar.xz";
     };
   };
   qtwebengine = {
-    version = "5.6.1";
+    version = "5.6.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebengine-opensource-src-5.6.1.tar.xz";
-      sha256 = "0yv0cflgywsyfn84vv2vc9rwpm8j7hin61rxqjqh498nnl2arw5x";
-      name = "qtwebengine-opensource-src-5.6.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebengine-opensource-src-5.6.0.tar.xz";
+      sha256 = "00vaqx3mypqlnjkfwhx54r6ygfs07amkwc4rma0sg64zdjnvb8la";
+      name = "qtwebengine-opensource-src-5.6.0.tar.xz";
     };
   };
-  qtscript = {
-    version = "5.6.1";
+  qtserialbus = {
+    version = "5.6.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtscript-opensource-src-5.6.1.tar.xz";
-      sha256 = "17zp5dlfplrnzlw233lzapj55drjqchvayajd02qsggzms3yzchw";
-      name = "qtscript-opensource-src-5.6.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtserialbus-opensource-src-5.6.0.tar.xz";
+      sha256 = "13hbmj9pilh5gkbbngfbp225qvc650pnzvpzawpnf69zwl757jlc";
+      name = "qtserialbus-opensource-src-5.6.0.tar.xz";
     };
   };
-  qtquickcontrols = {
-    version = "5.6.1";
+  qtwayland = {
+    version = "5.6.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtquickcontrols-opensource-src-5.6.1.tar.xz";
-      sha256 = "14d68ryn7r7rs7klpldnavcsccvyyg0xhwqkvjlm5wwplv2acah1";
-      name = "qtquickcontrols-opensource-src-5.6.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwayland-opensource-src-5.6.0.tar.xz";
+      sha256 = "1k5zsgz54wlkxm3ici55lbbz286bk2791vri02bjgja5y9102pdm";
+      name = "qtwayland-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qt5 = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qt5-opensource-src-5.6.0.tar.xz";
+      sha256 = "195dl9pk9slbiy6mgwwpc70vaw62sdhxc3lxmlnyddk99widqa3k";
+      name = "qt5-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtimageformats = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtimageformats-opensource-src-5.6.0.tar.xz";
+      sha256 = "1nmsh682idxl0642q7376r9qfxkx0736q9pl4jx179c9lrsl519c";
+      name = "qtimageformats-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtactiveqt = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtactiveqt-opensource-src-5.6.0.tar.xz";
+      sha256 = "0xrjr9jwkxxcv46a8vj77px3v1p36nm6rpvyxma0wb4xhpippp3a";
+      name = "qtactiveqt-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtdoc = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtdoc-opensource-src-5.6.0.tar.xz";
+      sha256 = "1z69yl8nkvp21arjhzl34gr8gvxm5b03d58lwnddl4mkaxbi4vap";
+      name = "qtdoc-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtsensors = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtsensors-opensource-src-5.6.0.tar.xz";
+      sha256 = "0blwqmkh0hn1716d5fvy0vnh56y9iikl34ayz6ksl0ayxhpkk3si";
+      name = "qtsensors-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtwebchannel = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebchannel-opensource-src-5.6.0.tar.xz";
+      sha256 = "0ky1njksczyfb7y7p5kfgzbx9vgajzy51g2y3vrpfvl6bs9j8m62";
+      name = "qtwebchannel-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtmacextras = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtmacextras-opensource-src-5.6.0.tar.xz";
+      sha256 = "1jkmwppapvymdr1kwdrbjlxhcafcn4jb23ssnhrvvgcq3lnl5lhj";
+      name = "qtmacextras-opensource-src-5.6.0.tar.xz";
     };
   };
   qtwebsockets = {
-    version = "5.6.1";
+    version = "5.6.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebsockets-opensource-src-5.6.1.tar.xz";
-      sha256 = "0fkj52i4yi6gmq4jfjgdij08cspxspac6mbpf0fknnllimmkl7jm";
-      name = "qtwebsockets-opensource-src-5.6.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebsockets-opensource-src-5.6.0.tar.xz";
+      sha256 = "17vi3n27gx3f3c2lii3b70pzz6mpblam3236v6mj439xzrlvi2i6";
+      name = "qtwebsockets-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtconnectivity = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtconnectivity-opensource-src-5.6.0.tar.xz";
+      sha256 = "1ss0ibabiv7n5hakkxmkc4msrwgqcvfffdjajnv5jrq0030v0p0c";
+      name = "qtconnectivity-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtscript = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtscript-opensource-src-5.6.0.tar.xz";
+      sha256 = "0hjhkh4lia1i0iir1i8dr57gizi74h73j0phhir3q3wsglcpax5c";
+      name = "qtscript-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qttranslations = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qttranslations-opensource-src-5.6.0.tar.xz";
+      sha256 = "0jfdfj2z0nvf1xblmdxaphn0psjycrb5g3jxxcddkci214gka2cq";
+      name = "qttranslations-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtlocation = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtlocation-opensource-src-5.6.0.tar.xz";
+      sha256 = "1jakjrwic01b5vyij6hfzdfpipandpkj9li3d7wf9bzws0cia3in";
+      name = "qtlocation-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtserialport = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtserialport-opensource-src-5.6.0.tar.xz";
+      sha256 = "07rwhmh9y7b3ycvx4d4d1j32nahf8nhsb9qj99kxz5xrdfv7zvhn";
+      name = "qtserialport-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtsvg = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtsvg-opensource-src-5.6.0.tar.xz";
+      sha256 = "07v4bzxd31dhkhp52y4g2ii0sslmk48cqkkz32v41frqj4qrk1vr";
+      name = "qtsvg-opensource-src-5.6.0.tar.xz";
     };
   };
   qtwebview = {
-    version = "5.6.1";
+    version = "5.6.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebview-opensource-src-5.6.1.tar.xz";
-      sha256 = "0q869wl61vidds551w3z49ysx88xqyn6igbz07zxac7d0gwgwpda";
-      name = "qtwebview-opensource-src-5.6.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebview-opensource-src-5.6.0.tar.xz";
+      sha256 = "0mqbh125bq37xybwslhri4pl861r26cnraiz9ivh4881kqzab3x4";
+      name = "qtwebview-opensource-src-5.6.0.tar.xz";
     };
   };
-  qttools = {
-    version = "5.6.1";
+  qtcanvas3d = {
+    version = "5.6.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qttools-opensource-src-5.6.1.tar.xz";
-      sha256 = "0wbzq60d7lkvlb7b5lqcw87qgy6kyjz1npjavz8f4grdxsaqi8vp";
-      name = "qttools-opensource-src-5.6.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtcanvas3d-opensource-src-5.6.0.tar.xz";
+      sha256 = "1kwykm1ffgpjgb3ggd4h2d2x3yhp9jsc0gnwlks620bahagdbbb6";
+      name = "qtcanvas3d-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtwinextras = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwinextras-opensource-src-5.6.0.tar.xz";
+      sha256 = "14xvm081wjyild2wi7pcilqxdkhc8b0lf9yn7yf7zp576i9ir5aq";
+      name = "qtwinextras-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtgraphicaleffects = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtgraphicaleffects-opensource-src-5.6.0.tar.xz";
+      sha256 = "1s0n8hrmrfs53cmm7i45p8zavvmsl0aisd5sgj93p8c5rzyi3s81";
+      name = "qtgraphicaleffects-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtxmlpatterns = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtxmlpatterns-opensource-src-5.6.0.tar.xz";
+      sha256 = "1m0rr0m9zg2d6rdban2p5qyx8rdnjnjsfk3bm72bh47hscxipvds";
+      name = "qtxmlpatterns-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtquickcontrols2 = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols2-opensource-src-5.6.0.tar.xz";
+      sha256 = "1q7yp7l32jd3p28587ldxzkj58z1aad9gcs80w6vqc9952i6xv2r";
+      name = "qtquickcontrols2-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtbase = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtbase-opensource-src-5.6.0.tar.xz";
+      sha256 = "0ynnvcs5idivzldsq5ciqg9myg82b3l3906l4vjv54lyamf8mykf";
+      name = "qtbase-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qt3d = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qt3d-opensource-src-5.6.0.tar.xz";
+      sha256 = "17a37xhav5mxspx2c9wsgvcilv7ys40q6minmlqd1gnfmsfphqdr";
+      name = "qt3d-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtenginio = {
+    version = "1.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtenginio-opensource-src-1.6.0.tar.xz";
+      sha256 = "033z2jncci64s7s9ml5rsfsnrkdmhx1g5dfvr61imv63pzxxqzb2";
+      name = "qtenginio-opensource-src-1.6.0.tar.xz";
+    };
+  };
+  qtx11extras = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtx11extras-opensource-src-5.6.0.tar.xz";
+      sha256 = "099lc7kxcxgp5s01ddnd6n955fc8866caark43xfs2dw0a6pdva7";
+      name = "qtx11extras-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtdeclarative = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtdeclarative-opensource-src-5.6.0.tar.xz";
+      sha256 = "0k70zlyx1nh35caiav4s3jvg5l029pvilm6sarxmfj73y19z0mcc";
+      name = "qtdeclarative-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtmultimedia = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtmultimedia-opensource-src-5.6.0.tar.xz";
+      sha256 = "11h66xcr3y3w8hhvx801r66yirvf1kppasjlhm25qvr6rpb9jgqh";
+      name = "qtmultimedia-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtquickcontrols = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols-opensource-src-5.6.0.tar.xz";
+      sha256 = "12vqkxpz5y2bbh083lpsxcianykl8x7am49pmc4x221a5xwrc27c";
+      name = "qtquickcontrols-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtandroidextras = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtandroidextras-opensource-src-5.6.0.tar.xz";
+      sha256 = "1qhrn8vhfn0z73bc2ls1b4zfvr7r5gn7b5xdmjp26hi338j55vp0";
+      name = "qtandroidextras-opensource-src-5.6.0.tar.xz";
     };
   };
 }

From 97d791978cca24515409b53c9cc0cef28f972ea8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 9 Jun 2016 17:01:52 +0300
Subject: [PATCH 130/436] qt56: 5.6.0 -> 5.6.1

---
 .../libraries/qt-5/5.6/fetchsrcs.sh           |   4 +-
 .../qt-5/5.6/qtbase/cmake-paths.patch         |  42 +-
 .../qt-5/5.6/qtbase/compose-search-path.patch |   6 +-
 .../qt-5/5.6/qtbase/decrypt-ssl-traffic.patch |   6 +-
 .../libraries/qt-5/5.6/qtbase/default.nix     |  48 +-
 .../qt-5/5.6/qtbase/dlopen-dbus.patch         |   6 +-
 .../libraries/qt-5/5.6/qtbase/dlopen-gl.patch |   6 +-
 .../qt-5/5.6/qtbase/dlopen-gtkstyle.patch     |  12 +-
 .../qt-5/5.6/qtbase/dlopen-libXcursor.patch   |   6 +-
 .../qt-5/5.6/qtbase/dlopen-openssl.patch      |   6 +-
 .../qt-5/5.6/qtbase/dlopen-resolv.patch       |  12 +-
 .../libraries/qt-5/5.6/qtbase/libressl.patch  |   6 +-
 .../qt-5/5.6/qtbase/mkspecs-libgl.patch       |   6 +-
 .../qtbase/nix-profiles-library-paths.patch   |   6 +-
 .../libraries/qt-5/5.6/qtbase/tzdir.patch     |   6 +-
 .../qt-5/5.6/qtbase/xdg-config-dirs.patch     |  12 +-
 pkgs/development/libraries/qt-5/5.6/srcs.nix  | 470 +++++++++---------
 17 files changed, 323 insertions(+), 337 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh b/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
index c499c70ea2ca..cbedf29ed79d 100755
--- a/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
+++ b/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/"
+RELEASE_URL="http://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp
@@ -12,7 +12,7 @@ mkdir tmp; cd tmp
 wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
 
 cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by manifest.sh
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
 { fetchurl, mirror }:
 
 {
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths.patch
index e37b3ad837af..6a5c73d3e148 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths.patch
@@ -1,7 +1,7 @@
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+Index: qtbase-opensource-src-5.6.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+--- qtbase-opensource-src-5.6.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ qtbase-opensource-src-5.6.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
  endif()
  !!ENDIF
@@ -182,10 +182,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5
  !!ELSE
          set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
  !!ENDIF
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.6.0/src/gui/Qt5GuiConfigExtras.cmake.in
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
+--- qtbase-opensource-src-5.6.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in
++++ qtbase-opensource-src-5.6.0/src/gui/Qt5GuiConfigExtras.cmake.in
 @@ -2,7 +2,7 @@
  !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
  
@@ -211,10 +211,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmak
  !!ELSE
      set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
  !!ENDIF
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.6.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+--- qtbase-opensource-src-5.6.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
++++ qtbase-opensource-src-5.6.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
 @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
      add_executable(Qt5::uic IMPORTED)
  
@@ -224,10 +224,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExt
  !!ELSE
      set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtras.cmake.in
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in
+--- qtbase-opensource-src-5.6.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
++++ qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtras.cmake.in
 @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
      add_executable(Qt5::qmake IMPORTED)
  
@@ -273,10 +273,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras
  !!ELSE
      set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
  !!ENDIF
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+Index: qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+--- qtbase-opensource-src-5.6.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
++++ qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
 @@ -1,6 +1,6 @@
  
  !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
@@ -285,10 +285,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras
  !!ELSE
  set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
  !!ENDIF
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+Index: qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+--- qtbase-opensource-src-5.6.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
++++ qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
 @@ -1,6 +1,6 @@
  
  !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
@@ -297,10 +297,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras
  !!ELSE
  set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
  !!ENDIF
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.6.0/src/dbus/Qt5DBusConfigExtras.cmake.in
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in
+--- qtbase-opensource-src-5.6.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
++++ qtbase-opensource-src-5.6.0/src/dbus/Qt5DBusConfigExtras.cmake.in
 @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
      add_executable(Qt5::qdbuscpp2xml IMPORTED)
  
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/compose-search-path.patch
index 3d65dcc902c3..230ca4167dbc 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/compose-search-path.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/compose-search-path.patch
@@ -1,7 +1,7 @@
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+Index: qtbase-opensource-src-5.6.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+--- qtbase-opensource-src-5.6.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
++++ qtbase-opensource-src-5.6.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
 @@ -251,10 +251,7 @@ void TableGenerator::initPossibleLocatio
      // the QTCOMPOSE environment variable
      if (qEnvironmentVariableIsSet("QTCOMPOSE"))
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/decrypt-ssl-traffic.patch
index 2cb3f7dfa700..495db07cfbb5 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/decrypt-ssl-traffic.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/decrypt-ssl-traffic.patch
@@ -1,7 +1,7 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp
+Index: qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp
+--- qtbase-opensource-src-5.5.1.orig/src/network/ssl/qsslsocket_openssl.cpp
++++ qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
 @@ -48,7 +48,7 @@
  ****************************************************************************/
  
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 5b02190b0454..14a89f82038d 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -24,7 +24,6 @@
 }:
 
 let
-  inherit (srcs.qt5) version;
   system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
 
   # Search path for Gtk plugin
@@ -33,19 +32,11 @@ in
 
 stdenv.mkDerivation {
 
-  name = "qtbase-${version}";
-  inherit version;
-
-  srcs = with srcs; [ qt5.src qtbase.src ];
-
-  sourceRoot = "qt-everywhere-opensource-src-${version}";
+  name = "qtbase-${srcs.qtbase.version}";
+  inherit (srcs.qtbase) src version;
 
   outputs = [ "dev" "out" "gtk" ];
 
-  postUnpack = ''
-    mv qtbase-opensource-src-${version} $sourceRoot/qtbase
-  '';
-
   patches =
     copyPathsToStore (lib.readPathsFromFile ./. ./series)
     ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
@@ -54,38 +45,37 @@ stdenv.mkDerivation {
   postPatch =
     ''
       substituteInPlace configure --replace /bin/pwd pwd
-      substituteInPlace qtbase/configure --replace /bin/pwd pwd
-      substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
-      sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
+      substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
+      sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
 
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in"
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake"
-      sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in"
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
+      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5Config.cmake.in"
+      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5CoreMacros.cmake"
+      sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in"
+      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
 
-      substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \
+      substituteInPlace src/network/kernel/qdnslookup_unix.cpp \
         --replace "@glibc@" "${stdenv.cc.libc.out}"
-      substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \
+      substituteInPlace src/network/kernel/qhostinfo_unix.cpp \
         --replace "@glibc@" "${stdenv.cc.libc.out}"
 
-      substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \
+      substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \
         --replace "@libXcursor@" "${libXcursor.out}"
 
-      substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \
+      substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \
         --replace "@openssl@" "${openssl.out}"
 
-      substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \
+      substituteInPlace src/dbus/qdbus_symbols.cpp \
         --replace "@dbus_libs@" "${dbus.lib}"
 
       substituteInPlace \
-        qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
+        src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
         --replace "@libX11@" "${libX11.out}"
     ''
     + lib.optionalString mesaSupported ''
       substituteInPlace \
-        qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
+        src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
         --replace "@mesa_lib@" "${mesa.out}"
-      substituteInPlace qtbase/mkspecs/common/linux.conf \
+      substituteInPlace mkspecs/common/linux.conf \
         --replace "@mesa_lib@" "${mesa.out}" \
         --replace "@mesa_inc@" "${mesa.dev or mesa}"
     '';
@@ -93,7 +83,7 @@ stdenv.mkDerivation {
 
   setOutputFlags = false;
   preConfigure = ''
-    export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
 
     configureFlags+="\
@@ -101,10 +91,6 @@ stdenv.mkDerivation {
         -importdir $out/lib/qt5/imports \
         -qmldir $out/lib/qt5/qml \
         -docdir $out/share/doc/qt5"
-  ''
-  # QMake expects to extract the list of available modules from .gitmodules
-  + ''
-    echo '[submodule "qtbase"]' >.gitmodules
   '';
 
   prefixKey = "-prefix ";
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-dbus.patch
index 401cfd5c295e..9118507e9388 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-dbus.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-dbus.patch
@@ -1,7 +1,7 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp
+Index: qtbase-opensource-src-5.5.1/src/dbus/qdbus_symbols.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/dbus/qdbus_symbols.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp
+--- qtbase-opensource-src-5.5.1.orig/src/dbus/qdbus_symbols.cpp
++++ qtbase-opensource-src-5.5.1/src/dbus/qdbus_symbols.cpp
 @@ -89,7 +89,7 @@ bool qdbus_loadLibDBus()
  #ifdef Q_OS_WIN
          QLatin1String("dbus-1"),
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gl.patch
index 59f510ac54da..ea3073ced50a 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gl.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gl.patch
@@ -1,7 +1,7 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+Index: qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+--- qtbase-opensource-src-5.5.1.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
++++ qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
 @@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const
              {
                  extern const QString qt_gl_library_name();
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch
index ad1719c46e29..755b0965cf5f 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch
@@ -1,7 +1,7 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtk2painter.cpp
+Index: qtbase-opensource-src-5.5.1/src/widgets/styles/qgtk2painter.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/widgets/styles/qgtk2painter.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtk2painter.cpp
+--- qtbase-opensource-src-5.5.1.orig/src/widgets/styles/qgtk2painter.cpp
++++ qtbase-opensource-src-5.5.1/src/widgets/styles/qgtk2painter.cpp
 @@ -96,7 +96,7 @@ static void initGtk()
      static bool initialized = false;
      if (!initialized) {
@@ -11,10 +11,10 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtk2painter
  
          QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new");
          QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable");
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp
+Index: qtbase-opensource-src-5.5.1/src/widgets/styles/qgtkstyle_p.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/widgets/styles/qgtkstyle_p.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp
+--- qtbase-opensource-src-5.5.1.orig/src/widgets/styles/qgtkstyle_p.cpp
++++ qtbase-opensource-src-5.5.1/src/widgets/styles/qgtkstyle_p.cpp
 @@ -327,7 +327,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus
  void QGtkStylePrivate::resolveGtk() const
  {
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-libXcursor.patch
index d3b5b631be76..3e2e8ab349d3 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-libXcursor.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-libXcursor.patch
@@ -1,7 +1,7 @@
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
+Index: qtbase-opensource-src-5.6.0/src/plugins/platforms/xcb/qxcbcursor.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
+--- qtbase-opensource-src-5.6.0.orig/src/plugins/platforms/xcb/qxcbcursor.cpp
++++ qtbase-opensource-src-5.6.0/src/plugins/platforms/xcb/qxcbcursor.cpp
 @@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c
  #if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY)
      static bool function_ptrs_not_initialized = true;
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-openssl.patch
index f51fa44faaf5..1d97aad94065 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-openssl.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-openssl.patch
@@ -1,7 +1,7 @@
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
+Index: qtbase-opensource-src-5.6.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
+--- qtbase-opensource-src-5.6.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ qtbase-opensource-src-5.6.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
 @@ -652,8 +652,8 @@ static QPair<QLibrary*, QLibrary*> loadO
  #endif
  #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch
index 3e9b9ca2b08a..5c285188ce40 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch
@@ -1,7 +1,7 @@
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qdnslookup_unix.cpp
+Index: qtbase-opensource-src-5.6.0/src/network/kernel/qdnslookup_unix.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/kernel/qdnslookup_unix.cpp
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qdnslookup_unix.cpp
+--- qtbase-opensource-src-5.6.0.orig/src/network/kernel/qdnslookup_unix.cpp
++++ qtbase-opensource-src-5.6.0/src/network/kernel/qdnslookup_unix.cpp
 @@ -79,7 +79,7 @@ static void resolveLibrary()
      if (!lib.load())
  #endif
@@ -11,10 +11,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qdnslookup_u
          if (!lib.load())
              return;
      }
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qhostinfo_unix.cpp
+Index: qtbase-opensource-src-5.6.0/src/network/kernel/qhostinfo_unix.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/kernel/qhostinfo_unix.cpp
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qhostinfo_unix.cpp
+--- qtbase-opensource-src-5.6.0.orig/src/network/kernel/qhostinfo_unix.cpp
++++ qtbase-opensource-src-5.6.0/src/network/kernel/qhostinfo_unix.cpp
 @@ -95,7 +95,7 @@ static void resolveLibrary()
      if (!lib.load())
  #endif
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/libressl.patch
index a05d55c8640a..c721a6be7470 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/libressl.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/libressl.patch
@@ -9,10 +9,10 @@ is defined in openssl, but not in libressl.
  src/network/ssl/qsslcontext_openssl.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslcontext_openssl.cpp
+Index: qtbase-opensource-src-5.6.0/src/network/ssl/qsslcontext_openssl.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslcontext_openssl.cpp
+--- qtbase-opensource-src-5.6.0.orig/src/network/ssl/qsslcontext_openssl.cpp
++++ qtbase-opensource-src-5.6.0/src/network/ssl/qsslcontext_openssl.cpp
 @@ -340,7 +340,7 @@ init_context:
  
      const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves();
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/mkspecs-libgl.patch
index 56ee0a411d4d..fda3d3e36533 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/mkspecs-libgl.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/mkspecs-libgl.patch
@@ -1,7 +1,7 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
+Index: qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf
 ===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/mkspecs/common/linux.conf
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
+--- qtbase-opensource-src-5.5.1.orig/mkspecs/common/linux.conf
++++ qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf
 @@ -12,8 +12,8 @@ QMAKE_INCDIR            =
  QMAKE_LIBDIR            =
  QMAKE_INCDIR_X11        =
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
index b2aad140ad0f..d454a74109ae 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
@@ -1,7 +1,7 @@
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/kernel/qcoreapplication.cpp
+Index: qtbase-opensource-src-5.6.0/src/corelib/kernel/qcoreapplication.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/kernel/qcoreapplication.cpp
+--- qtbase-opensource-src-5.6.0.orig/src/corelib/kernel/qcoreapplication.cpp
++++ qtbase-opensource-src-5.6.0/src/corelib/kernel/qcoreapplication.cpp
 @@ -2533,7 +2533,17 @@ QStringList QCoreApplication::libraryPat
          QStringList *app_libpaths = new QStringList;
          coreappdata()->app_libpaths.reset(app_libpaths);
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
index 1c0541bdc2ad..16e88d7c4f0d 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
@@ -1,7 +1,7 @@
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
+Index: qtbase-opensource-src-5.6.0/src/corelib/tools/qtimezoneprivate_tz.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
+--- qtbase-opensource-src-5.6.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
++++ qtbase-opensource-src-5.6.0/src/corelib/tools/qtimezoneprivate_tz.cpp
 @@ -62,7 +62,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q
  // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
  static QTzTimeZoneHash loadTzTimeZones()
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/xdg-config-dirs.patch
index ff4ad82ea8f8..8756cbe9f5f0 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/xdg-config-dirs.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/xdg-config-dirs.patch
@@ -1,7 +1,7 @@
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings.cpp
+Index: qtbase-opensource-src-5.6.0/src/corelib/io/qsettings.cpp
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/io/qsettings.cpp
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings.cpp
+--- qtbase-opensource-src-5.6.0.orig/src/corelib/io/qsettings.cpp
++++ qtbase-opensource-src-5.6.0/src/corelib/io/qsettings.cpp
 @@ -1155,6 +1155,24 @@ QConfFileSettingsPrivate::QConfFileSetti
      if (!application.isEmpty())
          confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
@@ -27,10 +27,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings.cpp
  #else
      QString confName = getPath(format, QSettings::UserScope) + org;
      if (!application.isEmpty())
-Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings_p.h
+Index: qtbase-opensource-src-5.6.0/src/corelib/io/qsettings_p.h
 ===================================================================
---- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/io/qsettings_p.h
-+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings_p.h
+--- qtbase-opensource-src-5.6.0.orig/src/corelib/io/qsettings_p.h
++++ qtbase-opensource-src-5.6.0/src/corelib/io/qsettings_p.h
 @@ -241,7 +241,7 @@ public:
          F_Organization = 0x1,
          F_User = 0x0,
diff --git a/pkgs/development/libraries/qt-5/5.6/srcs.nix b/pkgs/development/libraries/qt-5/5.6/srcs.nix
index 9ddbbbde078f..6f11e4408f77 100644
--- a/pkgs/development/libraries/qt-5/5.6/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.6/srcs.nix
@@ -1,261 +1,261 @@
-# DO NOT EDIT! This file is generated automatically by manifest.sh
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
 { fetchurl, mirror }:
 
 {
-  qttools = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qttools-opensource-src-5.6.0.tar.xz";
-      sha256 = "1791c9a1vxv0q2ywr00ya5rxaggidsq81s8h8fwmql75pdhlq90d";
-      name = "qttools-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtwebengine = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebengine-opensource-src-5.6.0.tar.xz";
-      sha256 = "00vaqx3mypqlnjkfwhx54r6ygfs07amkwc4rma0sg64zdjnvb8la";
-      name = "qtwebengine-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtserialbus = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtserialbus-opensource-src-5.6.0.tar.xz";
-      sha256 = "13hbmj9pilh5gkbbngfbp225qvc650pnzvpzawpnf69zwl757jlc";
-      name = "qtserialbus-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtwayland = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwayland-opensource-src-5.6.0.tar.xz";
-      sha256 = "1k5zsgz54wlkxm3ici55lbbz286bk2791vri02bjgja5y9102pdm";
-      name = "qtwayland-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qt5 = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qt5-opensource-src-5.6.0.tar.xz";
-      sha256 = "195dl9pk9slbiy6mgwwpc70vaw62sdhxc3lxmlnyddk99widqa3k";
-      name = "qt5-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtimageformats = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtimageformats-opensource-src-5.6.0.tar.xz";
-      sha256 = "1nmsh682idxl0642q7376r9qfxkx0736q9pl4jx179c9lrsl519c";
-      name = "qtimageformats-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtactiveqt = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtactiveqt-opensource-src-5.6.0.tar.xz";
-      sha256 = "0xrjr9jwkxxcv46a8vj77px3v1p36nm6rpvyxma0wb4xhpippp3a";
-      name = "qtactiveqt-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtdoc = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtdoc-opensource-src-5.6.0.tar.xz";
-      sha256 = "1z69yl8nkvp21arjhzl34gr8gvxm5b03d58lwnddl4mkaxbi4vap";
-      name = "qtdoc-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtsensors = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtsensors-opensource-src-5.6.0.tar.xz";
-      sha256 = "0blwqmkh0hn1716d5fvy0vnh56y9iikl34ayz6ksl0ayxhpkk3si";
-      name = "qtsensors-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtwebchannel = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebchannel-opensource-src-5.6.0.tar.xz";
-      sha256 = "0ky1njksczyfb7y7p5kfgzbx9vgajzy51g2y3vrpfvl6bs9j8m62";
-      name = "qtwebchannel-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtmacextras = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtmacextras-opensource-src-5.6.0.tar.xz";
-      sha256 = "1jkmwppapvymdr1kwdrbjlxhcafcn4jb23ssnhrvvgcq3lnl5lhj";
-      name = "qtmacextras-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtwebsockets = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebsockets-opensource-src-5.6.0.tar.xz";
-      sha256 = "17vi3n27gx3f3c2lii3b70pzz6mpblam3236v6mj439xzrlvi2i6";
-      name = "qtwebsockets-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtconnectivity = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtconnectivity-opensource-src-5.6.0.tar.xz";
-      sha256 = "1ss0ibabiv7n5hakkxmkc4msrwgqcvfffdjajnv5jrq0030v0p0c";
-      name = "qtconnectivity-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtscript = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtscript-opensource-src-5.6.0.tar.xz";
-      sha256 = "0hjhkh4lia1i0iir1i8dr57gizi74h73j0phhir3q3wsglcpax5c";
-      name = "qtscript-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qttranslations = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qttranslations-opensource-src-5.6.0.tar.xz";
-      sha256 = "0jfdfj2z0nvf1xblmdxaphn0psjycrb5g3jxxcddkci214gka2cq";
-      name = "qttranslations-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtlocation = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtlocation-opensource-src-5.6.0.tar.xz";
-      sha256 = "1jakjrwic01b5vyij6hfzdfpipandpkj9li3d7wf9bzws0cia3in";
-      name = "qtlocation-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtserialport = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtserialport-opensource-src-5.6.0.tar.xz";
-      sha256 = "07rwhmh9y7b3ycvx4d4d1j32nahf8nhsb9qj99kxz5xrdfv7zvhn";
-      name = "qtserialport-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtsvg = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtsvg-opensource-src-5.6.0.tar.xz";
-      sha256 = "07v4bzxd31dhkhp52y4g2ii0sslmk48cqkkz32v41frqj4qrk1vr";
-      name = "qtsvg-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtwebview = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebview-opensource-src-5.6.0.tar.xz";
-      sha256 = "0mqbh125bq37xybwslhri4pl861r26cnraiz9ivh4881kqzab3x4";
-      name = "qtwebview-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtcanvas3d = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtcanvas3d-opensource-src-5.6.0.tar.xz";
-      sha256 = "1kwykm1ffgpjgb3ggd4h2d2x3yhp9jsc0gnwlks620bahagdbbb6";
-      name = "qtcanvas3d-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtwinextras = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwinextras-opensource-src-5.6.0.tar.xz";
-      sha256 = "14xvm081wjyild2wi7pcilqxdkhc8b0lf9yn7yf7zp576i9ir5aq";
-      name = "qtwinextras-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtgraphicaleffects = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtgraphicaleffects-opensource-src-5.6.0.tar.xz";
-      sha256 = "1s0n8hrmrfs53cmm7i45p8zavvmsl0aisd5sgj93p8c5rzyi3s81";
-      name = "qtgraphicaleffects-opensource-src-5.6.0.tar.xz";
-    };
-  };
   qtxmlpatterns = {
-    version = "5.6.0";
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtxmlpatterns-opensource-src-5.6.0.tar.xz";
-      sha256 = "1m0rr0m9zg2d6rdban2p5qyx8rdnjnjsfk3bm72bh47hscxipvds";
-      name = "qtxmlpatterns-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtquickcontrols2 = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols2-opensource-src-5.6.0.tar.xz";
-      sha256 = "1q7yp7l32jd3p28587ldxzkj58z1aad9gcs80w6vqc9952i6xv2r";
-      name = "qtquickcontrols2-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtbase = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtbase-opensource-src-5.6.0.tar.xz";
-      sha256 = "0ynnvcs5idivzldsq5ciqg9myg82b3l3906l4vjv54lyamf8mykf";
-      name = "qtbase-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qt3d = {
-    version = "5.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qt3d-opensource-src-5.6.0.tar.xz";
-      sha256 = "17a37xhav5mxspx2c9wsgvcilv7ys40q6minmlqd1gnfmsfphqdr";
-      name = "qt3d-opensource-src-5.6.0.tar.xz";
-    };
-  };
-  qtenginio = {
-    version = "1.6.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtenginio-opensource-src-1.6.0.tar.xz";
-      sha256 = "033z2jncci64s7s9ml5rsfsnrkdmhx1g5dfvr61imv63pzxxqzb2";
-      name = "qtenginio-opensource-src-1.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtxmlpatterns-opensource-src-5.6.1.tar.xz";
+      sha256 = "0q412jv3xbg7v05b8pbahifwx17gzlp96s90akh6zwhpm8i6xx34";
+      name = "qtxmlpatterns-opensource-src-5.6.1.tar.xz";
     };
   };
   qtx11extras = {
-    version = "5.6.0";
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtx11extras-opensource-src-5.6.0.tar.xz";
-      sha256 = "099lc7kxcxgp5s01ddnd6n955fc8866caark43xfs2dw0a6pdva7";
-      name = "qtx11extras-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtx11extras-opensource-src-5.6.1.tar.xz";
+      sha256 = "0l736qiz8adrnh267xz63hv4sph6nhy90h836qfnnmv3p78ipsz8";
+      name = "qtx11extras-opensource-src-5.6.1.tar.xz";
     };
   };
-  qtdeclarative = {
-    version = "5.6.0";
+  qtwinextras = {
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtdeclarative-opensource-src-5.6.0.tar.xz";
-      sha256 = "0k70zlyx1nh35caiav4s3jvg5l029pvilm6sarxmfj73y19z0mcc";
-      name = "qtdeclarative-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwinextras-opensource-src-5.6.1.tar.xz";
+      sha256 = "1db3lcrj8af0z8lnh99lfbwz1cq9il7rr27rk9l38dff65qkssm8";
+      name = "qtwinextras-opensource-src-5.6.1.tar.xz";
     };
   };
-  qtmultimedia = {
-    version = "5.6.0";
+  qtwebview = {
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtmultimedia-opensource-src-5.6.0.tar.xz";
-      sha256 = "11h66xcr3y3w8hhvx801r66yirvf1kppasjlhm25qvr6rpb9jgqh";
-      name = "qtmultimedia-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebview-opensource-src-5.6.1.tar.xz";
+      sha256 = "0q869wl61vidds551w3z49ysx88xqyn6igbz07zxac7d0gwgwpda";
+      name = "qtwebview-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwebsockets = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebsockets-opensource-src-5.6.1.tar.xz";
+      sha256 = "0fkj52i4yi6gmq4jfjgdij08cspxspac6mbpf0fknnllimmkl7jm";
+      name = "qtwebsockets-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwebengine = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebengine-opensource-src-5.6.1.tar.xz";
+      sha256 = "0yv0cflgywsyfn84vv2vc9rwpm8j7hin61rxqjqh498nnl2arw5x";
+      name = "qtwebengine-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwebchannel = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebchannel-opensource-src-5.6.1.tar.xz";
+      sha256 = "01q80917a1048hdhaii4v50dqs84h16lc9w3v99r9xvspk8vab7q";
+      name = "qtwebchannel-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwayland = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwayland-opensource-src-5.6.1.tar.xz";
+      sha256 = "1jgghjfrg0wwyfzfwgwhagwxz9k936ylv3w2l9bwlpql8rgm8d11";
+      name = "qtwayland-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qttranslations = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qttranslations-opensource-src-5.6.1.tar.xz";
+      sha256 = "008wyk00mqz116pigm0qq78rvg28v6ykjnjxppkjnk0yd6i2vmb9";
+      name = "qttranslations-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qttools = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qttools-opensource-src-5.6.1.tar.xz";
+      sha256 = "0wbzq60d7lkvlb7b5lqcw87qgy6kyjz1npjavz8f4grdxsaqi8vp";
+      name = "qttools-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtsvg = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtsvg-opensource-src-5.6.1.tar.xz";
+      sha256 = "08ca5g46g75acy27jfnvnalmcias5hxmjp7491v3y4k9y7a4ybpi";
+      name = "qtsvg-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtserialport = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtserialport-opensource-src-5.6.1.tar.xz";
+      sha256 = "1hp63cgqhps6y1k041lzhcb2b0rcpcmszabnn293q5ilbvla4x0b";
+      name = "qtserialport-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtserialbus = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtserialbus-opensource-src-5.6.1.tar.xz";
+      sha256 = "1h683dkvnf2rdgxgisybnp8miqgn2gpi597rgx5zc7qk2k8kyidz";
+      name = "qtserialbus-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtsensors = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtsensors-opensource-src-5.6.1.tar.xz";
+      sha256 = "0bll7ll6s5g8w89knyrc0famjwqyfzwpn512m1f96bf6xwacs967";
+      name = "qtsensors-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtscript = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtscript-opensource-src-5.6.1.tar.xz";
+      sha256 = "17zp5dlfplrnzlw233lzapj55drjqchvayajd02qsggzms3yzchw";
+      name = "qtscript-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtquickcontrols2 = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtquickcontrols2-opensource-src-5.6.1.tar.xz";
+      sha256 = "13zbiv63b76ifpjalx5616nixfwjk48q977bzb1xxj363b7xv85v";
+      name = "qtquickcontrols2-opensource-src-5.6.1.tar.xz";
     };
   };
   qtquickcontrols = {
-    version = "5.6.0";
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols-opensource-src-5.6.0.tar.xz";
-      sha256 = "12vqkxpz5y2bbh083lpsxcianykl8x7am49pmc4x221a5xwrc27c";
-      name = "qtquickcontrols-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtquickcontrols-opensource-src-5.6.1.tar.xz";
+      sha256 = "14d68ryn7r7rs7klpldnavcsccvyyg0xhwqkvjlm5wwplv2acah1";
+      name = "qtquickcontrols-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtmultimedia = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtmultimedia-opensource-src-5.6.1.tar.xz";
+      sha256 = "058523c2qra3d8fq46ygcndnkrbwlh316zy28s2cr5pjr5gmnjyj";
+      name = "qtmultimedia-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtmacextras = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtmacextras-opensource-src-5.6.1.tar.xz";
+      sha256 = "147yhv7fb0yaakrffqiw6xz8ycqdc7qsnxvnpr6j8rarw5xmdc73";
+      name = "qtmacextras-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtlocation = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtlocation-opensource-src-5.6.1.tar.xz";
+      sha256 = "0qahs7a2n3l4h0bl8bnwci9mzy1vra3zncnzr40csic9ys67ddfk";
+      name = "qtlocation-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtimageformats = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtimageformats-opensource-src-5.6.1.tar.xz";
+      sha256 = "020v1148433zx4g87z2r8fgff32n0laajxqqsja1l3yzz7jbrwvl";
+      name = "qtimageformats-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtgraphicaleffects = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtgraphicaleffects-opensource-src-5.6.1.tar.xz";
+      sha256 = "1n0i2drfr7fvydgg810dcij8mxnygdpvqcqv7l1a9a1kv9ap3sap";
+      name = "qtgraphicaleffects-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtenginio = {
+    version = "1.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtenginio-opensource-src-1.6.1.tar.xz";
+      sha256 = "1iq4lnz3s6mfdgml61b9lsjisky55bbvsdj72kh003j94mzrc3l5";
+      name = "qtenginio-opensource-src-1.6.1.tar.xz";
+    };
+  };
+  qtdoc = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdoc-opensource-src-5.6.1.tar.xz";
+      sha256 = "0yg7903vk4w3h6jjyanssfcig0s2s660q11sj14nw6gcjs7kfa5z";
+      name = "qtdoc-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtdeclarative-render2d = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdeclarative-render2d-opensource-src-5.6.1.tar.xz";
+      sha256 = "1m08x8x355545r9wgrjl5p26zjhp5q1yh3h25dww8pk25v6cn8dg";
+      name = "qtdeclarative-render2d-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtdeclarative = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdeclarative-opensource-src-5.6.1.tar.xz";
+      sha256 = "1d2217kxk85kpi7ls08b41hqzy26hvch8m4cgzq6km5sqi5zvz0j";
+      name = "qtdeclarative-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtconnectivity = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtconnectivity-opensource-src-5.6.1.tar.xz";
+      sha256 = "06fr9321f52kf0nda9zjjfzp5694hbnx0y0v315iw28mnpvandas";
+      name = "qtconnectivity-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtcanvas3d = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtcanvas3d-opensource-src-5.6.1.tar.xz";
+      sha256 = "0q17hwmj893pk0lhxmibxmgk6h1gy4ksqfi62rkfzcf81bg2q7hr";
+      name = "qtcanvas3d-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtbase = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtbase-opensource-src-5.6.1.tar.xz";
+      sha256 = "0r3jrqymnnxrig4f11xvs33c26f0kzfakbp3kcbdpv795gpc276h";
+      name = "qtbase-opensource-src-5.6.1.tar.xz";
     };
   };
   qtandroidextras = {
-    version = "5.6.0";
+    version = "5.6.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtandroidextras-opensource-src-5.6.0.tar.xz";
-      sha256 = "1qhrn8vhfn0z73bc2ls1b4zfvr7r5gn7b5xdmjp26hi338j55vp0";
-      name = "qtandroidextras-opensource-src-5.6.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtandroidextras-opensource-src-5.6.1.tar.xz";
+      sha256 = "0prkpb57j0s8k36sba47k2bhs3ajf01rdwc7qf5gkvhs991rwckc";
+      name = "qtandroidextras-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtactiveqt = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtactiveqt-opensource-src-5.6.1.tar.xz";
+      sha256 = "0a2p0w03d04hqg71hlihj9mr6aasvb0h8jfa5rnq8b5rkm8haf4f";
+      name = "qtactiveqt-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qt3d = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qt3d-opensource-src-5.6.1.tar.xz";
+      sha256 = "03d81sls30a20yna6940np15112ciwy5024f8n5imaxicm8h34xd";
+      name = "qt3d-opensource-src-5.6.1.tar.xz";
     };
   };
 }

From cc658b695a2d6a49f9c94f0ac9d124de1f62b644 Mon Sep 17 00:00:00 2001
From: uwap <me@uwap.name>
Date: Thu, 9 Jun 2016 18:06:07 +0200
Subject: [PATCH 131/436] Make submission options more flexible

---
 nixos/modules/services/mail/postfix.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index e354ae668197..616018fc3079 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -129,10 +129,7 @@ let
     smtp      inet  n       -       n       -       -       smtpd
   '' + optionalString cfg.enableSubmission ''
     submission inet n       -       n       -       -       smtpd
-      -o smtpd_tls_security_level=encrypt
-      -o smtpd_sasl_auth_enable=yes
-      -o smtpd_client_restrictions=permit_sasl_authenticated,reject
-      ${cfg.extraSubmissionOptions}
+      ${concatStringsSep "\n  " (mapAttrsToList (x: y: "-o " + x + "=" + y) cfg.submissionOptions)}
   ''
   + ''
     pickup    unix  n       -       n       60      1       pickup
@@ -208,14 +205,17 @@ in
       enableSubmission = mkOption {
         type = types.bool;
         default = false;
-        description = "Whether to enable smtp submission in master.cf.";
+        description = "Whether to enable smtp submission";
       };
 
-      extraSubmissionOptions = mkOption {
-        type = types.str;
-        default = "";
-        description = "Extra options for the submission config in master.cf.";
-        example = "-o milter_macro_daemon_name=ORIGINATING";
+      submissionOptions = mkOption {
+        type = types.attrs;
+        default = { "smtpd_tls_security_level" = "encrypt";
+                    "smtpd_sasl_auth_enable" = "yes";
+                    "smtpd_client_restrictions" = "permit_sasl_authenticated,reject";
+                  };
+        description = "Options for the submission config in master.cf";
+        example = { "milter_macro_daemon_name" = "ORIGINATING"; };
       };
 
       setSendmail = mkOption {

From ac4903284c75f8cae746f538dee7f8d43dda8e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christopher=20L=C3=BCbbemeier?=
 <christopher.luebbemeier@gmail.com>
Date: Thu, 9 Jun 2016 18:51:21 +0200
Subject: [PATCH 132/436] gmsh: init at 2.12.0

---
 .../science/math/gmsh/CMakeLists.txt.patch    | 37 +++++++++++++++++++
 .../science/math/gmsh/default.nix             | 29 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 68 insertions(+)
 create mode 100644 pkgs/applications/science/math/gmsh/CMakeLists.txt.patch
 create mode 100644 pkgs/applications/science/math/gmsh/default.nix

diff --git a/pkgs/applications/science/math/gmsh/CMakeLists.txt.patch b/pkgs/applications/science/math/gmsh/CMakeLists.txt.patch
new file mode 100644
index 000000000000..0326a8d296a0
--- /dev/null
+++ b/pkgs/applications/science/math/gmsh/CMakeLists.txt.patch
@@ -0,0 +1,37 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -324,25 +324,16 @@
+         set_config_option(HAVE_BLAS "Blas(IntelMKL)")
+         set_config_option(HAVE_LAPACK "Lapack(IntelMKL)")
+       else(LAPACK_LIBRARIES)
+-        # on Linux also try to find ATLAS without a Fortran compiler, because
+-        # cmake ships with a buggy FindBLAS e.g. on Ubuntu Lucid Lynx
+-        set(ATLAS_LIBS_REQUIRED lapack f77blas cblas atlas)
+-        find_all_libraries(LAPACK_LIBRARIES ATLAS_LIBS_REQUIRED "" "")
++        # try with generic names
++        set(GENERIC_LIBS_REQUIRED lapack blas pthread)
++        find_all_libraries(LAPACK_LIBRARIES GENERIC_LIBS_REQUIRED "" "")
+         if(LAPACK_LIBRARIES)
+-          set_config_option(HAVE_BLAS "Blas(ATLAS)")
+-          set_config_option(HAVE_LAPACK "Lapack(ATLAS)")
+-        else(LAPACK_LIBRARIES)
+-          # try with generic names
+-          set(GENERIC_LIBS_REQUIRED lapack blas pthread)
+-          find_all_libraries(LAPACK_LIBRARIES GENERIC_LIBS_REQUIRED "" "")
+-          if(LAPACK_LIBRARIES)
+-            set_config_option(HAVE_BLAS "Blas(Generic)")
+-            set_config_option(HAVE_LAPACK "Lapack(Generic)")
+-            find_library(GFORTRAN_LIB gfortran)
+-            if(GFORTRAN_LIB)
+-              list(APPEND LAPACK_LIBRARIES ${GFORTRAN_LIB})
+-            endif(GFORTRAN_LIB)
+-          endif(LAPACK_LIBRARIES)
++          set_config_option(HAVE_BLAS "Blas(Generic)")
++          set_config_option(HAVE_LAPACK "Lapack(Generic)")
++          find_library(GFORTRAN_LIB gfortran)
++          if(GFORTRAN_LIB)
++            list(APPEND LAPACK_LIBRARIES ${GFORTRAN_LIB})
++          endif(GFORTRAN_LIB)
+         endif(LAPACK_LIBRARIES)
+       endif(LAPACK_LIBRARIES)
+     elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
new file mode 100644
index 000000000000..b55961205922
--- /dev/null
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, fltk, libjpeg
+, zlib, mesa, mesa_glu, xorg }:
+
+let version = "2.12.0"; in
+
+stdenv.mkDerivation {
+  name = "gmsh-${version}";
+
+  src = fetchurl {
+    url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
+    sha256 = "02cx2mfbxx6m18s54z4yzbk4ybch3v9489z7cr974y8y0z42xgbz";
+  };
+
+  # The original CMakeLists tries to use some version of the Lapack lib
+  # that is supposed to work without Fortran but didn't for me.
+  patches = [ ./CMakeLists.txt.patch ];
+
+  buildInputs = [ cmake blas liblapack gfortran fltk libjpeg zlib mesa
+    mesa_glu xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
+    xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
+  ];
+
+  meta = {
+    description = "A three-dimensional finite element mesh generator";
+    homepage = http://gmsh.info/;
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0f815c893ac..8d435157f7b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16009,6 +16009,8 @@ in
 
   ipopt = callPackage ../development/libraries/science/math/ipopt { openblas = openblasCompat; };
 
+  gmsh = callPackage ../applications/science/math/gmsh { };
+
   ### SCIENCE/MOLECULAR-DYNAMICS
 
   lammps = callPackage ../applications/science/molecular-dynamics/lammps {

From 0e262f52f30143e9f6fdc171fee69075934604e3 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Thu, 9 Jun 2016 18:26:04 +0200
Subject: [PATCH 133/436] go: v1.5.3 -> v1.5.4

---
 pkgs/development/compilers/go/1.5.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix
index b5bfac850280..b2eb4b1f246f 100644
--- a/pkgs/development/compilers/go/1.5.nix
+++ b/pkgs/development/compilers/go/1.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, tzdata, iana_etc, go_1_4, runCommand
+{ stdenv, lib, fetchFromGitHub, tzdata, iana_etc, go_1_4, runCommand
 , perl, which, pkgconfig, patch
 , pcre
 , Security, Foundation }:
@@ -15,11 +15,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.5.3";
+  version = "1.5.4";
 
-  src = fetchurl {
-    url = "https://github.com/golang/go/archive/go${version}.tar.gz";
-    sha256 = "1n2niq0147pqflqh8j1s5wv8aq3vlh58ni3bp9add261z5q1g50k";
+  src = fetchFromGitHub {
+    owner = "golang";
+    repo = "go";
+    rev = "go${version}";
+    sha256 = "1lvk9awmkjbz5z4snv3q3b3r7ijfz97kig2wkqz6jmr7b0lp1fcy";
   };
 
   # perl is used for testing go vet

From aea0ff96deacacb256ee20f35866883af739aa78 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 9 Jun 2016 12:39:02 -0500
Subject: [PATCH 134/436] sddm: run phase hooks

---
 pkgs/applications/display-managers/sddm/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 8e1812ec013b..923b185ae393 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -68,14 +68,19 @@ in
 
 stdenv.mkDerivation {
   name = "sddm-${version}";
-  phases = "installPhase";
 
   nativeBuildInputs = [ lndir makeQtWrapper ];
   buildInputs = [ unwrapped ] ++ themes;
   themes = map (pkg: pkg.out or pkg) themes;
   inherit unwrapped;
 
+  unpackPhase = "true";
+  configurePhase = "runHook preConfigure; runHook postConfigure";
+  buildPhase = "runHook preBuild; runHook postBuild";
+
   installPhase = ''
+    runHook preInstall
+
     makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm"
 
     mkdir -p "$out/share/sddm"
@@ -85,6 +90,8 @@ stdenv.mkDerivation {
             lndir -silent "$sddmDir" "$out/share/sddm"
         fi
     done
+
+    runHook postInstall
   '';
 
   inherit (unwrapped) meta;

From c608230a614b74eb6cf50b36269c28ddebc99d98 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 9 Jun 2016 12:39:10 -0500
Subject: [PATCH 135/436] nixos/kde5: include setup hook and icons with sddm
 theme

Fixes #16094.
---
 nixos/modules/services/x11/desktop-managers/kde5.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 538300f5793a..060dda1a70a8 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -170,7 +170,9 @@ in
     services.xserver.displayManager.sddm = {
       theme = "breeze";
       themes = [
+        kde5.extra-cmake-modules # for the setup-hook
         kde5.plasma-workspace
+        kde5.breeze-icons
         (kde5.oxygen-icons or kde5.oxygen-icons5)
       ];
     };

From 7b84294bd94b66111c4360fa9036d6bf410a1207 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 9 Jun 2016 21:37:24 +0300
Subject: [PATCH 136/436] tdesktop: fix with new Qt

---
 .../telegram/tdesktop/default.nix             | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 5d2cc9fa155b..9f398fbf9549 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -10,10 +10,11 @@
 
 let
   system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
+  packagedQt = "5.6.0";
 in stdenv.mkDerivation rec {
   name = "telegram-desktop-${version}";
   version = "0.9.49";
-  qtVersion = lib.replaceStrings ["."] ["_"] qtbase.version;
+  qtVersion = lib.replaceStrings ["."] ["_"] packagedQt;
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
@@ -63,7 +64,7 @@ in stdenv.mkDerivation rec {
     "LIBS+=-lssl"
   ];
 
-  qtSrcs = qtbase.srcs ++ [ qtimageformats.src ];
+  qtSrcs = [ qtbase.src qtimageformats.src ];
   qtPatches = qtbase.patches;
 
   buildCommand = ''
@@ -79,7 +80,8 @@ in stdenv.mkDerivation rec {
       -e 's,LIBS += .*libz.a,LIBS += -lz,' \
       -e 's,LIBS += .*libbreakpad_client.a,LIBS += ${breakpad}/lib/libbreakpad_client.a,' \
       -e 's, -flto,,g' \
-      -e 's, -static-libstdc++,,g'
+      -e 's, -static-libstdc++,,g' \
+      -e 's,${packagedQt},${qtbase.version},g'
 
     export QMAKE=$PWD/../qt/bin/qmake
     ( mkdir -p ../Libraries
@@ -87,18 +89,15 @@ in stdenv.mkDerivation rec {
       for i in $qtSrcs; do
         tar -xaf $i
       done
-      mv qt-everywhere-opensource-src-* QtStatic
-      mv qtbase-opensource-src-* ./QtStatic/qtbase
-      mv qtimageformats-opensource-src-* ./QtStatic/qtimageformats
-      cd QtStatic/qtbase
-      patch -p1 < ../../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff
-      cd ..
+      cd qtbase-*
+      patch -p1 < ../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff
       for i in $qtPatches; do
         patch -p1 < $i
       done
       ${qtbase.postPatch}
+      cd ..
 
-      export configureFlags="-prefix "$PWD/../../qt" -release -opensource -confirm-license -system-zlib \
+      export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \
         -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \
         -system-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests \
         -openssl-linked -dbus-linked -system-sqlite -verbose \
@@ -107,13 +106,13 @@ in stdenv.mkDerivation rec {
       export dontAddPrefix=1
       export MAKEFLAGS=-j$NIX_BUILD_CORES
 
-      ( cd qtbase
+      ( cd qtbase-*
         configurePhase
         buildPhase
         make install
       )
 
-      ( cd qtimageformats
+      ( cd qtimageformats-*
         $QMAKE
         buildPhase
         make install

From f8a0f1ce686674fc53830e2a1c61c40f53df4571 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Thu, 9 Jun 2016 20:49:26 +0200
Subject: [PATCH 137/436] klavaro: 3.01 -> 3.02

---
 pkgs/games/klavaro/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix
index 48b25d99492e..f5970ccd2207 100644
--- a/pkgs/games/klavaro/default.nix
+++ b/pkgs/games/klavaro/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, curl, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "klavaro-3.01";
+  name = "klavaro-${version}";
+  version = "3.02";
 
   src = fetchurl {
     url = "mirror://sourceforge/klavaro/${name}.tar.bz2";
-    sha256 = "11ay04lg362bh2di6y5r9g58bgmgbpwwnrbsa7bda4wiq8idawgd";
+    sha256 = "5f77730a8c1c8dfd4443ec8390c7226e3f82537df0882cd1222b140f0d0fcd6c";
   };
 
   buildInputs = [ makeWrapper pkgconfig intltool curl gtk3 ];

From 2a258d13ade7533aa37bffcdd2ce0cea67309483 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Thu, 9 Jun 2016 21:32:37 +0200
Subject: [PATCH 138/436] go: make 1.6 default

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0f815c893ac..e63123688967 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4549,7 +4549,7 @@ in
     inherit (darwin.apple_sdk.frameworks) Security Foundation;
   };
 
-  go = self.go_1_5;
+  go = self.go_1_6;
 
   go-repo-root = (callPackage ../development/tools/go-repo-root { }).bin;
 

From cf042ae750a9fe911addd6ffddea2c8c6fa45548 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 7 Jun 2016 22:47:26 +0200
Subject: [PATCH 139/436] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20160406-38-g2269395 using the following inputs:

  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/65d1dbe8dd1e2e501650ff6613c8927068074afa
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/1a80e0660e630f6dd98f34c3d82c23dc824ada01
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/5863aeaee36019c2f376858f6212c494becf721b
---
 .../haskell-modules/configuration-lts-0.0.nix |   10 +
 .../haskell-modules/configuration-lts-0.1.nix |   10 +
 .../haskell-modules/configuration-lts-0.2.nix |   10 +
 .../haskell-modules/configuration-lts-0.3.nix |   10 +
 .../haskell-modules/configuration-lts-0.4.nix |   10 +
 .../haskell-modules/configuration-lts-0.5.nix |   10 +
 .../haskell-modules/configuration-lts-0.6.nix |   10 +
 .../haskell-modules/configuration-lts-0.7.nix |   10 +
 .../haskell-modules/configuration-lts-1.0.nix |   10 +
 .../haskell-modules/configuration-lts-1.1.nix |   10 +
 .../configuration-lts-1.10.nix                |   10 +
 .../configuration-lts-1.11.nix                |   10 +
 .../configuration-lts-1.12.nix                |   10 +
 .../configuration-lts-1.13.nix                |   10 +
 .../configuration-lts-1.14.nix                |   10 +
 .../configuration-lts-1.15.nix                |   10 +
 .../haskell-modules/configuration-lts-1.2.nix |   10 +
 .../haskell-modules/configuration-lts-1.4.nix |   10 +
 .../haskell-modules/configuration-lts-1.5.nix |   10 +
 .../haskell-modules/configuration-lts-1.7.nix |   10 +
 .../haskell-modules/configuration-lts-1.8.nix |   10 +
 .../haskell-modules/configuration-lts-1.9.nix |   10 +
 .../haskell-modules/configuration-lts-2.0.nix |   10 +
 .../haskell-modules/configuration-lts-2.1.nix |   10 +
 .../configuration-lts-2.10.nix                |   10 +
 .../configuration-lts-2.11.nix                |   10 +
 .../configuration-lts-2.12.nix                |   10 +
 .../configuration-lts-2.13.nix                |   10 +
 .../configuration-lts-2.14.nix                |   10 +
 .../configuration-lts-2.15.nix                |   10 +
 .../configuration-lts-2.16.nix                |   10 +
 .../configuration-lts-2.17.nix                |   10 +
 .../configuration-lts-2.18.nix                |   10 +
 .../configuration-lts-2.19.nix                |   10 +
 .../haskell-modules/configuration-lts-2.2.nix |   10 +
 .../configuration-lts-2.20.nix                |   10 +
 .../configuration-lts-2.21.nix                |   10 +
 .../configuration-lts-2.22.nix                |   10 +
 .../haskell-modules/configuration-lts-2.3.nix |   10 +
 .../haskell-modules/configuration-lts-2.4.nix |   10 +
 .../haskell-modules/configuration-lts-2.5.nix |   10 +
 .../haskell-modules/configuration-lts-2.6.nix |   10 +
 .../haskell-modules/configuration-lts-2.7.nix |   10 +
 .../haskell-modules/configuration-lts-2.8.nix |   10 +
 .../haskell-modules/configuration-lts-2.9.nix |   10 +
 .../haskell-modules/configuration-lts-3.0.nix |   10 +
 .../haskell-modules/configuration-lts-3.1.nix |   10 +
 .../configuration-lts-3.10.nix                |   10 +
 .../configuration-lts-3.11.nix                |   10 +
 .../configuration-lts-3.12.nix                |   10 +
 .../configuration-lts-3.13.nix                |   10 +
 .../configuration-lts-3.14.nix                |   10 +
 .../configuration-lts-3.15.nix                |   10 +
 .../configuration-lts-3.16.nix                |   10 +
 .../configuration-lts-3.17.nix                |   10 +
 .../configuration-lts-3.18.nix                |   10 +
 .../configuration-lts-3.19.nix                |   10 +
 .../haskell-modules/configuration-lts-3.2.nix |   10 +
 .../configuration-lts-3.20.nix                |   10 +
 .../configuration-lts-3.21.nix                |   11 +
 .../configuration-lts-3.22.nix                |   11 +
 .../haskell-modules/configuration-lts-3.3.nix |   10 +
 .../haskell-modules/configuration-lts-3.4.nix |   10 +
 .../haskell-modules/configuration-lts-3.5.nix |   10 +
 .../haskell-modules/configuration-lts-3.6.nix |   10 +
 .../haskell-modules/configuration-lts-3.7.nix |   10 +
 .../haskell-modules/configuration-lts-3.8.nix |   10 +
 .../haskell-modules/configuration-lts-3.9.nix |   10 +
 .../haskell-modules/configuration-lts-4.0.nix |   15 +
 .../haskell-modules/configuration-lts-4.1.nix |   15 +
 .../haskell-modules/configuration-lts-4.2.nix |   15 +
 .../haskell-modules/configuration-lts-5.0.nix |   15 +
 .../haskell-modules/configuration-lts-5.1.nix |   15 +
 .../configuration-lts-5.10.nix                |   18 +
 .../configuration-lts-5.11.nix                |   18 +
 .../configuration-lts-5.12.nix                |   21 +
 .../configuration-lts-5.13.nix                |   21 +
 .../configuration-lts-5.14.nix                |   22 +
 .../configuration-lts-5.15.nix                |   22 +
 .../configuration-lts-5.16.nix                |   24 +
 .../configuration-lts-5.17.nix                |   24 +
 .../configuration-lts-5.18.nix                |   24 +
 .../haskell-modules/configuration-lts-5.2.nix |   15 +
 .../haskell-modules/configuration-lts-5.3.nix |   15 +
 .../haskell-modules/configuration-lts-5.4.nix |   15 +
 .../haskell-modules/configuration-lts-5.5.nix |   16 +
 .../haskell-modules/configuration-lts-5.6.nix |   16 +
 .../haskell-modules/configuration-lts-5.7.nix |   16 +
 .../haskell-modules/configuration-lts-5.8.nix |   16 +
 .../haskell-modules/configuration-lts-5.9.nix |   18 +
 .../haskell-modules/configuration-lts-6.0.nix |   28 +
 .../haskell-modules/configuration-lts-6.1.nix |   28 +
 .../haskell-modules/configuration-lts-6.2.nix |   30 +
 .../haskell-modules/hackage-packages.nix      | 1133 ++++++++++++++---
 94 files changed, 2108 insertions(+), 189 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 1a64e703b400..0c90cf0ba541 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1986,6 +1986,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2893,6 +2894,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2930,6 +2932,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3234,6 +3237,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2";
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4196,6 +4200,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6114,6 +6119,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7787,6 +7793,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8188,6 +8195,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8367,6 +8375,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 7630cb6fb6bd..a99ab6445078 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1986,6 +1986,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2893,6 +2894,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2930,6 +2932,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3234,6 +3237,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2";
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4196,6 +4200,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6114,6 +6119,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7787,6 +7793,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8188,6 +8195,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8367,6 +8375,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index f0fe60fadc02..14f4a2bdcae9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1986,6 +1986,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2893,6 +2894,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2930,6 +2932,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3234,6 +3237,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2";
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4196,6 +4200,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6114,6 +6119,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7787,6 +7793,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8188,6 +8195,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8367,6 +8375,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index d6356ef8528c..047003dfb38d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1986,6 +1986,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2893,6 +2894,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2930,6 +2932,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3234,6 +3237,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2";
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4196,6 +4200,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6114,6 +6119,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7787,6 +7793,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8188,6 +8195,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8367,6 +8375,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index e1ddb308b407..4dd0d3dca7a3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1986,6 +1986,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2893,6 +2894,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2930,6 +2932,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3234,6 +3237,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2";
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4194,6 +4198,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6112,6 +6117,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7784,6 +7790,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8185,6 +8192,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8364,6 +8372,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 3347a0f35c9a..5fb9067393ea 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1986,6 +1986,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2893,6 +2894,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2930,6 +2932,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3234,6 +3237,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2";
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4194,6 +4198,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6112,6 +6117,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7784,6 +7790,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8185,6 +8192,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8364,6 +8372,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 88b9d0205139..612959b6fc2e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1985,6 +1985,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2892,6 +2893,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2929,6 +2931,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3233,6 +3236,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2";
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4193,6 +4197,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6110,6 +6115,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7781,6 +7787,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8182,6 +8189,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8361,6 +8369,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 36c7782bdb47..5a9c4a1aab35 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1985,6 +1985,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2892,6 +2893,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2929,6 +2931,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3233,6 +3236,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2";
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4193,6 +4197,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6110,6 +6115,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7781,6 +7787,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8182,6 +8189,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8361,6 +8369,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 16d96af61626..184ed2ade480 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1980,6 +1980,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2886,6 +2887,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2923,6 +2925,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3226,6 +3229,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2";
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4186,6 +4190,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6102,6 +6107,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7772,6 +7778,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8172,6 +8179,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8351,6 +8359,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index e690b20846f2..bf3e9ce93b93 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1979,6 +1979,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2883,6 +2884,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2920,6 +2922,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3223,6 +3226,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2_1";
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4182,6 +4186,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6095,6 +6100,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7764,6 +7770,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8163,6 +8170,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8342,6 +8350,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index bd6abfb14784..6c05309cb07e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1977,6 +1977,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2879,6 +2880,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2916,6 +2918,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3217,6 +3220,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4172,6 +4176,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6078,6 +6083,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7743,6 +7749,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8142,6 +8149,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8320,6 +8328,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 1f6081ce6142..73e37ae69c40 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1977,6 +1977,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2879,6 +2880,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2916,6 +2918,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3217,6 +3220,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4171,6 +4175,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6075,6 +6080,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7740,6 +7746,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8139,6 +8146,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8317,6 +8325,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index bc90406605b1..b818c0136de1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1977,6 +1977,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2879,6 +2880,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2916,6 +2918,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3217,6 +3220,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4171,6 +4175,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6075,6 +6080,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7740,6 +7746,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8139,6 +8146,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8317,6 +8325,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 631d9ffef8fc..a602a7a2bb00 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1977,6 +1977,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2879,6 +2880,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2916,6 +2918,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3217,6 +3220,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4170,6 +4174,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6074,6 +6079,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7739,6 +7745,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8138,6 +8145,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8316,6 +8324,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 34b01fb8f0b9..7a4cb99b05ad 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1975,6 +1975,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2876,6 +2877,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2913,6 +2915,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3214,6 +3217,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4167,6 +4171,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6071,6 +6076,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7735,6 +7741,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8134,6 +8141,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8312,6 +8320,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 1a883a495649..d54d9ab0ff5f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1974,6 +1974,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2873,6 +2874,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2910,6 +2912,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3210,6 +3213,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4163,6 +4167,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6067,6 +6072,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7728,6 +7734,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8127,6 +8134,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8304,6 +8312,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 57c0d4ccc3ed..e8f963d6e1d9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1979,6 +1979,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2881,6 +2882,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2918,6 +2920,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3221,6 +3224,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2_1";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4179,6 +4183,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6092,6 +6097,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7759,6 +7765,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8158,6 +8165,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8337,6 +8345,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 79f58c5477c6..a69d1a8739c5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1978,6 +1978,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2880,6 +2881,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2917,6 +2919,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3220,6 +3223,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2_1";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4177,6 +4181,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6089,6 +6094,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7755,6 +7761,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8154,6 +8161,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8333,6 +8341,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index f32f91769a9a..32dee6b7f3c0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1977,6 +1977,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2879,6 +2880,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2916,6 +2918,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3219,6 +3222,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2_1";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4176,6 +4180,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6088,6 +6093,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7754,6 +7760,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8153,6 +8160,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8332,6 +8340,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 048e654b70eb..590551bccacf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1977,6 +1977,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2879,6 +2880,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2916,6 +2918,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3219,6 +3222,7 @@ self: super: {
   "fay-text" = doDistribute super."fay-text_0_3_2_1";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4176,6 +4180,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6083,6 +6088,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7749,6 +7755,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8148,6 +8155,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8327,6 +8335,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index e946445e3c1a..904e59ff1fc0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1977,6 +1977,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2879,6 +2880,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2916,6 +2918,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3217,6 +3220,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4173,6 +4177,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6079,6 +6084,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7745,6 +7751,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8144,6 +8151,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8323,6 +8331,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 636b53f52d3a..10cad7ef6611 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1977,6 +1977,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2879,6 +2880,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2916,6 +2918,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3217,6 +3220,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4172,6 +4176,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6078,6 +6083,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7744,6 +7750,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -8143,6 +8150,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8322,6 +8330,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 4f0abb825f3b..ffcecf2e451f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -1966,6 +1966,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2862,6 +2863,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2899,6 +2901,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3201,6 +3204,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4150,6 +4154,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6034,6 +6039,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7690,6 +7696,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8085,6 +8092,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8260,6 +8268,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index aaf066a7918c..98d1ce5c2931 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -1966,6 +1966,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2862,6 +2863,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2899,6 +2901,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3201,6 +3204,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4150,6 +4154,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6034,6 +6039,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7690,6 +7696,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8085,6 +8092,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8260,6 +8268,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 3730a6ce6cf3..5f5f8fb7fe9a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -1958,6 +1958,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2852,6 +2853,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2889,6 +2891,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3188,6 +3191,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_10";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4135,6 +4139,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6014,6 +6019,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7666,6 +7672,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8055,6 +8062,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8228,6 +8236,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 83dca9e8ad88..1cca8924c317 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -1957,6 +1957,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2851,6 +2852,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2888,6 +2890,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3187,6 +3190,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_10";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4134,6 +4138,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6013,6 +6018,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7663,6 +7669,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8051,6 +8058,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8223,6 +8231,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 363f0485970d..810fca6ba468 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -1957,6 +1957,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2851,6 +2852,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2888,6 +2890,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3187,6 +3190,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_10";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4134,6 +4138,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6013,6 +6018,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7662,6 +7668,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8050,6 +8057,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8222,6 +8230,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 6e2205c9fbbd..4ee3b5ea86d5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -1957,6 +1957,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2851,6 +2852,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2888,6 +2890,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3187,6 +3190,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_10";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4134,6 +4138,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6012,6 +6017,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7661,6 +7667,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8049,6 +8056,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8221,6 +8229,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 15625790d976..b76ca7e7c581 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -1957,6 +1957,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2851,6 +2852,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2888,6 +2890,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3187,6 +3190,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4133,6 +4137,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6010,6 +6015,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7659,6 +7665,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8047,6 +8054,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8219,6 +8227,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index b1927e740e67..ea09d02a2e9d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -1957,6 +1957,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2851,6 +2852,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2888,6 +2890,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3186,6 +3189,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4132,6 +4136,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6008,6 +6013,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7657,6 +7663,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8044,6 +8051,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8216,6 +8224,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 732ffc1cae58..0403b50e2e07 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -1957,6 +1957,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2849,6 +2850,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2886,6 +2888,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3183,6 +3186,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4129,6 +4133,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6004,6 +6009,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7653,6 +7659,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8040,6 +8047,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8212,6 +8220,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index b708c33a5b09..010fe952019d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -1956,6 +1956,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2848,6 +2849,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2885,6 +2887,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3181,6 +3184,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4126,6 +4130,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6001,6 +6006,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7649,6 +7655,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8036,6 +8043,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8208,6 +8216,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 8c7b8b6282dc..4014b94d7cbe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -1955,6 +1955,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2847,6 +2848,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2884,6 +2886,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3179,6 +3182,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4124,6 +4128,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5999,6 +6004,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7646,6 +7652,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8033,6 +8040,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8204,6 +8212,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 0778128fec52..294d6ce26d09 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -1955,6 +1955,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2847,6 +2848,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2884,6 +2886,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3179,6 +3182,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4123,6 +4127,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5998,6 +6003,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7645,6 +7651,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8032,6 +8039,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8203,6 +8211,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 359ece2f0af0..3416a218ed8d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -1964,6 +1964,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2860,6 +2861,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2897,6 +2899,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3199,6 +3202,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4148,6 +4152,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6032,6 +6037,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7688,6 +7694,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8083,6 +8090,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8258,6 +8266,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index c6b30481b93f..75288b5ce2c9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -1955,6 +1955,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2847,6 +2848,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2884,6 +2886,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3179,6 +3182,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4123,6 +4127,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5998,6 +6003,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7645,6 +7651,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8031,6 +8038,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8202,6 +8210,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 0bad35825d1e..1c0bde4dafe0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -1955,6 +1955,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2847,6 +2848,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2884,6 +2886,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3179,6 +3182,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4123,6 +4127,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5998,6 +6003,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7644,6 +7650,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8030,6 +8037,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8201,6 +8209,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 41584ebc8b48..ef9cb326074e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -1955,6 +1955,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2847,6 +2848,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2884,6 +2886,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3179,6 +3182,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4123,6 +4127,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5997,6 +6002,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7643,6 +7649,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8029,6 +8036,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8200,6 +8208,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index adf47f90fc8a..1e314a42ea07 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -1964,6 +1964,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2860,6 +2861,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2897,6 +2899,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3198,6 +3201,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4147,6 +4151,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6030,6 +6035,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7686,6 +7692,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8081,6 +8088,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8256,6 +8264,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index f9715f4f34ea..0a48b64acd49 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -1964,6 +1964,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2860,6 +2861,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2897,6 +2899,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3198,6 +3201,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4147,6 +4151,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6030,6 +6035,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7684,6 +7690,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8079,6 +8086,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8254,6 +8262,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 7cf582c448ef..5806bcdd1939 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -1964,6 +1964,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2859,6 +2860,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2896,6 +2898,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3197,6 +3200,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4146,6 +4150,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6029,6 +6034,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7683,6 +7689,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8078,6 +8085,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8253,6 +8261,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index ec52d94275e3..3a53fd60b699 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -1961,6 +1961,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2856,6 +2857,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2893,6 +2895,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3194,6 +3197,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4142,6 +4146,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6025,6 +6030,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7678,6 +7684,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8073,6 +8080,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8248,6 +8256,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 32f20050eb4a..9eba1f5025be 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -1961,6 +1961,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2856,6 +2857,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2893,6 +2895,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3194,6 +3197,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4142,6 +4146,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6025,6 +6030,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7679,6 +7685,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8074,6 +8081,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8249,6 +8257,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 12ddefc9ce25..03853c72c04e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -1960,6 +1960,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2855,6 +2856,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2892,6 +2894,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3193,6 +3196,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4140,6 +4144,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6023,6 +6028,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7676,6 +7682,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8068,6 +8075,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8243,6 +8251,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index eef057dc197f..ead963ec6037 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -1958,6 +1958,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2853,6 +2854,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2890,6 +2892,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3189,6 +3192,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4136,6 +4140,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -6017,6 +6022,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7670,6 +7676,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -8060,6 +8067,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8233,6 +8241,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index ccac712aec52..ad5e27fc616e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1908,6 +1908,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2785,6 +2786,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2822,6 +2824,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3112,6 +3115,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4044,6 +4048,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5878,6 +5883,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7500,6 +7506,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_3_3";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7878,6 +7885,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8046,6 +8054,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 737e3d586998..9315b001babc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1907,6 +1907,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2784,6 +2785,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2821,6 +2823,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3110,6 +3113,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4042,6 +4046,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5875,6 +5880,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7495,6 +7501,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_3_3";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7873,6 +7880,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8041,6 +8049,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index b11aa2803882..8b0d90e92872 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1898,6 +1898,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2772,6 +2773,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2809,6 +2811,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3097,6 +3100,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4024,6 +4028,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5848,6 +5853,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7460,6 +7466,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7834,6 +7841,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8002,6 +8010,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 4a2d67969189..9790785c6fbd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1898,6 +1898,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2772,6 +2773,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2809,6 +2811,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3096,6 +3099,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4023,6 +4027,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5847,6 +5852,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7459,6 +7465,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7833,6 +7840,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8001,6 +8009,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 2c15d0a0cee0..36792a074f28 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -1898,6 +1898,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2771,6 +2772,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2808,6 +2810,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3095,6 +3098,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4021,6 +4025,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5845,6 +5850,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7456,6 +7462,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7830,6 +7837,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7998,6 +8006,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 37d0b795af28..dd5b83310e77 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -1898,6 +1898,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2771,6 +2772,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2808,6 +2810,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3095,6 +3098,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4021,6 +4025,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5843,6 +5848,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7453,6 +7459,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7827,6 +7834,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7995,6 +8003,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 3722c779479e..fdf02391efd2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -1898,6 +1898,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2770,6 +2771,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2807,6 +2809,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3094,6 +3097,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4020,6 +4024,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5841,6 +5846,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7451,6 +7457,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7825,6 +7832,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7993,6 +8001,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 02415714ec45..379b32df0d55 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -1898,6 +1898,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2770,6 +2771,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2807,6 +2809,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3094,6 +3097,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4019,6 +4023,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5838,6 +5843,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7447,6 +7453,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7821,6 +7828,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7989,6 +7997,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 93dd140cfece..8c169120d5a5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -1897,6 +1897,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2769,6 +2770,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2806,6 +2808,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3093,6 +3096,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4018,6 +4022,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5835,6 +5840,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7442,6 +7448,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7816,6 +7823,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7984,6 +7992,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 1820d188e59c..7b905aa3a8c4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -1896,6 +1896,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2768,6 +2769,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2805,6 +2807,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3092,6 +3095,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4016,6 +4020,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5830,6 +5835,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7437,6 +7443,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_4_1";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7811,6 +7818,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7979,6 +7987,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 288940ce36d2..48a43fd58d58 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -1896,6 +1896,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2768,6 +2769,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2805,6 +2807,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3092,6 +3095,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4016,6 +4020,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5829,6 +5834,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7436,6 +7442,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7810,6 +7817,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7978,6 +7986,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 46bfb1a28c0d..14fe8239edbd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -1894,6 +1894,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2765,6 +2766,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2802,6 +2804,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3089,6 +3092,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4013,6 +4017,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5823,6 +5828,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7429,6 +7435,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7802,6 +7809,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7970,6 +7978,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 7c56a06404d3..b5e3f1a97f6e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1905,6 +1905,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2781,6 +2782,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2818,6 +2820,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3107,6 +3110,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4038,6 +4042,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5870,6 +5875,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7489,6 +7495,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_3_3";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7866,6 +7873,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8034,6 +8042,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index b52ad6ad81e8..1b81866173e5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -1893,6 +1893,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2764,6 +2765,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2801,6 +2803,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3088,6 +3091,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4012,6 +4016,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5822,6 +5827,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7427,6 +7433,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7799,6 +7806,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7967,6 +7975,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index b997704c5617..68b55ab297cd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -1893,6 +1893,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2763,6 +2764,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2800,6 +2802,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3085,6 +3088,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4009,6 +4013,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5817,6 +5822,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7204,6 +7210,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7415,6 +7422,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7786,6 +7794,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7954,6 +7963,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 450329b588a7..6af9be05b68d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -1893,6 +1893,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2763,6 +2764,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2800,6 +2802,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3085,6 +3088,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4008,6 +4012,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5814,6 +5819,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7201,6 +7207,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7412,6 +7419,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7783,6 +7791,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7951,6 +7960,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 8f982e2034c4..b182a5f45e55 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1905,6 +1905,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2781,6 +2782,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2818,6 +2820,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3107,6 +3110,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4037,6 +4041,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5868,6 +5873,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7487,6 +7493,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_3_3";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7863,6 +7870,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8031,6 +8039,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 8c3f11503ec1..5df06f358fea 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1905,6 +1905,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2781,6 +2782,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2818,6 +2820,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3107,6 +3110,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4037,6 +4041,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5868,6 +5873,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7487,6 +7493,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_3_3";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7862,6 +7869,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8030,6 +8038,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index e87358b7835a..5c9ca2308f45 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1904,6 +1904,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2780,6 +2781,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2817,6 +2819,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3106,6 +3109,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4035,6 +4039,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5863,6 +5868,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7479,6 +7485,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_3_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7854,6 +7861,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8022,6 +8030,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 0e57cf1ef579..5ec2fadc5851 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1904,6 +1904,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2780,6 +2781,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2817,6 +2819,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3106,6 +3109,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4033,6 +4037,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5859,6 +5864,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7475,6 +7481,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_3_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7850,6 +7857,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8018,6 +8026,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index a18d16a16904..a313001fa910 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1902,6 +1902,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2777,6 +2778,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2814,6 +2816,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3103,6 +3106,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4030,6 +4034,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5855,6 +5860,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7469,6 +7475,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7843,6 +7850,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8011,6 +8019,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index e2f8645e151f..47b4d5414ff5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1900,6 +1900,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2774,6 +2775,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2811,6 +2813,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3100,6 +3103,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4027,6 +4031,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5851,6 +5856,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7465,6 +7471,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7839,6 +7846,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8007,6 +8015,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index fcbf2a221055..114434704dad 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1898,6 +1898,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = dontDistribute super."cacophony";
@@ -2772,6 +2773,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2809,6 +2811,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3097,6 +3100,7 @@ self: super: {
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_12";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -4024,6 +4028,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5848,6 +5853,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -7462,6 +7468,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7836,6 +7843,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -8004,6 +8012,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index eecfb22a513d..27f57069c590 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -1070,6 +1070,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1863,6 +1864,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -2718,6 +2720,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2754,6 +2757,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3036,6 +3040,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3945,6 +3950,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5702,6 +5708,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6565,6 +6572,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -7043,6 +7051,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7251,6 +7260,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -7617,6 +7627,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7780,6 +7791,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7795,6 +7808,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8519,6 +8533,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 349b70d18a4a..4ccc69aea3dc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -1070,6 +1070,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1861,6 +1862,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -2716,6 +2718,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2752,6 +2755,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3033,6 +3037,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3941,6 +3946,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5692,6 +5698,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6555,6 +6562,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -7033,6 +7041,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7241,6 +7250,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -7607,6 +7617,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7770,6 +7781,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7785,6 +7798,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8509,6 +8523,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index 9199bef8cc68..6200493c49d8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -1070,6 +1070,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1859,6 +1860,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -2712,6 +2714,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2748,6 +2751,7 @@ self: super: {
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -3026,6 +3030,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3929,6 +3934,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5673,6 +5679,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6533,6 +6540,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -7009,6 +7017,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7216,6 +7225,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
@@ -7577,6 +7587,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7740,6 +7751,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7755,6 +7768,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8478,6 +8492,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 87349cbbfa40..ece58ffe1b30 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -1064,6 +1064,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1847,6 +1848,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -2689,6 +2691,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2723,6 +2726,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2999,6 +3003,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3894,6 +3899,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5632,6 +5638,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6484,6 +6491,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6955,6 +6963,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7161,6 +7170,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7517,6 +7527,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7680,6 +7691,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7695,6 +7708,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8409,6 +8423,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index 42eccff60cc2..c3d6270621e6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -1063,6 +1063,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1843,6 +1844,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -2684,6 +2686,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2718,6 +2721,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2994,6 +2998,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3889,6 +3894,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5625,6 +5631,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6477,6 +6484,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6947,6 +6955,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7152,6 +7161,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7508,6 +7518,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7671,6 +7682,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7686,6 +7699,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8399,6 +8413,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.10.nix b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
index f6291d426da5..fcdbf56a30b0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
@@ -1057,6 +1057,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1834,6 +1835,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -1996,6 +1998,7 @@ self: super: {
   "classy-prelude" = doDistribute super."classy-prelude_0_12_6";
   "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6";
   "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2659,6 +2662,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2693,6 +2697,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2963,6 +2968,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3774,6 +3780,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_1";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3848,6 +3855,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5558,6 +5566,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6394,6 +6403,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6859,6 +6869,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7062,6 +7073,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7414,6 +7426,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7576,6 +7589,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7591,6 +7606,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8292,6 +8308,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
@@ -8515,6 +8532,7 @@ self: super: {
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
   "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_8";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.11.nix b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
index dd29a63d843a..ed9b8e5a7a3d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
@@ -1056,6 +1056,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1830,6 +1831,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -1992,6 +1994,7 @@ self: super: {
   "classy-prelude" = doDistribute super."classy-prelude_0_12_6";
   "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6";
   "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2654,6 +2657,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2688,6 +2692,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2957,6 +2962,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3768,6 +3774,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_1";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3842,6 +3849,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5547,6 +5555,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6382,6 +6391,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6847,6 +6857,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7050,6 +7061,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7402,6 +7414,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7563,6 +7576,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7578,6 +7593,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -8275,6 +8291,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
@@ -8498,6 +8515,7 @@ self: super: {
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
   "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_8";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.12.nix b/pkgs/development/haskell-modules/configuration-lts-5.12.nix
index d89014d7065f..c3daabe3ef78 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.12.nix
@@ -1055,6 +1055,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1829,6 +1830,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -1982,12 +1984,16 @@ self: super: {
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_6_17";
+  "clash-lib" = doDistribute super."clash-lib_0_6_15";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_7";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_6";
   "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6";
   "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2650,6 +2656,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2684,6 +2691,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2951,6 +2959,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3762,6 +3771,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_1";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3836,6 +3846,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5534,6 +5545,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6367,6 +6379,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6832,6 +6845,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7034,6 +7048,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7385,6 +7400,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7546,6 +7562,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7561,6 +7579,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -8258,6 +8277,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
@@ -8481,6 +8501,7 @@ self: super: {
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
   "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_8";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.13.nix b/pkgs/development/haskell-modules/configuration-lts-5.13.nix
index c68a4c81247f..7e10df38bf94 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.13.nix
@@ -1054,6 +1054,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1824,6 +1825,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -1977,9 +1979,13 @@ self: super: {
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_6_17";
+  "clash-lib" = doDistribute super."clash-lib_0_6_15";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_7";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2641,6 +2647,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2675,6 +2682,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2942,6 +2950,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3753,6 +3762,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_1";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3827,6 +3837,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5520,6 +5531,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6349,6 +6361,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6814,6 +6827,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7016,6 +7030,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7367,6 +7382,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7528,6 +7544,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7543,6 +7561,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -8238,6 +8257,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
@@ -8459,6 +8479,7 @@ self: super: {
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
   "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_8";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.14.nix b/pkgs/development/haskell-modules/configuration-lts-5.14.nix
index 9fd822082b5e..c84be31b77b8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.14.nix
@@ -1052,6 +1052,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1819,6 +1820,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -1971,9 +1973,13 @@ self: super: {
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_6_17";
+  "clash-lib" = doDistribute super."clash-lib_0_6_15";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_7";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2632,6 +2638,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2666,6 +2673,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2933,6 +2941,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3742,6 +3751,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_1";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3816,6 +3826,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5506,6 +5517,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6333,6 +6345,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6797,6 +6810,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6998,6 +7012,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7347,6 +7362,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7507,6 +7523,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7522,6 +7540,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -8212,6 +8231,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
@@ -8335,6 +8355,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1_2";
   "xlsx-tabular" = dontDistribute super."xlsx-tabular";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
@@ -8430,6 +8451,7 @@ self: super: {
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
   "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_8";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.15.nix b/pkgs/development/haskell-modules/configuration-lts-5.15.nix
index e1d42399b49b..50dfd0e17545 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.15.nix
@@ -1051,6 +1051,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1818,6 +1819,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -1970,9 +1972,13 @@ self: super: {
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_6_17";
+  "clash-lib" = doDistribute super."clash-lib_0_6_15";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_7";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2629,6 +2635,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2663,6 +2670,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2928,6 +2936,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3737,6 +3746,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_1";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3811,6 +3821,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5498,6 +5509,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6323,6 +6335,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6787,6 +6800,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6988,6 +7002,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7337,6 +7352,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7497,6 +7513,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7511,6 +7529,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -8200,6 +8219,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
@@ -8323,6 +8343,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1_2";
   "xlsx-tabular" = dontDistribute super."xlsx-tabular";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
@@ -8417,6 +8438,7 @@ self: super: {
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
   "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_8";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.16.nix b/pkgs/development/haskell-modules/configuration-lts-5.16.nix
index 23b41150abff..e64a8a4294cc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.16.nix
@@ -1049,6 +1049,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1810,6 +1811,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -1962,9 +1964,13 @@ self: super: {
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_6_17";
+  "clash-lib" = doDistribute super."clash-lib_0_6_15";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_7";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2520,6 +2526,7 @@ self: super: {
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_6";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
@@ -2613,6 +2620,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2647,6 +2655,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2911,6 +2920,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3720,6 +3730,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_1";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3794,6 +3805,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5475,6 +5487,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6296,6 +6309,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6755,6 +6769,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6956,6 +6971,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7301,6 +7317,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7460,6 +7477,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7473,6 +7492,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -8160,6 +8180,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
@@ -8283,6 +8304,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1_2";
   "xlsx-tabular" = dontDistribute super."xlsx-tabular";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
@@ -8377,6 +8399,7 @@ self: super: {
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
   "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_8";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
@@ -8431,6 +8454,7 @@ self: super: {
   "yesod-worker" = dontDistribute super."yesod-worker";
   "yet-another-logger" = dontDistribute super."yet-another-logger";
   "yhccore" = dontDistribute super."yhccore";
+  "yi" = doDistribute super."yi_0_12_5";
   "yi-contrib" = dontDistribute super."yi-contrib";
   "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
   "yi-gtk" = dontDistribute super."yi-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.17.nix b/pkgs/development/haskell-modules/configuration-lts-5.17.nix
index 72ef8051115f..f63e3532fb9f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.17.nix
@@ -1047,6 +1047,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1806,6 +1807,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -1958,9 +1960,13 @@ self: super: {
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_6_17";
+  "clash-lib" = doDistribute super."clash-lib_0_6_15";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_7";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2516,6 +2522,7 @@ self: super: {
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_6";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
@@ -2609,6 +2616,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2643,6 +2651,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2907,6 +2916,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3716,6 +3726,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_1";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3790,6 +3801,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5469,6 +5481,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6288,6 +6301,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6746,6 +6760,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6947,6 +6962,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7292,6 +7308,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7450,6 +7467,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7463,6 +7482,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -8148,6 +8168,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
@@ -8271,6 +8292,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1_2";
   "xlsx-tabular" = dontDistribute super."xlsx-tabular";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
@@ -8364,6 +8386,7 @@ self: super: {
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
   "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_8";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
@@ -8418,6 +8441,7 @@ self: super: {
   "yesod-worker" = dontDistribute super."yesod-worker";
   "yet-another-logger" = dontDistribute super."yet-another-logger";
   "yhccore" = dontDistribute super."yhccore";
+  "yi" = doDistribute super."yi_0_12_5";
   "yi-contrib" = dontDistribute super."yi-contrib";
   "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
   "yi-gtk" = dontDistribute super."yi-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.18.nix b/pkgs/development/haskell-modules/configuration-lts-5.18.nix
index ae01a916519f..5783a2f558da 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.18.nix
@@ -1046,6 +1046,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1805,6 +1806,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -1956,9 +1958,13 @@ self: super: {
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_6_17";
+  "clash-lib" = doDistribute super."clash-lib_0_6_15";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_7";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2510,6 +2516,7 @@ self: super: {
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_6";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
@@ -2602,6 +2609,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2636,6 +2644,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2899,6 +2908,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3706,6 +3716,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_1";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3780,6 +3791,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5452,6 +5464,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6267,6 +6280,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6725,6 +6739,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6926,6 +6941,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7271,6 +7287,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7429,6 +7446,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7442,6 +7461,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -8123,6 +8143,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
@@ -8246,6 +8267,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1_2";
   "xlsx-tabular" = dontDistribute super."xlsx-tabular";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
@@ -8339,6 +8361,7 @@ self: super: {
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
   "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_8";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
@@ -8393,6 +8416,7 @@ self: super: {
   "yesod-worker" = dontDistribute super."yesod-worker";
   "yet-another-logger" = dontDistribute super."yet-another-logger";
   "yhccore" = dontDistribute super."yhccore";
+  "yi" = doDistribute super."yi_0_12_5";
   "yi-contrib" = dontDistribute super."yi-contrib";
   "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
   "yi-gtk" = dontDistribute super."yi-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index f7ff2830964c..c66cfb432508 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -1063,6 +1063,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1843,6 +1844,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -2683,6 +2685,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2717,6 +2720,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2991,6 +2995,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3884,6 +3889,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5615,6 +5621,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6464,6 +6471,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6932,6 +6940,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7137,6 +7146,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7493,6 +7503,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7655,6 +7666,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7670,6 +7683,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8383,6 +8397,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
index fc44d14c2003..b898ac218d89 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
@@ -1061,6 +1061,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1840,6 +1841,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -2677,6 +2679,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2711,6 +2714,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2982,6 +2986,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3873,6 +3878,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5601,6 +5607,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6449,6 +6456,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6914,6 +6922,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7119,6 +7128,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7473,6 +7483,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7635,6 +7646,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7650,6 +7663,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8360,6 +8374,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
index 513bf0c398e0..5889ce2628e2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
@@ -1060,6 +1060,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1839,6 +1840,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -2672,6 +2674,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2706,6 +2709,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2976,6 +2980,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3865,6 +3870,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5592,6 +5598,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6435,6 +6442,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6900,6 +6908,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7105,6 +7114,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7459,6 +7469,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7621,6 +7632,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7636,6 +7649,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8345,6 +8359,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
index 6cc680233bf7..7ace07b9a258 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
@@ -1060,6 +1060,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1838,6 +1839,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -2004,6 +2006,7 @@ self: super: {
   "classy-prelude" = doDistribute super."classy-prelude_0_12_5_1";
   "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5";
   "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2669,6 +2672,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2703,6 +2707,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2973,6 +2978,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3862,6 +3868,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5588,6 +5595,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6431,6 +6439,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6896,6 +6905,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7101,6 +7111,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7455,6 +7466,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7617,6 +7629,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7632,6 +7646,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8339,6 +8354,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.6.nix b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
index 4f630cf72eff..af90be145eb2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
@@ -1059,6 +1059,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1837,6 +1838,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -2003,6 +2005,7 @@ self: super: {
   "classy-prelude" = doDistribute super."classy-prelude_0_12_6";
   "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6";
   "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2667,6 +2670,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2701,6 +2705,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2971,6 +2976,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3857,6 +3863,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5580,6 +5587,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6420,6 +6428,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6885,6 +6894,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7090,6 +7100,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7444,6 +7455,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7606,6 +7618,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7621,6 +7635,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8326,6 +8341,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.7.nix b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
index 798028819721..361134e31705 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
@@ -1059,6 +1059,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1837,6 +1838,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -2000,6 +2002,7 @@ self: super: {
   "classy-prelude" = doDistribute super."classy-prelude_0_12_6";
   "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6";
   "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2664,6 +2667,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2698,6 +2702,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2968,6 +2973,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3854,6 +3860,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5575,6 +5582,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6415,6 +6423,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6880,6 +6889,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7084,6 +7094,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7438,6 +7449,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7600,6 +7612,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7615,6 +7629,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8319,6 +8334,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.8.nix b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
index 71db989b93b5..5fcc84e3e4f3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
@@ -1059,6 +1059,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1837,6 +1838,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -2000,6 +2002,7 @@ self: super: {
   "classy-prelude" = doDistribute super."classy-prelude_0_12_6";
   "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6";
   "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2664,6 +2667,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2698,6 +2702,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2968,6 +2973,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3854,6 +3860,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5575,6 +5582,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6415,6 +6423,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6880,6 +6889,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7084,6 +7094,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7438,6 +7449,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7600,6 +7612,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7615,6 +7629,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8318,6 +8333,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.9.nix b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
index b917addc4fdc..5d9ad584e543 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
@@ -1059,6 +1059,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1836,6 +1837,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_4_0";
@@ -1998,6 +2000,7 @@ self: super: {
   "classy-prelude" = doDistribute super."classy-prelude_0_12_6";
   "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6";
   "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2661,6 +2664,7 @@ self: super: {
   "doctest-discover" = dontDistribute super."doctest-discover";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2695,6 +2699,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2965,6 +2970,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3776,6 +3782,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_1";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3850,6 +3857,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -5566,6 +5574,7 @@ self: super: {
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monadplus" = dontDistribute super."monadplus";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6403,6 +6412,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protobuf-simple" = dontDistribute super."protobuf-simple";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
@@ -6868,6 +6878,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = doDistribute super."sandman_0_2_0_0";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -7071,6 +7082,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
@@ -7423,6 +7435,7 @@ self: super: {
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7585,6 +7598,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7600,6 +7615,7 @@ self: super: {
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_2";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -8302,6 +8318,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
@@ -8525,6 +8542,7 @@ self: super: {
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
   "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_8";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-6.0.nix b/pkgs/development/haskell-modules/configuration-lts-6.0.nix
index 682434925c6e..c70cc7798a78 100644
--- a/pkgs/development/haskell-modules/configuration-lts-6.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-6.0.nix
@@ -1032,6 +1032,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1770,6 +1771,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_6_0";
@@ -1917,9 +1919,13 @@ self: super: {
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_6_17";
+  "clash-lib" = doDistribute super."clash-lib_0_6_15";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_7";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2453,6 +2459,7 @@ self: super: {
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_6";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
@@ -2507,12 +2514,14 @@ self: super: {
   "disjoint-set" = dontDistribute super."disjoint-set";
   "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
   "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-process" = doDistribute super."distributed-process_0_6_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-tests" = doDistribute super."distributed-process-tests_0_4_5";
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
   "distributed-static" = doDistribute super."distributed-static_0_3_4_0";
   "distribution" = dontDistribute super."distribution";
@@ -2530,6 +2539,7 @@ self: super: {
   "dockercook" = dontDistribute super."dockercook";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2561,6 +2571,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2817,6 +2828,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3597,6 +3609,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_1";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3672,6 +3685,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -4669,6 +4683,7 @@ self: super: {
   "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
+  "katip-elasticsearch" = doDistribute super."katip-elasticsearch_0_2_0_0";
   "katt" = dontDistribute super."katt";
   "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
@@ -5284,6 +5299,7 @@ self: super: {
   "monadlist" = dontDistribute super."monadlist";
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6075,6 +6091,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_2_0";
   "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_2_0";
@@ -6507,6 +6524,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sarasvati" = dontDistribute super."sarasvati";
   "sarsi" = dontDistribute super."sarsi";
@@ -6691,6 +6709,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7025,6 +7044,7 @@ self: super: {
   "str" = dontDistribute super."str";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7175,6 +7195,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7187,6 +7209,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-dejafu" = doDistribute super."tasty-dejafu_0_3_0_0";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7838,6 +7861,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
@@ -7957,6 +7981,8 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1_2";
+  "xlsx-tabular" = doDistribute super."xlsx-tabular_0_1_0_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
@@ -8049,6 +8075,7 @@ self: super: {
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
   "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_8";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
@@ -8100,6 +8127,7 @@ self: super: {
   "yesod-worker" = dontDistribute super."yesod-worker";
   "yet-another-logger" = dontDistribute super."yet-another-logger";
   "yhccore" = dontDistribute super."yhccore";
+  "yi" = doDistribute super."yi_0_12_5";
   "yi-contrib" = dontDistribute super."yi-contrib";
   "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
   "yi-gtk" = dontDistribute super."yi-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-6.1.nix b/pkgs/development/haskell-modules/configuration-lts-6.1.nix
index 61bd2d470297..4641909e7357 100644
--- a/pkgs/development/haskell-modules/configuration-lts-6.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-6.1.nix
@@ -1029,6 +1029,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1760,6 +1761,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_6_0";
@@ -1904,9 +1906,13 @@ self: super: {
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_6_17";
+  "clash-lib" = doDistribute super."clash-lib_0_6_15";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_7";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2438,6 +2444,7 @@ self: super: {
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_6";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
@@ -2492,12 +2499,14 @@ self: super: {
   "disjoint-set" = dontDistribute super."disjoint-set";
   "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
   "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-process" = doDistribute super."distributed-process_0_6_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-tests" = doDistribute super."distributed-process-tests_0_4_5";
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
   "distributed-static" = doDistribute super."distributed-static_0_3_4_0";
   "distribution" = dontDistribute super."distribution";
@@ -2515,6 +2524,7 @@ self: super: {
   "dockercook" = dontDistribute super."dockercook";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2546,6 +2556,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2795,6 +2806,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3566,6 +3578,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_1";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3641,6 +3654,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -4629,6 +4643,7 @@ self: super: {
   "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
+  "katip-elasticsearch" = doDistribute super."katip-elasticsearch_0_2_0_0";
   "katt" = dontDistribute super."katt";
   "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
@@ -5237,6 +5252,7 @@ self: super: {
   "monadlist" = dontDistribute super."monadlist";
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -6014,6 +6030,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_2_0";
   "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_2_0";
@@ -6443,6 +6460,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sarasvati" = dontDistribute super."sarasvati";
   "sarsi" = dontDistribute super."sarsi";
@@ -6626,6 +6644,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -6959,6 +6978,7 @@ self: super: {
   "str" = dontDistribute super."str";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -7109,6 +7129,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7120,6 +7142,7 @@ self: super: {
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7764,6 +7787,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
@@ -7880,6 +7904,8 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1_2";
+  "xlsx-tabular" = doDistribute super."xlsx-tabular_0_1_0_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
@@ -7972,6 +7998,7 @@ self: super: {
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
   "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_8";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
@@ -8022,6 +8049,7 @@ self: super: {
   "yesod-worker" = dontDistribute super."yesod-worker";
   "yet-another-logger" = dontDistribute super."yet-another-logger";
   "yhccore" = dontDistribute super."yhccore";
+  "yi" = doDistribute super."yi_0_12_5";
   "yi-contrib" = dontDistribute super."yi-contrib";
   "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
   "yi-gtk" = dontDistribute super."yi-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-6.2.nix b/pkgs/development/haskell-modules/configuration-lts-6.2.nix
index 3c1ffa099337..fce15326d9fc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-6.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-6.2.nix
@@ -1022,6 +1022,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1677,6 +1678,7 @@ self: super: {
   "cabalvchk" = dontDistribute super."cabalvchk";
   "cabin" = dontDistribute super."cabin";
   "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
   "cacophony" = doDistribute super."cacophony_0_6_0";
@@ -1821,9 +1823,13 @@ self: super: {
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_6_17";
+  "clash-lib" = doDistribute super."clash-lib_0_6_15";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_7";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_11";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = doDistribute super."clckwrks_0_23_14";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -2351,6 +2357,7 @@ self: super: {
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_6";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
@@ -2405,12 +2412,14 @@ self: super: {
   "disjoint-set" = dontDistribute super."disjoint-set";
   "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
   "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-process" = doDistribute super."distributed-process_0_6_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-tests" = doDistribute super."distributed-process-tests_0_4_5";
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
@@ -2427,6 +2436,7 @@ self: super: {
   "dockercook" = dontDistribute super."dockercook";
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
   "dom-lt" = dontDistribute super."dom-lt";
   "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
@@ -2458,6 +2468,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2705,6 +2716,7 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
   "fca" = dontDistribute super."fca";
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
@@ -3469,6 +3481,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_1";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3544,6 +3557,7 @@ self: super: {
   "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
   "haskell-docs" = dontDistribute super."haskell-docs";
   "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
   "haskell-formatter" = dontDistribute super."haskell-formatter";
   "haskell-ftp" = dontDistribute super."haskell-ftp";
   "haskell-generate" = dontDistribute super."haskell-generate";
@@ -4525,6 +4539,7 @@ self: super: {
   "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
+  "katip-elasticsearch" = doDistribute super."katip-elasticsearch_0_2_0_0";
   "katt" = dontDistribute super."katt";
   "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
@@ -5131,6 +5146,7 @@ self: super: {
   "monadlist" = dontDistribute super."monadlist";
   "monadloc-pp" = dontDistribute super."monadloc-pp";
   "monads-fd" = dontDistribute super."monads-fd";
+  "monads-tf" = doDistribute super."monads-tf_0_1_0_2";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
   "mondo" = dontDistribute super."mondo";
@@ -5900,6 +5916,7 @@ self: super: {
   "props" = dontDistribute super."props";
   "prosper" = dontDistribute super."prosper";
   "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = doDistribute super."protobuf_0_2_1_0";
   "protobuf-native" = dontDistribute super."protobuf-native";
   "protocol-buffers" = doDistribute super."protocol-buffers_2_2_0";
   "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_2_0";
@@ -6323,6 +6340,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
   "sandlib" = dontDistribute super."sandlib";
   "sarasvati" = dontDistribute super."sarasvati";
   "sarsi" = dontDistribute super."sarsi";
@@ -6505,6 +6523,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -6771,6 +6790,7 @@ self: super: {
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
+  "stack-run-auto" = doDistribute super."stack-run-auto_0_1_1_2";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -6835,6 +6855,7 @@ self: super: {
   "str" = dontDistribute super."str";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
   "stratux-types" = dontDistribute super."stratux-types";
   "stratux-websockets" = dontDistribute super."stratux-websockets";
   "stream" = dontDistribute super."stream";
@@ -6982,6 +7003,8 @@ self: super: {
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -6993,6 +7016,7 @@ self: super: {
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty-expected-failure" = doDistribute super."tasty-expected-failure_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7309,6 +7333,7 @@ self: super: {
   "twitch" = dontDistribute super."twitch";
   "twitter" = dontDistribute super."twitter";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_6";
   "tx" = dontDistribute super."tx";
   "txt-sushi" = dontDistribute super."txt-sushi";
   "txt2rtf" = dontDistribute super."txt2rtf";
@@ -7633,6 +7658,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
   "web-routes-regular" = dontDistribute super."web-routes-regular";
@@ -7746,6 +7772,8 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1_2";
+  "xlsx-tabular" = doDistribute super."xlsx-tabular_0_1_0_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
@@ -7837,6 +7865,7 @@ self: super: {
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
   "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_8";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
@@ -7887,6 +7916,7 @@ self: super: {
   "yesod-worker" = dontDistribute super."yesod-worker";
   "yet-another-logger" = dontDistribute super."yet-another-logger";
   "yhccore" = dontDistribute super."yhccore";
+  "yi" = doDistribute super."yi_0_12_5";
   "yi-contrib" = dontDistribute super."yi-contrib";
   "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
   "yi-gtk" = dontDistribute super."yi-gtk";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a95a33cc8409..99a406095109 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -849,7 +849,7 @@ self: {
        executableToolDepends = [ emacs ];
        jailbreak = true;
        postInstall = ''
-         files=($out/share/*-ghc-*/Agda-*/lib/prim/Agda/{Primitive.agda,Builtin/*.agda})
+         files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/{Primitive.agda,Builtin/"*.agda})
          for f in "''${files[@]}" ; do
            $out/bin/agda $f
          done
@@ -11316,6 +11316,7 @@ self: {
        sha256 = "4e0951e1b26587ee46fe56b91e75e3d878afc3f87deecbdb2b6254b23d21d840";
        libraryHaskellDepends = [ base mtl process strict ];
        testHaskellDepends = [ base tasty tasty-hunit ];
+       doCheck = false;
        homepage = "https://github.com/jetho/Hclip";
        description = "A small cross-platform library for reading and modifying the system clipboard";
        license = stdenv.lib.licenses.bsd3;
@@ -18806,18 +18807,19 @@ self: {
      }) {};
 
   "SciFlow" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default-class
-     , fgl, graphviz, lens, mtl, optparse-applicative, shelly, split
+    ({ mkDerivation, base, bytestring, cereal, containers, directory
+     , executable-path, fgl, graphviz, lens, lifted-async, mtl
+     , optparse-applicative, rainbow, shelly, split, sqlite-simple
      , template-haskell, text, th-lift, transformers, yaml
      }:
      mkDerivation {
        pname = "SciFlow";
-       version = "0.4.1";
-       sha256 = "5e517ebe5bd29ce80606d7011a898bbcfb8f5538c5b888755ba7567405b7230c";
+       version = "0.5.1";
+       sha256 = "bbd6d78dae17138dcd6e9849c156402bf1e65b71cc6bbfe3ca6bc64acc99422d";
        libraryHaskellDepends = [
-         base bytestring containers data-default-class fgl graphviz lens mtl
-         optparse-applicative shelly split template-haskell text th-lift
-         transformers yaml
+         base bytestring cereal containers directory executable-path fgl
+         graphviz lens lifted-async mtl optparse-applicative rainbow shelly
+         split sqlite-simple template-haskell text th-lift transformers yaml
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
@@ -22563,8 +22565,8 @@ self: {
      }:
      mkDerivation {
        pname = "abnf";
-       version = "0.3.0.0";
-       sha256 = "b1e18758161e20ecc55c043d5751071f335eb13aac6d1ad5469e26a301bb2142";
+       version = "0.3.1.0";
+       sha256 = "c556b06416b432092f2d6084605a40384b4e91822b49ccc33596badd7fc2ad12";
        libraryHaskellDepends = [
          attoparsec base containers megaparsec text
        ];
@@ -23067,7 +23069,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "acid-state" = callPackage
+  "acid-state_0_14_0" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
      , directory, extensible-exceptions, filepath, mtl, network
      , safecopy, stm, template-haskell, unix
@@ -23089,6 +23091,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "acid-state" = callPackage
+    ({ mkDerivation, array, base, bytestring, cereal, containers
+     , directory, extensible-exceptions, filepath, mtl, network
+     , safecopy, stm, template-haskell, unix
+     }:
+     mkDerivation {
+       pname = "acid-state";
+       version = "0.14.1";
+       sha256 = "5ae9dde518e2aedbb1650445023ff45049541a18e8ca5e7f1a5269507c034fc2";
+       libraryHaskellDepends = [
+         array base bytestring cereal containers directory
+         extensible-exceptions filepath mtl network safecopy stm
+         template-haskell unix
+       ];
+       homepage = "http://acid-state.seize.it/";
+       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, directory, filepath, mtl, random
@@ -33461,13 +33483,13 @@ self: {
      }) {};
 
   "ansigraph" = callPackage
-    ({ mkDerivation, ansi-terminal, base }:
+    ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "ansigraph";
-       version = "0.1.0.0";
-       sha256 = "ba653a0c6fe36488714fce8a77e553b1c3cadbcbd5e6c6fe53449f25bdae8a40";
+       version = "0.2.0.0";
+       sha256 = "3ded8cb86e659854a051328982c4b3f3527c409c5bbeb37383d717685e76ca43";
        libraryHaskellDepends = [ ansi-terminal base ];
-       jailbreak = true;
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/BlackBrane/ansigraph";
        description = "Terminal-based graphing via ANSI and Unicode";
        license = stdenv.lib.licenses.mit;
@@ -35774,8 +35796,8 @@ self: {
      }:
      mkDerivation {
        pname = "ascii-table";
-       version = "0.2.0.0";
-       sha256 = "8ece1383cf232164eb6d9be16160dbea71dff611fa849a7378353ddf00cae230";
+       version = "0.3.0.0";
+       sha256 = "c9e548aafcdc778811230075f65050edab27627140ac5c3102db779ea927998e";
        libraryHaskellDepends = [
          aeson base containers dlist hashable text unordered-containers
          vector wl-pprint-extras
@@ -41355,7 +41377,6 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck transformers transformers-compat
        ];
-       doHaddock = false;
        homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -43328,8 +43349,8 @@ self: {
      }:
      mkDerivation {
        pname = "biohazard";
-       version = "0.6.6";
-       sha256 = "9e558ad4a3a37de20ebf28bf7c08160884e70898050527113eab136d8fc5a167";
+       version = "0.6.6.1";
+       sha256 = "ad458331686a5a0ac2ace70d63ddccd3cbd76aba2da6c4a38b8b70540789e28f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -43651,8 +43672,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitcoin-payment-channel";
-       version = "0.1.1.1";
-       sha256 = "acb7cbcd418a416a2b4a5fc180b5c3a27a5d5d4d9a4b64b953ebe4e6e057891e";
+       version = "0.1.1.2";
+       sha256 = "13e64ee669f4752947170940b42afdcb43aa8bcde503a967370492ff12d6f9fc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45442,21 +45463,23 @@ self: {
 
   "bond-haskell" = callPackage
     ({ mkDerivation, aeson, array, base, binary, bond-haskell-compiler
-     , bytestring, containers, either, extra, filepath, hashable, mtl
-     , scientific, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
-     , text, unordered-containers, vector
+     , bytestring, containers, deepseq, either, extra, filepath
+     , hashable, mtl, scientific, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "bond-haskell";
-       version = "0.1.2.0";
-       sha256 = "edfdb9fe245a634b06d2cd309d334192043114145a0117d07a8bc55bfbbcfcf5";
+       version = "0.1.3.0";
+       sha256 = "37b7dc9229b423772bd44d796aae5cd50daedfe745deaf3fdd6d75139ac4b341";
        libraryHaskellDepends = [
          aeson array base binary bond-haskell-compiler bytestring containers
-         extra hashable mtl scientific text unordered-containers vector
+         deepseq extra hashable mtl scientific text unordered-containers
+         vector
        ];
        testHaskellDepends = [
-         aeson base bytestring containers either filepath mtl tasty
+         aeson base bytestring containers deepseq either filepath mtl tasty
          tasty-golden tasty-hunit tasty-quickcheck unordered-containers
+         vector
        ];
        homepage = "http://github.com/rblaze/bond-haskell#readme";
        description = "Runtime support for BOND serialization";
@@ -45470,8 +45493,8 @@ self: {
      }:
      mkDerivation {
        pname = "bond-haskell-compiler";
-       version = "0.1.2.0";
-       sha256 = "faa936e9a89dbf42919746b13fb9b1b0731d36201b5f36dd0c092a2b1942c7bc";
+       version = "0.1.3.0";
+       sha256 = "be3887eb0404614cff445b99c943788d1556337552fcc099587a9bfdc833a4f7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bond filepath haskell-src-exts ];
@@ -45479,7 +45502,6 @@ self: {
          aeson base bond bytestring cmdargs directory filepath monad-loops
        ];
        testHaskellDepends = [ base ];
-       jailbreak = true;
        homepage = "http://github.com/rblaze/bond-haskell#readme";
        description = "Bond code generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -46994,8 +47016,8 @@ self: {
      }:
      mkDerivation {
        pname = "byline";
-       version = "0.2.1.0";
-       sha256 = "dd464d3b9afb9e74fd2ed72e44f9fc74bcd59abf870184ee2a4ed2512e2b75c4";
+       version = "0.2.2.0";
+       sha256 = "f1a00142d77643a3da1ddabf9d9f1308e7ee1d8ea758d8161ed118a3d7c4123a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -49886,6 +49908,23 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {cabocha = null;};
 
+  "cache" = callPackage
+    ({ mkDerivation, base, clock, hashable, hspec, stm, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "cache";
+       version = "0.1.0.0";
+       sha256 = "149ee40a6452297c61bfba2aa2ee9d7c18cf1a3d51f59cf1a8765d6dddb0fbd0";
+       libraryHaskellDepends = [
+         base clock hashable stm transformers unordered-containers
+       ];
+       testHaskellDepends = [ base clock hspec stm transformers ];
+       homepage = "https://github.com/hverr/haskell-cache";
+       description = "An in-memory key/value store with expiration support";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cached-io" = callPackage
     ({ mkDerivation, base, stm, time }:
      mkDerivation {
@@ -50838,8 +50877,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "3.0.0.1";
-       sha256 = "87ad635f973a69820c4238ba634f8c4f9ece450d994b4c31f83a8cbcf2a791cc";
+       version = "3.0.0.3";
+       sha256 = "39eee803fda99b785de6f162467f75941ee62048ae4edebb0932540ade80febf";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear spatial-math vector vector-binary-instances
@@ -53068,8 +53107,8 @@ self: {
      }:
      mkDerivation {
        pname = "chorale";
-       version = "0.1.5";
-       sha256 = "cff064b97b28d61dc0a982c8a4c7cf8a7c527a099b29b0e01c8c2fb6dc08f681";
+       version = "0.1.7";
+       sha256 = "5c7ae9e2ee593295ae158046ceef0c3c5868bc5c890eb1f6e2e4be511e251e5d";
        libraryHaskellDepends = [ base containers safe ];
        testHaskellDepends = [
          base containers HUnit ieee754 QuickCheck safe test-framework
@@ -54249,8 +54288,10 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.6.18";
-       sha256 = "d44967cbf7633d53e9152f62511782ae2feebc23a109ee818c05d3ae5924b737";
+       version = "0.6.19";
+       sha256 = "35aa6bfec8dba42d40b44fd75703fcee4d4927c3e530d2f803e01405ab8b789b";
+       revision = "1";
+       editedCabalFile = "333860d4a5deff8eb95a1fec544a29c86ac3db879e80f4341796f5227d89c55a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -54501,7 +54542,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-lib" = callPackage
+  "clash-lib_0_6_15" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
      , concurrent-supply, containers, deepseq, directory, errors, fgl
      , filepath, hashable, lens, mtl, pretty, process, template-haskell
@@ -54521,9 +54562,10 @@ 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-lib_0_6_16" = callPackage
+  "clash-lib" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
      , concurrent-supply, containers, deepseq, directory, errors, fgl
      , filepath, hashable, lens, mtl, pretty, process, template-haskell
@@ -54534,13 +54576,36 @@ self: {
        pname = "clash-lib";
        version = "0.6.16";
        sha256 = "f2da35653db0ef4834ccd97f403084d0e0d706a59070547922ff7f34f739fb0a";
+       revision = "1";
+       editedCabalFile = "02a7623d96f27553486c2b3df4a4ff15e4c2f96c4fe5c82ff462bf3b35cc0d16";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring clash-prelude concurrent-supply
+         containers deepseq directory errors fgl filepath hashable lens mtl
+         pretty process template-haskell text time transformers
+         unbound-generics unordered-containers uu-parsinglib wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - As a Library";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
+  "clash-lib_0_6_17" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
+     , concurrent-supply, containers, deepseq, directory, errors, fgl
+     , filepath, hashable, lens, mtl, pretty, process, template-haskell
+     , text, time, transformers, unbound-generics, unordered-containers
+     , uu-parsinglib, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-lib";
+       version = "0.6.17";
+       sha256 = "b6a036da95283f66f9dc6c0b2c0ae11845384a2c01a8b38b9c223771b0cbb179";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath hashable lens mtl
          pretty process template-haskell text time transformers
          unbound-generics unordered-containers uu-parsinglib wl-pprint-text
        ];
-       jailbreak = true;
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - As a Library";
        license = stdenv.lib.licenses.bsd2;
@@ -54657,7 +54722,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-prelude" = callPackage
+  "clash-prelude_0_10_7" = callPackage
     ({ mkDerivation, array, base, data-default, doctest, ghc-prim
      , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens
      , QuickCheck, reflection, singletons, template-haskell
@@ -54672,13 +54737,13 @@ self: {
          singletons template-haskell
        ];
        testHaskellDepends = [ base doctest ];
-       doCheck = false;
        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_0_10_8" = callPackage
+  "clash-prelude" = callPackage
     ({ mkDerivation, array, base, data-default, doctest, ghc-prim
      , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens
      , QuickCheck, reflection, singletons, template-haskell
@@ -54693,6 +54758,29 @@ self: {
          singletons template-haskell
        ];
        testHaskellDepends = [ base doctest ];
+       doCheck = false;
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - Prelude library";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
+  "clash-prelude_0_10_9" = callPackage
+    ({ mkDerivation, array, base, data-default, doctest, ghc-prim
+     , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens
+     , QuickCheck, reflection, singletons, template-haskell
+     }:
+     mkDerivation {
+       pname = "clash-prelude";
+       version = "0.10.9";
+       sha256 = "4a96fa9222427df9b515c343d0db6f53441c710141a09a344ee47ab30ebacee1";
+       revision = "1";
+       editedCabalFile = "60f4e89dd73b84c4798fc7fd7f52d58afd7eb3069b5d41994fb3d43be4eb40f5";
+       libraryHaskellDepends = [
+         array base data-default ghc-prim ghc-typelits-extra
+         ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection
+         singletons template-haskell
+       ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Prelude library";
        license = stdenv.lib.licenses.bsd2;
@@ -54846,6 +54934,8 @@ self: {
        pname = "clash-systemverilog";
        version = "0.6.6";
        sha256 = "89afc5fb0ed8abc66412ee28a01742be14f08b11f976dd2a9efb357ae4d8840a";
+       revision = "1";
+       editedCabalFile = "6766cfda0bfaebd8f39b54491e1af8be77516e43923b49826c9b515fcc1d540b";
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -54989,6 +55079,8 @@ self: {
        pname = "clash-verilog";
        version = "0.6.6";
        sha256 = "8dda7b2d72f849016fc32f563efcf59d22efc68d29f2eb2f3c8b7338701bb844";
+       revision = "1";
+       editedCabalFile = "d387b5796b663d97383a199d470690c93513fd4cc7e6c4a24b17c26204693c9e";
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -55178,7 +55270,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-vhdl" = callPackage
+  "clash-vhdl_0_6_11" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -55193,9 +55285,10 @@ 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;
      }) {};
 
-  "clash-vhdl_0_6_12" = callPackage
+  "clash-vhdl" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -55210,6 +55303,23 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - VHDL backend";
        license = stdenv.lib.licenses.bsd2;
+     }) {};
+
+  "clash-vhdl_0_6_13" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-vhdl";
+       version = "0.6.13";
+       sha256 = "77a702328472782f1cc878f12220a7fdacc032decd28f42e630d6e04c8b36825";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl lens mtl text unordered-containers
+         wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - VHDL backend";
+       license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -56164,7 +56274,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
-  "clckwrks" = callPackage
+  "clckwrks_0_23_14" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
      , blaze-html, bytestring, cereal, containers, directory, filepath
      , happstack-authenticate, happstack-hsp, happstack-jmacro
@@ -56199,6 +56309,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
+  "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, tagsoup, 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.23.15";
+       sha256 = "ef2959ed07b4123815536ee9eb98a91d93570717a5efb159ac1343b2072e7872";
+       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 tagsoup 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
@@ -66269,6 +66413,7 @@ self: {
          HUnit mtl QuickCheck shelly split test-framework
          test-framework-hunit test-framework-quickcheck2 text zip-archive
        ];
+       jailbreak = true;
        doCheck = false;
        postInstall = ''
          mkdir -p $out/etc/bash_completion.d
@@ -72426,14 +72571,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-pgf";
-       version = "0.1.0.3";
-       sha256 = "15148b7e985025fcee125086c13610de1b927b7c4dfcf5d8e6674f6844290641";
+       version = "0.1.0.4";
+       sha256 = "106f0401b97fe6d14572fd964bf97d400277bf44e9af19f3711e4fa14a4fb85a";
        libraryHaskellDepends = [
          base bytestring bytestring-builder colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels mtl
          optparse-applicative process split texrunner time vector zlib
        ];
-       jailbreak = true;
        homepage = "http://github.com/cchalmers/diagrams-pgf";
        description = "PGF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -72566,7 +72710,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-postscript" = callPackage
+  "diagrams-postscript_1_3_0_5" = callPackage
     ({ mkDerivation, base, containers, data-default-class
      , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
      , monoid-extras, mtl, semigroups, split, statestack
@@ -72587,6 +72731,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diagrams-postscript" = callPackage
+    ({ mkDerivation, base, containers, data-default-class
+     , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
+     , monoid-extras, mtl, semigroups, split, statestack
+     }:
+     mkDerivation {
+       pname = "diagrams-postscript";
+       version = "1.3.0.6";
+       sha256 = "713301a1febb383287349c1a317855add01812ea12ea680a8b4a86967d935093";
+       libraryHaskellDepends = [
+         base containers data-default-class diagrams-core diagrams-lib dlist
+         filepath hashable lens monoid-extras mtl semigroups split
+         statestack
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Postscript backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-qrcode" = callPackage
     ({ mkDerivation, array, base, colour, diagrams-core, diagrams-lib
      }:
@@ -74469,7 +74633,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "distributed-process" = callPackage
+  "distributed-process_0_6_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , data-accessor, deepseq, distributed-static, exceptions, ghc-prim
      , hashable, mtl, network-transport, random, rank1dynamic, stm, syb
@@ -74493,6 +74657,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "distributed-process" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , data-accessor, deepseq, distributed-static, exceptions, hashable
+     , mtl, network-transport, random, rank1dynamic, stm, syb, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "distributed-process";
+       version = "0.6.2";
+       sha256 = "ea3a29d9fa80d273807012c79f6af05e6c4022d29c5be1ef113fe335526a1fe9";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-accessor deepseq
+         distributed-static exceptions hashable mtl network-transport random
+         rank1dynamic stm syb time transformers
+       ];
+       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_0_2_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, containers
      , data-accessor, deepseq, distributed-process
@@ -75147,7 +75332,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "distributed-process-tests" = callPackage
+  "distributed-process-tests_0_4_5" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, bytestring
      , distributed-process, distributed-static, HUnit, network
      , network-transport, network-transport-inmemory, random, rematch
@@ -75173,6 +75358,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "distributed-process-tests" = callPackage
+    ({ mkDerivation, ansi-terminal, base, binary, bytestring
+     , distributed-process, distributed-static, HUnit, network
+     , network-transport, network-transport-inmemory, random, rematch
+     , setenv, stm, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "distributed-process-tests";
+       version = "0.4.6";
+       sha256 = "ba64f41f3e5a5ebd14a9a8e7c4114ea988b1554a80310c528c464746dcd6bf53";
+       libraryHaskellDepends = [
+         ansi-terminal base binary bytestring distributed-process
+         distributed-static HUnit network network-transport random rematch
+         setenv stm test-framework test-framework-hunit
+       ];
+       testHaskellDepends = [
+         base network network-transport network-transport-inmemory
+         test-framework
+       ];
+       homepage = "http://github.com/haskell-distributed/distributed-process/tree/master/distributed-process-tests";
+       description = "Tests and test support tools for distributed-process";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "distributed-process-zookeeper" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , distributed-process, distributed-process-monad-control
@@ -76197,6 +76407,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "docvim" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , dlist, filepath, hlint, lens, mtl, optparse-applicative, parsec
+     , pretty-show, process, split, tasty, tasty-golden, tasty-hunit
+     , temporary
+     }:
+     mkDerivation {
+       pname = "docvim";
+       version = "0.2.0.0";
+       sha256 = "3c9ad07ffa3c6e4d0a5352df82975027ea83206b1066f4026729cf620bc8c71d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory dlist filepath lens mtl
+         optparse-applicative parsec pretty-show split
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base bytestring containers deepseq dlist filepath hlint lens mtl
+         parsec pretty-show process split tasty tasty-golden tasty-hunit
+         temporary
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/wincent/docvim";
+       description = "Documentation generator for Vim plug-ins";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dom-lt" = callPackage
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
@@ -76913,6 +77151,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "drmaa" = callPackage
+    ({ mkDerivation, base, drmaa, inline-c, shelly, text }:
+     mkDerivation {
+       pname = "drmaa";
+       version = "0.1.0.1";
+       sha256 = "5cb530e4c7f8cde9e8b4520ef116a44e9c5cde8191ad7f91964ca270c69ae1e7";
+       libraryHaskellDepends = [ base inline-c shelly text ];
+       librarySystemDepends = [ drmaa ];
+       description = "A simple Haskell bindings to DRMAA C library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {drmaa = null;};
+
   "dropbox-sdk" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
      , certificate, conduit, HTTP, http-conduit, http-types, json
@@ -85038,6 +85288,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fbmessenger-api" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , filepath, hspec, http-client, http-client-tls, http-media
+     , http-types, mime-types, servant, servant-client, servant-server
+     , stm, string-conversions, text, transformers, unordered-containers
+     , warp
+     }:
+     mkDerivation {
+       pname = "fbmessenger-api";
+       version = "0.1.0.2";
+       sha256 = "006c0f782b5e66e0c9198def481730ec6aa70ba3a5005ea409d3febeb8fb98de";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive http-client http-media
+         http-types mime-types servant servant-client string-conversions
+         text transformers unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson base http-client http-client-tls servant servant-server stm
+         text transformers warp
+       ];
+       testHaskellDepends = [ aeson base bytestring filepath hspec text ];
+       homepage = "https://github.com/mseri/fbmessenger-api-hs#readme";
+       description = "High-level bindings to Facebook Messenger Platform API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fca" = callPackage
     ({ mkDerivation, base, bytestring, containers, cryptohash, hashable
      , text, unordered-containers
@@ -92992,8 +93270,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-heap-view";
-       version = "0.5.6";
-       sha256 = "002d2b39ab510e04e8a0852f42fd7c8dd81529ce395adabb00fefcfdc19d30bf";
+       version = "0.5.7";
+       sha256 = "4b6cbb42c256987e55b5d6136f4c7efb560a5ea1fd34d4878dcec1fe9aa71524";
        libraryHaskellDepends = [
          base binary bytestring containers ghc template-haskell transformers
        ];
@@ -95175,8 +95453,8 @@ self: {
      }:
      mkDerivation {
        pname = "gipeda";
-       version = "0.3";
-       sha256 = "8d3069ed3b75118cc420a0f5abe546cb4ec1d10d7ecb4c1b80e6b47eb944d7b6";
+       version = "0.3.0.1";
+       sha256 = "09cf582109f33e6946a7bbac3d9c123a9323cb2af18df207d65413c74b770ce8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -95185,7 +95463,6 @@ self: {
          scientific shake split tagged text transformers
          unordered-containers vector yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
@@ -103841,8 +104118,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackage-security";
-       version = "0.5.1.0";
-       sha256 = "5b2effb1e342f00c57db0b1390c46f9c6142e8039bb062ddab589ba438c88eba";
+       version = "0.5.2.1";
+       sha256 = "f80daf98372df883b09cc44a83503a0ffb3d4ac076ae4267c988ba5aafc9b7ba";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring Cabal
          containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -103859,37 +104136,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hackage-security_0_5_2_0" = callPackage
-    ({ mkDerivation, base, base16-bytestring, base64-bytestring
-     , bytestring, Cabal, containers, cryptohash-sha256, directory
-     , ed25519, filepath, ghc-prim, HUnit, mtl, network, network-uri
-     , parsec, pretty, QuickCheck, tar, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, temporary, time, transformers
-     , zlib
-     }:
-     mkDerivation {
-       pname = "hackage-security";
-       version = "0.5.2.0";
-       sha256 = "767968f35dfe85934a2fd0cc6e9106799f13cdc947dd4ee4bb2725bedf8a8c54";
-       revision = "1";
-       editedCabalFile = "bd7fb578131a70d6cf59817a37773014d54889d137ef6c0c9faf4145f7f17e19";
-       libraryHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring Cabal
-         containers cryptohash-sha256 directory ed25519 filepath ghc-prim
-         mtl network network-uri parsec pretty tar template-haskell time
-         transformers zlib
-       ];
-       testHaskellDepends = [
-         base bytestring Cabal containers HUnit network-uri QuickCheck tar
-         tasty tasty-hunit tasty-quickcheck temporary time zlib
-       ];
-       jailbreak = true;
-       homepage = "https://github.com/well-typed/hackage-security";
-       description = "Hackage security library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hackage-security-HTTP" = callPackage
     ({ mkDerivation, base, bytestring, hackage-security, HTTP, mtl
      , network, network-uri, zlib
@@ -104261,7 +104507,6 @@ self: {
          ghc ghc-boot ghc-paths haddock-library transformers xhtml
        ];
        testHaskellDepends = [ base containers ghc hspec QuickCheck ];
-       doHaddock = false;
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -106276,7 +106521,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "happstack-authenticate" = callPackage
+  "happstack-authenticate_2_3_4_1" = callPackage
     ({ mkDerivation, acid-state, aeson, authenticate, base
      , base64-bytestring, boomerang, bytestring, containers
      , data-default, email-validate, filepath, happstack-hsp
@@ -106307,6 +106552,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "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.2";
+       sha256 = "53a20c001ea7aed653923c8449ab19656c967d9b892c7689d9b8b2535df8e456";
+       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
@@ -108374,6 +108649,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-fake-user-agent" = callPackage
+    ({ mkDerivation, base, bytestring, lens, tagsoup, wreq }:
+     mkDerivation {
+       pname = "haskell-fake-user-agent";
+       version = "0.0.1";
+       sha256 = "0aefb6f1d64ddc5f6e686bb20d84f899270beb5da7b7609d00e50768d3fa1c5a";
+       libraryHaskellDepends = [ base bytestring lens tagsoup wreq ];
+       jailbreak = true;
+       description = "Simple library for retrieving current user agent strings";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "haskell-formatter" = callPackage
     ({ mkDerivation, base, containers, directory, directory-tree
      , doctest, filemanip, filepath, haskell-src-exts, hlint
@@ -110264,8 +110551,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-core";
-       version = "0.3.0";
-       sha256 = "eda63e201e25598815af84a5766a3f2aff7460af9aedc38f2e03a240ad0fce1d";
+       version = "0.3.1";
+       sha256 = "3257afb81053b70a4740fb483653ce23bf6d7824d2eafc4f6747dfaf2aa9f32b";
        libraryHaskellDepends = [
          aeson base base16-bytestring binary byteable bytestring conduit
          containers cryptohash deepseq either entropy largeword mtl murmur3
@@ -110322,8 +110609,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-node";
-       version = "0.3.0";
-       sha256 = "b44e3ad573fc68a40c585748892d6e4bf6207f1100d461ff8cab52d802a8c791";
+       version = "0.3.1";
+       sha256 = "224929fe22c426c9d4b6b05d7c562053efdbc11f63c63b40d3d80131152f07c1";
        libraryHaskellDepends = [
          aeson async base binary bytestring concurrent-extra conduit
          conduit-extra containers data-default deepseq either esqueleto
@@ -110429,8 +110716,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-wallet";
-       version = "0.3.0";
-       sha256 = "9ef76ec2515a02ec65d5c89d957c596b4b5766b62c56a0ac4683606ab79917f7";
+       version = "0.3.1";
+       sha256 = "3b0b9e83893c11b0dd8e3ae1d1e1c64481c32f32bd12b014de4f3deae3e9382e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111851,8 +112138,8 @@ self: {
      }:
      mkDerivation {
        pname = "hatex-guide";
-       version = "1.3.1.3";
-       sha256 = "9ec844efda0fd5ece2fb7e0c57ac3a79a7dcf3035aac85a08c797f3ded4c17ac";
+       version = "1.3.1.5";
+       sha256 = "da69f3ea3b9736d69b64ab3c5fdc8b27afc0e9723c7bd1e725e9cd0f1affc34c";
        libraryHaskellDepends = [
          base blaze-html directory filepath HaTeX parsec text time
          transformers
@@ -116619,6 +116906,7 @@ self: {
        testHaskellDepends = [
          base directory exceptions extensible-exceptions filepath HUnit
        ];
+       doCheck = false;
        homepage = "https://github.com/mvdan/hint";
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
@@ -121934,6 +122222,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hpio_0_8_0_2" = callPackage
+    ({ mkDerivation, async, base, base-compat, bytestring, containers
+     , directory, doctest, exceptions, filepath, hlint, hspec, mtl
+     , mtl-compat, optparse-applicative, QuickCheck, text, transformers
+     , transformers-compat, unix, unix-bytestring
+     }:
+     mkDerivation {
+       pname = "hpio";
+       version = "0.8.0.2";
+       sha256 = "b7f3c775454faea34a3bef496741f5d15ff5fc8319981b61b799ec895a21dca5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat bytestring containers directory exceptions
+         filepath mtl mtl-compat QuickCheck text transformers
+         transformers-compat unix unix-bytestring
+       ];
+       executableHaskellDepends = [
+         async base base-compat exceptions mtl mtl-compat
+         optparse-applicative transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         async base base-compat bytestring containers directory doctest
+         exceptions filepath hlint hspec mtl mtl-compat QuickCheck text
+         transformers transformers-compat unix unix-bytestring
+       ];
+       homepage = "https://github.com/dhess/hpio";
+       description = "Monads for GPIO in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hplayground" = callPackage
     ({ mkDerivation, base, containers, data-default, haste-compiler
      , haste-perch, monads-tf, transformers
@@ -122423,8 +122743,8 @@ self: {
      }:
      mkDerivation {
        pname = "hquantlib";
-       version = "0.0.2.5";
-       sha256 = "6063f698be72203b6d9517756098169af3e5a3d45d229ad1d88f2105979004d9";
+       version = "0.0.3.0";
+       sha256 = "14ef306cc8f2e45302cdfbaf0aff70f6391bce69867119427b6d9eea9ea277a6";
        libraryHaskellDepends = [
          base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random
          parallel statistics time vector vector-algorithms
@@ -122433,7 +122753,6 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "http://github.com/paulrzcz/hquantlib.git";
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
@@ -132017,8 +132336,8 @@ self: {
      }:
      mkDerivation {
        pname = "hylogen";
-       version = "0.1.3.1";
-       sha256 = "1937f59b1b32196c898cec3c3d3e5cb95a6fdb59075d0b7e8c720c0db8a22e3c";
+       version = "0.1.3.2";
+       sha256 = "6f6617a9a5f5a692a0a4eaa50a9ee7540e95992dcd6d8d06c8107e39f748e193";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base data-reify vector-space ];
@@ -132026,7 +132345,6 @@ self: {
          aeson base bytestring filepath fsnotify hint http-types process
          text wai warp websockets
        ];
-       jailbreak = true;
        homepage = "https://github.com/sleexyz/hylogen";
        description = "an EDSL for live-coding fragment shaders";
        license = stdenv.lib.licenses.mit;
@@ -134169,18 +134487,17 @@ self: {
 
   "imagemagick" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, imagemagick
-     , lifted-base, MonadCatchIO-transformers, QuickCheck, resourcet
-     , tasty, tasty-hunit, text, transformers, vector
+     , lifted-base, QuickCheck, resourcet, tasty, tasty-hunit, text
+     , transformers, vector
      }:
      mkDerivation {
        pname = "imagemagick";
-       version = "0.0.4.1";
-       sha256 = "a395fa54e4aa3edca9961f062345247e925e841206c1826e58b31e255062c6ea";
+       version = "0.0.4.2";
+       sha256 = "1956fd48139c43e73528c358021595c1b867abb6fba8bc0334770f74d4089178";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring filepath MonadCatchIO-transformers resourcet text
-         transformers vector
+         base bytestring filepath resourcet text transformers vector
        ];
        libraryPkgconfigDepends = [ imagemagick ];
        executablePkgconfigDepends = [ imagemagick ];
@@ -134189,7 +134506,6 @@ self: {
          tasty tasty-hunit text transformers vector
        ];
        testPkgconfigDepends = [ imagemagick ];
-       jailbreak = true;
        description = "bindings to imagemagick library";
        license = "unknown";
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
@@ -135915,8 +136231,8 @@ self: {
      }:
      mkDerivation {
        pname = "intero";
-       version = "0.1.13";
-       sha256 = "4b59667057afed0e2b9557ab7eedc64597c39a3bc5e18524e4c0578a5320af87";
+       version = "0.1.14";
+       sha256 = "1719348eabd877c95461c5709d9033460495245212529c211046a652c7cf4b2e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -136058,13 +136374,12 @@ self: {
      }:
      mkDerivation {
        pname = "interruptible";
-       version = "0.1.1.0";
-       sha256 = "68fbb16e5044eca8c5cd1f6a365e60ce11f8f3621dadf47f7be3a6b843c34264";
+       version = "0.1.1.1";
+       sha256 = "d3ef92f178d03041edc7845dd3c3ac90a3e5c6b74b5ca1bca65246ac90af1e5c";
        libraryHaskellDepends = [
          base either lifted-base monad-control transformers
        ];
        testHaskellDepends = [ base Cabal either transformers ];
-       jailbreak = true;
        homepage = "https://sealgram.com/git/haskell/interruptible/";
        description = "Monad transformers that can be run and resumed later, conserving their context";
        license = stdenv.lib.licenses.bsd3;
@@ -141109,7 +141424,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "katip-elasticsearch" = callPackage
+  "katip-elasticsearch_0_2_0_0" = callPackage
     ({ mkDerivation, aeson, async, base, bloodhound, containers
      , enclosed-exceptions, exceptions, http-client, http-types, katip
      , lens, lens-aeson, quickcheck-instances, random, retry, scientific
@@ -141134,6 +141449,32 @@ self: {
        doCheck = false;
        description = "ElasticSearch scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "katip-elasticsearch" = callPackage
+    ({ mkDerivation, aeson, async, base, bloodhound, containers
+     , enclosed-exceptions, exceptions, http-client, http-types, katip
+     , lens, lens-aeson, quickcheck-instances, retry, scientific, stm
+     , stm-chans, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "katip-elasticsearch";
+       version = "0.2.1.0";
+       sha256 = "e00a3d10cf1b7ed9f2f4346c59a992bc5955d1da90d4cc93f9edacc56ccce984";
+       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
+       ];
+       description = "ElasticSearch scribe for the Katip logging framework";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
@@ -156788,6 +157129,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-platform_0_3_1_1" = callPackage
+    ({ mkDerivation, base, hashable, microlens, microlens-ghc
+     , microlens-mtl, microlens-th, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-platform";
+       version = "0.3.1.1";
+       sha256 = "d8588d11159c4400cfffda7979a3beb9b259740e0ce40580183a825eab724b27";
+       libraryHaskellDepends = [
+         base hashable microlens microlens-ghc microlens-mtl microlens-th
+         text unordered-containers vector
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "Feature-complete microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-th_0_2_1_0" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
@@ -160161,7 +160520,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "monads-tf" = callPackage
+  "monads-tf_0_1_0_2" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "monads-tf";
@@ -160171,6 +160530,18 @@ self: {
        jailbreak = true;
        description = "Monad classes, using type families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "monads-tf" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "monads-tf";
+       version = "0.1.0.3";
+       sha256 = "249dd2aa55c4dd6530f1e49f6b052ec91bc590ecfef2bd24c58837a3f8d4b0f1";
+       libraryHaskellDepends = [ base transformers ];
+       description = "Monad classes, using type families";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "monadtransform" = callPackage
@@ -160801,6 +161172,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monoid-extras_0_4_1" = callPackage
+    ({ mkDerivation, base, groups, semigroupoids, semigroups }:
+     mkDerivation {
+       pname = "monoid-extras";
+       version = "0.4.1";
+       sha256 = "8c50d24f25f4e10e54d719aedf72afc8d4f0d438afe9d3a757422d5cb9c2e33a";
+       libraryHaskellDepends = [ base groups semigroupoids semigroups ];
+       description = "Various extra monoid-related definitions and utilities";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoid-owns" = callPackage
     ({ mkDerivation, base, bytestring, containers }:
      mkDerivation {
@@ -164640,8 +165023,8 @@ self: {
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "7.1.0.1";
-       sha256 = "92da6c57328e531072e17ea8ae5ff9bd2752fef57f74a151d263c79e30d38c80";
+       version = "7.1.1";
+       sha256 = "d6f8411ec298909e93abfc37748fb9579d4cc346edd4287a434f4fcd8ddccf02";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -166579,16 +166962,14 @@ self: {
 
   "neural" = callPackage
     ({ mkDerivation, ad, array, attoparsec, base, deepseq, directory
-     , doctest, filepath, ghc-typelits-natnormalise, hspec, lens
+     , doctest, filepath, ghc-typelits-natnormalise, Glob, hspec, lens
      , MonadRandom, mtl, parallel, pipes, profunctors, STMonadTrans
      , text, transformers, typelits-witnesses, vector
      }:
      mkDerivation {
        pname = "neural";
-       version = "0.1.0.1";
-       sha256 = "989012480140e35465b6338fc77d8646e7409277a58b60d31d3aed1a11ff1b57";
-       revision = "1";
-       editedCabalFile = "cad6cae5570a2d79091662e8b2be4cec5488ed88ba10e8960dbe00eef13543f8";
+       version = "0.1.1.0";
+       sha256 = "222ef9b9feaaf5fcd4577e60c18d9a2cf9feed9dbdbe8f63d997b9b5a7f435c6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -166597,7 +166978,7 @@ self: {
          text transformers typelits-witnesses vector
        ];
        executableHaskellDepends = [ attoparsec base MonadRandom text ];
-       testHaskellDepends = [ base doctest hspec MonadRandom ];
+       testHaskellDepends = [ base doctest Glob hspec MonadRandom ];
        jailbreak = true;
        homepage = "https://github.com/brunjlar/neural";
        description = "Neural Networks in native Haskell";
@@ -167341,19 +167722,17 @@ self: {
      }) {};
 
   "not-gloss" = callPackage
-    ({ mkDerivation, base, binary, bmp, bytestring, cereal, GLUT
-     , OpenGL, OpenGLRaw, spatial-math, time, vector
-     , vector-binary-instances
+    ({ mkDerivation, base, binary, bmp, bytestring, GLUT, OpenGL
+     , OpenGLRaw, spatial-math, time, vector, vector-binary-instances
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.6.5";
-       sha256 = "2d035f7086cdf09542010b98881feb4aeb9e4eaddb9e3d28292d20fe3984e804";
+       version = "0.7.7.0";
+       sha256 = "4740d1ee04015bca98092f72c11414326d1bd08473aead61f6678773fb8b835f";
        libraryHaskellDepends = [
-         base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
-         spatial-math time vector vector-binary-instances
+         base binary bmp bytestring GLUT OpenGL OpenGLRaw spatial-math time
+         vector vector-binary-instances
        ];
-       jailbreak = true;
        description = "Painless 3D graphics, no affiliation with gloss";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168348,6 +168727,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "octane_0_7_0" = callPackage
+    ({ mkDerivation, aeson, autoexporter, base, bimap, binary
+     , binary-bits, bytestring, containers, data-binary-ieee754, deepseq
+     , tasty, tasty-hspec, text
+     }:
+     mkDerivation {
+       pname = "octane";
+       version = "0.7.0";
+       sha256 = "3a257d55d375d959ecb8965c0c89a1b9259eba1befd3a0736727f96dcce5657d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson autoexporter base bimap binary binary-bits bytestring
+         containers data-binary-ieee754 deepseq text
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base binary bytestring containers tasty tasty-hspec
+       ];
+       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
@@ -173029,6 +173433,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parseargs_0_2_0_7" = callPackage
+    ({ mkDerivation, base, containers, process }:
+     mkDerivation {
+       pname = "parseargs";
+       version = "0.2.0.7";
+       sha256 = "900eaca47e0ddbdadf137377f1eb6b16b69eabed54ce45a4c22b176ba8ddb45d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base process ];
+       homepage = "http://github.com/BartMassey/parseargs";
+       description = "Full-featured command-line argument parsing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "parsec_3_1_7" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, mtl, test-framework
      , test-framework-hunit, text
@@ -177416,8 +177837,8 @@ self: {
      }:
      mkDerivation {
        pname = "pgdl";
-       version = "9.3";
-       sha256 = "3c759fcc0548fdbfb7d39cff40dde1bd47c16aa5ee2765fcd3716954ff04c85a";
+       version = "10.0";
+       sha256 = "be71f949ba02b8ef5b094527346a9a9202cf2e50f2801cac0f70aa5ee57458c3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -184811,7 +185232,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) alsaLib;};
 
-  "protobuf" = callPackage
+  "protobuf_0_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers
      , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged
      , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
@@ -184831,6 +185252,29 @@ self: {
        homepage = "https://github.com/alphaHeavy/protobuf";
        description = "Google Protocol Buffers via GHC.Generics";
        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
+     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "protobuf";
+       version = "0.2.1.1";
+       sha256 = "cd659a085b670d204c0b4ddf0cb323e4f024c9d972cf183dc14154a44d5e722c";
+       libraryHaskellDepends = [
+         base base-orphans bytestring cereal data-binary-ieee754 deepseq mtl
+         text unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring cereal containers hex HUnit mtl QuickCheck tagged
+         tasty tasty-hunit tasty-quickcheck text unordered-containers
+       ];
+       homepage = "https://github.com/alphaHeavy/protobuf";
+       description = "Google Protocol Buffers via GHC.Generics";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
@@ -188703,8 +189147,8 @@ self: {
     ({ mkDerivation, async, base, containers, foreign-store, stm }:
      mkDerivation {
        pname = "rapid";
-       version = "0.1.0";
-       sha256 = "1839228f3c617a92799f84a8337fcec6df511377bf555b79b67b47cea17d83c5";
+       version = "0.1.1";
+       sha256 = "f1df04a5820b77896475df4de1e3f10ecee871f8e4227809727855b8d0404825";
        libraryHaskellDepends = [
          async base containers foreign-store stm
        ];
@@ -197570,7 +198014,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "sandi" = callPackage
+  "sandi_0_3_6" = callPackage
     ({ mkDerivation, base, bytestring, conduit, exceptions, HUnit
      , tasty, tasty-hunit, tasty-quickcheck, tasty-th
      }:
@@ -197586,6 +198030,26 @@ self: {
        homepage = "http://hackage.haskell.org/package/sandi";
        description = "Data encoding library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "sandi" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, exceptions, HUnit
+     , stringsearch, tasty, tasty-hunit, tasty-quickcheck, tasty-th
+     }:
+     mkDerivation {
+       pname = "sandi";
+       version = "0.4.0";
+       sha256 = "40c895a4b26904e3a4b4488e93f37225bdb48e6787dffed627d16242f01aaeea";
+       libraryHaskellDepends = [
+         base bytestring conduit exceptions stringsearch
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
+       ];
+       homepage = "http://hackage.haskell.org/package/sandi";
+       description = "Data encoding library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "sandlib" = callPackage
@@ -204911,23 +205375,38 @@ self: {
      }) {};
 
   "shellmate" = callPackage
-    ({ mkDerivation, base, bytestring, directory, feed, filepath, HTTP
-     , network-uri, process, tagsoup, temporary, transformers, xml
+    ({ mkDerivation, base, bytestring, directory, filepath, process
+     , temporary, transformers
      }:
      mkDerivation {
        pname = "shellmate";
-       version = "0.2.3";
-       sha256 = "a1769617a819289400a8be95a967d8873d196aad4f696396016ea4f7f65cdf65";
+       version = "0.3";
+       sha256 = "6d79053eeb3bbff4cd5c35da1f9c6962e4af56efacb5383c7a5fc02312e97348";
        libraryHaskellDepends = [
-         base bytestring directory feed filepath HTTP network-uri process
-         tagsoup temporary transformers xml
+         base bytestring directory filepath process temporary transformers
        ];
        jailbreak = true;
-       homepage = "http://github.com/valderman/shellmate";
+       homepage = "https://github.com/valderman/shellmate";
        description = "Simple interface for shell scripting in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shellmate-extras" = callPackage
+    ({ mkDerivation, base, bytestring, feed, HTTP, network-uri
+     , shellmate, tagsoup, xml
+     }:
+     mkDerivation {
+       pname = "shellmate-extras";
+       version = "0.3";
+       sha256 = "a04254b00c39cfe7260d535b4a525e4072dc6b4d857165dc16c9cd4a101a08d8";
+       libraryHaskellDepends = [
+         base bytestring feed HTTP network-uri shellmate tagsoup xml
+       ];
+       homepage = "https://github.com/valderman/shellmate";
+       description = "Extra functionality for shellmate";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "shelltestrunner" = callPackage
     ({ mkDerivation, base, cmdargs, Diff, directory, filemanip
      , filepath, HUnit, parsec, pretty-show, process, regex-tdfa, safe
@@ -213079,7 +213558,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stack-run-auto" = callPackage
+  "stack-run-auto_0_1_1_2" = callPackage
     ({ mkDerivation, async, base, extract-dependencies, file-modules
      , lens, lens-aeson, MissingH, process, stm-containers, text, time
      , wreq
@@ -213105,9 +213584,10 @@ self: {
        homepage = "http://github.com/yamadapc/stack-run-auto#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stack-run-auto_0_1_1_4" = callPackage
+  "stack-run-auto" = callPackage
     ({ mkDerivation, async, base, directory, extract-dependencies
      , file-modules, filepath, lens, lens-aeson, MissingH, process
      , stm-containers, text, time, wreq
@@ -213133,7 +213613,6 @@ self: {
        homepage = "http://github.com/yamadapc/stack-run-auto#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage_0_3_1" = callPackage
@@ -214383,7 +214862,6 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector vector-algorithms
        ];
-       doHaddock = false;
        doCheck = false;
        homepage = "https://github.com/bos/statistics";
        description = "A library of statistical types, data, and functions";
@@ -215698,13 +216176,15 @@ self: {
 
   "stratux" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
-     , stratux-types, stratux-websockets, template-haskell
+     , stratux-http, stratux-types, stratux-websockets, template-haskell
      }:
      mkDerivation {
        pname = "stratux";
-       version = "0.0.3";
-       sha256 = "3eb06fd679aee8e4ee2bfa7e77550756811c182c9311b51c494927ddb63aed1c";
-       libraryHaskellDepends = [ base stratux-types stratux-websockets ];
+       version = "0.0.5";
+       sha256 = "ff2386fdbd47ad6bfbd56e970d551ae12277beeacb870432997cd89685263994";
+       libraryHaskellDepends = [
+         base stratux-http stratux-types stratux-websockets
+       ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
@@ -215714,14 +216194,33 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "stratux-http" = callPackage
+    ({ mkDerivation, aeson, base, directory, doctest, either, filepath
+     , HTTP, network-uri, QuickCheck, stratux-types, template-haskell
+     }:
+     mkDerivation {
+       pname = "stratux-http";
+       version = "0.0.5";
+       sha256 = "5d9e9cac0854cb65e12136ac5aee32c77e659a855e9d0f0c513509479ea84901";
+       libraryHaskellDepends = [
+         aeson base either HTTP network-uri stratux-types
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/tonymorris/stratux-http";
+       description = "A library for using HTTP with stratux";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stratux-types" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath, lens, QuickCheck, scientific, template-haskell, time
      }:
      mkDerivation {
        pname = "stratux-types";
-       version = "0.0.3";
-       sha256 = "4ccaf05dfd7b70a1dd5032c99e68a01c0af77f1c4537aa2c1a68dc18501cbe84";
+       version = "0.0.5";
+       sha256 = "a710cb04c9b5e471ba3350c18ab98bf4a2a50a047c6c5e9c5096d45adf8e6266";
        libraryHaskellDepends = [
          aeson base bytestring lens scientific time
        ];
@@ -215729,7 +216228,7 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/tonymorris/stratux-types";
-       description = "A library for stratux";
+       description = "A library for reading JSON output from stratux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
@@ -215741,8 +216240,8 @@ self: {
      }:
      mkDerivation {
        pname = "stratux-websockets";
-       version = "0.0.3";
-       sha256 = "94cb21267cc6c34977a28baa2413510ebf2c0babb55a682c515565453a90f35c";
+       version = "0.0.4";
+       sha256 = "1b3e73f423aa4415607a59a31b3cdb1c512475b3db2f0b0a99d4b18f31e89516";
        libraryHaskellDepends = [
          aeson base either network stratux-types text transformers
          websockets
@@ -220631,6 +221130,45 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "tak" = callPackage
+    ({ mkDerivation, base, bytestring, hashable, hslogger, HUnit
+     , matrix, network, parsec, random-shuffle, safe
+     }:
+     mkDerivation {
+       pname = "tak";
+       version = "0.1.0.0";
+       sha256 = "39253006641e6057105c42097701df1173f01302757b2d8f4980612c97397dd9";
+       libraryHaskellDepends = [
+         base bytestring hashable hslogger matrix network parsec
+         random-shuffle safe
+       ];
+       testHaskellDepends = [
+         base bytestring hashable hslogger HUnit matrix network parsec
+         random-shuffle safe
+       ];
+       homepage = "http://bitbucket.org/sffubs/tak";
+       description = "A library encoding the rules of Tak, and a playtak.com client.";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
+  "tak-ai" = callPackage
+    ({ mkDerivation, base, HUnit, matrix, parsec, random-shuffle, tak
+     }:
+     mkDerivation {
+       pname = "tak-ai";
+       version = "0.1.0.1";
+       sha256 = "66fcc335e1cb639dc1c5a66f71e5a272d5e5c841d88056cce55cf22ccd8364c7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base random-shuffle tak ];
+       testHaskellDepends = [
+         base HUnit matrix parsec random-shuffle tak
+       ];
+       homepage = "http://bitbucket.org/sffubs/tak";
+       description = "AI(s) for playing Tak on playtak.com";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "takahashi" = callPackage
     ({ mkDerivation, base, lens, monad-skeleton, mtl }:
      mkDerivation {
@@ -221224,7 +221762,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-expected-failure" = callPackage
+  "tasty-expected-failure_0_11_0_3" = callPackage
     ({ mkDerivation, base, tagged, tasty }:
      mkDerivation {
        pname = "tasty-expected-failure";
@@ -221235,6 +221773,19 @@ self: {
        homepage = "http://github.com/nomeata/tasty-expected-failure";
        description = "Mark tasty tests as failure expected";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tasty-expected-failure" = callPackage
+    ({ mkDerivation, base, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-expected-failure";
+       version = "0.11.0.4";
+       sha256 = "41ed5a34e250ee5dc78daf93aa02a25d751b2c6423302faf49f28986822ba564";
+       libraryHaskellDepends = [ base tagged tasty ];
+       homepage = "http://github.com/nomeata/tasty-expected-failure";
+       description = "Mark tasty tests as failure expected";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "tasty-fail-fast" = callPackage
@@ -225557,8 +226108,8 @@ self: {
      }:
      mkDerivation {
        pname = "themoviedb";
-       version = "1.1.1.0";
-       sha256 = "a8999895fdf594720cdce1661cc093c978d72cf4377fbc26eae756fbe182a9a0";
+       version = "1.1.2.0";
+       sha256 = "c4dc8038b004f192854c5e8341c8cc4637f6c9d340a76e77f9e36ee412a7eb88";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -228235,11 +228786,11 @@ self: {
      }:
      mkDerivation {
        pname = "tpdb";
-       version = "1.2.0";
-       sha256 = "60553cf6424b839b79331516056b5ea3cc61f6fc22e2d1c2c1035889ae51848a";
+       version = "1.3.2";
+       sha256 = "eb54039be2a2bc45f1018e7f2531118d69b96abdfeb91e61ced4e597e3730409";
        libraryHaskellDepends = [
-         base containers filepath hashable HaXml hxt mtl parsec text time
-         wl-pprint-text
+         base bytestring containers filepath hashable HaXml hxt mtl parsec
+         text time wl-pprint-text
        ];
        testHaskellDepends = [ base bytestring HaXml pretty ];
        homepage = "https://github.com/jwaldmann/haskell-tpdb";
@@ -230736,7 +231287,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "twitter-feed" = callPackage
+  "twitter-feed_0_2_0_6" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
      , containers, http-conduit, HUnit, test-framework
      , test-framework-hunit
@@ -230754,6 +231305,27 @@ self: {
        homepage = "https://github.com/stackbuilders/twitter-feed";
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "twitter-feed" = callPackage
+    ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
+     , containers, http-conduit, HUnit, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "twitter-feed";
+       version = "0.2.0.7";
+       sha256 = "031cafcb9685b1f3f677f9a168b72831f85df43e49a74cc9e89d3d7218e15d95";
+       libraryHaskellDepends = [
+         aeson authenticate-oauth base bytestring http-conduit
+       ];
+       testHaskellDepends = [
+         base containers HUnit test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/stackbuilders/twitter-feed";
+       description = "Client for fetching Twitter timeline via Oauth";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "twitter-types_0_7_1_1" = callPackage
@@ -233559,6 +234131,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unordered-containers_0_2_7_1" = callPackage
+    ({ mkDerivation, base, ChasingBottoms, containers, deepseq
+     , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "unordered-containers";
+       version = "0.2.7.1";
+       sha256 = "2f9277f1d61c409775835f094c031fbb5462dd564d639f4f1357ee086fc4d702";
+       libraryHaskellDepends = [ base deepseq hashable ];
+       testHaskellDepends = [
+         base ChasingBottoms containers hashable HUnit QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/tibbe/unordered-containers";
+       description = "Efficient hashing-based container types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unordered-containers-rematch" = callPackage
     ({ mkDerivation, base, hashable, hspec, HUnit, rematch
      , unordered-containers
@@ -243070,6 +243662,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "web-plugins_0_2_9" = callPackage
+    ({ mkDerivation, base, containers, mtl, stm, text }:
+     mkDerivation {
+       pname = "web-plugins";
+       version = "0.2.9";
+       sha256 = "e63bfd7f666b40c7ff962a070c64dc5bef4a5c490af745fa7ee8f964284a7a50";
+       libraryHaskellDepends = [ base containers mtl stm text ];
+       homepage = "https://github.com/clckwrks/web-plugins";
+       description = "dynamic plugin system for web applications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "web-routes" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, exceptions
      , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck
@@ -243089,7 +243694,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "web-routes-boomerang" = callPackage
+  "web-routes-boomerang_0_28_4" = callPackage
     ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }:
      mkDerivation {
        pname = "web-routes-boomerang";
@@ -243100,6 +243705,20 @@ self: {
        ];
        description = "Library for maintaining correctness and composability of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "web-routes-boomerang" = callPackage
+    ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }:
+     mkDerivation {
+       pname = "web-routes-boomerang";
+       version = "0.28.4.2";
+       sha256 = "7ea892cd6e8c25e4adabf999d2332248a7b458662479a28a812bafd8dd2b7827";
+       libraryHaskellDepends = [
+         base boomerang mtl parsec text web-routes
+       ];
+       description = "Use boomerang for type-safe URL parsers/printers";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
@@ -247320,7 +247939,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xlsx" = callPackage
+  "xlsx_0_2_1_2" = callPackage
     ({ mkDerivation, base, binary-search, bytestring, conduit
      , containers, data-default, digest, HUnit, lens, mtl, old-locale
      , smallcheck, tasty, tasty-hunit, tasty-smallcheck, text, time
@@ -247350,6 +247969,52 @@ 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" = callPackage
+    ({ mkDerivation, base, base64-bytestring, binary-search, bytestring
+     , conduit, containers, data-default, extra, filepath, HUnit, lens
+     , mtl, network-uri, old-locale, raw-strings-qq, safe, smallcheck
+     , tasty, tasty-hunit, tasty-smallcheck, text, time, transformers
+     , unordered-containers, vector, xml-conduit, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "xlsx";
+       version = "0.2.2.1";
+       sha256 = "74f376f7071ea7171dc505fc09c71f63d2364631b9562e039c61b897a1350a65";
+       libraryHaskellDepends = [
+         base base64-bytestring binary-search bytestring conduit containers
+         data-default extra filepath lens mtl network-uri old-locale safe
+         text time transformers unordered-containers vector xml-conduit
+         zip-archive zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers HUnit lens raw-strings-qq smallcheck
+         tasty tasty-hunit tasty-smallcheck time unordered-containers vector
+         xml-conduit
+       ];
+       homepage = "https://github.com/qrilka/xlsx";
+       description = "Simple and incomplete Excel file parser/writer";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "xlsx-tabular_0_1_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, data-default
+     , lens, text, xlsx
+     }:
+     mkDerivation {
+       pname = "xlsx-tabular";
+       version = "0.1.0.0";
+       sha256 = "fe472e9fcac1d47f8d325a24a219ac54ff2471cbaeb071aef81b14300ecf9276";
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default lens text xlsx
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/kkazuo/xlsx-tabular#readme";
+       description = "Xlsx table decode utility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-tabular" = callPackage
@@ -247358,8 +248023,8 @@ self: {
      }:
      mkDerivation {
        pname = "xlsx-tabular";
-       version = "0.1.0.0";
-       sha256 = "fe472e9fcac1d47f8d325a24a219ac54ff2471cbaeb071aef81b14300ecf9276";
+       version = "0.1.0.1";
+       sha256 = "29efb942a99bd0afe4ffda1856a51354b9ffa44253574b307f51bb2f05cf539a";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default lens text xlsx
        ];
@@ -248433,8 +249098,8 @@ self: {
 
   "xmobar" = callPackage
     ({ mkDerivation, alsa-core, alsa-mixer, base, bytestring
-     , containers, dbus, directory, filepath, hinotify, HTTP, libXpm
-     , libXrandr, libXrender, mtl, old-locale, parsec, process
+     , containers, dbus, directory, filepath, hinotify, HTTP, libmpd
+     , libXpm, libXrandr, libXrender, mtl, old-locale, parsec, process
      , regex-compat, stm, time, timezone-olson, timezone-series
      , transformers, unix, utf8-string, wirelesstools, X11, X11-xft
      }:
@@ -248442,18 +249107,14 @@ self: {
        pname = "xmobar";
        version = "0.23.1";
        sha256 = "3b31558373bdb8561f06440da902dd0db8398e5c774fa027931785c263f5567a";
-       configureFlags = [
-         "-fwith_alsa" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify"
-         "-fwith_iwlib" "-f-with_mpd" "-fwith_mpris" "-fwith_threaded"
-         "-fwith_utf8" "-fwith_xft" "-fwith_xpm"
-       ];
+       configureFlags = [ "-fall_extensions" ];
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          alsa-core alsa-mixer base bytestring containers dbus directory
-         filepath hinotify HTTP mtl old-locale parsec process regex-compat
-         stm time timezone-olson timezone-series transformers unix
-         utf8-string X11 X11-xft
+         filepath hinotify HTTP libmpd mtl old-locale parsec process
+         regex-compat stm time timezone-olson timezone-series transformers
+         unix utf8-string X11 X11-xft
        ];
        executableSystemDepends = [
          libXpm libXrandr libXrender wirelesstools
@@ -249603,6 +250264,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_8_17_2" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
+     , bytestring, conduit, containers, directory, enclosed-exceptions
+     , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
+     , semigroups, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.8.17.2";
+       sha256 = "b2008ad273ea424414817fe703f507464e6124393959370f371decd92663f18a";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         enclosed-exceptions filepath resourcet scientific semigroups text
+         transformers unordered-containers vector
+       ];
+       libraryPkgconfigDepends = [ libyaml ];
+       executableHaskellDepends = [ aeson base bytestring ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat bytestring conduit hspec HUnit
+         mockery resourcet text transformers unordered-containers vector
+       ];
+       homepage = "http://github.com/snoyberg/yaml/";
+       description = "Support for parsing and rendering YAML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libyaml;};
+
   "yaml-config" = callPackage
     ({ mkDerivation, base, deepseq, hashable, QuickCheck, tasty
      , tasty-quickcheck, text, unordered-containers, yaml
@@ -251535,7 +252226,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-auth-oauth2" = callPackage
+  "yesod-auth-oauth2_0_1_8" = callPackage
     ({ mkDerivation, aeson, authenticate, base, bytestring, containers
      , hoauth2, hspec, http-client, http-conduit, http-types
      , lifted-base, load-env, network-uri, random, text, transformers
@@ -251560,6 +252251,33 @@ self: {
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
        description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-auth-oauth2" = callPackage
+    ({ 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";
+       version = "0.1.9";
+       sha256 = "719152c20799024acf4c1ec9c91cb97cf44a2d371223672a75c705a06d12081c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson authenticate base bytestring hoauth2 http-client http-conduit
+         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";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "yesod-auth-pam" = callPackage
@@ -256252,7 +256970,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yi" = callPackage
+  "yi_0_12_5" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , data-default, directory, dlist, dynamic-state, dyre, exceptions
      , filepath, glib, gtk, hashable, hint, HUnit, lens, mtl, old-locale
@@ -256286,6 +257004,43 @@ self: {
        homepage = "https://yi-editor.github.io";
        description = "The Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yi" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
+     , data-default, directory, dlist, dynamic-state, dyre, exceptions
+     , filepath, glib, gtk, hashable, Hclip, hint, HUnit, lens, mtl
+     , old-locale, oo-prototypes, pango, parsec, pointedlist, process
+     , QuickCheck, random, safe, semigroups, split, stm, tasty
+     , tasty-hunit, tasty-quickcheck, template-haskell, text, text-icu
+     , time, transformers-base, unix, unix-compat, unordered-containers
+     , vty, word-trie, xdg-basedir, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi";
+       version = "0.12.6";
+       sha256 = "886bbac8634a251d9872fbcc47350df3e84cf881e42cb7408d1a1e92614205d8";
+       configureFlags = [ "-fpango" "-fvty" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring Cabal containers data-default
+         directory dlist dynamic-state dyre exceptions filepath glib gtk
+         hashable Hclip hint lens mtl old-locale oo-prototypes pango parsec
+         pointedlist process QuickCheck random safe semigroups split stm
+         template-haskell text text-icu time transformers-base unix
+         unix-compat unordered-containers vty word-trie xdg-basedir
+         yi-language yi-rope
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory filepath HUnit lens QuickCheck semigroups tasty
+         tasty-hunit tasty-quickcheck text yi-language yi-rope
+       ];
+       homepage = "https://yi-editor.github.io";
+       description = "The Haskell-Scriptable Editor";
+       license = stdenv.lib.licenses.gpl2;
      }) {};
 
   "yi-contrib" = callPackage

From 7914242b377b35dabcf8c38150d005bc7e5b3199 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 9 Jun 2016 16:50:36 +0200
Subject: [PATCH 140/436] haskell-timezone-series: fix build with GHC 8.0.1

 - Fix the incorrect sha256 hash of the patch.
 - Apply the patch only when compiling with GHC 8.0.x.
---
 pkgs/development/haskell-modules/configuration-common.nix  | 4 ----
 .../haskell-modules/configuration-ghc-8.0.x.nix            | 7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6092ec5a7d3a..c9e38e1e17c7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1041,8 +1041,4 @@ self: super: {
     '';
   }));
 
-  timezone-series = appendPatch super.timezone-series (pkgs.fetchpatch {
-    url = "https://github.com/ryantrinkle/timezone-series/commit/f8dece8c016db6476e2bb0d4f972769a76f6ff40.patch";
-    sha256 = "02sgciica2pzaal7wwp36v6iybr1hjypda0zljxylnq0qs8bizhy";
-  });
 }
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 c11381a96039..530e62047b98 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -62,4 +62,11 @@ self: super: {
       sha256 = "1i45196qrzlhgbisnvkzni4n54saky0i1kyla162xcb5cg3kf2ji";
     };
   });
+
+  # https://github.com/ygale/timezone-series/issues/2
+  timezone-series = appendPatch super.timezone-series (pkgs.fetchpatch {
+    url = "https://github.com/ryantrinkle/timezone-series/commit/f8dece8c016db6476e2bb0d4f972769a76f6ff40.patch";
+    sha256 = "01wxhknsnn7lyl9v8viz7m5zhmyi3bqpbva7d3dx1dxn0nmkfh6a";
+  });
+
 }

From bcd46a3d9b71d1d57d6ddb3d2822bca7c74f353a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 9 Jun 2016 15:45:27 +0200
Subject: [PATCH 141/436] haskell-cryptol: switch to LTS package set to fix the
 build

---
 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 29453441c562..f15e00f70e80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4196,7 +4196,7 @@ in
     ocamlPackages = ocamlPackages_4_02;
   });
 
-  cryptol = self.haskellPackages.cryptol;
+  cryptol = self.haskell.packages.lts.cryptol;
 
   cython = pythonPackages.cython;
   cython3 = python3Packages.cython;

From 3a4ff5fc7e91bd0c26d2622aa6884df49027e0d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 9 Jun 2016 15:45:56 +0200
Subject: [PATCH 142/436] haskell-darcs: switch to LTS package set to fix the
 build

---
 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 f15e00f70e80..882377cf3b1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12181,7 +12181,7 @@ in
 
   d4x = callPackage ../applications/misc/d4x { };
 
-  darcs = haskell.lib.overrideCabal self.haskellPackages.darcs (drv: {
+  darcs = haskell.lib.overrideCabal self.haskell.packages.lts.darcs (drv: {
     configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];
     enableSharedExecutables = false;
     enableSharedLibraries = false;

From 6e709b180e83c275f49ba0520e598509c2827abe Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Thu, 9 Jun 2016 22:09:07 +0200
Subject: [PATCH 143/436] storebrowse: mark broken

`storebrowse` depends on https://code.google.com/archive/p/gosqlite/
which leads to gosqlite.googlecode.com/hg/sqlite which now 404s.
---
 pkgs/tools/system/storebrowse/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix
index aa510a28c231..40332f7b0d44 100644
--- a/pkgs/tools/system/storebrowse/default.nix
+++ b/pkgs/tools/system/storebrowse/default.nix
@@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://viric.name/cgi-bin/storebrowse;
     license = stdenv.lib.licenses.agpl3Plus;
+    broken = true;
   };
 }

From b89d4a3a61fe4a7d70c18336e18411da1bdc5b84 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <gopinath@eecs.oregonstate.edu>
Date: Thu, 9 Jun 2016 13:32:44 -0700
Subject: [PATCH 144/436] unicon: init at 11.7

Unicon is a very high level goal-directed, object-oriented, general purpose
applications language
---
 .../interpreters/unicon-lang/default.nix      | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/interpreters/unicon-lang/default.nix

diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix
new file mode 100644
index 000000000000..7487aa633131
--- /dev/null
+++ b/pkgs/development/interpreters/unicon-lang/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, unzip, gdbm, libX11, libXt }:
+
+stdenv.mkDerivation rec {
+  name = "unicon-lang-${version}";
+  version = "11.7";
+  src = fetchurl {
+    url = "http://unicon.org/dist/uni-2-4-2010.zip";
+    sha256 = "1g9l2dfp99dqih2ir2limqfjgagh3v9aqly6x0l3qavx3qkkwf61";
+  };
+  buildInputs = [ libX11 libXt unzip ];
+
+  sourceRoot = ".";
+
+  configurePhase = ''
+    case "$(uname -a | sed 's/ /_/g')" in
+    Darwin*Version_9*i386) sys=intel_macos;;
+    Linux*x86_64*) sys=amd64_linux;;
+    Linux*i686*) sys=intel_linux;;
+    *) sys=unknown;;
+    esac
+    echo "all: ; echo" >  uni/3d/makefile
+    make X-Configure name=$sys
+  '';
+
+  buildPhase = ''
+    make Unicon
+  '';
+
+  installPhase = ''
+    mkdir -p $out/
+    cp -r bin $out/
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''A very high level, goal-directed, object-oriented, general purpose applications language'';
+    maintainers = with maintainers; [ vrthra ];
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    homepage = http://unicon.org;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0f815c893ac..8d6a96cbe011 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9233,6 +9233,8 @@ in
 
   unicap = callPackage ../development/libraries/unicap {};
 
+  unicon-lang = callPackage ../development/interpreters/unicon-lang {};
+
   tsocks = callPackage ../development/libraries/tsocks { };
 
   unixODBC = callPackage ../development/libraries/unixODBC { };

From 7bd515979c59fa2b5786fba2fddbca9d56c04cb1 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 9 Jun 2016 18:09:42 +0200
Subject: [PATCH 145/436] tinycc: fix paxmark call

I missed this due to testing on a checkout that didn't contain
the paxmark fix ...
---
 pkgs/development/compilers/tinycc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index 147edcb5d48a..de8044386e70 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   checkTarget = "test";
 
   postFixup = ''
-    paxmark m $out/bin/tcc
+    paxmark m $bin/bin/tcc
   '';
 
   meta = {

From 830c748ea43c470586052c8f67f948900926753a Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Thu, 9 Jun 2016 23:41:17 +0200
Subject: [PATCH 146/436] Add myself as maintainer

---
 lib/maintainers.nix            | 1 +
 pkgs/games/klavaro/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 198bb93c6be3..0516cc3b076f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -238,6 +238,7 @@
   meisternu = "Matt Miemiec <meister@krutt.org>";
   michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>";
   michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
+  mimadrid = "Miguel Madrid <mimadrid@ucm.es>";
   mingchuan = "Ming Chuan <ming@culpring.com>";
   mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
   mirrexagon = "Andrew Abbott <mirrexagon@mirrexagon.com>";
diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix
index f5970ccd2207..2ca105af19d2 100644
--- a/pkgs/games/klavaro/default.nix
+++ b/pkgs/games/klavaro/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     homepage = http://klavaro.sourceforge.net/;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.linux;
+    maintainer = [stdenv.lib.maintainers.mimadrid];
   };
 }

From 1f99f81d24f131ddc9c9b2c847aa873391e715e2 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Fri, 10 Jun 2016 00:32:35 +0200
Subject: [PATCH 147/436] vault: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 1197c840fc9a..6e956b7a7780 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "vault-${version}";
-  version = "0.5.2";
+  version = "0.5.3";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/vault";
@@ -11,6 +11,6 @@ buildGoPackage rec {
     inherit rev;
     owner = "hashicorp";
     repo = "vault";
-    sha256 = "085rk5i480wdlkn2p14yxi8zgsc11595nkkda1i77c4vjkllbkdy";
+    sha256 = "0px9l5zkvqawzsss70g58fx1anrx5zsdgxl6iplv0md111h0d87z";
   };
 }

From c1cb5ca57e4b067afaa13fd93ed1392ec84c9da2 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 10 Jun 2016 01:01:56 +0200
Subject: [PATCH 148/436] oauth2_proxy module: fix manual build

---
 .../services/security/oauth2_proxy.nix        | 43 ++++++++-----------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index aa962743f855..b149373076a6 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -77,17 +77,12 @@ let
 in
 {
   options.services.oauth2_proxy = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to run oauth2_proxy.
-      '';
-    };
+    enable = mkEnableOption "oauth2_proxy";
 
     package = mkOption {
       type = types.package;
       default = pkgs.oauth2_proxy;
+      defaultText = "pkgs.oauth2_proxy";
       description = ''
         The package that provides oauth2_proxy.
       '';
@@ -137,8 +132,8 @@ in
      type = types.listOf types.str;
      default = [];
      description = ''
-       List of regular expressions which will bypass authentication when
-       requests path's match.
+       Skip authentication for requests matching any of these regular
+       expressions.
      '';
     };
 
@@ -148,7 +143,8 @@ in
         type = types.listOf types.str;
         default = [];
         description = ''
-          Authenticate emails with the specified domains. Use * to authenticate any email.
+          Authenticate emails with the specified domains. Use
+          <literal>*</literal> to authenticate any email.
         '';
       };
 
@@ -178,7 +174,7 @@ in
       type = types.nullOr types.str;
       default = null;
       description = ''
-     	Token redemption endpoint.
+        Token redemption endpoint.
 
         You only need to set this if you are using a self-hosted provider (e.g.
         Github Enterprise). If you're using a publicly hosted provider
@@ -238,7 +234,7 @@ in
           Directory API, thus the service account needs to impersonate one of
           those users to access the Admin SDK Directory API.
 
-          See <link xlink="https://developers.google.com/admin-sdk/directory/v1/guides/delegation#delegate_domain-wide_authority_to_your_service_account" />
+          See <link xlink:href="https://developers.google.com/admin-sdk/directory/v1/guides/delegation#delegate_domain-wide_authority_to_your_service_account" />.
         '';
       };
 
@@ -282,8 +278,8 @@ in
     upstream = mkOption {
       type = types.commas;
       description = ''
-        The http url(s) of the upstream endpoint or file:// paths for static
-        files. Routing is based on the path.
+        The http url(s) of the upstream endpoint or <literal>file://</literal>
+        paths for static files. Routing is based on the path.
       '';
     };
 
@@ -395,11 +391,9 @@ in
       type = types.str;
       default = "127.0.0.1:4180";
       description = ''
-        [http://]<addr>:<port> or unix://<path> to listen on for HTTP clients.
-
-        This module does *not* expose the port by default. If you want this URL
-        to be accessible to other machines, please add the port to
-        networking.firewall.allowedTCPPorts.
+        HTTPS listening address.  This module does not expose the port by
+        default. If you want this URL to be accessible to other machines, please
+        add the port to <literal>networking.firewall.allowedTCPPorts</literal>.
       '';
     };
 
@@ -409,7 +403,7 @@ in
         default = null;
         description = ''
           Additionally authenticate against a htpasswd file. Entries must be
-          created with "htpasswd -s" for SHA encryption.
+          created with <literal>htpasswd -s</literal> for SHA encryption.
         '';
       };
 
@@ -434,7 +428,7 @@ in
       type = types.str;
       default = "/oauth2";
       description = ''
-        The url root path that this proxy should be nested under (e.g. /<oauth2>/sign_in);
+        The url root path that this proxy should be nested under.
       '';
     };
 
@@ -465,10 +459,11 @@ in
         type = types.str;
         default = ":443";
         description = ''
-          <addr>:<port> to listen on for HTTPS clients.
+          <literal>addr:port</literal> to listen on for HTTPS clients.
 
-          Remember to add <port> to allowedTCPPorts if you want other machines
-          to be able to connect to it.
+          Remember to add <literal>port</literal> to
+          <literal>allowedTCPPorts</literal> if you want other machines to be
+          able to connect to it.
         '';
       };
     };

From 42b3156b4e005aae743caee3547f700d8b77188e Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 9 Jun 2016 16:28:30 -0700
Subject: [PATCH 149/436] rkt: 1.7.0 -> 1.8.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 2440d54f6920..e602688b8cef 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -11,7 +11,7 @@ let
   stage1Flavours = [ "coreos" "fly" "host" ];
 
 in stdenv.mkDerivation rec {
-  version = "1.7.0";
+  version = "1.8.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
       rev = "v${version}";
       owner = "coreos";
       repo = "rkt";
-      sha256 = "1ds063q205p5fbahl2qqawhav1fkcvs9ynh80j8g0h9ls0bbv8j7";
+      sha256 = "0n4xjvvvkqk83npiqz13cv82lmnsqpzzyjc03lyz6svw2pdszmhd";
   };
 
   stage1BaseImage = fetchurl {

From 511565e996ff4eac7dc114eb39d6f81dba0e50bb Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 9 Jun 2016 23:21:40 +0000
Subject: [PATCH 150/436] kibana: 4.4.1 -> 4.5.1

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

diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix
index ce138014408f..ca3d33624915 100644
--- a/pkgs/development/tools/misc/kibana/default.nix
+++ b/pkgs/development/tools/misc/kibana/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "kibana-${version}";
-  version = "4.4.1";
+  version = "4.5.1";
 
   src = fetchurl {
     url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz";
-    sha256 = "0kxvrhrkcvx7pcn7myvabhcm4nj8gi86ij4a1xi392lfds2v350z";
+    sha256 = "0k9pmzx2sa3026yw29f2h2lddxdkhyn3jvdf3si8scz70ncwylj9";
   };
 
   buildInputs = [ makeWrapper ];

From 9657844db241d915f60cd0aa64d6d1c17111a7d0 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 9 Jun 2016 23:22:48 +0000
Subject: [PATCH 151/436] fluentd: 0.12.6 -> 0.14.0

---
 pkgs/tools/misc/fluentd/Gemfile.lock |  48 ++++---
 pkgs/tools/misc/fluentd/default.nix  |   2 +-
 pkgs/tools/misc/fluentd/gemset.nix   | 195 +++++++++++++--------------
 3 files changed, 118 insertions(+), 127 deletions(-)

diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock
index 4f51d365513a..581fa6e169ae 100644
--- a/pkgs/tools/misc/fluentd/Gemfile.lock
+++ b/pkgs/tools/misc/fluentd/Gemfile.lock
@@ -1,45 +1,48 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    cool.io (1.3.0)
-    elasticsearch (1.0.8)
-      elasticsearch-api (= 1.0.7)
-      elasticsearch-transport (= 1.0.7)
-    elasticsearch-api (1.0.7)
+    cool.io (1.4.4)
+    elasticsearch (1.0.17)
+      elasticsearch-api (= 1.0.17)
+      elasticsearch-transport (= 1.0.17)
+    elasticsearch-api (1.0.17)
       multi_json
-    elasticsearch-transport (1.0.7)
+    elasticsearch-transport (1.0.17)
       faraday
       multi_json
-    faraday (0.9.1)
+    excon (0.49.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fluent-plugin-elasticsearch (0.7.0)
+    fluent-plugin-elasticsearch (1.5.0)
       elasticsearch
+      excon
       fluentd (>= 0.10.43)
-      patron (~> 0)
-    fluent-plugin-record-reformer (0.6.0)
+    fluent-plugin-record-reformer (0.8.1)
       fluentd
-    fluentd (0.12.6)
-      cool.io (>= 1.2.2, < 2.0.0)
+    fluentd (0.14.0)
+      cool.io (>= 1.4.3, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       json (>= 1.4.3)
-      msgpack (>= 0.5.11, < 0.6.0)
+      msgpack (>= 0.7.0)
+      serverengine (>= 1.6.4)
       sigdump (~> 0.2.2)
-      string-scrub (>= 0.0.3)
+      strptime (>= 0.1.7)
       tzinfo (>= 1.0.0)
       tzinfo-data (>= 1.0.0)
       yajl-ruby (~> 1.0)
     http_parser.rb (0.6.0)
-    json (1.8.2)
-    msgpack (0.5.11)
-    multi_json (1.11.0)
+    json (1.8.3)
+    msgpack (0.7.6)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
-    patron (0.4.20)
-    sigdump (0.2.2)
-    string-scrub (0.0.5)
+    serverengine (1.6.4)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    strptime (0.1.8)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2015.1)
+    tzinfo-data (1.2016.4)
       tzinfo (>= 1.0.0)
     yajl-ruby (1.2.1)
 
@@ -50,3 +53,6 @@ DEPENDENCIES
   fluent-plugin-elasticsearch
   fluent-plugin-record-reformer
   fluentd
+
+BUNDLED WITH
+   1.11.2
diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix
index 1a1871e22da6..4c5de7448409 100644
--- a/pkgs/tools/misc/fluentd/default.nix
+++ b/pkgs/tools/misc/fluentd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, bundlerEnv, ruby, curl }:
 
 bundlerEnv {
-  name = "fluentd-0.12.6";
+  name = "fluentd-0.14.0";
 
   inherit ruby;
   gemfile = ./Gemfile;
diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix
index 84577c03587d..e6b03fadfd36 100644
--- a/pkgs/tools/misc/fluentd/gemset.nix
+++ b/pkgs/tools/misc/fluentd/gemset.nix
@@ -1,181 +1,166 @@
 {
   "cool.io" = {
-    version = "1.3.0";
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ycc8qdvpba8bf6da8nsna34md86mk527j4qizxh059vqm3521sb";
       type = "gem";
-      sha256 = "1s3x0a32gbr6sg4lb0yk5irh48z4260my6g5ssifyl54rh4b6lzh";
     };
+    version = "1.4.4";
   };
-  "elasticsearch" = {
-    version = "1.0.8";
+  elasticsearch = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g7vax396l68w5mrrfbsaly39zkc4rrvljz9717mxyn82m5f66w5";
       type = "gem";
-      sha256 = "0kfiza9p98gchqgd0a64ryw77wgy42b7hhy89ba1s2jy2kcm3ahl";
     };
-    dependencies = [
-      "elasticsearch-api"
-      "elasticsearch-transport"
-    ];
+    version = "1.0.17";
   };
-  "elasticsearch-api" = {
-    version = "1.0.7";
+  elasticsearch-api = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08bb63raz381fmspijwjc4ksvrrgavmwrymjms1b9mg4qkic87jx";
       type = "gem";
-      sha256 = "0fb7pmzhfl48zxkbx3ayc61x1gv3qvvs4xcp4yf1rxflz1iw6ck9";
     };
-    dependencies = [
-      "multi_json"
-    ];
+    version = "1.0.17";
   };
-  "elasticsearch-transport" = {
-    version = "1.0.7";
+  elasticsearch-transport = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07r798g3lnzr3zabk2ks2j5jnxdga23bc8wrr7mcqzn8q0yv82bz";
       type = "gem";
-      sha256 = "0p5yzbvgpw84asfj8ifbqckw6qbssc6xrw086qfh58kxpfnin0zc";
     };
-    dependencies = [
-      "faraday"
-      "multi_json"
-    ];
+    version = "1.0.17";
   };
-  "faraday" = {
-    version = "0.9.1";
+  excon = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jmdgc4lhlbxccpg79a32vn3qngqipcaaq8bxa0ivfw5mvz0zc0z";
       type = "gem";
-      sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn";
     };
-    dependencies = [
-      "multipart-post"
-    ];
+    version = "0.49.0";
   };
-  "fluent-plugin-elasticsearch" = {
-    version = "0.7.0";
+  faraday = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6";
       type = "gem";
-      sha256 = "1jav4lqf9j3w014ksgl3zr05kg62lkc58xnhjjriqp3c1412vwpy";
     };
-    dependencies = [
-      "elasticsearch"
-      "fluentd"
-      "patron"
-    ];
+    version = "0.9.2";
   };
-  "fluent-plugin-record-reformer" = {
-    version = "0.6.0";
+  fluent-plugin-elasticsearch = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kgv62s51y9x98qk0b6wrg4a73jfbhw50vg5z36hr0bh9rh2rq4y";
       type = "gem";
-      sha256 = "1h43xx7dypbrhdw22c28jsp3054g4imic2wd12rl5nf1k85phfkk";
     };
-    dependencies = [
-      "fluentd"
-    ];
+    version = "1.5.0";
   };
-  "fluentd" = {
-    version = "0.12.6";
+  fluent-plugin-record-reformer = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ca09msvcdgrjv0xdjxh0nhxx8crp3h9nz5qw90c75s5hss2ws9b";
       type = "gem";
-      sha256 = "04lrr133ci6m3j85cj2rhhjkw3b1r12fxcymk943lsdlrip0brr1";
     };
-    dependencies = [
-      "cool.io"
-      "http_parser.rb"
-      "json"
-      "msgpack"
-      "sigdump"
-      "string-scrub"
-      "tzinfo"
-      "tzinfo-data"
-      "yajl-ruby"
-    ];
+    version = "0.8.1";
+  };
+  fluentd = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v6c8g6fv9s710lrl0jy9ihbb8af37gvw3klk7csr5whp1mhwb8f";
+      type = "gem";
+    };
+    version = "0.14.0";
   };
   "http_parser.rb" = {
-    version = "0.6.0";
     source = {
-      type = "gem";
       sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
-    };
-  };
-  "json" = {
-    version = "1.8.2";
-    source = {
       type = "gem";
-      sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5";
     };
+    version = "0.6.0";
   };
-  "msgpack" = {
-    version = "0.5.11";
+  json = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
       type = "gem";
-      sha256 = "1jmi0i3j8xfvidx6ivbcbdwpyf54r0d7dc4rrq1jbvhd1ffvr79w";
     };
+    version = "1.8.3";
   };
-  "multi_json" = {
-    version = "1.11.0";
+  msgpack = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fn2riiaygiyvmr0glgm1vx995np3jb2hjf5i0j78vncd2wbwdw5";
       type = "gem";
-      sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl";
     };
+    version = "0.7.6";
   };
-  "multipart-post" = {
-    version = "2.0.0";
+  multi_json = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
       type = "gem";
+    };
+    version = "1.12.1";
+  };
+  multipart-post = {
+    source = {
       sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
-    };
-  };
-  "patron" = {
-    version = "0.4.20";
-    source = {
       type = "gem";
-      sha256 = "0wdgjazzyllnajkzgdh55q60mlczq8h5jhwpzisrj2i8izrq45zb";
     };
+    version = "2.0.0";
   };
-  "sigdump" = {
-    version = "0.2.2";
+  serverengine = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16sy6yissv8h2vla5ba4msqzsjy0cm0x8q2llssx3kl3bwysrbrp";
       type = "gem";
-      sha256 = "1h4d4vfg1g3wbbmqahmk7khzhswk5mjv4hwbs7bhmp808h8mz973";
     };
+    version = "1.6.4";
   };
-  "string-scrub" = {
-    version = "0.0.5";
+  sigdump = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mqf06iw7rymv54y7rgbmfi6ppddgjjmxzi3hrw658n1amp1gwhb";
       type = "gem";
-      sha256 = "0fy4qby2az268qzmf00mb3p0hiqgshz9g6kvgl5vg76y90hl178g";
     };
+    version = "0.2.4";
   };
-  "thread_safe" = {
-    version = "0.3.5";
+  strptime = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lkadizgdls9ya4sbf3bg5i1z6g2kxfw1r5ja0wkc9711zxjilx2";
       type = "gem";
+    };
+    version = "0.1.8";
+  };
+  thread_safe = {
+    source = {
       sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
-    };
-  };
-  "tzinfo" = {
-    version = "1.2.2";
-    source = {
       type = "gem";
+    };
+    version = "0.3.5";
+  };
+  tzinfo = {
+    dependencies = ["thread_safe"];
+    source = {
       sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
-    };
-    dependencies = [
-      "thread_safe"
-    ];
-  };
-  "tzinfo-data" = {
-    version = "1.2015.1";
-    source = {
       type = "gem";
-      sha256 = "1x6fa8ayd2kal397d5gdsdg0fjqynfqv1n9n0q702mq839dw593h";
     };
-    dependencies = [
-      "tzinfo"
-    ];
+    version = "1.2.2";
   };
-  "yajl-ruby" = {
-    version = "1.2.1";
+  tzinfo-data = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bxfljd5i7g89s7jc5l4a3ddykfsvvp0gm02805r1q77ahn1gp33";
       type = "gem";
+    };
+    version = "1.2016.4";
+  };
+  yajl-ruby = {
+    source = {
       sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
+      type = "gem";
     };
+    version = "1.2.1";
   };
 }
\ No newline at end of file

From cc05622761b2d0db7b58f21a1bc9fc4d89f7db53 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Fri, 10 Jun 2016 10:23:44 +0800
Subject: [PATCH 152/436] augeas: 1.2.0 -> 1.5.0

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

diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix
index 7f35551f2ee9..c8a4c2616de8 100644
--- a/pkgs/tools/system/augeas/default.nix
+++ b/pkgs/tools/system/augeas/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "augeas-${version}";
-  version = "1.2.0";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "http://download.augeas.net/${name}.tar.gz";
-    sha256 = "1q41yilxc0nvjz5h9phm38k2b73k2v0b9jg11y92228bps7b5bpl";
+    sha256 = "0gzpafrflkr0incq58vjkabfncrpc97d7mdgglkr57iyzvkbcfr2";
   };
 
   buildInputs = [ pkgconfig readline libxml2 ];

From 4c96860b5380e0ccb4df2b280286946416505c22 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 10 Jun 2016 04:24:27 +0200
Subject: [PATCH 153/436] firefox-bin: 47.0b9 -> 48.0b1, 48.0a2 -> 49.0a2

---
 .../browsers/firefox-bin/beta_sources.nix     | 366 +++++++++---------
 .../browsers/firefox-bin/default.nix          |   6 +-
 2 files changed, 186 insertions(+), 186 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 356c5767b413..ad26ab6e9501 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -4,189 +4,189 @@
 # ruby generate_sources.rb 46.0.1 > sources.nix
 
 {
-  version = "47.0b9";
+  version = "48.0b1";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha512 = "9b015901ec00815e486c36cb0f81301301eda6646dd8279aa1672d550ca6cc6ed9d9044b1ed9339bb7e46dd8b578cb4774857125d127827020e0ddfe2c1ab5c6"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha512 = "49f0699dc92c00f9ff5c20bbbe595416db807254437d3c643bfcc4868977205391f2c3e0ac396c6724c1e5c8b641197f4b36e0a8a0ebb6e0f460394ec2973350"; }
-    { locale = "af"; arch = "linux-i686"; sha512 = "7ecc57e0e882bfda24d5ba8258a482699a4ce66d0eb17317f3ae62a6567cb34627e8a29f2682fade775c22eace65d9c56c78e8d0a0936ed35ef9b5015886a57e"; }
-    { locale = "af"; arch = "linux-x86_64"; sha512 = "978d4f1606d96fc9c37dc5b3cb7b62fd94d88edeab1c12a78d6e8a3a9da38fe7eacf4530e5abfb5d43a72f668914d463d2b1c631c527ccbd3f7a7eb869edcb94"; }
-    { locale = "an"; arch = "linux-i686"; sha512 = "edf84af121ea41ec949858b5815466358405c039146666c098901ee96616532d09d204b8472aab645e4c2eef63a803b7011deafa6e3f5f9709e560c2cc07979b"; }
-    { locale = "an"; arch = "linux-x86_64"; sha512 = "4fe7d9c230c57baca2e104958f644e2356c7849b9d7b1f06470783978b501317ffc2d4dc74e151f59dbc0c29e12e4cbdbb32a701044163fdbfe7b940ea5537c6"; }
-    { locale = "ar"; arch = "linux-i686"; sha512 = "c3714acb9ad1564ed1b85fd7f0ccfe3905bb29b69d6cb766e1b8831b629d161e7b27d1682e7f4ba56c000fc17c75f3da9e75c907a77185776c02df61e9521199"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha512 = "14fd3b575cbd1580e62b149e379faee3ad34601dfc3f759afa81af5210a4236182df6ab22dfeba2fae2626199c6d22c112fcb34c379d374122d259bec6dc7444"; }
-    { locale = "as"; arch = "linux-i686"; sha512 = "1afe17a6b4f0d1cf35f6468937c0a103edcf74d9d299b374e0413887d2cf9878532cfbcbceccf180d00735b3c45f474aa13e68911b6def8a31142c0e5f64242c"; }
-    { locale = "as"; arch = "linux-x86_64"; sha512 = "45741f5435b32a494565f0953b8da4f5c83182dc96daa958506783a04ab2bbec78c30a72f4dfb2f0b42c1b988118bdd00599285d3da99cc22bf4ae9984c6261c"; }
-    { locale = "ast"; arch = "linux-i686"; sha512 = "913ad74888c00a8b96daef346d20d5704e92c5bc82db82edc685cbdb1465fd8e472195ec80cd6847ff75229c7ce8a0e0496e747fca50ee70b22a23fcb3a856d3"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha512 = "22e8177a8d2d88ae82c830768b3812ea4f6d54e173fc6ab42a6c2edef1ee1c696e678de2945caaadcccaef0023a317657f1f4111a60aa617dc6ac84176d99568"; }
-    { locale = "az"; arch = "linux-i686"; sha512 = "fa6cad0fc70e060a58e648b7a4b52da9e134739534d4d9b640e3026fe9a18b93bde0b4c57803bfbf0cb8b2fb52ef82879f1ebd76f06d6b9d88eca3d82436c34b"; }
-    { locale = "az"; arch = "linux-x86_64"; sha512 = "36531eccbb275c3b62c7c32d8169d8190217bf5bd80ff145fc73a35569b7e25685e2b7d2e64fb17994c0a463eaa323e8c0b0577c77b3a725a696ffa839c883d2"; }
-    { locale = "be"; arch = "linux-i686"; sha512 = "484f31cd01f745c167657d1353b1d0db54dafde2a00222de63436d1d2eea12563b923c9b4d6ea9fa9b42012b1b6eb9da3413e806ccf8c692ae19a901133910d6"; }
-    { locale = "be"; arch = "linux-x86_64"; sha512 = "a521285ed012191b7da91051cd77de1d48a8eea5804f968a208c6fe171b10ed9d4085680458e59dbf23a42ba689dddabfd4ed838a9771f57d542c05a685f83be"; }
-    { locale = "bg"; arch = "linux-i686"; sha512 = "efa2d080e04ffe895be3a74e05250e18408c68ac96adeb52172ffeadeb5e18c6d1a667baa7eb6b336ba22449b4ea0ec435b98b984be4550c985e85128d87d135"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha512 = "e32fa17ce32ec8e206d162825f548582be9774d97eaaedb4e6d7f95b917bbb7e1d88f498d3a1fcbd7f091238079bf6903212879e4a73cb9e9feab18d234fe0b7"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha512 = "8b537e121d9829d7af68eb3da08ff98a144e7257c38640ebc8665cbbc946a96f9d359d5eb061dfe29fdb45dfc412a7fe26849e048469ff30d33c1c60056e862c"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "97416decc38d2d94d85d45b1f075bf8ab7581f3014bf58c1eb30b1ad2ba791d98e3c3f1985d2c934ae767fea755a19f6c16f21717ed92d659d35aa486f16485e"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha512 = "7778763307699171aba4cd191b07fa0510ce31b33636b40a4e6c5958903f05b94ff06a00c6e73db604b7097dc8afee80018bd40224e68eceec39845c9c734a72"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "3433c797c912183ddece699c28698449bbff1623ac6c8dcf22a7568ad8711daeac45c1bcf45ccdf7f726b93bb1daa8e090eee66707fddb2a335c27a7537fb723"; }
-    { locale = "br"; arch = "linux-i686"; sha512 = "4ec33ca955cbb729ef87fa85afdd15565bbde15ff6dfdc8a0e1e5734e651568d9daad4fbd5298303b7eade3962838eeaaa9e5420644744b910cfad98d81fb216"; }
-    { locale = "br"; arch = "linux-x86_64"; sha512 = "7b6bca964f78321fc66ea79d4d28c817fc6b39ad6f6e46aabe8a2479cfa72e3c8e4603f7a753470a2c41e5a79aa3fc9e71b9cd28fd49189ad6679e839577024a"; }
-    { locale = "bs"; arch = "linux-i686"; sha512 = "a5afdde737bac2e2923d831d3c75243c02d7f660c710b74112bc23d40e360a0ca1e6bd2185da1d2fc57324def9c67ea4959c0b16d59c04a19e846db0e2597e5a"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha512 = "74621639534d949dd385745b61c008835156d8c0a3d200aa494bd8038e8c5b9c297f8be4dfe6c1e49c112ea7c2d626398dbc71f85e53bb7fb26f83492643cec9"; }
-    { locale = "ca"; arch = "linux-i686"; sha512 = "304e3558a0f96825ead7832f0400f13cd5ca6e45aea93f1c47682bffdc0fab9b32ca20a5c640dbe0c57be422e49ba00497d2a95f00f4edda79a946841bd201ec"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha512 = "0029b9273f0d45c161ad57072cac048a265501a7179e11189b015201e96c2d826c30a44cf86277a9237e9b0fde7c0a9bf03a48a2bcf82b6141ae01f5500c380b"; }
-    { locale = "cak"; arch = "linux-i686"; sha512 = "6eebf5ad6efbc840e15de942f125fcdd2299feaf2bf0bbeab309372b1b8dc205c9b62c0ae57fde0922b04ead1197c0d877b84ea58798a3f2361e937893bde51e"; }
-    { locale = "cak"; arch = "linux-x86_64"; sha512 = "5154dabd368ab42ce489b1b7c0b0b11493a17b8821449c19a16241e6b05eaa092e8c7d744c4df9c5152d8d96c56710f56ca87643e92d0a2ac5de02567b59c8ef"; }
-    { locale = "cs"; arch = "linux-i686"; sha512 = "b3f93887371fd444163bd435300a3c34fa18bf045ebf7f1be1465efe84b78073c6c52f5817724175403fb0e1881c498d9c79e5c53bddcbd6eb0fd6bbd2f10fdc"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha512 = "a11acdd2efa852120c9fe0f6384dbe81f90333104c3d7a5ef0ad6780e92331e723b51c571d0374308726de454fedbbd58d18c2c5782d96ae6f7036da653b3e28"; }
-    { locale = "cy"; arch = "linux-i686"; sha512 = "490368cdd45c4a5f62c805bdd71217bc2aada185a7c7afb120da8cb2c050198ccf8faf853cf8af4a1fff68f3685318f18e63f7722bb42ceb3bf061ca667df1e5"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha512 = "d314a9bf43e2b7580c27937ecd21a7bbdf071bff3c8e3ffb6cab7c7a2df1b06ba21eb4cd7d71bf4ffe00e743484de9917ac9b568169e9813889e3641659cb947"; }
-    { locale = "da"; arch = "linux-i686"; sha512 = "128c5fdebe1ca256a2012a6cbe9ea1478b86784c265463431da55c6d0a624e4f8ab3f915efc6f5c1d01b65c615bc2f882aae541049f8be6ed3c94513fec41803"; }
-    { locale = "da"; arch = "linux-x86_64"; sha512 = "f1cb5332b566399d89a46e75bac80ae3579607e7cd55e6f5f5099b99d09203fa9aa8a72b2b3d279eb9e8de0957ed757b96d06f8faa49f3b56e3184ec6cc7bf4b"; }
-    { locale = "de"; arch = "linux-i686"; sha512 = "39ded240ca93fffd02ec72c03abcf9296d51890650a61a09baa43815bc602f6b54d1503da8d1a82da79b83559c6cd2299fa69a233e90a96cfd6e93d05bec6b18"; }
-    { locale = "de"; arch = "linux-x86_64"; sha512 = "4c99b6e6fdcea845e38a708f7257b5e0f50ae9aff8d4d666d70a15531f346ed5a0c6dfbc8bd821eedb9438ef3de29c475b936722500dc6f81aef7e43dc6af68c"; }
-    { locale = "dsb"; arch = "linux-i686"; sha512 = "4647cfd5e16c8ed9e008f96389de9009a3607aba607671b57b90d64d7be545e07d4bb4d33aaf8f38935bf9c6edb600e5145e5186ff7bbf7998c87a59714d8392"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha512 = "a3e2dbccf984b1b0c43ebe782770bd124d55fc957620666638e9b4d8b61ef2bf355a5193bf2456a68d68e344f198683a8bb2549bd37444f2d05eece674d171ae"; }
-    { locale = "el"; arch = "linux-i686"; sha512 = "d1de11f2f41ddca5eb9beb4278ddf8237f74b46a36eef782de6f204210f0f5cfb0c3a099ae8224795ed414884183f5afbf7606831a4016f16a64fe5b2019c003"; }
-    { locale = "el"; arch = "linux-x86_64"; sha512 = "c1cc9504b4b287feeadd67cc1f6888a3bb0519792b63d827291c0c3d30f86b672d8ed77865a60feb3c85e792b874aef80fb0f0c7aa287ee9fe41f16699918900"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha512 = "5fa39b5c3e05d046675e14b4ff7e6e87fc16680706137a7b9f3d5683322b783dd5201ec7f6a08019753683cad6fd69c1169d1d9453c54ff3e934c1b461d18001"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "fd7f8b51c54350ccfd9f78780c15c0e8e99ca8b437f1fc41d0f828deb742b33a610751c6d0cb9689bd5ec293a86dea6301e0e25c2de70df3ebc2101259ad7e4d"; }
-    { locale = "en-US"; arch = "linux-i686"; sha512 = "5ed8597fc5604dccbd34c82c6d63a1033ed338b8267966901d7fd949d2a5ea3a1c8366279b4f1fedd44d6bcbac00b894c688f4e6a4816da401fa1ea68490ae4e"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha512 = "345125c0c2e66f83c8d360047bd212b949a5de4a880e956e8ba74e6503c78081eb3fbc693522d0a32af4dd6f1bf077d8f9565aef0ebbd0d6aa39eca5444b6e2a"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha512 = "60dd889ef7e710849881dda8ac25714402b72eb2085c2f3358450d58a0e6441f82894c74917cdf5c8e06bbf5e7bd466f89bc0ca8317acf6e80da0b5efdd031b8"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "83ebd66b35e1e600cb7e9dde13a3202d6a22fd6afe311d9ef2465b83c876ce3b0145d12eb1ff5cc60b2552fb03998c147d3288347acf6e7162c6ca02a6651624"; }
-    { locale = "eo"; arch = "linux-i686"; sha512 = "628ec95c60966e3f93499c7d2d528651c9b8f915190560c57d919dd0866f160692f5feff455610791a5c7526ed99b101a7e0ca1d97c1b7fe039ccfc847905d55"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha512 = "e7ae4b4228702c34798fa0f1eb509a039827a0b0eef788ee42b0fe7f8f90e99fee62ebb3f80c02f918594a814157242218602bd1592265f90d1137a1f572f9de"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha512 = "641368566ab0cf40c010d8cb916bda9ff36bcd3a3e8db25f6095e119acbcb71d51fc6c659b882db9956cf131ce767cef0acefc5eeeabcd6db4b299be74979e2d"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "2ae2583ea9eaba2f53f0a00b5e83fefd7736766521124c42d7f7c15e6e3c0ebaba322ce49c3f08df2522bd4b01b5bbb489a226c7c59e172e4383043e97078725"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha512 = "0ac60e69b9fa53c901bcc63f0a458be52f1f0067e353f9cd43b89b6d735c6c39048d554c095cad5132fb0a6a0af7e980314ca705bd49c34f21e3c5ec92d99725"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha512 = "dbb0fb1ca4343a218fb0d6ad65de347a6bf97e9721ea2642019890131fdc18b0d916a5bea0922a443816dd465ac8fdc205feb36b7d339f3494dfc763477965de"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha512 = "9e6803906d9541f40523d1a887e6964002be6e8376e2cfaeda5dfb82bbd048808c9666b57edce980a4f687136c0fc467d8161b02562ba577e1d0f9d00a8ef67a"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "0a43efbc7442a3da4f0787601a761024a321d3ad53b1d8f787be95168b424beb29344ec7fa85e26bccca8ccc79500401459000c190b1702400905e0d2b7bb5d5"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha512 = "79f8e85a7aef41f88d1b3378d7d93f56c9dca202593b5818234acb9fa0629cbc96bdf206f030f4c68f1bcafb9807b8f7babb26befeac46fe5f4afd2e3d6ddeca"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha512 = "7cffe16943188a5cb55417aaeb72330797f451b0824c84d5542b39ac9d80f85def28c6a1aa79b78ac2ee5e4d636b361c86b015f962bdd6160d023e994a47e6a5"; }
-    { locale = "et"; arch = "linux-i686"; sha512 = "4f9db463e7793bab3f1364d6b1fbbb4a3f48a9e48ac66ab5f940dd646929fecb8fb3d78bb64646d58391a9a9902fc36657d8b6555ea5c28ce046e1229eb04958"; }
-    { locale = "et"; arch = "linux-x86_64"; sha512 = "0f4a5ead0ad8ff0a02c0f306e66cbff5a8603c44924b5f510b6a808ee0c8664103846b9742b154dd270db0a31a2b60c23512a4fa587897b738042e8ceac29a08"; }
-    { locale = "eu"; arch = "linux-i686"; sha512 = "4d7250e0e65eab16a01422754b472d0b24236feefc1f8022f4a5f3c0e724f8c101fba4fcd5ba88f9a98e670548b4e21b13f86ead9e5b347c268ae52e5f070ac1"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha512 = "6646bf30ef01a9bb3d2b48d3f1e0051cb5e00563da32b4a040d42d4937464724284a1da9d93790dfdf68d3c6307f5e82b165a54c35df5f0f8aa3c1ce63877b15"; }
-    { locale = "fa"; arch = "linux-i686"; sha512 = "7d91d5f8cbe72b7bd6ae45623c6439ba1b0e9200c3faaaf22a2f6247fdd1444e3f26a45567068c85167e62f72c7552b784720e9e602ea46dd2c5b766c7d44f5d"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha512 = "e99dd536ca5d85049da3d3ba79af598d4893ba03cc4ae97dc4ee1e8a15a251ced7270ec2c09c19215c16cedbc9688a9373285c23ca874d44522cccaa50bd5b87"; }
-    { locale = "ff"; arch = "linux-i686"; sha512 = "313aaf43f17d1c19646c50aab7f675d2e6c3023da69b244e7c6c2f7b32f943d9b12006255b03dc71ba7e636703398f66364d00639295112bbf1adba2da851bc6"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha512 = "61a5ff71dbca9f50bde8cbca397a837862fce479a3ddd1da1becf5d9ab0969ac02654a380b80a2a4d297f4b0c7867246766607b73ba07d712284b44e28e34f7a"; }
-    { locale = "fi"; arch = "linux-i686"; sha512 = "dcf933aac369cb320ae42192aea3389d9124f424e04ae4551ffd25a3b7e3133d744c0febd708ef67a3f5d178211d9ca7b888a892706477aad69aa921d688995a"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha512 = "2868e6ba0ba1c0bcdbebd72cff4b6e49967658f3492950b34de00a3615ed3386ca160ca3988aa244ae793a64954812a7f180a24da4528b0408777659b95bc755"; }
-    { locale = "fr"; arch = "linux-i686"; sha512 = "dae726290dcde0caf9004f48eff28279a6450eb82188ecb79fd352f2449a8eccd4cbd1366978d7017d884dd4f356f7e19b7a41ee20d26b88b48e76655e9f727a"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha512 = "47ad53ea1cebb08a88df5ea7d45343f94a4f7f53a2006dadb6bb6f49f4f70e072bbb0f32465a87d86e580a4edf5ca301c52e03b427c53ed45616823bba878593"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha512 = "304f0be7676ce05ab41ca4138eee5c93b5736929cde3882bae931be2191c47b81339a2f9e30126a3d9870776118040207861273c55063bbafc5d57dce166f14e"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "34a1b02931292460c9e4356f33f32013cbab191bac19f8fbc38b986b0f44cb6cd390d00b83df95d6304d8b4a8c7c79509729f07ee7424568c499e0c2cbffed2d"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha512 = "23b327215f12fab399f7bbc5b957edebd568eb9c29ace5bd0f555972d03210e69fc9abbeb62b40caa23159897d80bdb6bbf3e6de92962db972fb7c21c4fda417"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "fcdf39848e8b02c4b9a2260e0f005e3c1c6d63abcf68bbd2903a0bfcd6c91136183cd51b0b0c4b6beb3e26dfc410f251a27aad72eeb778a145df187a3188c688"; }
-    { locale = "gd"; arch = "linux-i686"; sha512 = "bfb9254748df4c093dad98e086b6cce0f5c534be55c58aace5c0e9e226464dadf4e7c71091bb89924e36b72685fa6b0f1fe3d9f8dec0bec58c9c915c47157124"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha512 = "ef6551fb9d4da9546cd9c15ced0fbcf333df1d987254492d6910bad68d1a9501f494e4c458d587383671df929e3a3e06f353621c446ed643da703f92c85447dd"; }
-    { locale = "gl"; arch = "linux-i686"; sha512 = "9412e0b5ba7bd0b72e9de57c7cb80bd4a0a0edeb43ae5543c600dbd94bd653c8ec0fb3405104817a4c69ea21aaef8a62d2e3ccbc0845456b85b06cfc0adbbc97"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha512 = "5a9a2f406ec581374c0d6f1465043ce8e3642244df272e45159c96ffb114be58dd5cbafe366346a69a23107fbd9cf73302252aef77c92177444f991ec0467437"; }
-    { locale = "gn"; arch = "linux-i686"; sha512 = "d241cf5314cda302a0e7cb5356f38e51da502498e555901cb83b76fd4044bf008db32fe40ab5279bd5ef22f2cd384ee8aa14d8c828c6734d1c7b0a932864bc4a"; }
-    { locale = "gn"; arch = "linux-x86_64"; sha512 = "2b295165ee8fa287e0798c5e6066b0e6bef70cba3a798df3899dbcbac78d8628059ada9a7a94455a4b71f3da5ad34a78ff2f806e6f96694da406f0ca4a8be872"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha512 = "f734b1d9da1e5ff4b3909a7f2725ce28113aa8eecdb7fa1cfcdd55af3ab594f1d45bab27061a4a91215b74fd80a9ce4ef489ed41c97ded7deb4f1fbfbb13aadd"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "5a851709f7870fd045dee372b472d22d36e98d2f05e2c52f960c5d84013178469dd59adc44f003b0577eda67b4cb24ed61bb7ab92108321b5936399c38c240c6"; }
-    { locale = "he"; arch = "linux-i686"; sha512 = "7aefe5685ee03d7204c38b4f4fe9c9dc2b0e043b14f4966ad81f2138694aba0d6f36f239a36352acac3b5c171624e2938c9da2106b2929c48d17639cf585a920"; }
-    { locale = "he"; arch = "linux-x86_64"; sha512 = "48f5bab9ab75ec63dcc3b05e47f81361e8c0e8c069109b699d86f032503366c88259e7084992283a2076be5b5db890fb4e33369f616182220edb05c60ecf030b"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha512 = "c97acb0bfc51734971730bb643f2ac42673fc746419e99eb01140e41711f0ccebe693825916a3a8825c45ad58231d2215ca6c808d069cfd5aff7987a59f35e0f"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "d0b94289c39fc25fc0a783cb774f38b434d0bff3a0c7f399c3d916cb827288d3c6de32435a01e9d735d4c7eada9a3ead25e2d51f3f8be4f030e433f1f9fa020b"; }
-    { locale = "hr"; arch = "linux-i686"; sha512 = "fb3688ff337b9296dd3ba9fe796d7a8569b9b5feefcaa433860cc279fab8bff03c24259074c6317d822c99ba9f990f44808e0fddf287f1044cdc2185123ec0b3"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha512 = "685dc67d26c33a994579cf81f4e02334bcf7b1253d78ece7c4816c645398bec36967c990e8612b63ab403271527fae4636f493629d717ccd5047592e50c1df34"; }
-    { locale = "hsb"; arch = "linux-i686"; sha512 = "3610bb81053bae24b7ca95173db398792dffea3744d08ac6a4a98b696555df7a44342d3a923c5a82d37dcd7b173984d47db02bc4be7cee9a84871448bf05028e"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha512 = "e2d612b9b0e03889b7009d288157b3946b1a7865e331179953584ab1936d359504350d82e47ce60659b05951a99dbcf271df72e4c2cfcae42327a48f0c60cf7c"; }
-    { locale = "hu"; arch = "linux-i686"; sha512 = "40e56487a5d244e25796ab70dc05c0cc264a83ff862a4caeb762558b76e003f415bbf529996e54ef2248581201d17c879d0be781df1cd1f84a5a54e155ee9a90"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha512 = "31fc259a329e46abc1d6031bafd538e694382fa0adc432558fa4b7cc6e310f7baffdbfc1339f3ab57ceecb1f14c8dd5080a9fdc666c0ace8e872f8117826b64c"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha512 = "f5fe7b8b696609b663e51419f51e4f05535c379ec9fd73a7b743ba58c83b6b97d3fc9e5a38a3af5f05eeac5f66d39d8c0e416fc96a72853b80009ba3c2526e3f"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "97947e5fde20851bfc8bf7b426a6cab76a84fa3b385daee22773d9e871d27820a54ec4e846aa43b2fa8fdf3eaf2d7022209e3b694db31953a240ea484390c37b"; }
-    { locale = "id"; arch = "linux-i686"; sha512 = "7a4dc15099dbab8a1ce47f127bdcdc732d820d15c84ac5ffb3aca3b1ab1b97adb164ed2d72f690c435d80392625fa573e98ffc4fcf0a80e5a219e8ae84be1673"; }
-    { locale = "id"; arch = "linux-x86_64"; sha512 = "25692014c15c07d7d94fcdd776446f0cc22dfa8d2a9d7adf871122ba63a851eec56ae4df239691260a1f9d21b42b3eaf606b3049d0547f314974837e14dae74c"; }
-    { locale = "is"; arch = "linux-i686"; sha512 = "036b35bbc1bac2be13855f05a84bb877e90abda9a57ca5cb9be546ee42d449b973dd136c0286fb738ed460863b6910e24df1e7dbd695d1abd67a643adde1cda2"; }
-    { locale = "is"; arch = "linux-x86_64"; sha512 = "00cf2a413525a8453f4cc3813882d88fcefda0b979569ec419366ae6a26c1b28ca64d47fc0d72eb5260fd07dd8d0a427321d61e895aa997335531957ddbc6903"; }
-    { locale = "it"; arch = "linux-i686"; sha512 = "3b337a3a6d233056c48adbd9d1b8342db109238ff16c6b6ef785c5698ed163110eb697910a7b5a4915aa40dcf675d67e3fc9c299a73494e9ae5b65790c984c6f"; }
-    { locale = "it"; arch = "linux-x86_64"; sha512 = "9a960265ef27e6a6ca1f2a952fe4df88d6b96e9dbb57d01a991295802c7b1cd34dc31e8961a0e5d8628df9eecead3fe669a23e15fe9c19e5ca468b2586836f5c"; }
-    { locale = "ja"; arch = "linux-i686"; sha512 = "acd2e3f8e0cebe313a4afac39b09e202c2b0975fc97f421848fbacc78c7a04022a6bdeb32f919984423b1746319055ad8965d82b0f234d513c96e26a6aa5ada0"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha512 = "3ab71fdab458221f1055b0fbb0a483d2697a331f2107e21506501ccd0bff82c854f470e8d62c16e1d6d001af9b391e8b04b6ead61450b682e3b2235bd181da3f"; }
-    { locale = "kk"; arch = "linux-i686"; sha512 = "426698fc5c117501d5fea47481dbf3f94e172824d30280305cbde4c12dd6a23fc2cc15ff67f5f0831d716e32381544d7b5b2466bf5dbd934ccc0053a0e87796b"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha512 = "64c6f754123f050b2791045dfa4db84594465b71714b57b036747771439810c31acc11fd8a87b0b80668e98e763b308f0334dc244ffc8c0d46d6907cf0459c19"; }
-    { locale = "km"; arch = "linux-i686"; sha512 = "aa070339b61ca41fbdc3997209e799f1c170961e8f65f7b27022d8ee7d1392b6e71c365814b72ed7a3af49afec94a639119f538c76b10e07bc372d073c779520"; }
-    { locale = "km"; arch = "linux-x86_64"; sha512 = "2cb8c583ecc406f0db20fd80b750012cbb55b53ea18b4f3725bc573ceb40676ccac60636ce242de4721ba1ba73ddb8a7ed54c150218894144b376096184f060f"; }
-    { locale = "kn"; arch = "linux-i686"; sha512 = "f8a9ac953f5a1f2d991e8093d0468b54386f0d5a91a95e89dc7ed0352b4b1dda30ce304381c572146037740e47982d38c40ab320048b3798985d664945b6fb8f"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha512 = "b2ad831bfa6dcfb7edc5dee54fbbf06b040e9a7fd490cd2e4c1e2390b640804ad03f6b343f5df63b2e759109e15b6553391ff50a91c73adf40cdd4154bf4f2c2"; }
-    { locale = "ko"; arch = "linux-i686"; sha512 = "877c2af15287b9aa592d859cd956c54fd2c5aa4bfe90dc250750dceeedddffa242fd0a6ad8e9a064d4e32640fc1b7de5ff3500d14a5733b9bea239ffc263967d"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha512 = "ada09f37a92ea088fb15ec48be4661e05dcdc4ea5a438998772e3ce4f49abdea4493a9b66a998da3dff08af71786839744ec5c655b10514c5fef343c19823867"; }
-    { locale = "lij"; arch = "linux-i686"; sha512 = "c80e4753bea1e02ada5a3ffb72256137f175b02f1d5846d5f74911f62a5cde1a9a40e9916dae56f3a9ec09f86be3b0fe6cb8bf129370654998538b45185a9047"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha512 = "6bddcb215cdeef4a7126b8b4b9aac8001c1fc2f30cc29bc85be6aa665f7ac075e4408e4ae9eb2eee19de0df672b4a4a02af1eee8c55dbcbce38eaf2cac998c0b"; }
-    { locale = "lt"; arch = "linux-i686"; sha512 = "c99faa1cdfb09b10cf89c06d2327698859a5a697c6f992ebd47d8413c1d897a1c080e1fa67aa37835c37ba4d9869fd975c2750b50849ba7a38096ffaaf36a61c"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha512 = "de45e3f04ccbe43742bdffb3e8b52ce6d7688a3a3709a4b0a96908f05c0ae80e49c4ef58046a62e88a23a39eee011484ed24759e449fa60cc8b2be790c897c25"; }
-    { locale = "lv"; arch = "linux-i686"; sha512 = "5cb67b52ecf53a22075cc1a1e1daea20d7b91207f0424acc953fb8aa023c21ace6ea6b68e76dab530135ef88558b91b185cad52851c0c5e0ccec76353677ff1b"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha512 = "19fa569fc3773ca85a44378f128cb39a8cfe2d83ce35598f0a0ebe2fc6187cb3218ec9fecfe4f6fe5c202c77b33c1d6fa310f48bba77518eea98947fac5239b8"; }
-    { locale = "mai"; arch = "linux-i686"; sha512 = "f45829fce2f523620142049829ccaf550c3dbb49f60a18ef8d534a71b008b0589e8da4370966f5633c5a84c811f990fbb80e45a44dc653b36ac472582e8cdd43"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha512 = "5d94527e5028b3e45d17f67cf0d217ee2b84a59c3227c3fd139dab07ace2640936222f6dd782edf8b10bd7053c6cc8e1a4d5eb8abbe925113478bc19231793b8"; }
-    { locale = "mk"; arch = "linux-i686"; sha512 = "aafd5ef79b3f1685f31cc116da25e8ddc38356b88607627f141c4ccbcea51f40e5d9dbd6c8f6b7b94bc3c2e5b4dfadd40bc32737a30ccf2294e81feb756a3017"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha512 = "3e1d353ee168bce3c7e2ace92c023cb76bd21971b6806837be1c6827cca6236938d26f3f75e705f6c16a64b62c7af497e66d90bb07eae8500968d1c594b52fe8"; }
-    { locale = "ml"; arch = "linux-i686"; sha512 = "bf56974aa6165dc302037822fe8eb5e30519612c6c60e97e9c44850c9c792dba74380303a7e412ad9ae1a292dfc3d003851f08b0dae88c87dd251604dc70b36c"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha512 = "8b831469b2326dd1a6e654c9bf1a7658fb2d8d2626d1f1c69c9d3f826bd2cd0ffab80c38c724adf222cef8cfb8c887f07ea8d1a32251216e2b995ca9de8c810d"; }
-    { locale = "mr"; arch = "linux-i686"; sha512 = "abfb68e4f0a34fb49a196e903f6bbcc15c6aa4d0169a61647df69f25730237c7324beea389bd44629f4bf4796d142b4de06f527e721f1a8672a7469604711091"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha512 = "840099cfaee9a8cde24ab9bf6acb99f5375f2f2c8420c901cee556f293947dca53481d84940522ea90f7febc6533576589a490475ae96eb94735e20725faad10"; }
-    { locale = "ms"; arch = "linux-i686"; sha512 = "42999849d6003bccc4fa2796949ef64c9f44fac46f2fea0c6ff85d1be46932ac65254b077ea7b1ede75b0dd76e6a212302797ed79ab3b42f829c2d3164413442"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha512 = "6d4cbd331ebf05501a010bebee204d747d4a4577bac353bb43b611eacc6ebc917f779b6dba23ce151c5897a30f74145b76fa01ed77f278f6dcf54b504fce7333"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha512 = "390eac558e95c89ac3cfebd3b2c77624380bca97419a7539ff0af37a8942c739b0e2c586602b9a7eafd39695bad2b69047d2678838c810bff5bc4da92bbbf641"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "663325450128c0bdec21d43c3e318062ce2b4c045c7b74a6119cf80dd47c76ec7aeeb477ee0702b30cfac3aa47cd2fd0a751f513627c695bdc9a210ccd92c890"; }
-    { locale = "nl"; arch = "linux-i686"; sha512 = "b05f8558e76eb65318470aa63f90d3191f79626a7b29d934e146f00d85c29e1fa28814d1c1078af2240129a4c820654a1c7b74f3f572fd6fc39393dde54b3680"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha512 = "864a14cf1475690c12aae22794168c2026707214db5bcac5060c7986c856ab466c62116cc54239e98235f548daefa1ee2b02f175d4948d679d882c4903a0a5da"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha512 = "9e7ab893c29d3f13fc3fa1aafdb26359085cee2b83be480ad35eafecaabe7eeef88826ede4fb71951815106841201112201f89a01cab02108b32f5f8588dfc7a"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "ab72d341438cfd6f3db041d217841af48ddd4022f0b4e5b77add391592e9f65b5baf4f5ad22ed39835522ed3075994b0a2883acf69af8f3a79f481b2b1dc3204"; }
-    { locale = "or"; arch = "linux-i686"; sha512 = "98c97edff27894a1f04093955095ca27b66c0f5b4f2dc8c006f1db03b3a8abc5fa5815654e12f29f9ceefce70d771be3b9e37aa4206673d6be4ce0b65fa808cc"; }
-    { locale = "or"; arch = "linux-x86_64"; sha512 = "a4672e7d4653564337cc0cba2358d073072be7fa3153b99908f257ddf032b9b759b04b0e49aa675da84ba9378f3711c330d2e6f0841bb2a67e6719a8d5d8805a"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha512 = "0b2703c37ec0b6201fda260331812f093d1f28ec4b9453b75d6ed3fb4ddf91b02e8d5146b3eea96368855bd8ddafb2e649830de5306b34e559f780426719b742"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "e6c52aa8d105d185b2442abba714b9fe4bce5d8303b25082506178f420b06c0b683c0d182fb6091c42931b8a598986d85c55f15ec534d84abc674fc1b9b04568"; }
-    { locale = "pl"; arch = "linux-i686"; sha512 = "795d542560d89a0cbb05531340027d0894f4da5aa9b47c2e79342ffc0c96616bbf7569fb5354b48065728ea31c0fe476609d1627d7c80f9a4071c3a41853c93b"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha512 = "a024adc013c20e20008565ba325366920f352db25583bcdc327b0d1343baa8262be22a5613fec13067b3ab87782bbf663d32e1e533b4e5b85e60900a31415d05"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha512 = "d1969bffe5ca9134676c16a42bada531553450082ee7df38d091e78ecd91c4f11a9258d3c1313fab87509c114f7d2182028bdbe9044caf08dd816dd792cdfeb3"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "d57f60f57d7f45ce59c4b41bfd9deab996c814070caa0e59117b3fb95b2251e60b05bf2ecc0ad9e346f293d3b6f9cdbb8abfae855e92d6b938fcaaa5ea5e1e02"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha512 = "ddeddfb237fe3b47873696d8ab863eb4811ccce5a7c524aeaa48ef1e68567f999c7d00493c8b6113b5b7c0ab69909e64c94d787af262fcbe3e622495d31905c6"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "146010ad2d1a41577d1ae8bad3bd6042519cb780f8968559047c621149913773eac494b179252a41ee800f0b8d545d8328f6c2858b9b49931b5afb21aac24876"; }
-    { locale = "rm"; arch = "linux-i686"; sha512 = "35166f7cf4e8e9c9b6b2d6a787a25304ab406f093aa44eec0a0696e4d046db57cd92473378d8c1c12b885a77c7f0e8af25bca2ee35b15eda2078223f70d5e976"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha512 = "9224c7ffac7088847b0a74c8699b55fce6d057cb4c05f900ad760f0ba65c9f4c922301b77a7979972f72e1dfa95fcb8c9fcdeb62c1e23ed294e32d0ad44f1858"; }
-    { locale = "ro"; arch = "linux-i686"; sha512 = "6af2ac5449cbe42120d5e1db60c24570ba2b34abdf8ee65df28829c5ee7981928a5ab314215ee04290d407bdc7b8a41b44210f598bd196af9b72721ed9fe295a"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha512 = "2cb4e65445f7990329b1ac45fbc847a61fdd35dd1c96be7f36c231fb32fb416b79f9ab9f4bda091086cba4f8394c2549041f099f0d72a7adc594f5563794fe06"; }
-    { locale = "ru"; arch = "linux-i686"; sha512 = "11df81efd6ce56f8e302b3e44bc700da5a60248b025495fdd3bc54086e35607ce4c4bba7d6ba8e924754df72eba5c8794061da1b47ebfa158f9eef5f00d662a8"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha512 = "5fdac11500749a9dc2ca5c19aa6525c083ff4af6bbf8432fce0a74df5f00cb566ed572d836a1ff4a0f308ac19b9fe24d3e460fa63107d96e02ed4b4a78049309"; }
-    { locale = "si"; arch = "linux-i686"; sha512 = "77f37615c2aa4a487b70051f62ec9924fa70f0f724bbb07f5686c06ef14c1d04d2649767714446509c8c85942e3cc5b9fd01100c7bc1b36100b23993d1eaa315"; }
-    { locale = "si"; arch = "linux-x86_64"; sha512 = "28eacad8735844e6b02bc45acb53ffd8dbfdc56730cd7fc8b6f900e0cab726fc71be33e5a04d68d7c3ffa270215bc3d7f8e1f5a6f898300e7555b1feff8910f3"; }
-    { locale = "sk"; arch = "linux-i686"; sha512 = "123e8266d3a3421792269145d65c92b65704d4315fdd2c9e0161c2051ddd3f84eef7c57be6a073647b901894bfeffc997deb08926f4c4c737cffae7d77b84e9b"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha512 = "d702f248ee1fcd58343f5ef71af24b31c74f6638fecbd4619cc71a302352b01756edaf6ff4f7db4cfd27d166c8ea335aee23434b1842ab3f65839c74ef3da3c0"; }
-    { locale = "sl"; arch = "linux-i686"; sha512 = "5ecfd8d3c7401fe6e3e4251a129bff07f005cb94be7bc667505625db8555bc08836c9026752549bbb07db28517b191aa1eec56d81f3e96c6801beac5aac9064b"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha512 = "65a1b995acdaae97c69b8010447fb5672d42724aebb37c74497be7cc9b8db31328157b28b7728f4c8d177d8844b0caf044ecfb67d9a1ac5c15dd69c5bcd603ff"; }
-    { locale = "son"; arch = "linux-i686"; sha512 = "720bb533f4e86c109bfe09552f138015722a45cd07584a66e25506309cf94289652c284ead6674cec360e5b8e19d26e197bdb10c5a5b562b234c54749a81db1b"; }
-    { locale = "son"; arch = "linux-x86_64"; sha512 = "307bb60ee04018fb531c0f8d6aa14f9ed2910c970ef33c95572bb7fb249518ea016c5694303aa5e09771980d922537dba8e370dcdc1cb2c5120dc5e863b7cdb1"; }
-    { locale = "sq"; arch = "linux-i686"; sha512 = "e1f61cad31a300db89eb3cad1fbd1082ddfbb06f0befc1509e5da2c401bdef2bcbbef65a705f36202a933182af13ec41966a8243fc6fa55cdf251537891be4ea"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha512 = "86a0fc4493b5b4f3aabc1b93dca25aefee16e08adffba77ba2369944c035185f36b6474298b5e58c939529aae393fcbe6a4d00c1d8cc2e9d6a8bcde5d457bedb"; }
-    { locale = "sr"; arch = "linux-i686"; sha512 = "933a3adf04d37ba5f4c4c417306d7df67706c7757c0a0b68714fa4321c740a26b8717b7a6078fa631709dd03f5a159468e8c5d24457e1a521881274c1f43cf31"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha512 = "eaaa12dfb8c8078437651cd78480f8ef6de9b8a1b7d48fcc57c97e427efa432c85804e9ab45c84eb7552c5d99005395f7c241a14ac75b2b6ccc78b91813d6f5c"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha512 = "a6cb6ae105229efd891c372d85127b2321aa8febe5d6cdbfc636873e3a4b0b85596474795a220deae0fe35b672e2af0c27b3717f53a6fdda9e97c0097193fe2a"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "5438137ad6a81fc352ad72a41cc774c8e20e3bdfa054ee88d83a23fbea60b33a46022f5069203d2f0addc3b7799ed788686e5f6a8997a5a7e9b5825b907417a2"; }
-    { locale = "ta"; arch = "linux-i686"; sha512 = "f546e1c7ac06082102ae312acca417feedcf55b663efcfdef58b7cc23736bfc7eba3bcc1f503d9197408296a293c4e67f64438937b5bfecf01f1d77d0e83ca6a"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha512 = "ce6c95c29aa021b549c0dae4e90718a8e3cf3ea63a418fad6d2ec95df916bf39a60523c492083256704f6beb9ce558d7557a8e48b970af3482a16a4785947601"; }
-    { locale = "te"; arch = "linux-i686"; sha512 = "b4ac6a6ecdff9566f262e66647ed50c1b792aed88992416fea7b4d4dbc22ae915b2c87d468610effc190204de107b8a17bb06d8ab71f529f55765579b653e979"; }
-    { locale = "te"; arch = "linux-x86_64"; sha512 = "7dec427cb4d54528b9877e4b95fe04b7045ae3f5dd8645acf17145e38fccf9121cf4e02faae0e36acdec80fb94c18f64095d72351f102ac3abbf9657e8b078b3"; }
-    { locale = "th"; arch = "linux-i686"; sha512 = "3a770ed0b63a2f9c373a100d2fcc2138ab78b3c9809103a68a5bdf324dab59d272c805f1b602e50917fcf245802b61cc7f8b47c583ae9703c980d40ad75c309c"; }
-    { locale = "th"; arch = "linux-x86_64"; sha512 = "571b088e7ce2cc38168b9e8630485a1638c9c5d136dd48f1e48b2be8cf89ac81ed1833c71f89d94de4fa46693ae7d86a77825d0b33d85bea67673485b328e1fa"; }
-    { locale = "tr"; arch = "linux-i686"; sha512 = "34f32af940eb3d8aaec3fd18d593df1cf33a77b58bcfb2f23af64991bcd007b49fd1a00e7a8948ed53590174e6f12037af423c6c4b23dfb632db1c763fd7f49f"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha512 = "9a10ac59c52d511dc08fbac735e54ca7002d3c9fd54e27c8b5a3b452a1fc88ddc9321fe62e783e168925187ffeed7892b04cc527af9d2f483b1b9b87c1a7a5f5"; }
-    { locale = "uk"; arch = "linux-i686"; sha512 = "47a5b468fa10b34baa6589a1ad152dd06778d607c5417af262f0899d752fb1d83bf3eb93e2d99244008b8d245bff3bb95505f999a517e5b4ebdaff3f3aa22557"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha512 = "053a3cb4369f959e98fec5b137458012115fdcc786dc90d9aaead2f8addd689f1d0d0f12b90335529f811f00b29dd252f388ba72ab85f0b0414208511399c61f"; }
-    { locale = "uz"; arch = "linux-i686"; sha512 = "64e96a0d1ca8fb88043a6d99da0124fcca14c1a052232b3e581a32ebff57ea92459d4046abc779a4b97380b9f3d958db0acc1dbf05763c6fdc71a0ad55e772d9"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha512 = "74713c830addd81237df3155912996624c52f647633b69be4ae82154efde38c43fba2746c46868b6bd3502502e4afdeb1c67c317ff44db7224853372b83bc3e7"; }
-    { locale = "vi"; arch = "linux-i686"; sha512 = "a4703f2af5428d81b76c1e9c460d8f023ddf7335bfe2420c1f03ee0de812b419d40a964cba5ad563d7733ef14342cf6dc6c4127cba1bd18f230c31adc451e218"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha512 = "bb5688172339d764e24d22efa39c17ccef6d8dcfdd8ac9b2213a8575b0570cfc194b26c911c85313a647e509054a031fae3c6c5285e59a8e362f44df7dd6c088"; }
-    { locale = "xh"; arch = "linux-i686"; sha512 = "2654a664817d4af92f0b735380b17adef283556b42932997e8ded01151a1c9ac18e7eccae5a45600f299ec002ba5a615d5b2beb84fcc5659740a79f57dcdfa64"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha512 = "3f4e89afd9628cdf812a3b34fecd06a4315bae66adbe4629baf1999a74b5f77c5c8004a07af50178e1a0be10442a864dfefeab162d8e69aed30fb5e3917b1766"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha512 = "04c2e924f4f24866a980a86f1fc6e9a1ab40752d7d09080d8f7c466d8682375131088119f3bb8d9da2274ac735099272c94c495ea0d1f4c3244279f0d36d85fc"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "4fe23139affa8f3761b06a38056a82a8fd1f6d5749cd22ff661a7779826c3f01f365b51b7b9a5900e17cb9a01d1a41a34a66e0897e4f3d59220fcb75b7bbff45"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha512 = "f06db5072056a5dfc50ad87b1b1c8733af2141a6283f0db63f57e9e01fbb472635b62f117aa13c96386bfd2ac842b1773bb2f0490744a18910decaa28bde2f76"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "c6c369085560334f9c78467fe0c43be0cf807bc0990dd9b02a6fa6d68f32e4dd6ee1399be3c3f6d7b270653665dcfacc4e1af2a2d2ed28b07a2f98b413649ef0"; }
+    { locale = "ach"; arch = "linux-i686"; sha512 = "464c3b19ab7bda118d962da2699dd40482e1742887bcd9d72b8b7d211c7ab085aaf4c31fdea3c4e195af9030276118431ed7c2e6a917b354c5bf9f55cc8111a9"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha512 = "d9f9844fb06637ca7449bc00c54c02abf8660c42207c0671fffd53e2415df7b0fc3df782c4a2ccde807b4c2e477b0cf3a74c36acb7cce3f75e4ce267a3575e5c"; }
+    { locale = "af"; arch = "linux-i686"; sha512 = "77bca1f05627ed9ace120eee7a7cd24fc354e9bf23a7709e38879241ad87c5d39a8cfcf2aed12881b6f9d6d611c334a864c20c9dee877952990c47c631c6a61b"; }
+    { locale = "af"; arch = "linux-x86_64"; sha512 = "bf4d5353a46778d93627c232c404c768e643420b17d490c932848d126846e4ca3a185df671dcf72b1c1d3fe75606c212e6b0dadd2169b52c4fe73f5088e87b94"; }
+    { locale = "an"; arch = "linux-i686"; sha512 = "2882258205866c93a4b808b7397ff62efd629b74b5233154190ce72ddd0be5d1eb8153d686d921ddb72049dfae0f11c3eb46128413e578c0f9f6323636a0e378"; }
+    { locale = "an"; arch = "linux-x86_64"; sha512 = "543b1d66dc37e1843f370ff071adb050af16e5777bc0042c2d25579a7d99b5b1d176ea099a0b3afc19f270ad5f191fec65e544634e2bbc2223ccc6afcb1869e0"; }
+    { locale = "ar"; arch = "linux-i686"; sha512 = "855fc1c71b50ba5b8354ee7ce2ea59664b40b77d007d99ea6b658873de729e22ca9018e475a669992b2e2bea9388fe0966e06f1e2b0d334df4ffbff2be147949"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha512 = "8ff272dd30cc66460a617dd80678b68917067b87d63d6b307f6d60e61deda092f46bca9e890d08b69a0738f4c204cd2c5896201b362df68aa9abbe7dd0fcc96d"; }
+    { locale = "as"; arch = "linux-i686"; sha512 = "607039866932e6ec0692c534aa2e4ddcb3725d81f2908e7e905edafdbafb3221161f5ae4a5b6eb2ba065e9bd66e1f63c008015b17040033ed90ffa0576b1d08b"; }
+    { locale = "as"; arch = "linux-x86_64"; sha512 = "59f3c28bcbc50a9ffe780025e03edafbbf82a213f28ba8e0f62a04a0e052038c24e1a5928ad4a730455bd358fc3cd0f1188e785dd13f79b377d86e5c55360735"; }
+    { locale = "ast"; arch = "linux-i686"; sha512 = "c9767d9b73ec2dd411e16b1fab503e97b7960c315533ca529c4898dd10a6e0f809104588ac33f440e1026d026d114ec080cfc312b1902601958656607cdd4ad1"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha512 = "f4c7ab66af5e7fca460999b3d68793f8099b177809e70f682fcd7b0a50a3d5ad2a1c15bc5df5a63c37437fce9d70e08e963119755626c357bce6eb17bfb229ee"; }
+    { locale = "az"; arch = "linux-i686"; sha512 = "58bb0eb057caf6af113debeb8d9d7eeb3b2fbd2c52c9dac04c527a67da45b3a4ebac4debfea1704639cdf20ec116876e140f4b55ea5f2b90f3afb9db6b2641b6"; }
+    { locale = "az"; arch = "linux-x86_64"; sha512 = "a82fdc532e4d9fee9ffab9ab8aa58074c4ed174c131d56b4ed48b1ebce1f8950371fa7c7e174c4f35150b752cdeccc2a553b416e94fb3eec22c0c4467c0b1f20"; }
+    { locale = "be"; arch = "linux-i686"; sha512 = "55a96ff3fe9e54ec09a828f740899118504848c82b9c842ed27b9c1e1179f8efcbb2fae5e25f01dd1440f9d2ad896e37056fe8240979cf2c60f536870590cac3"; }
+    { locale = "be"; arch = "linux-x86_64"; sha512 = "6fe1b00f8a03160a5131a52aba5b31401bf18913eb5b6018d1dccb0456ee09154c76220bb94b1ee20bf5b8e63535a888abf895af570e9a668395b497bbdf90b1"; }
+    { locale = "bg"; arch = "linux-i686"; sha512 = "e21d3a2234b533b9d5904be3c1ee4f489bfdea747ff2b45828c40712f70d631ca824375c7a232989741bfceb8a7eb1ca341a4709285056cea2cf3689326a9c35"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha512 = "160600a553d452c30d533e4d9a4ccc4c4d0cbbadf7875856f9be0fc81dbb7a686aa79f47ae8ea1c1e3746d150db31c7ce0dc18f1d271a47abb6d9bc35f478bf0"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha512 = "6a4267ce4e0d474779f16a7bb31fb873c0d2ba4af993428330bef8c93a24c1f9121b68d50956beb3df549fccf233fa2ce851c69950bf93cf6cdf34debae0cfce"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "31100d78f0b2fcca2643c822f930ffcf01da9ad3c026d8e05e88b659afddb9d55a000dfe043a87d6e4008d40fced109c134a3bb2c8183a1044d462fdc050989d"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha512 = "cb0efc8151949b33c23cb9d4fe41168830e215d4361963ec9399e43c97aa4504b4539a202f2c43283e63ea0a4afbdffb9bbfa1340a256483c3b848ef24660734"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "37e8311e0126da80740b9f97b4b69eb2285716b309e1986daaec5becf88ee5624343ca3b208fa84eb63477f47234c8d5958e394bf750da32e02d777ee94437f1"; }
+    { locale = "br"; arch = "linux-i686"; sha512 = "be6cb0e7b1ceb0be27a7203620b19341c16061ce0d4632f9ce135b2559db2ca31adac2e40ef95f98db903fd151a1b5d411232361631272f2d6200dbcc45464be"; }
+    { locale = "br"; arch = "linux-x86_64"; sha512 = "aa71bd069902a921b2a61ebbcbb604972104ba5f4274788da261e1e527dc7ce10c6a9aa0652773f0d0499d53c2916dd1e2d862b900fb87d678a9bcb401948cba"; }
+    { locale = "bs"; arch = "linux-i686"; sha512 = "5282780a9f35577498b95ded38f86423d043429a0fb4b9ded956716381a3343ebe653508e8929bd8ac7475a2fa0d6c4c67e84482cae0d40a681338eba09f4c96"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha512 = "1056be9971338d821025a5d272321ea4b1704f3103c02014cde711516e9da5303dbc5753f0c2c1cf236096a53b3b067261b628f17d6d45e6c713f5b5cdee69b1"; }
+    { locale = "ca"; arch = "linux-i686"; sha512 = "15c98207cb051466bc89dc15fb2dc1da95490306030fb318f3e3bb184d23590df7213e183af2e5178969099a4edf9752e5872a9d4a091958d7a9ab6087ff6bdf"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha512 = "f7fc94c6c358dff1336938ff2d28c4fb9b0d391c22acefa7e286004978570e18cc1fd1a41a101a8bee27cbec1d750e04ba43cb409886f2b72e8e16a9aed6c835"; }
+    { locale = "cak"; arch = "linux-i686"; sha512 = "96da63ceb6d4382abd8d1e343fdc4b72ead5e5ed2e3d451e768c6b092186287dcbaf239c389d29bc23e5641495a3f2a05512377300f45402428647ab77550b17"; }
+    { locale = "cak"; arch = "linux-x86_64"; sha512 = "8584d4d82c79a56657a01a9cff211fa99e0fbcf0a42103a6cd9688713e7c11b77f35535fe31ed7e48855e055897b2c5fd84c2b1796c313401d8f01ed889ac7cf"; }
+    { locale = "cs"; arch = "linux-i686"; sha512 = "2dff956f8df85bd007b68eeb8b809ddf7d99a6185f6946d2f4fd371f17e4dbf46bf2aad1799b6a1c84bd983935fa2ade5acd3b062f3eee48f7a160f37f3e8e6e"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha512 = "725a2e1272722cdce125b5dea7e61525a43ddda6a45cb003f397ec8d1c9334f11adcd7fb6dd2c901de1cd9a0d07eae54304e5f95ecc6c529c80070b9d6af1b47"; }
+    { locale = "cy"; arch = "linux-i686"; sha512 = "5eeacbc1cd803687235927a91923895930e135a39de62574c79499fe56accb5278da3efc4d151f0f93ec482ad44099481960dd6e3102afa94cce3c30db67b133"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha512 = "49fc8136b3900b96fcea850a9549812b1cf1e9b1058cf99ee7e2e135cf49827e46ef4361badcc4efbd5dd09600d5269e68392f8df03c2e039d6b3d04b244aa71"; }
+    { locale = "da"; arch = "linux-i686"; sha512 = "f806a36960cbec3624be8ebf6e7f8116635c7fff63ca890a886bd16fe73ec8a311d1e8b3c34ca680425d4634c91f8b96b0617cd175eef69e701d7c72e8917872"; }
+    { locale = "da"; arch = "linux-x86_64"; sha512 = "22a274b9a5a1e670369009f2e48a4b7d2f63f18baf435d001506dd590b59115d43619fa824e2156b468b17739aea420621148ca47cd46bc3ace31bc5be4533f8"; }
+    { locale = "de"; arch = "linux-i686"; sha512 = "6d64a77f420d1f87b7dac151eec75d4d42ec1f904b882b970d88b0e20a38ed5ebf8cbb2180abbdb8fb00dd60621e538fecaf77e09c4aee51f71a38a14f81b9b8"; }
+    { locale = "de"; arch = "linux-x86_64"; sha512 = "897918d57691fb1a3f93273da48c128cf8a91e9bc5dd12d0ce2b4a085ff4df01db3ee28a378f36b7e7944c23f71df8a6dbf3481ec207cf85b73f3bac95bde054"; }
+    { locale = "dsb"; arch = "linux-i686"; sha512 = "d5fa1438b71fcd3507175619090840cf983de9efb003f537eb28b9dba66f1cb3518e1410c4918187eb25766634464aaa796ebe0020f8fc110361008751e1c359"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha512 = "30cb3759bd1f6ba91dfa847703326a57901782ebf397adaa1a403afe894f9b8cdeba80fc910f50037bae003e61956845f605b0e62c364c1c415b12a5abb87080"; }
+    { locale = "el"; arch = "linux-i686"; sha512 = "991dfd0870e38ee4a8887a61ce87a4c5af1c21206442a0602197caafae0be2c3c5aa4c7b25fd92fd9968bdf25c780ac342dd0203c3df8d729034ba20a459d120"; }
+    { locale = "el"; arch = "linux-x86_64"; sha512 = "d62b4f1eb5feeb30e4d2d7b8cb7391f374a209d14b70cdd77acb56106b6df36f54c67a3c5fa1ab4286fd7c46b5d0a42efc52d140b8e5cbe08b17c6d7bd14b498"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha512 = "2cddfb3d4472bfda882a3e3a054d5826a596bfd6b9b4399d7f45c6ad9f157599206f5e149f6c4fb35845ae291320520bf7a76c891713f1951c6e9a9450e92d23"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "d6bda8496f96448b9b046822547167c9c631dbf35c8bba07226634fc9aa1058009200d10e4e586fe059ab1e7b558d6cfa2c0040a33220d46dba5ca742bfe6f5c"; }
+    { locale = "en-US"; arch = "linux-i686"; sha512 = "a9025b8d66c9294ede71ed37b7df256476cc640f7b7ce74cc4998c0b4b5741b5f869c486f1eaf4793fb4b2f347ba069f859e1c5318fa8df18c52377c83f8a09d"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha512 = "a551550037fe762d6d06a4f046ff4e2f37cd2607aace13df5ba2e28d643ddcef01210367555fb2fc66c6fe45d83f0306f61f4139001d1059ea5e913fbd43cd69"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha512 = "3e4721593a69bc289c7299b64e91af0ff121d59ded0167bfdd6692dc6d7a0ce0b0a7e8e89a591cee9fb90dc8b9eac26c5d978e4443b1d3462a0f4030ec8c5a50"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "76e069c8938cc133576c934e4049fd4d8920d8a823122f1961d4ab69802e9e52e920873fc1406dbab01edebd0cc576ccb12df0ebbf5487ddd49c339111bf7101"; }
+    { locale = "eo"; arch = "linux-i686"; sha512 = "ff071fd2545a8dfe0fbb1b1dae57d3fc4b0743698e54746da1f774b568b2b9ad9b0e14e2cd27f56031e1d159a05ae7d54060509532a7503b3dcc7fffa442a514"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha512 = "7705efee2c65de30a0efc6ea0c372061f47c4266ab7faeb6feb01bfde4324ac92ed99a9eab81d8c4e2e6972245953a200c4331b26845eb7a2f9e048fb3023840"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha512 = "3c08ab10d76650fd11ecd9616af1d4646fabdc55b63c7625940630f8aa25427482a3ff04052b91e6aceac708ca187552f7c87343d08c01cc1b4940e341e1672b"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "b6d700123f612b93b952f05bfa92dceed8878ad20a84214f8daab63e4eb669f1f69a9a5d6d28896b16b19d3dbd710b98a4851d7f611bea0fd79e41930c3d838e"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha512 = "7c64c7f7058b1cb3bd5f55b1afa0bc2e779d46d05e5dd354fac7573ad6245ba31aa126301d827ffd17f197b460be24c98ad7c2a9a3d4c66cb6189618a4e38ebe"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha512 = "dcc4b4085fd4e480e79ca85b862c421f6e85d200d46b40178ce27177c1ac00f0d19d0c71ae3d7c12e15bf570cd0234743d080d06dae1e9e3c0c2f0eccf4bdf86"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha512 = "d049bada399fbc723ceb14aa116b9218d14729cca6a2297d852782e4d3a0cc7e278aecc62ec4b7f1e1c5af10f65d0cd0bd39e6fbf95d989ce4d2ea5b0e2f7901"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "a77978f8af7f932151468c9e002731c8b6b3e9d3d8d8dfdcf28cc545b63f1d859b99c6dd25c547201b050f58bde9a55fc67b8134ecb0c893ce50f7788774fe99"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha512 = "46a7bc0f112f99ffc218e0161116b373c5b496e8d73744f9ed341fcd0fece5bc4618bcaebd68cb0aa80bf86078163d92205d322464dd8a918463507e4a9bde9d"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha512 = "412f52d4eaf3f85cd452d18164d2ce13d3057b45bd4f81ef2255a3580bb5b7e68f23dfc8622dbe3c4d69291b1fbb4a3312a429713b940b081415157fe5dc849c"; }
+    { locale = "et"; arch = "linux-i686"; sha512 = "34d56c20cd06f224d1a3916a12bfd3f076a1659d9bf21aacacd5bea59e789ff496600b712a12f0b67410da97e0500d2f28f1f916872bd223f9f3b913ac648552"; }
+    { locale = "et"; arch = "linux-x86_64"; sha512 = "383a4e2b28217651e76a06dd84eed5f058bf53c25847a6ef0ad1ea9e6a3c98f6a94ef05999a92f03f669e7cea0df11654b201c4e21fc595fcf99bc91b90c05df"; }
+    { locale = "eu"; arch = "linux-i686"; sha512 = "cae20dc1b9880dcd9ecf4331bf1b6c6208a63ee3490ac8b827c9e338916a9d07e447f93be4108db78ce3cc96b8d3828f1882c28aaf28f198fa4f875035ca5835"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha512 = "38ff3155783328b685c72f1ada0e01ab8a8fb75b191455dd43de590207f9b3a258da7cca6ecd3538a7d8319c8d1372e174fea0a22baecb497ca33aaff80a33d2"; }
+    { locale = "fa"; arch = "linux-i686"; sha512 = "6d4d15e4897568d32128f193fa7bb413e63cb2bca23b81a16cb5b9ae7a558b768193461a182552da1153dfb708f834434a1fb63478cb5fe7984b91d00415ea34"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha512 = "6439f27cec2a8af66a4e68406c88b536c5f8e2b0202ce82aa46e75f840cb3977ddb041d8ee315d95505ebaa0e37b36afbf26ea0f39310cda09f6e765eb7bb120"; }
+    { locale = "ff"; arch = "linux-i686"; sha512 = "ee9114fe358d9a6dcb7e404f13fc594de9339fc7ad126063b52548d42aaedac7abbce9e647766462de2716c3ad248b6992dc04e96ea3816068e884c30a3bcf84"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha512 = "beae2223a6b3aa555c071b51a46d3b0758efa53b6002f2486554f5bec154cfc1a1598f0175af654fc47a60a170eda916152e959a5ce2f799b779e5040ae15c5e"; }
+    { locale = "fi"; arch = "linux-i686"; sha512 = "d8414f63f04a5a9c916487f93c67d2368bb4d8c8fb757c1d58233e6c6e6bde139f323b1c77dda57730173c6005b2647c688f7072ac09c1962b04a2493cdfa18b"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha512 = "7e0fce63b69653fa5d0d0ffa9598d10976a1f49aeeb48bcd8eee26b51ca1f6d1d898c84944a442d530abcab700dcfdf89c48ca23db9d835c877388a8f694b7ea"; }
+    { locale = "fr"; arch = "linux-i686"; sha512 = "c3bfda75397d644bc4392ef87f1d24faa033f4c5672adc4d5d0007d5fbd63efd7f46a2febd0bfdf95d8f06152d274daf39ef6355e049e7fd5e53e2d750d03ae0"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha512 = "81c8091c9d8cc1ede738bb1d9b4fe72580d13de7e3f89410d1c684ca017ee197837788e63243c9722b30e23b2c910cb54fc7985f4936bc6068643a504d9a4ebd"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha512 = "59797af1d76fb2afceb06de28c6fd13bdbc14d42c61f87f1f71d8273e03aa691e2ade3ba0361d19721862878c911ec46ffbfd0431d19d6ec0a92ebac05cfb4c4"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "19d0cfb01374bf2842a17ef4e9f5ab85280c1090723c1657459a230262d22aeb14c2faee1b86ac0b342c5926cbbf0479f2e1ec315117c06ad3272a3362d02f8c"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha512 = "c1a4fe00a36e95fcd33d21544ee6b4fa5a6eae0628a37c27057cc801a641fbe5519818ccc157b87b64f24f4886dd6dd629809c89b9c89dc4878de794e48b107d"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "8d9654ecf7b6cb43b4794f345105c779809b9bd39a9dd46a0fbb1920139e9234e7433fd9a8d7dd57192c738d187f97ab82c8dd3f3a2460e3a34cdc9e9a5c5089"; }
+    { locale = "gd"; arch = "linux-i686"; sha512 = "0d48b2886c431a9237293f24fa5f8cc7104a3373b24c98e23bbf93f66aeeb5b8b9e737712bdd1c777db19bbd6b01f9a33f0c388b6af023d852cce6543d486973"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha512 = "0339b6952f993d38686d92ac9a664cfa558f2827b92ae3464188f12e28e2676c8c4718cff62a840dba14de687434cf13902a621094f63e1bca1ebce321800d15"; }
+    { locale = "gl"; arch = "linux-i686"; sha512 = "5cecaede8ebdfb58951b3f839388b81dccaaaa5d3b4fb5cbf26978b23cd962905191fa91d961037fa15000af47ab48042d272fd18a73e5ed4dcc2bb0ff4416ca"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha512 = "d1a0447ce592e7d2a8564d9c27fbce5f9378a4e21db3fa501782e57b6e13ede6f42b612fffea32e8891d47010509ac8e3ed1f63c5a81878008f9bead68b6b750"; }
+    { locale = "gn"; arch = "linux-i686"; sha512 = "aff2f407e4c947d3e34447b43e844135562d79bf937a05dad5ce4dd1853dd479f35b4f6af1b2d8b52deeb9786a4fc67980cbf58ad82a747a7e55ea753a50ad43"; }
+    { locale = "gn"; arch = "linux-x86_64"; sha512 = "78645796fffe364fcd28b80cde591d88db91a756318f645610f6823b616222c0c53faf8d55aaf1703d4bbcec1e8381cee566bb5739ccfa181e1d1224408463de"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha512 = "331bc227d138a49d74cca37f8d7ba4e6eb891064357aa5b0606761f9af8cc4a029816a3a96cc3ac4dfb71b1d010c569940ebd70375fdd06af7b6b487bd90dafe"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "d1f6c5af9e75e76683d39281eb559ac688436eae65d6bc486763028744af030a6c311d1f0358ead5e88ead60357261032dd739251352cde097986251dfdff325"; }
+    { locale = "he"; arch = "linux-i686"; sha512 = "7a49d8cabab6aa8480026de6b77e1b6d60333c580d2b9591cf3fdc8c491d269f6a7a7f93118594de8c87576dda868f12de5a88f494736f721ee3ddc16a9afea9"; }
+    { locale = "he"; arch = "linux-x86_64"; sha512 = "0eed4301d7949415d21426d9e52825710a0f48a1a0a3546f62d757059091bf12b3b53091f2c3102de0682162e3982a9fb58c111c9a6b8245d84825892e1d6844"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha512 = "70ecabcdfee807b1a7e0b6a167bab07d3df798672a61bb7b80d1d6c3ace9385c472e08dd31f2c4c684cd5e723e7024016728df7b22943d3adec3d770ba7abd1b"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "11e8be059afa8298a23857bd68b2f895bb60f73378c513d2aae0395b5faed68123631d9ee44b5608263334269e33b76b4563c063b2feec486e7a2dac1be42275"; }
+    { locale = "hr"; arch = "linux-i686"; sha512 = "2c99b81cb0c8413aa98dcbac2cbd45d59a440c173a9cd744b78ee0d60b82ec4fe4894fe5e313d51b81caf6b86f40effdb36f5fd90c73cab82acf97c20fb5b152"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha512 = "fc209d82cbc24eea777a4318f5555d2cea4828bb7f305f868b8fca18014ea7c930f778c716eb0b9c1a7e29d9a4353b4c537900f9d659c432d6a75b1eebf30963"; }
+    { locale = "hsb"; arch = "linux-i686"; sha512 = "3232380f15a33f31f8e3755707231ba0725b9afdae1d2a0d4fb2eb883ab4dcb5c8aee75549e41e7e2cdf445b6f39331b2be4d7e417604987c7ced46d2dd5dc51"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha512 = "11bb460c404316c322e2498986ac6e7cb976a196de7208ee54dcd4ec61b8f05fa8f7782d6cf462cd5531f3137b1688b7797da2d78437e3c4d4f95867c781953c"; }
+    { locale = "hu"; arch = "linux-i686"; sha512 = "40c3837c7ca4e0dc9e97e4c4422e54cc3ef157933ce9969abf71fd422fbcad517a6f6da3bcada83d3567323e83248a060fccc8a23a7f6fb55568a5b7ee0ff464"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha512 = "d05bdf14ed9c72031a29e7e9b39afe79bd2ccdc69bafaf8c6196081d462b0aa57a220a8a2105812b215067494c53de8adc994fbbb3549ccfcadfc15f99c710ac"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha512 = "a9da495cc3e7a1e89ca8dd7a3db6c83529e0b7ba6562e7f0542f8b9c93bee8e4c219973b0b6fda1abd046d933fca718fab1f6bd4350ee960ddd89144dd321ed6"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "53db4843e0c9e99188e28bbe46b09239d998a3bae35ab79954bc6eedc5e73c0f3010c500dbb93f8a6ee2d5b22fb3ee9fef9ef6eef2dbbadf4b83f948282a8bc3"; }
+    { locale = "id"; arch = "linux-i686"; sha512 = "05e7450a164c940e43ce34f6b7c9ad610d1652f11b0f030dfea7c9d8539961b2f3e69ab0d3b8d714725cf3e8bb256f18f4ac3613bc86bbf6223d9914e4eb77f3"; }
+    { locale = "id"; arch = "linux-x86_64"; sha512 = "7ce0b880406dfbef90ca6ae6f121eaf72bd289e7b57f7686ea83fc182cb9b54a3e0bd8b23bffbcfb3c9e82a6b13c7afa16ce56d426f33f66072db4b5f466db04"; }
+    { locale = "is"; arch = "linux-i686"; sha512 = "71446911d5142ab19308aca456dcc1d4d087db07898e331604230faa58c2146b980212880c7f88b6e3770b303a8450cff9e447638b5a063daf50ec25d29de738"; }
+    { locale = "is"; arch = "linux-x86_64"; sha512 = "2542f214cb2474eab97d18a1daffb1181fff569058b91c1c9d7d6400b8401020b69ea9492fca55153c904289be45215b37ed0846d563f8f06ba401c482d59762"; }
+    { locale = "it"; arch = "linux-i686"; sha512 = "bdf0da50be211492e2acdd9de223ef741fa916c54e94bf9c8eb20685006b68b5f430949161199a915c368d11143caf828c25b2e82c33fd5a61bfcd05de53966e"; }
+    { locale = "it"; arch = "linux-x86_64"; sha512 = "a4562fdcac6d9ba96fc840498bbb381de6190158fea65c4809ea1ff3518181ed47b7c33bb772077975fd07c23a1e8700403cb6cc67c5fcb1c24e72563214f4bc"; }
+    { locale = "ja"; arch = "linux-i686"; sha512 = "cc81a02282474928e7d2efc694761168db022ffcbf5ff32d92c21b90edfb194187dfb78f2eca4c42e60cfbba8ab6614c1c7b0359aaecafa47b1c9d3918327cee"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha512 = "07cd92b7f9647f774b080cfcef828899144cb03472d70394be197c43732b164978e1d9ebc9212a47b58fdcc61f5009328e766f4c6f799f35d73a4dcd2b31fdd4"; }
+    { locale = "kk"; arch = "linux-i686"; sha512 = "1bef31c35180ad7fd49ab695a6985d8be301a6802225d319e979b8c716e78a5687753b6f63516f4b4221c402a2d2c8c0a0e22aec9023cdee98d71a4335728e7a"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha512 = "dff599278a27fe2b4efbcc99b7ad3b211ef5debbf1b95d765a36fdbdbaebff69936c250018f237843481244e2b02cb8de4e3090d9422adcbb3d8af4239759269"; }
+    { locale = "km"; arch = "linux-i686"; sha512 = "0080783187b80019cb4c56e2b30a1a403c632defc375adab7d613489fbf7f217a22a779f0119e2810ee9f0bd024418ffc654df146873a06f59bc7f1de5fbf244"; }
+    { locale = "km"; arch = "linux-x86_64"; sha512 = "84d1ca7fd0a4d6a39aff375e922dcdcbe51fb2b497c6eebc312abe6cb5b29bd049e648197f0181bb2ee1b47b43275c14eb13233958c0bd4f7cf7b28e5725de97"; }
+    { locale = "kn"; arch = "linux-i686"; sha512 = "2dac35157e3264547726ad33f786bd86e52a4db8aa8d1449cdfa9993e5bc16556c6005e06cee915e427e74b3eb4eed665a4a6deed7bf3800a95319346fda3690"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha512 = "175b3edf58286a229ab4045ca2d75f8a00e8ddcac532fbfc8aee5a048e0ae0cd5044155a8619d6dc53756150bce2d46b910e1abe216bf537d259435199cb42cd"; }
+    { locale = "ko"; arch = "linux-i686"; sha512 = "1db17eaf47e7916366d05021d683c2b4d8f26316abc057a450d24a5d19fa1ed9aaad2f7a45cee63c0f021d93214b62a032d17312cdb123289b31dd2e5bd43808"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha512 = "4bc673e54fb0c30b7c8389c2a66b322bd4b19e8635cb3d633754214c0726fb95d3194d09435bb4afca17e6cb3f03f028408d13f9ed44d8c2b9c323eabe5101e9"; }
+    { locale = "lij"; arch = "linux-i686"; sha512 = "8349ba8cf921d73f0c3bd54c9a30df9c0232d7686724a0d635435d65a6bc8baa1915e25702b930cbefe954b5aedd1d3faeaf54ffa9b5dc494e465a635a57369e"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha512 = "e12597062c060dabaff08c251f82ad63f534c341d1afa94e567c763b7ac290cbb03a27726e03b449ff89fe8b86b25211e807ef7ba34e876d902705f9361d5cdc"; }
+    { locale = "lt"; arch = "linux-i686"; sha512 = "f67ff28a20ae0580aa537797928bf84cdc088cc0df586071a460eda6ea7b96337a5004b2689688a487ed246b5d83a14bf77a5002f39fe7ccc46e92f65b565cf1"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha512 = "f4ffb37c69b9c69e9ea54d691bfa3c069b28d5b1b0b48b917f4c6f10c1434bb451b7c17e777b5daf3c869eeefb2a064264bba7591f681d319fcab00335b37384"; }
+    { locale = "lv"; arch = "linux-i686"; sha512 = "7efe759ef2f0e585a8887e829e2bdf917209efd5b3d5235f5765c0995206c25941abed9b11f9241da565a919f94890682a944d2bb7dd1d1360f67f173dcf2852"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha512 = "63cdba3ea94fb1847913a42ba70193ebfbbf1235a28881c7d671b20dc8272c5989dcb8290087a0862cea7a4c8ff448ee61b42a13d6c03c8787be1dbd957769f1"; }
+    { locale = "mai"; arch = "linux-i686"; sha512 = "0619cde7ad13590d2da001fdf87e2fe9772d65d1ce468ea2b1f3085d8c6c157f48d23b343e6886969dde5827d12a368e208242dd16df4e498893d53f030665d7"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha512 = "f65ab5c51b7dd0f127a4b9f65a0280002af3387b12e8730f8efd79f4700f6c5f5842e3f634dd738571995dfa52ef58ec0d68255ceb52c6a7df0332797dfab253"; }
+    { locale = "mk"; arch = "linux-i686"; sha512 = "e6d2bf183fc1fa88d0bbccbf058344e8dada0271694ba3bfc149e965ff16ec05ba6f7a04cc39f3657524555e84f25d072d7922fb2c075b0bbb8cd933336f1d94"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha512 = "68a96a11e38944d654d1aa720b5a099fd0789520b8681f15cf33d972956e7dd2c44d940ea0b2840c48db79615aed8c83d3f19769908752f960f84a7bdcf3a2ab"; }
+    { locale = "ml"; arch = "linux-i686"; sha512 = "32c8e00f71a7fa609c3b99799f64362962d245d75865ce54fcd72e8cefc45f5cec7a99ed343a7bd92614569e62a02ac0e712b4ca3fce3d5d0f2f7ad52767c209"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha512 = "c641244006a11de3b6ae947f2d5bf8b40fd4bcde8e7b71d2fa2a8258087bf3d6382f21b10b05b2554f031ee95a579d31d0e0d8f1b72a5e1101acb31075aee02c"; }
+    { locale = "mr"; arch = "linux-i686"; sha512 = "3949d3e4d9fa507c50f5ca92ee9cb041dc9d034f78d44343139a1576f128a06d8ef3aa2b1fcfe11d77a7489b0f7dd18e14f0ec0fff595dbefc219f6b1eadd969"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha512 = "c323cf8842f695e47f3c91d356ff63bb0ce7a5cf47cbe874dc6956d90fd84f6330e6e1f5f0bbf61e2cfda66a2dd0e81a756f3b464108e7ad84450722562e5906"; }
+    { locale = "ms"; arch = "linux-i686"; sha512 = "f5ded01c47ac91d506a10774b198b3c2fdcff35a10ced17cd0cd94a1e367d489f2afe7ae22d59beb420f771684cefe3724c88313249a4c6072ce68f36bb16cbf"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha512 = "39d4a052c21fe9ee876f8b8a7fabeae9a6a30d959e1a7b27b0a1fd08658cac5959aa4879e3056675e2b7de83f588cf82f5d138f2ee5d9b0bbd135b51de109f7b"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha512 = "6cc34cda3cccb3ce92f44244e291dc94238292ef6e91172d73659ca5b4b46fd004483680a7a45ad3643d59c57c7fe7bf4286f4cf7c903301eb39712db9bd3583"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "da645c69d2675bdd1d2808f0d7446ded4414311bffe5f1a37a685f6f4338a56e831349a1a7904c0332266e909e4e82085585afb14b3fda7925698d66e9912a65"; }
+    { locale = "nl"; arch = "linux-i686"; sha512 = "a2d906caf6b4c36305cbcd2840915000c53db2ac03122aca162e672014b217237363bc309cdee5ec19d21106073044fe8668fd044805161bf4916cdd938565ed"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha512 = "6288c2f0306aacd87a82a3a6262b514f32a177674e6b96eeb5a8f937ee36b6573d8a3e6925be87609e4d7dabd1e6367eb0e730d87148cd50c1572756bb098a5a"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha512 = "04454f9f5dd2611cc76575a41d56f6819c5b97e213f82ebf0aa5e8393d9cd4a99a9df5291d3e3c3985396a99559f39fe5dc6a85141ac1d2f4919b731d7539a89"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "fb55685275d0b6c9e47b0356bd4249feeb3005b338d2a2caea4bb7b86edc6991752af9276db91f448032ba7d9e01209d92706f7612531232f87c05cbcb13f337"; }
+    { locale = "or"; arch = "linux-i686"; sha512 = "16639bc10229e171577abfeab841bd7b5dc411f4e314335787727803a486b8f04e8730a7be9321172fdd60791fce7363d5ce5aa28628cc4d2b7769357737cd0a"; }
+    { locale = "or"; arch = "linux-x86_64"; sha512 = "041f3a63a4cd9c0f287132252df7aa6d7eedc72650244729e01eb52a93a9ca8206a11cd7783e7778d4cad9a525ce2aef1c423840ea5c54fa202600a0b5805e31"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha512 = "7c9cda0d9dd9d1196ca33a58b6f5f3c3f09896bf65e8fbeed67fd9811cb1bdc12b7ca8966b7612cad524a3bcc9dd1e2678627f6cfe172b1bfc2d9b64eaac17cc"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "56507e7e1e93ae880de5410b4ad8c1302f58b43ade2ee4dc70c1290334edf2ea05f7ddf2ca00317ee33662de29c635caad8f73332935fd5bd4ff6a37758bd195"; }
+    { locale = "pl"; arch = "linux-i686"; sha512 = "52cb7e700e541a82328c935a0a99313dad6b7699c09a1386697c77544284d53653705ec6d57f3cc1bec632962217c090ee39687a81b19f3a3af2178eba9a1eae"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha512 = "77a99740ad99808a31df3e71038944901fc0d5339f919cce40389de67baeecf2b9c34608194ea1f0e4a25bbaed0ba06159d10ac8816735b34a2e28ab041ae97b"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha512 = "e39d9b22f8b7226ff2908b34847fb77cbe0c834f51985712024de83ece7549c8a89c3ab3d81abb6bfe6a7b21f18dee2d87926abf3d2edf9f8a8976242a4dcb26"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "a03a0e37ecc2d903715b70eec0a4b2808a913a8e27398dd96206295e1e765283e97b76ba278b394f9629e352c10cdb2011f3184b903d0e6de784a13abfcf9668"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha512 = "2d511400948ce05358b9400752bba41cbd947d1a4a5a5a92f982830db92507e257c28ae319f411717253dd53a1a7e73607f9f62fb7b7c8666aa339fdc73ce728"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "71e2a000333ae8565de6fc9d01e871c2e894f96a9a2544a21aac08ccea0399da37d74c3230c4b3cb7ba0231fcdddaa417f78e48848fda8f063179766cb675038"; }
+    { locale = "rm"; arch = "linux-i686"; sha512 = "4337964e6daa7bc799f01aa52a33f04c060288bbb881c2321ef938658b57f05b632f734ea0564cddd0078f4b38d1c8cb2c2e6221849ca4aa80579f308fdc2056"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha512 = "a55e250de5e11ef808243ef974fac8938c70269a36bcf9db898a11997722b8d96d60d76ca28e41e023b4c7e6614e323479d3d4d2831b83655ad3ae3eb5ed774c"; }
+    { locale = "ro"; arch = "linux-i686"; sha512 = "17171889ac7647e525783c96afa5a5de796d603c8fa6a7ad8d12205ad510f869b35f0df79aaa04e4b980c86ceb923f89936499df7e55539393e40ac92c23bb1d"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha512 = "721912e5ad4b0ad0727f0185f660351b3c59291b3a22aa394f01c26ee87366b43b5aa08cdfc164c16117e1650837bc2007e42c34756dc26466edbb113f11fc09"; }
+    { locale = "ru"; arch = "linux-i686"; sha512 = "28dafdbe6ae4fdabc061c68ca82dc6ab8fc463da11c712500378d90dfb662d6e0991f35a918315ce138603283befcee182092ac4f8d348815bef27431252874b"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha512 = "27bbd48859f5ed6053a2062778537f4952a0847ff74d2dd407766ef4b4f144903167b4fe80b98a5b2b80e42d6b730bdfed36fe9a958d247a335bf31f091b8c70"; }
+    { locale = "si"; arch = "linux-i686"; sha512 = "0f50616131a3b80499885ed5fb8573fd3ebe522cc893496d03e48ac6eafbc2a5224240971b66c393323d2583512dacb73f3201eef1a495298badad605cc76bb3"; }
+    { locale = "si"; arch = "linux-x86_64"; sha512 = "37996cbc994a7527c2ffc5143dfe970ae2fe0e098f0bcbf9fd4643e8297bddbe7fc0f4af2f2ee15b0807c339c25d780040e2f9f03975ba9f49359052a2be271e"; }
+    { locale = "sk"; arch = "linux-i686"; sha512 = "db95ce3b68fdfdfc9916cfbfa6a797370ddf58f5aa234d59bde6e76cf7fc0e821e9954cd0ce090404f5f718b9ede9c1ae6b9c7e37db9e64eb9d9dcfd975c6a79"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha512 = "f9e28572c83e70c7658fd67abce93d021600fcf6b8daa7861cb6eff315a28c0e531f1082f6c25f5779371b2884c975fbc22cb953aaf589ba6b050bc736d25d9f"; }
+    { locale = "sl"; arch = "linux-i686"; sha512 = "e40c201c5e892a83a23ac9f1af22e9274bf6d964b39bae2e191bdac100170685376fa81210ddca38c76e5277978772c693563e55871318777cca7ac7e47fd1f3"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha512 = "ea4a198b300e2fbb23fdf863659b683b772624cf4f6c2c3e5e07af9a3f991a8fdf7113f852646f36f697c705c3a6f24485dcb8e2d615a3a358bfdfca406254a0"; }
+    { locale = "son"; arch = "linux-i686"; sha512 = "b510efeafff8c32ef3b7f88e81d4c1a1c1b2bb435c2ed4ad69adbef8f5d374677e2231f94700cdbff9e5f747c712d8f58245a4c8f0d38ac3eebb5adcdc42c7ae"; }
+    { locale = "son"; arch = "linux-x86_64"; sha512 = "8c8d583e7e5ef1363096c905535c8e6dd63900ee50684d9cd36b4e55100930b8fc8ee9a3ae770128cfc71a30a73f331cc508555ecdfd3fbbf359ad08d5cc9519"; }
+    { locale = "sq"; arch = "linux-i686"; sha512 = "809ec8706df6f3538e3c53765a1f1834cee3d2d9cffbfb1f3e991faeedaca28a2dc3d4e037ed9e00d58ac6cdb27f5575bdafdc454828d9fa988d7764bca88c0c"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha512 = "6f2c5778d40e9bc5bb558ac626becfcbe33c42e2a2e588ee59065f60643708ff83be55a082b383f7747241ad8d59c0e3e13bc8556967f5fce034ee23d7f054f8"; }
+    { locale = "sr"; arch = "linux-i686"; sha512 = "cc0e0c039af32611d489bf082dba5ba971b54b22937d4b8fa80150a560a3c452851e67d02f7cb27e1a63229c9a42da449f932cdb88af342e0146022586de109c"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha512 = "21928411981e8d3fac5e44f02173a08ad4c3135ec874998d6ddf5ef2821226ffee260023e5bb45848a40db19537b1d6cc0b127d9524c0d0616d80618ab1d9228"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha512 = "cddd222328f1099c25591b03abe23692fdccc82405df127ff920818fb7952fe384fc1373b1330b971d196e98acd62b3754711b38876050ec3cce7de20f183b79"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "06c819436de292d531a9d3df34b76bad36bb627e0e45ca042f2dafb06db14cc23e956dc2e00904d5147bf7d0b39c16f712f2b8acb1d9bc4daa210d56d8058e22"; }
+    { locale = "ta"; arch = "linux-i686"; sha512 = "5e8560e423aa88c1fc5b61cf91c558a861a58d09d7e560790ba835f0bbae85cc82c61e1eb9e1a92e632d2fe24419d3eecec4a15bb083bf0c1568a441a5586a50"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha512 = "6ba48474d930036d77d23b717fd2e592b19d0ab2b4399f7a6f7bd36da48cc0a2dea9c25442928c507cdfe8a8f37a8d0e4ddb94da42a7a3d6c2ecba26d4f7dd2f"; }
+    { locale = "te"; arch = "linux-i686"; sha512 = "2df2a46677c979b8702700c69f687e8bfa49e879ccd9204a1ca876b7a5f8925abfe6f81f42e6d6576aff6cea264cced854ae536a3cc01ed04b7a536396e9ff33"; }
+    { locale = "te"; arch = "linux-x86_64"; sha512 = "d6c7bdb7a823be0cbe8286b977cc265e80ae290ae8fc4002a7dc71eddb3b80a3796e66ad1e00fe2e797ae83272422f460defa86322dea8e33ad0d7dfb50491de"; }
+    { locale = "th"; arch = "linux-i686"; sha512 = "eb017475d187ef4f1329d303bde84a17995ed84458923330c2ef61940c86674c03f06de2e3655885df49cdc384d1b8e952dfe8ce960cec738f99b8853af1e018"; }
+    { locale = "th"; arch = "linux-x86_64"; sha512 = "cca6fe63bf24ca1db9d736305dff312f334cbe0a836cb181fdde85c4b2e383e1a19135f441a1f07c69cce716a4c2d3fe42a07fe3c91146aa6598d651890ff049"; }
+    { locale = "tr"; arch = "linux-i686"; sha512 = "98aa598f348be7705c11834f6d174fa19a8408b87193a93f641c4fe92898f3175f79a1bef9c66dc93c3cc19a372930725025d7ff1bf178e951c9d5dfd675ff36"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha512 = "a4c2d82f7e56e413526cbe40eb24df79ea264b37dc09b470ccf3416c922730d714ad166507f06b6a68fc85ff73df73309da936ff56499cdf81b78fc973675c86"; }
+    { locale = "uk"; arch = "linux-i686"; sha512 = "cc04ead20aa1f6d3a8ac470ed3fc69ac0d348ab0523308ae56b49734785fd63bae4ac6fcc32bcac3f2e9350ebfefe76fa39efc2a7a7f5d7c2309b6999f490e90"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha512 = "1f29246b8bd1a4e07af7b30c2ffcb5239ee5f870e529227e96c0ef091cf9d9d8783891b2e60b0a5dee10e80893ddc6a5cb972d27e70ae4cd0f820ba9f60a2165"; }
+    { locale = "uz"; arch = "linux-i686"; sha512 = "d144626529e57e93ea12ddca25184903b78b878563302c7f14a396435187791d2a14482a7d10bb569890d9483253474634574f105b9c79763ad6a85fb10de73d"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha512 = "4e6b7706c6f529739a18748f35d7e31071c6818c0f83261e1d31e66306fb40ac94573f7ebe3b811f4c70f88a2bbca29528b868821962e88ba30dbf84039c5ea1"; }
+    { locale = "vi"; arch = "linux-i686"; sha512 = "fc7144a73551e09196b7c79e4fcf1ecf5ad92b3e54e8a203e213627133df0260dc53f0cc9bb9e03ccae0953de5f2752e303a35e0fdb720a40637e5b31edd3544"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha512 = "7a38b4814418516c8971825616874782512bf91d51a798fbdb1b8d8a817d30e72d9fde45238602a6de9cb9c53cd0512acb07f6e16a819ce24fba6467ab1cc8b2"; }
+    { locale = "xh"; arch = "linux-i686"; sha512 = "0fe791a3270343598417b093476fc7eb50628a7557c56294b3222e657c62a2b5ce7988243d75ae08f7a11c2b9e437d01d47258b1ac93c2579638ac67e12c4d78"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha512 = "f797c52d88b62aaff15419baf5d7c5b2a44909674602ca82c295120b4b0fcb7182a36952f7adeaf7e9878b3d21031e990d22e5f8dcbc5421a3d587ba37f63906"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha512 = "970c14e1f105d6092fd542d73db57260836bf249aee99ab53f43882cb6327520905b7a452e96a6c142676794bf22e13c80e86291bb5b6dcaa09d0d9bb376d4be"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "b811f9d359fb61674781443d71e961ba687fecbe4904622b6ac410e435e31b6118f30726896021d28ae51628ab95092b28181ca0ae471374c0cbc5a740fea496"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha512 = "43f8d6e9cdf5815365e0eb1516ccb5f6c7ac7e19c10d1ee45ee367d721bf1944321879d9966f7000f50d324f14c36f9f8fcd9bb43ef20c780ba39d3c138f2192"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "02f4910b3c5b6f75e2f19c03452ce0534980be7ff18abed8be2a2f9af19c6eee5928c493e618b00d167bb3b2d7e60724741a2f4de1df9b1e48a05923a7649cef"; }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 7de465292ed1..26030e33e488 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -44,9 +44,9 @@ let
 
   generated = if channel == "stable" then (import ./sources.nix)
          else if channel == "beta"   then (import ./beta_sources.nix)
-         else if channel == "developer"   then { version = "48.0a2"; sources = [
-            { locale = "en-US"; arch = "linux-i686"; sha512 = "3xa9lmq4phx7vfd74ha1bq108la96m4jyq11h2m070rbcjv5pg6ck2pxphr2im55lym7h6saw2l4lpzcr5xvnfmj1a7fdhszswjl3s4"; }
-            { locale = "en-US"; arch = "linux-x86_64"; sha512 = "1vndwja68xbn3rfq15ffksagr7fm2ns84cib4bhx654425hp5ghfpiszl7qwyxg8s28srqdfsl9w8hp7qxsz5gmmiznf05zxfv487w7"; }
+         else if channel == "developer"   then { version = "49.0a2"; sources = [
+            { locale = "en-US"; arch = "linux-i686"; sha512 = "45dad182bf7a4e753c1be6b8f966393a06531e7b5530238d20cb67b26324e8f5d0eeec983a0855418f31187d3ae508c28810ab86269848b4e48ab2ca3b5d21e7"; }
+            { locale = "en-US"; arch = "linux-x86_64"; sha512 = "cfcbfc633b51612a62267c8a1afc25af212eb832d1fa876a1ffd82421e9378f96b3ac1488446f804518290abd99c21c9f10e4d0e0f699432aeb74b63305d7edc"; }
           ]; }
          else builtins.abort "Wrong channel! Channel must be one of `stable`, `beta` or `developer`";
 

From 5f34b5476b8132b5eee7873f2cc4777843bc4f85 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 10 Jun 2016 04:33:27 +0200
Subject: [PATCH 154/436] goaccess: 0.9.4 -> 1.0

also there is no need for local variables
---
 pkgs/tools/misc/goaccess/default.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index b9310db0ee86..4b352f512082 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -1,16 +1,13 @@
 { stdenv, fetchurl, pkgconfig, geoipWithDatabase, ncurses, glib }:
 
-let
-  version = "0.9.4";
-  mainSrc = fetchurl {
-    url = "http://tar.goaccess.io/goaccess-${version}.tar.gz";
-    sha256 = "1kn5yvgzrzjlxd0zhr2d2gbjdin9j9vmfbk5gkrwqc4kd9zicvla";
-  };
-in
-
 stdenv.mkDerivation rec {
+  version = "1.0";
   name = "goaccess-${version}";
-  src = mainSrc;
+
+  src = fetchurl {
+    url = "http://tar.goaccess.io/goaccess-${version}.tar.gz";
+    sha256 = "1zma9p0gwxwl9kgq47i487fy1q8567fqnpik0zacjhgmpnzry3h0";
+  };
 
   configureFlags = [
     "--enable-geoip"
@@ -29,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage    = http://goaccess.prosoftcorp.com;
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ ederoyd46 ];
+    maintainers = with stdenv.lib.maintainers; [ ederoyd46 garbas ];
   };
 }

From 335ccfcf3440b5f45ea45ba4216a68cb8b84e249 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 10 Jun 2016 07:59:11 +0000
Subject: [PATCH 155/436] hbase: 0.98.13 -> 0.98.19

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

diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix
index 408022f650f4..56b71ef969c8 100644
--- a/pkgs/servers/hbase/default.nix
+++ b/pkgs/servers/hbase/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 stdenv.mkDerivation rec {
   name = "hbase-${version}";
-  version = "0.98.13";
+  version = "0.98.19";
 
   src = fetchurl {
     url = "mirror://apache/hbase/${version}/hbase-${version}-hadoop2-bin.tar.gz";
-    sha256 = "1av81nnnwivxf5ha6x9qrr2afl5sbyskl07prv0rdac954xmgg8n";
+    sha256 = "0g7y38cw09fydbf4fbs1anyilhfgxpbfs41f0aignli5i3hd1pgx";
   };
 
   buildInputs = [ makeWrapper ];

From b9922661b8a5757f12b4164b766b64f959de65ae Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 10 Jun 2016 07:59:59 +0000
Subject: [PATCH 156/436] jetty: Remove obsolete versions and init new default
 to 9.3.9.v20160517

---
 pkgs/servers/http/jetty/6.1/bin-builder.sh |  7 ------
 pkgs/servers/http/jetty/6.1/default.nix    | 13 ----------
 pkgs/servers/http/jetty/9.2.nix            | 28 ---------------------
 pkgs/servers/http/jetty/bin-builder.sh     |  7 ------
 pkgs/servers/http/jetty/default.nix        | 29 ++++++++++++++++------
 pkgs/top-level/all-packages.nix            |  4 ---
 6 files changed, 21 insertions(+), 67 deletions(-)
 delete mode 100644 pkgs/servers/http/jetty/6.1/bin-builder.sh
 delete mode 100644 pkgs/servers/http/jetty/6.1/default.nix
 delete mode 100644 pkgs/servers/http/jetty/9.2.nix
 delete mode 100644 pkgs/servers/http/jetty/bin-builder.sh

diff --git a/pkgs/servers/http/jetty/6.1/bin-builder.sh b/pkgs/servers/http/jetty/6.1/bin-builder.sh
deleted file mode 100644
index bec0663bee78..000000000000
--- a/pkgs/servers/http/jetty/6.1/bin-builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-set -e
-
-source $stdenv/setup
-
-unzip $src
-mkdir -p $out/$name
-mv jetty*/* $out/$name
diff --git a/pkgs/servers/http/jetty/6.1/default.nix b/pkgs/servers/http/jetty/6.1/default.nix
deleted file mode 100644
index 894a21fdece9..000000000000
--- a/pkgs/servers/http/jetty/6.1/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, unzip}:
-
-stdenv.mkDerivation {
-  name = "jetty-6.1.26";
-
-  builder = ./bin-builder.sh;
-  buildInputs = [unzip];
-
-  src = fetchurl {
-    url = http://dist.codehaus.org/jetty/jetty-6.1.26/jetty-6.1.26.zip;
-    sha256 = "11w1ciayv8zvxjg45xzs0kwc7k45x97sbnxkqb62sxy3gsw8xh4n";
-  };
-}
diff --git a/pkgs/servers/http/jetty/9.2.nix b/pkgs/servers/http/jetty/9.2.nix
deleted file mode 100644
index 7bef32f3db2a..000000000000
--- a/pkgs/servers/http/jetty/9.2.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "jetty-9.2.5";
-
-  src = fetchurl {
-    url = "http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/jetty-distribution-9.2.11.v20150529.tar.gz&r=1";
-    name = "jetty-distribution-9.2.11.v20150529.tar.gz";
-    sha256 = "1d9s9l64b1l3x6vkx8qwgzfqwm55iq5g9xjjm2h2akf494yx1mrd";
-  };
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out
-    mv etc lib modules start.jar $out
-  '';
-
-  meta = {
-    description = "A Web server and javax.servlet container";
-
-    homepage = http://www.eclipse.org/jetty/;
-
-    platforms = stdenv.lib.platforms.all;
-
-    license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ];
-  };
-}
diff --git a/pkgs/servers/http/jetty/bin-builder.sh b/pkgs/servers/http/jetty/bin-builder.sh
deleted file mode 100644
index 1da42099dca4..000000000000
--- a/pkgs/servers/http/jetty/bin-builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-set -e
-
-source $stdenv/setup
-
-unzip $src
-mkdir $out
-mv jetty*/* $out
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 78b6e4cc7eee..c9049259fb26 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -1,13 +1,26 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "jetty-6.1.4";
-
-  builder = ./bin-builder.sh;
-  buildInputs = [unzip];
+stdenv.mkDerivation rec {
+  name = "jetty-${version}";
+  version = "9.3.9.v20160517";
 
   src = fetchurl {
-    url = mirror://sourceforge/jetty/jetty-6.1.4.zip;
-    sha256 = "061cx442g5a5szzms9zhnfmr4aipmqyy9r8m5r84gr79gz9z6dv0";
+    url = "http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
+    name = "jetty-distribution-${version}.tar.gz";
+    sha256 = "0yqzcv4mj9wj8882jssf8ylh6s3jhgylrqxfggbn102dw05pppqs";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out
+    mv etc lib modules start.jar $out
+  '';
+
+  meta = {
+    description = "A Web server and javax.servlet container";
+    homepage = http://www.eclipse.org/jetty/;
+    platforms = stdenv.lib.platforms.all;
+    license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bd8ca6a01df..1c73c69f92eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9954,10 +9954,6 @@ in
 
   jetty = callPackage ../servers/http/jetty { };
 
-  jetty61 = callPackage ../servers/http/jetty/6.1 { };
-
-  jetty92 = callPackage ../servers/http/jetty/9.2.nix { };
-
   rdkafka = callPackage ../development/libraries/rdkafka { };
 
   leafnode = callPackage ../servers/news/leafnode { };

From 70338f49815f197cd2fc00fe2b8d18ccfbca91ae Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 10 Jun 2016 08:00:18 +0000
Subject: [PATCH 157/436] bosun: 0.5.0-alpha -> 0.5.0-rc4

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

diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
index 5b5593d55142..ed8f14387eb6 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/pkgs/servers/monitoring/bosun/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "bosun";
-  rev = "0.5.0-alpha";
+  rev = "0.5.0-rc4";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "bosun-monitor";
     repo = "bosun";
-    sha256 = "0nkphzkwx5r974skn269nnsqr4gllws5z4z6n53sslj2x9rz57ml";
+    sha256 = "0cybhy5nshg3z2h5i6r8p9d0qihcnz8s8wh5cqf17ix17k31qans";
   };
 
   subPackages = [ "cmd/bosun" "cmd/scollector" ];

From 527077f02c01c3bc62766703dd315ea438dcf994 Mon Sep 17 00:00:00 2001
From: Christian Lask <christian@hiberno.net>
Date: Fri, 10 Jun 2016 10:11:59 +0200
Subject: [PATCH 158/436] qutebrowser: 0.6.1 -> 0.6.2

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

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 93aff9498df7..6e94767c16e0 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -2,7 +2,7 @@
 , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good
 , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }:
 
-let version = "0.6.1"; in
+let version = "0.6.2"; in
 
 buildPythonApplication rec {
   name = "qutebrowser-${version}";
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchurl {
     url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1xb95yjc390h7f75l1jk252qiwcamgz2bls2978mmjkhf5hm3jm0";
+    sha256 = "16g7vlpvzkj94xk6fzl0jav2izfpvqn3zx9gydsk064cdxb02hrs";
   };
 
   # Needs tox

From 656c48f141be5886c515a1a874a47472cbbac6bd Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 10 Jun 2016 08:17:20 +0000
Subject: [PATCH 159/436] opentsdb: 2.1.1 -> 2.2.0

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

diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index fd73eecacde1..e111cda9cd1b 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -2,11 +2,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "opentsdb-${version}";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchurl {
-    url = "https://github.com/OpenTSDB/opentsdb/releases/download/${version}/opentsdb-${version}.tar.gz";
-    sha256 = "17wbdvrv83dr18dqxxsk73c1a7jlbw19algvz0hsz9a1k7aiy29b";
+    url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "1dfzfsagpviqbifz81pik7pzvadz71kls1idi7jiq7z27vcd92an";
   };
 
   buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ];

From 548a136345db627ca52cc3f12b222002ac0655b4 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 10 Jun 2016 09:07:01 +0000
Subject: [PATCH 160/436] google-cloud-sdk: 109.0.0 -> 113.0.0

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index fa3655fb21cf..7da43d6fa71b 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -4,18 +4,18 @@ with python27Packages;
 
 stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "109.0.0";
+  version = "113.0.0";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
-        sha256 = "0jcg4pzqmkmpcp86rdi9hcqvvm61rqvl8spl2r1n4658w48h61x7";
+        sha256 = "0v90am3zb77c1d4qbm8pn3mn4xc9xbcw48clca2v5mr5g48aq221";
       }
     else
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
-        sha256 = "1ii2ivh2na9933fhqrzsicihs6mpr10jgmml1fkdjmhmmp92zshd";
+        sha256 = "1fjc80i1szzppib5pplw3vxh83vzkimlfcpg82vakyhvbjndnqyr";
       };
 
   buildInputs = [python27 makeWrapper];

From 76b331ae592150c853e01e6451ff0781a8513766 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 10 Jun 2016 00:10:40 +0200
Subject: [PATCH 161/436] go2nix: 20160307 -> 0.1.0

---
 pkgs/development/go-modules/libs.json     | 13 +++++++++++--
 pkgs/development/tools/go2nix/default.nix | 15 ++++++++-------
 pkgs/development/tools/go2nix/deps.json   |  6 ++----
 pkgs/top-level/all-packages.nix           |  2 +-
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 520c1fd8e5c0..c3bb2eb7ea3d 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1291,8 +1291,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/Masterminds/vcs",
-      "rev": "9c0db6583837118d5df7c2ae38ab1c194e434b35",
-      "sha256": "0590ww2av4407y7zy3bcmnr8i74fv00k9zzcxcpjxivl6qszna0d"
+      "rev": "7af28b64c5ec41b1558f5514fd938379822c237c",
+      "sha256": "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6"
     }
   },
   {
@@ -1528,5 +1528,14 @@
       "rev": "373819725fc560fa962c6cd883b533d2ebec4844",
       "sha256": "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx"
     }
+  },
+  {
+    "goPackagePath": "github.com/jawher/mow.cli",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jawher/mow.cli",
+      "rev": "772320464101e904cd51198160eb4d489be9cc49",
+      "sha256": "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j"
+    }
   }
 ]
diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 757dc8cb379f..e0e9fe8c3fc5 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, lib, buildGoPackage, go-bindata, goimports, nix-prefetch-git, git, makeWrapper,
-  fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, go-bindata, goimports, nix-prefetch-git, git, makeWrapper,
+  fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "go2nix-${version}";
-  version = "20160307-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "4c552dadd855e3694ed3499feb46dca9cd855f60";
+  version = "0.1.0";
+  rev = "v${version}";
 
   goPackagePath = "github.com/kamilchm/go2nix";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/kamilchm/go2nix";
-    sha256 = "1pwnm1vrjxvgl17pk9n1k5chmhgwxkrwp2s1bzi64xf12anibj63";
+    owner = "kamilchm";
+    repo = "go2nix";
+    sha256 = "10nz7gva3n6wk01wphrjjb31sy33kf9ji03zr849x21a669fnmjf";
   };
 
   goDeps = ./deps.json;
diff --git a/pkgs/development/tools/go2nix/deps.json b/pkgs/development/tools/go2nix/deps.json
index 8e7fefb17ee2..f6d392ad3ce3 100644
--- a/pkgs/development/tools/go2nix/deps.json
+++ b/pkgs/development/tools/go2nix/deps.json
@@ -2,10 +2,8 @@
   {
     "include": "../../libs.json",
     "packages": [
-      "github.com/alecthomas/template",
-      "github.com/alecthomas/units",
-      "gopkg.in/alecthomas/kingpin.v2",
-      "github.com/Masterminds/vcs"
+      "github.com/Masterminds/vcs",
+      "github.com/jawher/mow.cli"
     ]
   }
 ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 882377cf3b1b..3075c73e7d80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9617,7 +9617,7 @@ in
 
   buildGoPackage = buildGo16Package;
 
-  go2nix = callPackage ../development/tools/go2nix { };
+  go2nix = (callPackage ../development/tools/go2nix { }).bin;
 
   ### DEVELOPMENT / LISP MODULES
 

From e0e9df7c8d81eaca4ef0113cef97016705bd8485 Mon Sep 17 00:00:00 2001
From: Christian Lask <christian@hiberno.net>
Date: Fri, 10 Jun 2016 11:33:25 +0200
Subject: [PATCH 162/436] mononoki: init at 1.2

---
 pkgs/data/fonts/mononoki/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/data/fonts/mononoki/default.nix

diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix
new file mode 100644
index 000000000000..fe429fe1df8b
--- /dev/null
+++ b/pkgs/data/fonts/mononoki/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "mononoki-${version}";
+  version = "1.2";
+
+  src = fetchurl {
+    url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip";
+    sha256 = "0n66bnn2i776fbky14qjijwsbrja9yzc1xfsmvz99znvcdvflafg";
+  };
+
+  buildInputs = [ unzip ];
+  phases = [ "unpackPhase" ];
+
+  unpackPhase = ''
+    mkdir -p $out/share/fonts/mononoki
+    unzip $src -d $out/share/fonts/mononoki
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/madmalik/mononoki;
+    description = "A font for programming and code review";
+    license = licenses.ofl;
+    maintainers = [ maintainers.hiberno ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bd8ca6a01df..a12811fe3091 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11648,6 +11648,8 @@ in
 
   mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { };
 
+  mononoki = callPackage ../data/fonts/mononoki { };
+
   montserrat = callPackage ../data/fonts/montserrat { };
 
   mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };

From 64a6e099796764708e24888ced7196ce3d5df6fd Mon Sep 17 00:00:00 2001
From: Christian L <hiberno@users.noreply.github.com>
Date: Fri, 10 Jun 2016 12:30:50 +0200
Subject: [PATCH 163/436] atom: 1.7.3 -> 1.8.0 (#16118)

---
 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 5f0ba1b19015..620d0fb629ed 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.7.3";
+  version = "1.8.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1fd6j05czir2z3bvkf0mixkfncp73jw8kgqgaqxjjg546381yb7a";
+    sha256 = "0x73n64y3jfwbwg6s9pmsajryrjrrx1a0dzf3ff6dbi5gvv950xi";
     name = "${name}.deb";
   };
 

From 0f7a0a0377433334c2693f3899258c141406199d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 10 Jun 2016 14:40:19 +0200
Subject: [PATCH 164/436] haskell-stack: apply small patch from Git to fix
 "stack repl" for GHC 8.x

---
 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 c9e38e1e17c7..5d9d08af110b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1041,4 +1041,10 @@ self: super: {
     '';
   }));
 
+  # https://github.com/commercialhaskell/stack/issues/2263
+  stack = appendPatch super.stack (pkgs.fetchpatch {
+    url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch";
+    sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29";
+  });
+
 }

From a6072331c0237999c6dfcdf618d2ea9ee6dcc10a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 10 Jun 2016 14:43:15 +0200
Subject: [PATCH 165/436] gle: init at 3.1.0

---
 pkgs/development/libraries/gle/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/gle/default.nix

diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix
new file mode 100644
index 000000000000..64f51a56fd37
--- /dev/null
+++ b/pkgs/development/libraries/gle/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, mesa, freeglut, libX11, libXt, libXmu, libXi, libXext}:
+stdenv.mkDerivation {
+  name = "gle-3.1.0";
+  buildInputs = [mesa freeglut libX11 libXt libXmu libXi libXext];
+  src = fetchurl {
+    urls = [
+      "mirror://sourceforge/project/gle/gle/gle-3.1.0/gle-3.1.0.tar.gz"
+      "http://www.linas.org/gle/pub/gle-3.1.0.tar.gz"
+      ];
+    sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw";
+  };
+  meta = {
+    description = ''Tubing and extrusion library'';
+    license = stdenv.lib.licenses.gpl2 ;
+    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 21d9e62d708b..c7d609d9ec2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7102,6 +7102,8 @@ in
 
   libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { };
 
+  gle = callPackage ../development/libraries/gle { };
+
   glew = callPackage ../development/libraries/glew { };
   glew110 = callPackage ../development/libraries/glew/1.10.nix { };
 

From 46d3001fa70f86ae69aa95ae7688d6c1348d5ddf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 10 Jun 2016 14:51:19 +0200
Subject: [PATCH 166/436] xscreensaver: use gle

---
 pkgs/misc/screensavers/xscreensaver/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 6942d642fb1b..fd0f2d93581d 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11
 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk
-, libxml2, libglade, intltool, xorg, makeWrapper
+, libxml2, libglade, intltool, xorg, makeWrapper, gle
 }:
 
 stdenv.mkDerivation rec {
@@ -15,15 +15,11 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam
       libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
-      libXxf86misc intltool xorg.appres makeWrapper
+      libXxf86misc intltool xorg.appres makeWrapper gle
     ];
 
   preConfigure =
     ''
-      # Fix build error in version 5.18. Remove this patch when updating
-      # to a later version.
-      #sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c
-
       # Fix installation paths for GTK resources.
       sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
           -i driver/Makefile.in po/Makefile.in.in
@@ -33,7 +29,7 @@ stdenv.mkDerivation rec {
     [ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
       "--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
       "--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext"
-      "--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay"
+      "--with-xshm-ext" "--with-xdbe-ext"
       "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
     ];
 

From ab0547b16fc9a80cb801041a78cb21bd05470139 Mon Sep 17 00:00:00 2001
From: uwap <me@uwap.name>
Date: Fri, 10 Jun 2016 14:51:43 +0200
Subject: [PATCH 167/436] Choose a better default for
 services.postfix.submissionOptions

---
 nixos/modules/services/mail/postfix.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 616018fc3079..c97aad774196 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -210,12 +210,13 @@ in
 
       submissionOptions = mkOption {
         type = types.attrs;
-        default = { "smtpd_tls_security_level" = "encrypt";
+        default = {};
+        description = "Options for the submission config in master.cf";
+        example = { "smtpd_tls_security_level" = "encrypt";
                     "smtpd_sasl_auth_enable" = "yes";
                     "smtpd_client_restrictions" = "permit_sasl_authenticated,reject";
+                    "milter_macro_daemon_name" = "ORIGINATING";
                   };
-        description = "Options for the submission config in master.cf";
-        example = { "milter_macro_daemon_name" = "ORIGINATING"; };
       };
 
       setSendmail = mkOption {

From ff42b489c16da92b19d647d2a7cd65bdd355d9ee Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Fri, 10 Jun 2016 13:49:07 +0100
Subject: [PATCH 168/436] xgeometry-select: add back entry in top level removed
 in 7eb671e

---
 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 447becc96094..56bb8a7e9e31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9428,6 +9428,8 @@ in
 
   xgboost = callPackage ../development/libraries/xgboost { };
 
+  xgeometry-select = callPackage ../tools/X11/xgeometry-select { };
+
   # Avoid using this. It isn't really a wrapper anymore, but we keep the name.
   xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper {
     packages = [

From d73f5d69930fe7293f53548c682cc2ef6711cfbf Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 10 Jun 2016 15:04:46 +0200
Subject: [PATCH 169/436] icon-lang, xgeometry-select: FIX accidental remove
 after rebase in https://github.com/NixOS/nixpkgs/pull/16017 (#16121)

---
 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 56bb8a7e9e31..bd230e09a6dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7094,6 +7094,8 @@ in
 
   gio-sharp = callPackage ../development/libraries/gio-sharp { };
 
+  icon-lang = callPackage ../development/interpreters/icon-lang { };
+
   libgit2 = callPackage ../development/libraries/git2 (
     stdenv.lib.optionalAttrs stdenv.isDarwin {
       inherit (darwin) libiconv;

From 1e72706d667f33d5282d4a8f519d32837b3aa8bd Mon Sep 17 00:00:00 2001
From: uwap <me@uwap.name>
Date: Fri, 10 Jun 2016 15:10:28 +0200
Subject: [PATCH 170/436] Change default to postfix default.

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

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index c97aad774196..cdde41446224 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -210,10 +210,15 @@ in
 
       submissionOptions = mkOption {
         type = types.attrs;
-        default = {};
+        default = { "smtpd_tls_security_level" = "encrypt";
+                    "smtpd_sasl_auth_enable" = "yes";
+                    "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";
                   };

From 7537e228bcb8406dda4e4b475c6014120450f7aa Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 10 Jun 2016 15:29:15 +0200
Subject: [PATCH 171/436] pythonPackages.klaus: 0.6.0 -> 0.9.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 d52e2ddeec0e..37a44fa78ab9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11714,12 +11714,12 @@ in modules // {
   };
 
   klaus = buildPythonPackage rec {
-    version = "0.6.0";
+    version = "0.9.1";
     name = "klaus-${version}";
 
     src = pkgs.fetchurl {
       url = "https://github.com/jonashaag/klaus/archive/${version}.tar.gz";
-      sha256 = "0ab3lxbysnvsx7irlxhiy78clbk4d0gzv2241pqkkvlmqq3968p4";
+      sha256 = "0k3v3p56hq8alm083grrp98znxkz1zqx0pczm2lah8qddbyrdkgm";
     };
 
     propagatedBuildInputs = with self;

From 4fbafb23957c04dded895a17f052428fa21e51e9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 10 Jun 2016 09:30:11 -0400
Subject: [PATCH 172/436] linux 4.6.1 -> 4.6.2

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.6.nix b/pkgs/os-specific/linux/kernel/linux-4.6.nix
index b93550b6ea63..6223a55c467b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.6.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.6.1";
+  version = "4.6.2";
   extraMeta.branch = "4.6";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "073vpwidl28ka3y2rd7n6dcckrppi5kalh48vsz980k9z12g9pfm";
+    sha256 = "e158f3c69da87c2ec28d0f194dbe18b05e0d0b9e1142566615cea3390bab1c6a";
   };
 
   kernelPatches = args.kernelPatches;

From 40b661a8500fc6b0f98e809db9259ca0f6191bd8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 9 Jun 2016 07:02:26 -0700
Subject: [PATCH 173/436] minecraft: use icon in jar

This removes the dependency on a wiki image download, which seemed bad
when I first introduced it. Unfortunately, they do not provide a 48x48
icon so we are not satisfying the minimal XDG standard.
---
 pkgs/games/minecraft/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index f3a8a34fa3b8..6bceb40b523b 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, makeDesktopItem
 , jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
+, openjdk
 , mesa, openal
 , useAlsa ? false, alsaOss ? null }:
 with stdenv.lib;
@@ -7,15 +8,10 @@ with stdenv.lib;
 assert useAlsa -> alsaOss != null;
 
 let
-  icon = fetchurl {
-    url = "https://hydra-media.cursecdn.com/minecraft.gamepedia.com/c/c5/Grass.png";
-    sha256 = "438c0f63e379e92af1b5b2e06cc5e3365ee272810af65ebc102304bce4fa8c4b";
-  };
-
   desktopItem = makeDesktopItem {
     name = "minecraft";
     exec = "minecraft";
-    icon = "${icon}";
+    icon = "minecraft";
     comment = "A sandbox-building game";
     desktopName = "Minecraft";
     genericName = "minecraft";
@@ -49,6 +45,9 @@ in stdenv.mkDerivation {
 
     mkdir -p $out/share/applications
     ln -s ${desktopItem}/share/applications/* $out/share/applications/
+
+    ${openjdk}/bin/jar xf $out/minecraft.jar favicon.png
+    install -D favicon.png $out/share/icons/hicolor/32x32/apps/minecraft.png
   '';
 
   meta = {

From b21329e0e04a7f7a6f37686f75ced7207750885e Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Fri, 10 Jun 2016 17:04:22 +0300
Subject: [PATCH 174/436] zathura: Enable synctex support

Closes #15984.
abbradar: list is not needed for lib.optional
---
 pkgs/applications/misc/zathura/core/default.nix | 11 ++++++++---
 pkgs/applications/misc/zathura/default.nix      |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 0048cb738782..dbb406a23e6c 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon, sqlite, glib }:
+{ stdenv, lib, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon, sqlite, glib
+, synctexSupport ? true, texlive ? null
+}:
+
+assert synctexSupport -> texlive != null;
 
 stdenv.mkDerivation rec {
   version = "0.3.6";
@@ -9,7 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "0fyb5hak0knqvg90rmdavwcmilhnrwgg1s5ykx9wd3skbpi8nsh8";
   };
 
-  buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite glib ];
+  buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite glib
+  ] ++ lib.optional synctexSupport texlive.bin.core;
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 
@@ -18,7 +23,7 @@ stdenv.mkDerivation rec {
     "RSTTOMAN=${docutils}/bin/rst2man.py"
     "VERBOSE=1"
     "TPUT=${ncurses.out}/bin/tput"
-  ];
+  ] ++ lib.optional synctexSupport "WITH_SYNCTEX=1";
 
   postInstall = ''
     wrapProgram "$out/bin/zathura" \
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 0ad3bf2adb99..ed121be6dcdb 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, lib, pkgs, fetchurl, stdenv, useMupdf }:
+{ callPackage, lib, pkgs, fetchurl, stdenv, useMupdf, synctexSupport ? true }:
 
 rec {
   inherit stdenv;
@@ -8,6 +8,7 @@ rec {
   zathura_core = callPackage ./core {
     gtk = pkgs.gtk3;
     zathura_icon = icon;
+    inherit synctexSupport;
   };
 
   zathura_pdf_poppler = callPackage ./pdf-poppler { };

From 0b30c3ab95ebf23016126fa1c50c336f7a3279d8 Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Fri, 10 Jun 2016 17:18:02 +0200
Subject: [PATCH 175/436] seaborn: 0.7.0 -> 0.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 c17b808f1676..38e261f90f65 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20342,10 +20342,10 @@ in modules // {
   };
 
   seaborn = buildPythonPackage rec {
-    name = "seaborn-0.7.0";
+    name = "seaborn-0.7.1";
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/seaborn/${name}.tar.gz";
-      sha256 = "0ibi3xsfm2kysph61mnfy0pf8d5rkgxgrdb0z9nbizgcgdsb5a0m";
+      sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs";
     };
 
     buildInputs = with self; [ nose ];

From da021cdda1f019f9a75982f44bd8c9b748ae947d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 10 Jun 2016 17:51:18 +0200
Subject: [PATCH 176/436] xscreensaver: an option to install all the hacks,
 including retired ones and DNA logo

---
 pkgs/misc/screensavers/xscreensaver/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index fd0f2d93581d..3540119e6656 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11
 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk
 , libxml2, libglade, intltool, xorg, makeWrapper, gle
+, forceInstallAllHacks ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -36,7 +37,14 @@ stdenv.mkDerivation rec {
   postInstall = ''
       wrapProgram $out/bin/xscreensaver-text \
         --prefix PATH : ${stdenv.lib.makeBinPath [xorg.appres]}
-  '';
+  ''
+  + stdenv.lib.optionalString forceInstallAllHacks ''
+    make -C hacks/glx dnalogo
+    cat hacks/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1  | xargs make -C hacks
+    cat hacks/glx/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1  | xargs make -C hacks/glx
+    cp -f $(find hacks -type f -perm -111 "!" -name "*.*" )  "$out/libexec/xscreensaver"
+  ''
+  ;
 
   meta = {
     homepage = "http://www.jwz.org/xscreensaver/";

From c6168827573dce16a72a8c206cf814a1341ceef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@polytechnique.org>
Date: Fri, 10 Jun 2016 18:23:23 +0200
Subject: [PATCH 177/436] pythonPackages.bugwarrior : 1.0.2 -> 1.4.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 d52e2ddeec0e..a9fc6cad2ffc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2764,17 +2764,17 @@ in modules // {
 
   bugwarrior = buildPythonPackage rec {
     name = "bugwarrior-${version}";
-    version = "1.0.2";
+    version = "1.4.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/bugwarrior/${name}.tar.gz";
-      sha256 = "efe41756c152789f39006f157add9bedfa2b85d2cac15c067e635e37c70cb8f8";
+      sha256 = "1jkz5vzbwspi1jcb3qsgcl619yip77khb696pc3ryk0pdhjhgs5w";
     };
 
     buildInputs = with self; [ mock unittest2 nose /* jira megaplan */ ];
     propagatedBuildInputs = with self; [
       twiggy requests2 offtrac bugzilla taskw dateutil pytz keyring six
-      jinja2 pycurl dogpile_cache lockfile click
+      jinja2 pycurl dogpile_cache lockfile click pyxdg
     ];
 
     # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite.

From d8e4432fe26c2b9aaa4eedfb17d77d0cbd9492cf Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 17 May 2016 05:20:04 +0200
Subject: [PATCH 178/436] kernel: unconditionally disable /dev/kmem

This was presumably set for grsecurity compatibility, but now appears
redundant.  Grsecurity does not expect nor require /dev/kmem to be
present and so it makes little sense to continue making its inclusion in
the standard kernel dependent on grsecurity.

More generally, given the large number of possible grsecurity
configurations, it is unclear what `features.grsecurity` even
*means* and its use should be discouraged.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 3ce65a3f6e18..bd0bd1424865 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -261,9 +261,7 @@ with stdenv.lib;
   # Security related features.
   STRICT_DEVMEM y # Filter access to /dev/mem
   SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
-  ${optionalString (!(features.grsecurity or false)) ''
-    DEVKMEM n # Disable /dev/kmem
-  ''}
+  DEVKMEM n # Disable /dev/kmem
   ${if versionOlder version "3.14" then ''
     CC_STACKPROTECTOR? y # Detect buffer overflows on the stack
   '' else ''

From 4ae5eb97f12218525ebb3657b311ac52e21c8418 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 17 May 2016 05:20:48 +0200
Subject: [PATCH 179/436] kernel: set virtualization options regardless of
 grsec

Per my own testing, the NixOS grsecurity kernel works both as a
KVM-based virtualisation host and guest; there appears to be no good
reason to making these conditional on `features.grsecurity`.

More generally, it's unclear what `features.grsecurity` *means*. If
someone configures a grsecurity kernel in such a fashion that it breaks
KVM support, they should know to disable KVM themselves.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index bd0bd1424865..624d380fe568 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -420,13 +420,11 @@ with stdenv.lib;
 
   # Virtualisation.
   PARAVIRT? y
-  ${optionalString (!(features.grsecurity or false))
-    (if versionAtLeast version "3.10" then ''
-      HYPERVISOR_GUEST y
-    '' else ''
-      PARAVIRT_GUEST? y
-    '')
-  }
+  ${if versionAtLeast version "3.10" then ''
+    HYPERVISOR_GUEST y
+  '' else ''
+    PARAVIRT_GUEST? y
+  ''}
   KVM_APIC_ARCHITECTURE y
   KVM_ASYNC_PF y
   ${optionalString (versionOlder version "3.7") ''
@@ -441,9 +439,7 @@ with stdenv.lib;
   ${optionalString (versionAtLeast version "4.0") ''
     KVM_GENERIC_DIRTYLOG_READ_PROTECT y
   ''}
-  ${optionalString (!features.grsecurity or true) ''
-    KVM_GUEST y
-  ''}
+  KVM_GUEST y
   KVM_MMIO y
   ${optionalString (versionAtLeast version "3.13") ''
     KVM_VFIO y

From 14d49ddc40f6631a2b588c4d35e0ce265a4d68e1 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 10 Jun 2016 20:26:13 +0200
Subject: [PATCH 180/436] buildGoPackage: updated docs for goPackages after
 rework in https://github.com/NixOS/nixpkgs/pull/16017

---
 doc/languages-frameworks/go.xml | 143 ++++++++++++++++++++------------
 1 file changed, 88 insertions(+), 55 deletions(-)

diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
index d715765f6a14..520c338b9a87 100644
--- a/doc/languages-frameworks/go.xml
+++ b/doc/languages-frameworks/go.xml
@@ -5,27 +5,29 @@
 <title>Go</title>
 
 <para>The function <varname>buildGoPackage</varname> builds
-standard Go packages.
+standard Go programs.
 </para>
 
 <example xml:id='ex-buildGoPackage'><title>buildGoPackage</title>
 <programlisting>
-net = buildGoPackage rec {
-  name = "go.net-${rev}";
-  goPackagePath = "golang.org/x/net"; <co xml:id='ex-buildGoPackage-1' />
-  subPackages = [ "ipv4" "ipv6" ]; <co xml:id='ex-buildGoPackage-2' />
-  rev = "e0403b4e005";
+deis = buildGoPackage rec {
+  name = "deis-${version}";
+  version = "1.13.0";
+  
+  goPackagePath = "github.com/deis/deis"; <co xml:id='ex-buildGoPackage-1' />
+  subPackages = [ "client" ]; <co xml:id='ex-buildGoPackage-2' />
+
   src = fetchFromGitHub {
-    inherit rev;
-    owner = "golang";
-    repo = "net";
-    sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp";
+    owner = "deis";
+    repo = "deis";
+    rev = "v${version}";
+    sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw";
   };
-  goPackageAliases = [ "code.google.com/p/go.net" ]; <co xml:id='ex-buildGoPackage-3' />
-  propagatedBuildInputs = [ goPackages.text ]; <co xml:id='ex-buildGoPackage-4' />
-  buildFlags = "--tags release"; <co xml:id='ex-buildGoPackage-5' />
-  disabled = isGo13;<co xml:id='ex-buildGoPackage-6' />
-};
+
+  goDeps = ./deps.json; <co xml:id='ex-buildGoPackage-3' />
+
+  buildFlags = "--tags release"; <co xml:id='ex-buildGoPackage-4' />
+}
 </programlisting>
 </example>
 
@@ -47,64 +49,94 @@ the following arguments are of special significance to the function:
       packages will be built.
     </para>
     <para>
-      In this example only <literal>code.google.com/p/go.net/ipv4</literal> and
-      <literal>code.google.com/p/go.net/ipv6</literal> will be built.
+      In this example only <literal>github.com/deis/deis/client</literal> will be built.
     </para>
   </callout>
 
   <callout arearefs='ex-buildGoPackage-3'>
     <para>
-      <varname>goPackageAliases</varname> is a list of alternative import paths
-      that are valid for this library.
-      Packages that depend on this library will automatically rename
-      import paths that match any of the aliases to <literal>goPackagePath</literal>.
-    </para>
-    <para>
-      In this example imports will be renamed from
-      <literal>code.google.com/p/go.net</literal> to
-      <literal>golang.org/x/net</literal> in every package that depend on the
-      <literal>go.net</literal> library.
+      <varname>goDeps</varname> is where the Go dependencies of a Go program are listed
+      in a JSON format described below.
     </para>
   </callout>
 
   <callout arearefs='ex-buildGoPackage-4'>
-    <para>
-      <varname>propagatedBuildInputs</varname> is where the dependencies of a Go library are
-      listed. Only libraries should list <varname>propagatedBuildInputs</varname>. If a standalone
-      program is being built instead, use <varname>buildInputs</varname>. If a library's tests require
-      additional dependencies that are not propagated, they should be listed in <varname>buildInputs</varname>.
-    </para>
-  </callout>
-
-  <callout arearefs='ex-buildGoPackage-5'>
     <para>
       <varname>buildFlags</varname> is a list of flags passed to the go build command.
     </para>
   </callout>
 
-  <callout arearefs='ex-buildGoPackage-6'>
-    <para>
-      If <varname>disabled</varname> is <literal>true</literal>,
-      nix will refuse to build this package.
-    </para>
-    <para>
-      In this example the package will not be built for go 1.3. The <literal>isGo13</literal>
-      is an utility function that returns <literal>true</literal> if go used to build the
-      package has version 1.3.x.
-    </para>
-  </callout>
-
 </calloutlist>
 
 </para>
 
-<para>
-Reusable Go libraries may be found in the <varname>goPackages</varname> set. You can test
-build a Go package as follows:
+<para>The <varname>goDeps</varname> attribute should point to a JSON file that defines which Go libraries
+  are needed and should be included in <varname>GOPATH</varname> for <varname>buildPhase</varname>.
 
-<screen>
-$ nix-build -A goPackages.net
-</screen>
+</para>
+
+<example xml:id='ex-goDeps'><title>deps.json</title>
+<programlisting>
+[ <co xml:id='ex-goDeps-1' />
+    {
+        "goPackagePath": "gopkg.in/yaml.v2", <co xml:id='ex-goDeps-2' />
+        "fetch": {
+          "type": "git", <co xml:id='ex-goDeps-3' />
+          "url": "https://gopkg.in/yaml.v2",
+          "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
+          "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
+        }
+    },
+    {
+    "include": "../../libs.json", <co xml:id='ex-goDeps-4' />
+    "packages": [ <co xml:id='ex-goDeps-5' />
+            "github.com/docopt/docopt-go",
+            "golang.org/x/crypto",
+        ]
+    }
+]
+</programlisting>
+</example>
+
+<para>
+
+<calloutlist>
+
+  <callout arearefs='ex-goDeps-1'>
+    <para>
+      <varname>goDeps</varname> is a list of Go dependencies.
+    </para>
+  </callout>
+
+  <callout arearefs='ex-goDeps-2'>
+    <para>
+      <varname>goPackagePath</varname> specifies Go package import path.
+    </para>
+  </callout>
+
+  <callout arearefs='ex-goDeps-3'>
+    <para>
+      <varname>fetch type</varname> that needs to be used to get package source. If <varname>git</varname>
+      is used there should be <varname>url</varname>, <varname>rev</varname> and <varname>sha256</varname>
+      defined next to it.
+    </para>
+  </callout>
+
+  <callout arearefs='ex-goDeps-4'>
+    <para>
+      <varname>include</varname> could be used to reuse <varname>goDeps</varname> between Go programs.
+      There is a common libs set in <varname>&lt;nixpkgs/pkgs/development/go-modules/libs.json&gt;</varname>
+      with pinned versions of many packages that you can reuse.
+    </para>
+  </callout>
+
+  <callout arearefs='ex-goDeps-5'>
+    <para>
+      <varname>packages</varname> enumerates all Go packages that will be imported from included file.
+    </para>
+  </callout>
+
+</calloutlist>
 
 </para>
 
@@ -119,6 +151,7 @@ done
 </screen>
 </para>
 
-  <para>To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>.</para>
+<para>To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>.
+  It can produce complete derivation and <varname>goDeps</varname> file for Go programs.</para>
 </section>
 

From 65b3ddec31630cc4f3dee7d9bd8754af1ca84995 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Fri, 10 Jun 2016 13:40:02 -0700
Subject: [PATCH 181/436] neomutt: 20160502 -> 20160530

Adds keywords, compress, nntp to patches.
---
 .../networking/mailreaders/neomutt/default.nix            | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index fd5f4a18bd4f..1c1a4ed2d189 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -2,14 +2,14 @@
 , cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "20160502";
+  version = "20160530";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner = "neomutt";
     repo = "neomutt";
     rev = "neomutt-${version}";
-    sha256 = "0r7nn7yjhf3d7nc89gwpgrq45gqiwsrcaw1pkgmvrd16p0jhga1m";
+    sha256 = "17v9qnd7dd7rgz5bq5qqf0b1v59ba6jlqkbmwngx4hal6zm9b9wi";
   };
 
   buildInputs =
@@ -25,7 +25,9 @@ stdenv.mkDerivation rec {
     "--enable-pgp"
     "--enable-pop"
     "--enable-sidebar"
+    "--enable-keywords"
     "--enable-smtp"
+    "--enable-nntp"
     "--with-homespool=mailbox"
     "--with-gss"
     "--with-mailpath="
@@ -46,6 +48,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.neomutt.org;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ hiberno cstrahan ];
+    maintainers = with maintainers; [ hiberno cstrahan vrthra ];
   };
 }

From 1497998a403429e27c6a8d84fd928136b24babbc Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sat, 11 Jun 2016 05:49:51 +0800
Subject: [PATCH 182/436] bluejeans: 2.155.17.5 -> 2.160.49-8

---
 .../networking/browsers/mozilla-plugins/bluejeans/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index 6abc2bc7fc46..147540ed158d 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -17,11 +17,11 @@ in
 stdenv.mkDerivation rec {
   name = "bluejeans-${version}";
 
-  version = "2.155.17.5";
+  version = "2.160.49.8";
 
   src = fetchurl {
     url = "https://swdl.bluejeans.com/skinny/bjnplugin_${version}-1_amd64.deb";
-    sha256 = "1vszk0nrnpji4lm2pndq11kfcrcq1xccjbif9nkm15s3hcb1b66m";
+    sha256 = "1hf4jx0d1wiv622rwck0mm8cckm121yszviw47jsw0mjnp91hqch";
   };
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];

From 5dc116e4566b360720ea78a9901ebd785fe27d43 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 10 Jun 2016 20:49:24 +0300
Subject: [PATCH 183/436] julia-git: 0.4.4-pre-2016-02-08 ->
 0.5.0-dev-2016-06-10

---
 pkgs/development/compilers/julia/git.nix | 30 +++++++++++++++---------
 pkgs/top-level/all-packages.nix          |  1 -
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
index 60e71b353e82..80aaf6dd01fa 100644
--- a/pkgs/development/compilers/julia/git.nix
+++ b/pkgs/development/compilers/julia/git.nix
@@ -2,7 +2,7 @@
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
 # libjulia dependencies
-, libunwind, llvm, readline, utf8proc, zlib
+, libunwind, readline, utf8proc, zlib
 # standard library dependencies
 , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
 # linear algebra
@@ -22,16 +22,22 @@ let
 in
 
 let
+  llvmVersion = "3.7.1";
+  llvm = fetchurl {
+    url = "http://llvm.org/releases/${llvmVersion}/llvm-${llvmVersion}.src.tar.xz";
+    sha256 = "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy";
+  };
+
   dsfmtVersion = "2.2.3";
   dsfmt = fetchurl {
     url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz";
     sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
   };
 
-  libuvVersion = "07730c4bd595b4d45a498a8ee0bcd53878ff7c10";
+  libuvVersion = "a1d9166a440e4a0664c0e6de6ebe25350de56a42";
   libuv = fetchurl {
     url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
-    sha256 = "19nk8vdvx2mxyrwpndb7888c3b237ja5xvxr3jk5ah77ix3srr3h";
+    sha256 = "1sjvly4ylfyj8kxnx0gsjj2f70cg17h302h1i08gfndrqam68za5";
   };
 
   rmathVersion = "0.1";
@@ -40,26 +46,27 @@ let
     sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4";
   };
   
-  virtualenvVersion = "1.11.6";
+  virtualenvVersion = "15.0.0";
   virtualenv = fetchurl {
     url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
-    sha256 = "1xq4prmg25n9cz5zcvbqx68lmc3kl39by582vd8pzs9f3qalqyiy";
+    sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
   };
 in
 
 stdenv.mkDerivation rec {
   pname = "julia";
-  version = "0.4.4-pre-2016-02-08";
+  version = "0.5.0-dev-2016-06-10";
   name = "${pname}-${version}";
 
   src = fetchgit {
     url = "https://github.com/JuliaLang/${pname}";
-    rev = "cb93e6b70b4b1313b4de8c54e55e85c8eb43daa3";
-    sha256 = "1xihq66il4wlxfm5fsgcirh76dq936fm887v2ynqkm3kz7ahhssw";
+    rev = "56d7d6672c7db717dacb5e34f485180c2eba83b2";
+    sha256 = "1wbrzdrxp94i7yxdgf3qgrjshmqxi0c4bqz7wy0c0c0kjlg6flmx";
   };
 
   prePatch = ''
     mkdir deps/srccache
+    cp "${llvm}" "./deps/srccache/llvm-${llvmVersion}.src.tar.xz"
     cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
     cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
     cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
@@ -76,7 +83,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    arpack fftw fftwSinglePrec gmp libgit2 libunwind llvm mpfr
+    arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
     pcre2 openblas openlibm openspecfun readline suitesparse utf8proc
     zlib
   ];
@@ -117,7 +124,8 @@ stdenv.mkDerivation rec {
       "USE_SYSTEM_GMP=1"
       "USE_SYSTEM_LIBGIT2=1"
       "USE_SYSTEM_LIBUNWIND=1"
-      "USE_SYSTEM_LLVM=1"
+      # 'replutil' test failure with LLVM 3.8.0, invalid libraries with 3.7.1
+      "USE_SYSTEM_LLVM=0"
       "USE_SYSTEM_MPFR=1"
       "USE_SYSTEM_OPENLIBM=1"
       "USE_SYSTEM_OPENSPECFUN=1"
@@ -155,7 +163,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
         wrapProgram "$prog" \
-            --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
+            --prefix LD_LIBRARY_PATH : "$out/lib/julia:$LD_LIBRARY_PATH" \
             --prefix PATH : "${curl}/bin"
     done
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 010a06c7818b..7f5e52c4b58d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4677,7 +4677,6 @@ in
 
   julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix {
     gmp = gmp6;
-    llvm = llvm_37;
     openblas = openblasCompat;
   });
 

From 9a1d6fe7011fc940ffa8e7f196018e2fc977c7ed Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Jun 2016 01:41:44 +0300
Subject: [PATCH 184/436] fontforge: 20150824 -> 20160404

---
 pkgs/data/fonts/libertine/default.nix |  2 +-
 pkgs/tools/misc/fontforge/default.nix | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix
index 3b89f3db36dd..c69cc7ae34de 100644
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/pkgs/data/fonts/libertine/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     for i in *.sfd; do
-      fontforge -c \
+      fontforge -lang=ff -c \
         'Open($1);
         ScaleToEm(1000);
         Reencode("unicode");
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 9ee3eb23e0e9..0d6cfb19c349 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -1,20 +1,19 @@
-{ stdenv, fetchurl, fetchpatch, lib
+{ stdenv, fetchFromGitHub, fetchpatch, lib
 , autoconf, automake, gnum4, libtool, git, perl, gnulib, uthash, pkgconfig, gettext
 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango
 , withGTK ? false, gtk2
-, withPython ? false # python-scripting was breaking inconsolata and libertine builds
+, withPython ? true
 }:
 
-let
-  version = "20150824"; # also tagged v2.1.0
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "fontforge-${version}";
+  version = "20160404";
 
-  src = fetchurl {
-    url = "https://github.com/fontforge/fontforge/archive/${version}.tar.gz";
-    sha256 = "09zzg166lw5ldbzsa2j9x7hizn6y3ld1kf4abfkiy301rdqj9ar8";
+  src = fetchFromGitHub {
+    owner = "fontforge";
+    repo = "fontforge";
+    rev = version;
+    sha256 = "15nacq84n9gvlzp3slpmfrrbh57kfb6lbdlc46i7aqgci4qv6fg0";
   };
 
   patches = [(fetchpatch {

From ac30c87d01126c089a351a6863e2e5eb82fccbd1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Jun 2016 01:44:44 +0300
Subject: [PATCH 185/436] fontforge: add to pythonPackages

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2757bae982b7..60f169a6af25 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10005,6 +10005,11 @@ in modules // {
     };
   });
 
+  fontforge = pkgs.fontforge.override {
+    withPython = true;
+    inherit python;
+  };
+
   fonttools = buildPythonPackage (rec {
     version = "3.0";
     name = "fonttools-${version}";

From 3ce3ff64fddb8687c8e4877857802a6548d965ba Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Jun 2016 01:23:41 +0300
Subject: [PATCH 186/436] pythonPackages.scfbuild: init at 1.0.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 60f169a6af25..9f8ac5677cf7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8174,6 +8174,49 @@ in modules // {
     };
   };
 
+  scfbuild = self.buildPythonPackage rec {
+    name = "scfbuild-${version}";
+    version = "1.0.3";
+
+    disabled = isPy3k;
+
+    src = pkgs.fetchFromGitHub {
+      owner = "eosrei";
+      repo = "scfbuild";
+      rev = "c179c8d279b7cc0a9a3536a713ac880ac6010318";
+      sha256 = "1bsi7k4kkj914pycp1g92050hjxscyvc9qflqb3cv5yz3c93cs46";
+    };
+
+    phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+    propagatedBuildInputs = with self; [ pyyaml fonttools fontforge ];
+
+    installPhase = ''
+      mkdir -p $out/${python.sitePackages}
+      cp -r scfbuild $out/${python.sitePackages}
+      # Workaround for #16133
+      mkdir -p $out/bin
+
+      cat >$out/bin/scfbuild <<EOF
+      #!/usr/bin/env python2
+
+      import sys
+      from scfbuild.main import main
+
+      if __name__ == '__main__':
+        sys.exit(main())
+      EOF
+
+      chmod +x $out/bin/scfbuild
+    '';
+
+    meta = with stdenv.lib; {
+      description = "SVGinOT color font builder";
+      homepage = "https://github.com/eosrei/scfbuild";
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
 
   substanced = buildPythonPackage rec {
     # no release yet

From 5f925c7e2b17f60e9564c151eaa21d655704f2ed Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Jun 2016 02:04:58 +0300
Subject: [PATCH 187/436] mueval: use LTS package set

---
 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 7f5e52c4b58d..7aa10afdbe76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8530,7 +8530,9 @@ in
     texinfo = texinfo4;
   };
 
-  mueval = callPackage ../development/tools/haskell/mueval { };
+  mueval = callPackage ../development/tools/haskell/mueval {
+    haskellPackages = haskell.packages.lts;
+  };
 
   muparser = callPackage ../development/libraries/muparser { };
 

From 80b22a823c4d08492c4d903a82186c2fda723f16 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Jun 2016 02:05:04 +0300
Subject: [PATCH 188/436] lambdabot: use LTS package 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 7aa10afdbe76..75fdb3c2ea35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8939,6 +8939,7 @@ in
 
   lambdabot = callPackage ../development/tools/haskell/lambdabot {
     haskell-lib = haskell.lib;
+    haskellPackages = haskell.packages.lts;
   };
 
   leksah = callPackage ../development/tools/haskell/leksah {

From 862c160e29afbdc0a989e77b40aee0f7b815ecfe Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Jun 2016 02:35:58 +0300
Subject: [PATCH 189/436] uwsgi: 2.0.12 -> 2.0.13.1

---
 pkgs/servers/uwsgi/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index 181518c2d7a3..de3689a80074 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -33,11 +33,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "uwsgi-${version}";
-  version = "2.0.12";
+  version = "2.0.13.1";
 
   src = fetchurl {
     url = "http://projects.unbit.it/downloads/${name}.tar.gz";
-    sha256 = "02g46dnw5j1iw8fsq392bxbk8d21b9pdgb3ypcinv3b4jzdm2srh";
+    sha256 = "0zwdljaljzshrdcqsrr2l2ak2zcmsps4glac2lrg0xmb28phrjif";
   };
 
   nativeBuildInputs = [ python3 pkgconfig ];
@@ -73,10 +73,13 @@ stdenv.mkDerivation rec {
     ${lib.concatMapStringsSep "\n" (x: x.install) needed}
   '';
 
+  NIX_CFLAGS_LINK = [ "-lsystemd" ];
+
   meta = with stdenv.lib; {
     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 ];
+    platforms = platforms.linux;
   };
 }

From 3b24a4b09adda5f73a954071f309ec414eb609a5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Jun 2016 00:58:44 +0300
Subject: [PATCH 190/436] nodePackages: regenerate, add svgo, pin parsoid

---
 pkgs/top-level/node-packages-generated.nix | 9371 ++++++++++++--------
 pkgs/top-level/node-packages.json          |    3 +-
 2 files changed, 5723 insertions(+), 3651 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 079926a7595f..0ec4731a9474 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -100,15 +100,15 @@
     cpu = [ ];
   };
   by-spec."JSONStream"."1.x" =
-    self.by-version."JSONStream"."1.1.1";
-  by-version."JSONStream"."1.1.1" = self.buildNodePackage {
-    name = "JSONStream-1.1.1";
-    version = "1.1.1";
+    self.by-version."JSONStream"."1.1.2";
+  by-version."JSONStream"."1.1.2" = self.buildNodePackage {
+    name = "JSONStream-1.1.2";
+    version = "1.1.2";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.1.tgz";
-      name = "JSONStream-1.1.1.tgz";
-      sha1 = "c98bfd88c8f1e1e8694e53c5baa6c8691553e59a";
+      url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.2.tgz";
+      name = "JSONStream-1.1.2.tgz";
+      sha1 = "7c01816613d7e5fe41e913edb3b7f359fddbfbf8";
     };
     deps = {
       "jsonparse-1.2.0" = self.by-version."jsonparse"."1.2.0";
@@ -142,7 +142,7 @@
     cpu = [ ];
   };
   by-spec."JSONStream"."^1.0.3" =
-    self.by-version."JSONStream"."1.1.1";
+    self.by-version."JSONStream"."1.1.2";
   by-spec."abbrev"."1" =
     self.by-version."abbrev"."1.0.7";
   by-version."abbrev"."1.0.7" = self.buildNodePackage {
@@ -244,7 +244,7 @@
       sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea";
     };
     deps = {
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "mime-types-2.1.11" = self.by-version."mime-types"."2.1.11";
       "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
     };
     optionalDependencies = {
@@ -258,19 +258,19 @@
   by-spec."accepts"."~1.2.13" =
     self.by-version."accepts"."1.2.13";
   by-spec."accepts"."~1.3.0" =
-    self.by-version."accepts"."1.3.2";
-  by-version."accepts"."1.3.2" = self.buildNodePackage {
-    name = "accepts-1.3.2";
-    version = "1.3.2";
+    self.by-version."accepts"."1.3.3";
+  by-version."accepts"."1.3.3" = self.buildNodePackage {
+    name = "accepts-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/accepts/-/accepts-1.3.2.tgz";
-      name = "accepts-1.3.2.tgz";
-      sha1 = "9bfd7ddc497fdc1dad73a97b3f7cdc133929fac1";
+      url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz";
+      name = "accepts-1.3.3.tgz";
+      sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca";
     };
     deps = {
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
-      "negotiator-0.6.0" = self.by-version."negotiator"."0.6.0";
+      "mime-types-2.1.11" = self.by-version."mime-types"."2.1.11";
+      "negotiator-0.6.1" = self.by-version."negotiator"."0.6.1";
     };
     optionalDependencies = {
     };
@@ -278,8 +278,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."accepts"."~1.3.1" =
-    self.by-version."accepts"."1.3.2";
+  by-spec."accepts"."~1.3.3" =
+    self.by-version."accepts"."1.3.3";
   by-spec."acorn"."0.11.0" =
     self.by-version."acorn"."0.11.0";
   by-version."acorn"."0.11.0" = self.buildNodePackage {
@@ -320,7 +320,7 @@
   };
   by-spec."acorn"."^1.0.3" =
     self.by-version."acorn"."1.2.2";
-  by-spec."acorn"."^2.0.1" =
+  by-spec."acorn"."^2.1.0" =
     self.by-version."acorn"."2.7.0";
   by-version."acorn"."2.7.0" = self.buildNodePackage {
     name = "acorn-2.7.0";
@@ -339,20 +339,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."acorn"."^2.1.0" =
-    self.by-version."acorn"."2.7.0";
   by-spec."acorn"."^2.7.0" =
     self.by-version."acorn"."2.7.0";
   by-spec."acorn"."^3.0.0" =
-    self.by-version."acorn"."3.0.4";
-  by-version."acorn"."3.0.4" = self.buildNodePackage {
-    name = "acorn-3.0.4";
-    version = "3.0.4";
+    self.by-version."acorn"."3.2.0";
+  by-version."acorn"."3.2.0" = self.buildNodePackage {
+    name = "acorn-3.2.0";
+    version = "3.2.0";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/acorn/-/acorn-3.0.4.tgz";
-      name = "acorn-3.0.4.tgz";
-      sha1 = "04f244950fdb8faf85507ad481c2edee7aecdeec";
+      url = "https://registry.npmjs.org/acorn/-/acorn-3.2.0.tgz";
+      name = "acorn-3.2.0.tgz";
+      sha1 = "7a82989ef6f063a237ababaf8df20d2965184b9f";
     };
     deps = {
     };
@@ -363,7 +361,9 @@
     cpu = [ ];
   };
   by-spec."acorn"."^3.0.4" =
-    self.by-version."acorn"."3.0.4";
+    self.by-version."acorn"."3.2.0";
+  by-spec."acorn"."^3.1.0" =
+    self.by-version."acorn"."3.2.0";
   by-spec."acorn-globals"."^1.0.2" =
     self.by-version."acorn-globals"."1.0.9";
   by-version."acorn-globals"."1.0.9" = self.buildNodePackage {
@@ -386,19 +386,19 @@
   };
   by-spec."acorn-globals"."^1.0.3" =
     self.by-version."acorn-globals"."1.0.9";
-  by-spec."acorn-jsx"."^2.0.1" =
-    self.by-version."acorn-jsx"."2.0.1";
-  by-version."acorn-jsx"."2.0.1" = self.buildNodePackage {
-    name = "acorn-jsx-2.0.1";
-    version = "2.0.1";
+  by-spec."acorn-jsx"."^3.0.0" =
+    self.by-version."acorn-jsx"."3.0.1";
+  by-version."acorn-jsx"."3.0.1" = self.buildNodePackage {
+    name = "acorn-jsx-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-2.0.1.tgz";
-      name = "acorn-jsx-2.0.1.tgz";
-      sha1 = "0edf9878a5866bca625f52955a1ed9e7d8c5117e";
+      url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
+      name = "acorn-jsx-3.0.1.tgz";
+      sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
     };
     deps = {
-      "acorn-2.7.0" = self.by-version."acorn"."2.7.0";
+      "acorn-3.2.0" = self.by-version."acorn"."3.2.0";
     };
     optionalDependencies = {
     };
@@ -647,18 +647,50 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."alea"."~0.0.9" =
-    self.by-version."alea"."0.0.9";
-  by-version."alea"."0.0.9" = self.buildNodePackage {
-    name = "alea-0.0.9";
-    version = "0.0.9";
+  by-spec."airplay-protocol"."^2.0.2" =
+    self.by-version."airplay-protocol"."2.0.2";
+  by-version."airplay-protocol"."2.0.2" = self.buildNodePackage {
+    name = "airplay-protocol-2.0.2";
+    version = "2.0.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/alea/-/alea-0.0.9.tgz";
-      name = "alea-0.0.9.tgz";
-      sha1 = "f738cb45f83430069f45cf69ccbf312dd57a9e1a";
+      url = "https://registry.npmjs.org/airplay-protocol/-/airplay-protocol-2.0.2.tgz";
+      name = "airplay-protocol-2.0.2.tgz";
+      sha1 = "b5b2a7137331f5545acbe196ba5693c13238fc5e";
     };
     deps = {
+      "bplist-creator-0.0.6" = self.by-version."bplist-creator"."0.0.6";
+      "bplist-parser-0.1.1" = self.by-version."bplist-parser"."0.1.1";
+      "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
+      "plist-1.2.0" = self.by-version."plist"."1.2.0";
+      "reverse-http-1.2.0" = self.by-version."reverse-http"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."airplayer"."^2.0.0" =
+    self.by-version."airplayer"."2.0.0";
+  by-version."airplayer"."2.0.0" = self.buildNodePackage {
+    name = "airplayer-2.0.0";
+    version = "2.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/airplayer/-/airplayer-2.0.0.tgz";
+      name = "airplayer-2.0.0.tgz";
+      sha1 = "7ab62d23b96d44234138aec1281d2e67ef190259";
+    };
+    deps = {
+      "airplay-protocol-2.0.2" = self.by-version."airplay-protocol"."2.0.2";
+      "appendable-cli-menu-2.0.0" = self.by-version."appendable-cli-menu"."2.0.0";
+      "bonjour-3.5.0" = self.by-version."bonjour"."3.5.0";
+      "internal-ip-1.2.0" = self.by-version."internal-ip"."1.2.0";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
+      "range-parser-1.2.0" = self.by-version."range-parser"."1.2.0";
+      "server-destroy-1.0.1" = self.by-version."server-destroy"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -698,7 +730,7 @@
       sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
     };
     deps = {
-      "kind-of-3.0.2" = self.by-version."kind-of"."3.0.2";
+      "kind-of-3.0.3" = self.by-version."kind-of"."3.0.3";
       "longest-1.0.1" = self.by-version."longest"."1.0.1";
       "repeat-string-1.5.4" = self.by-version."repeat-string"."1.5.4";
     };
@@ -773,18 +805,18 @@
   by-spec."amdefine".">=0.0.4" =
     self.by-version."amdefine"."1.0.0";
   by-spec."amqp".">=0.1.3" =
-    self.by-version."amqp"."0.2.4";
-  by-version."amqp"."0.2.4" = self.buildNodePackage {
-    name = "amqp-0.2.4";
-    version = "0.2.4";
+    self.by-version."amqp"."0.2.6";
+  by-version."amqp"."0.2.6" = self.buildNodePackage {
+    name = "amqp-0.2.6";
+    version = "0.2.6";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/amqp/-/amqp-0.2.4.tgz";
-      name = "amqp-0.2.4.tgz";
-      sha1 = "b47e9f5b01f292ab18a8097ff0e72a54b4d03a89";
+      url = "https://registry.npmjs.org/amqp/-/amqp-0.2.6.tgz";
+      name = "amqp-0.2.6.tgz";
+      sha1 = "d97fee5143026fa0b4fd6a5d56485f0448eb37ca";
     };
     deps = {
-      "lodash-1.3.1" = self.by-version."lodash"."1.3.1";
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
     };
     optionalDependencies = {
     };
@@ -816,15 +848,15 @@
   by-spec."ansi"."~0.3.1" =
     self.by-version."ansi"."0.3.1";
   by-spec."ansi-escapes"."^1.1.0" =
-    self.by-version."ansi-escapes"."1.3.0";
-  by-version."ansi-escapes"."1.3.0" = self.buildNodePackage {
-    name = "ansi-escapes-1.3.0";
-    version = "1.3.0";
+    self.by-version."ansi-escapes"."1.4.0";
+  by-version."ansi-escapes"."1.4.0" = self.buildNodePackage {
+    name = "ansi-escapes-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.3.0.tgz";
-      name = "ansi-escapes-1.3.0.tgz";
-      sha1 = "070883c337d5e4ce9e124fce2639267f2a14d554";
+      url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz";
+      name = "ansi-escapes-1.4.0.tgz";
+      sha1 = "d3a8a83b319aa67793662b13e761c7911422306e";
     };
     deps = {
     };
@@ -1010,7 +1042,7 @@
     };
     deps = {
       "arrify-1.0.1" = self.by-version."arrify"."1.0.1";
-      "micromatch-2.3.7" = self.by-version."micromatch"."2.3.7";
+      "micromatch-2.3.8" = self.by-version."micromatch"."2.3.8";
     };
     optionalDependencies = {
     };
@@ -1057,16 +1089,38 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."aproba"."~1.0.1" =
-    self.by-version."aproba"."1.0.1";
-  by-version."aproba"."1.0.1" = self.buildNodePackage {
-    name = "aproba-1.0.1";
-    version = "1.0.1";
+  by-spec."appendable-cli-menu"."^2.0.0" =
+    self.by-version."appendable-cli-menu"."2.0.0";
+  by-version."appendable-cli-menu"."2.0.0" = self.buildNodePackage {
+    name = "appendable-cli-menu-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/aproba/-/aproba-1.0.1.tgz";
-      name = "aproba-1.0.1.tgz";
-      sha1 = "c4ac2cc5becfb8b099de7ef9f02790e7d32d99ef";
+      url = "https://registry.npmjs.org/appendable-cli-menu/-/appendable-cli-menu-2.0.0.tgz";
+      name = "appendable-cli-menu-2.0.0.tgz";
+      sha1 = "dcfca9e509300e4c3b2d467965fe50c56fc75e66";
+    };
+    deps = {
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "keypress-0.2.1" = self.by-version."keypress"."0.2.1";
+      "single-line-log-1.1.1" = self.by-version."single-line-log"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."aproba"."^1.0.1" =
+    self.by-version."aproba"."1.0.3";
+  by-version."aproba"."1.0.3" = self.buildNodePackage {
+    name = "aproba-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/aproba/-/aproba-1.0.3.tgz";
+      name = "aproba-1.0.3.tgz";
+      sha1 = "7fb6da3a72c70249db63fd9b5c64b31af718a94f";
     };
     deps = {
     };
@@ -1076,6 +1130,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."aproba"."~1.0.3" =
+    self.by-version."aproba"."1.0.3";
   by-spec."archiver"."~0.14.0" =
     self.by-version."archiver"."0.14.4";
   by-version."archiver"."0.14.4" = self.buildNodePackage {
@@ -1093,7 +1149,7 @@
       "glob-4.3.5" = self.by-version."glob"."4.3.5";
       "lazystream-0.1.0" = self.by-version."lazystream"."0.1.0";
       "lodash-3.2.0" = self.by-version."lodash"."3.2.0";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
       "tar-stream-1.1.5" = self.by-version."tar-stream"."1.1.5";
       "zip-stream-0.5.2" = self.by-version."zip-stream"."0.5.2";
     };
@@ -1137,7 +1193,7 @@
     };
     deps = {
       "delegates-1.0.0" = self.by-version."delegates"."1.0.0";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -1178,7 +1234,7 @@
       sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4";
     };
     deps = {
-      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
       "sprintf-js-1.0.3" = self.by-version."sprintf-js"."1.0.3";
     };
     optionalDependencies = {
@@ -1207,6 +1263,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."argparse"."^1.0.7" =
+    self.by-version."argparse"."1.0.7";
   by-spec."argparse"."~ 0.1.11" =
     self.by-version."argparse"."0.1.16";
   by-version."argparse"."0.1.16" = self.buildNodePackage {
@@ -1326,7 +1384,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."array-find-index"."^1.0.0" =
+  by-spec."array-find-index"."^1.0.1" =
     self.by-version."array-find-index"."1.0.1";
   by-version."array-find-index"."1.0.1" = self.buildNodePackage {
     name = "array-find-index-1.0.1";
@@ -1402,6 +1460,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."array-flatten"."^2.1.0" =
+    self.by-version."array-flatten"."2.1.0";
+  by-version."array-flatten"."2.1.0" = self.buildNodePackage {
+    name = "array-flatten-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.0.tgz";
+      name = "array-flatten-2.1.0.tgz";
+      sha1 = "26a692c83881fc68dac3ec5d1f0c1b49bf2304d9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."array-index"."^1.0.0" =
     self.by-version."array-index"."1.0.0";
   by-version."array-index"."1.0.0" = self.buildNodePackage {
@@ -1415,7 +1492,7 @@
     };
     deps = {
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "es6-symbol-3.0.2" = self.by-version."es6-symbol"."3.0.2";
+      "es6-symbol-3.1.0" = self.by-version."es6-symbol"."3.1.0";
     };
     optionalDependencies = {
     };
@@ -1617,15 +1694,15 @@
     cpu = [ ];
   };
   by-spec."asap"."^2.0.0" =
-    self.by-version."asap"."2.0.3";
-  by-version."asap"."2.0.3" = self.buildNodePackage {
-    name = "asap-2.0.3";
-    version = "2.0.3";
+    self.by-version."asap"."2.0.4";
+  by-version."asap"."2.0.4" = self.buildNodePackage {
+    name = "asap-2.0.4";
+    version = "2.0.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz";
-      name = "asap-2.0.3.tgz";
-      sha1 = "1fc1d1564ee11620dfca6d67029850913f9f4679";
+      url = "https://registry.npmjs.org/asap/-/asap-2.0.4.tgz";
+      name = "asap-2.0.4.tgz";
+      sha1 = "b391bf7f6bfbc65706022fec8f49c4b07fecf589";
     };
     deps = {
     };
@@ -1655,7 +1732,7 @@
     cpu = [ ];
   };
   by-spec."asap"."~2.0.3" =
-    self.by-version."asap"."2.0.3";
+    self.by-version."asap"."2.0.4";
   by-spec."ascii-json"."~0.2" =
     self.by-version."ascii-json"."0.2.0";
   by-version."ascii-json"."0.2.0" = self.buildNodePackage {
@@ -1753,19 +1830,21 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."asn1"."~0.2.3" =
+    self.by-version."asn1"."0.2.3";
   by-spec."asn1.js"."^4.0.0" =
-    self.by-version."asn1.js"."4.5.2";
-  by-version."asn1.js"."4.5.2" = self.buildNodePackage {
-    name = "asn1.js-4.5.2";
-    version = "4.5.2";
+    self.by-version."asn1.js"."4.6.2";
+  by-version."asn1.js"."4.6.2" = self.buildNodePackage {
+    name = "asn1.js-4.6.2";
+    version = "4.6.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.5.2.tgz";
-      name = "asn1.js-4.5.2.tgz";
-      sha1 = "17492bdfd4bb5f1d7e56ab6b085297fee9e640e9";
+      url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.6.2.tgz";
+      name = "asn1.js-4.6.2.tgz";
+      sha1 = "c7c5a3444a45d40e7c56416400d00b33fd78247f";
     };
     deps = {
-      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "bn.js-4.11.4" = self.by-version."bn.js"."4.11.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimalistic-assert-1.0.0" = self.by-version."minimalistic-assert"."1.0.0";
     };
@@ -1776,6 +1855,29 @@
     cpu = [ ];
   };
   by-spec."assert"."*" =
+    self.by-version."assert"."1.4.1";
+  by-version."assert"."1.4.1" = self.buildNodePackage {
+    name = "assert-1.4.1";
+    version = "1.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
+      name = "assert-1.4.1.tgz";
+      sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
+    };
+    deps = {
+      "util-0.10.3" = self.by-version."util"."0.10.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "assert" = self.by-version."assert"."1.4.1";
+  by-spec."assert"."^1.1.1" =
+    self.by-version."assert"."1.4.1";
+  by-spec."assert"."~1.3.0" =
     self.by-version."assert"."1.3.0";
   by-version."assert"."1.3.0" = self.buildNodePackage {
     name = "assert-1.3.0";
@@ -1795,11 +1897,6 @@
     os = [ ];
     cpu = [ ];
   };
-  "assert" = self.by-version."assert"."1.3.0";
-  by-spec."assert"."^1.1.1" =
-    self.by-version."assert"."1.3.0";
-  by-spec."assert"."~1.3.0" =
-    self.by-version."assert"."1.3.0";
   by-spec."assert-plus"."0.1.2" =
     self.by-version."assert-plus"."0.1.2";
   by-version."assert-plus"."0.1.2" = self.buildNodePackage {
@@ -1885,15 +1982,15 @@
     cpu = [ ];
   };
   by-spec."assertion-error"."^1.0.1" =
-    self.by-version."assertion-error"."1.0.1";
-  by-version."assertion-error"."1.0.1" = self.buildNodePackage {
-    name = "assertion-error-1.0.1";
-    version = "1.0.1";
+    self.by-version."assertion-error"."1.0.2";
+  by-version."assertion-error"."1.0.2" = self.buildNodePackage {
+    name = "assertion-error-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.1.tgz";
-      name = "assertion-error-1.0.1.tgz";
-      sha1 = "35aaeec33097f11f42399ecadf33faccd27f5c4c";
+      url = "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz";
+      name = "assertion-error-1.0.2.tgz";
+      sha1 = "13ca515d86206da0bac66e834dd397d87581094c";
     };
     deps = {
     };
@@ -2001,18 +2098,18 @@
     cpu = [ ];
   };
   by-spec."async"."*" =
-    self.by-version."async"."2.0.0-rc.3";
-  by-version."async"."2.0.0-rc.3" = self.buildNodePackage {
-    name = "async-2.0.0-rc.3";
-    version = "2.0.0-rc.3";
+    self.by-version."async"."2.0.0-rc.6";
+  by-version."async"."2.0.0-rc.6" = self.buildNodePackage {
+    name = "async-2.0.0-rc.6";
+    version = "2.0.0-rc.6";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/async/-/async-2.0.0-rc.3.tgz";
-      name = "async-2.0.0-rc.3.tgz";
-      sha1 = "1fae1160594dd47dbe5431d4726d66b10f374d89";
+      url = "https://registry.npmjs.org/async/-/async-2.0.0-rc.6.tgz";
+      name = "async-2.0.0-rc.6.tgz";
+      sha1 = "978fc4155d1fc30b8b58fc3f020102b2da02f2a4";
     };
     deps = {
-      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
     };
     optionalDependencies = {
     };
@@ -2020,7 +2117,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "async" = self.by-version."async"."2.0.0-rc.3";
+  "async" = self.by-version."async"."2.0.0-rc.6";
   by-spec."async"."0.1.18" =
     self.by-version."async"."0.1.18";
   by-version."async"."0.1.18" = self.buildNodePackage {
@@ -2196,6 +2293,26 @@
   };
   by-spec."async"."1.x" =
     self.by-version."async"."1.5.2";
+  by-spec."async"."2.0.0-rc.4" =
+    self.by-version."async"."2.0.0-rc.4";
+  by-version."async"."2.0.0-rc.4" = self.buildNodePackage {
+    name = "async-2.0.0-rc.4";
+    version = "2.0.0-rc.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/async/-/async-2.0.0-rc.4.tgz";
+      name = "async-2.0.0-rc.4.tgz";
+      sha1 = "9b7f60724c17962a973f787419e0ebc5571dbad8";
+    };
+    deps = {
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."async".">=0.2.9" =
     self.by-version."async"."1.5.2";
   by-spec."async".">=0.9.0 <1.0.0-0" =
@@ -2308,15 +2425,15 @@
     cpu = [ ];
   };
   by-spec."aws-sdk"."*" =
-    self.by-version."aws-sdk"."2.3.2";
-  by-version."aws-sdk"."2.3.2" = self.buildNodePackage {
-    name = "aws-sdk-2.3.2";
-    version = "2.3.2";
+    self.by-version."aws-sdk"."2.3.19";
+  by-version."aws-sdk"."2.3.19" = self.buildNodePackage {
+    name = "aws-sdk-2.3.19";
+    version = "2.3.19";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.3.2.tgz";
-      name = "aws-sdk-2.3.2.tgz";
-      sha1 = "2025fb6cfd40b077befb783b8de57d0c09a92575";
+      url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.3.19.tgz";
+      name = "aws-sdk-2.3.19.tgz";
+      sha1 = "d040df16b1880fdf231a8d48139c8956191fc00e";
     };
     deps = {
       "sax-1.1.5" = self.by-version."sax"."1.1.5";
@@ -2330,7 +2447,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "aws-sdk" = self.by-version."aws-sdk"."2.3.2";
+  "aws-sdk" = self.by-version."aws-sdk"."2.3.19";
   by-spec."aws-sdk"."2.0.5" =
     self.by-version."aws-sdk"."2.0.5";
   by-version."aws-sdk"."2.0.5" = self.buildNodePackage {
@@ -2354,7 +2471,7 @@
     cpu = [ ];
   };
   by-spec."aws-sdk"."2.x" =
-    self.by-version."aws-sdk"."2.3.2";
+    self.by-version."aws-sdk"."2.3.19";
   by-spec."aws-sdk".">=1.2.0 <2" =
     self.by-version."aws-sdk"."1.18.0";
   by-version."aws-sdk"."1.18.0" = self.buildNodePackage {
@@ -2377,9 +2494,9 @@
     cpu = [ ];
   };
   by-spec."aws-sdk".">=2.0.0 >=2.2.43 <3.0.0" =
-    self.by-version."aws-sdk"."2.3.2";
+    self.by-version."aws-sdk"."2.3.19";
   by-spec."aws-sdk"."^2.2.43" =
-    self.by-version."aws-sdk"."2.3.2";
+    self.by-version."aws-sdk"."2.3.19";
   by-spec."aws-sdk-apis"."3.x" =
     self.by-version."aws-sdk-apis"."3.1.10";
   by-version."aws-sdk-apis"."3.1.10" = self.buildNodePackage {
@@ -2476,18 +2593,17 @@
     cpu = [ ];
   };
   by-spec."aws4"."^1.2.1" =
-    self.by-version."aws4"."1.3.2";
-  by-version."aws4"."1.3.2" = self.buildNodePackage {
-    name = "aws4-1.3.2";
-    version = "1.3.2";
+    self.by-version."aws4"."1.4.1";
+  by-version."aws4"."1.4.1" = self.buildNodePackage {
+    name = "aws4-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz";
-      name = "aws4-1.3.2.tgz";
-      sha1 = "d39e0bee412ced0e8ed94a23e314f313a95b9fd1";
+      url = "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz";
+      name = "aws4-1.4.1.tgz";
+      sha1 = "fde7d5292466d230e5ee0f4e038d9dfaab08fc61";
     };
     deps = {
-      "lru-cache-4.0.1" = self.by-version."lru-cache"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -2495,39 +2611,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."babel-plugin-syntax-flow"."^6.5.0" =
-    self.by-version."babel-plugin-syntax-flow"."6.5.0";
-  by-version."babel-plugin-syntax-flow"."6.5.0" = self.buildNodePackage {
-    name = "babel-plugin-syntax-flow-6.5.0";
-    version = "6.5.0";
+  by-spec."babel-runtime"."^6.3.19" =
+    self.by-version."babel-runtime"."6.9.2";
+  by-version."babel-runtime"."6.9.2" = self.buildNodePackage {
+    name = "babel-runtime-6.9.2";
+    version = "6.9.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.5.0.tgz";
-      name = "babel-plugin-syntax-flow-6.5.0.tgz";
-      sha1 = "07dfe735b45fce8905296296a40072afce82b215";
+      url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.9.2.tgz";
+      name = "babel-runtime-6.9.2.tgz";
+      sha1 = "d7fe391bc2cc29b8087c1d9b39878912e9fcfd59";
     };
     deps = {
-      "babel-runtime-5.8.38" = self.by-version."babel-runtime"."5.8.38";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."babel-runtime"."^5.0.0" =
-    self.by-version."babel-runtime"."5.8.38";
-  by-version."babel-runtime"."5.8.38" = self.buildNodePackage {
-    name = "babel-runtime-5.8.38";
-    version = "5.8.38";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.38.tgz";
-      name = "babel-runtime-5.8.38.tgz";
-      sha1 = "1c0b02eb63312f5f087ff20450827b425c9d4c19";
-    };
-    deps = {
-      "core-js-1.2.6" = self.by-version."core-js"."1.2.6";
+      "core-js-2.4.0" = self.by-version."core-js"."2.4.0";
+      "regenerator-runtime-0.9.5" = self.by-version."regenerator-runtime"."0.9.5";
     };
     optionalDependencies = {
     };
@@ -2614,16 +2711,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."balanced-match"."^0.3.0" =
-    self.by-version."balanced-match"."0.3.0";
-  by-version."balanced-match"."0.3.0" = self.buildNodePackage {
-    name = "balanced-match-0.3.0";
-    version = "0.3.0";
+  by-spec."balanced-match"."^0.4.1" =
+    self.by-version."balanced-match"."0.4.1";
+  by-version."balanced-match"."0.4.1" = self.buildNodePackage {
+    name = "balanced-match-0.4.1";
+    version = "0.4.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz";
-      name = "balanced-match-0.3.0.tgz";
-      sha1 = "a91cdd1ebef1a86659e70ff4def01625fc2d6756";
+      url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz";
+      name = "balanced-match-0.4.1.tgz";
+      sha1 = "19053e2e0748eadb379da6c09d455cf5e1039335";
     };
     deps = {
     };
@@ -2653,15 +2750,15 @@
     cpu = [ ];
   };
   by-spec."base62"."^1.1.0" =
-    self.by-version."base62"."1.1.0";
-  by-version."base62"."1.1.0" = self.buildNodePackage {
-    name = "base62-1.1.0";
-    version = "1.1.0";
+    self.by-version."base62"."1.1.1";
+  by-version."base62"."1.1.1" = self.buildNodePackage {
+    name = "base62-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/base62/-/base62-1.1.0.tgz";
-      name = "base62-1.1.0.tgz";
-      sha1 = "4659de866558906d43fec61e07abd4397da74c19";
+      url = "https://registry.npmjs.org/base62/-/base62-1.1.1.tgz";
+      name = "base62-1.1.1.tgz";
+      sha1 = "974e82c11bd5e00816b508a7ed9c7b9086c9db6b";
     };
     deps = {
     };
@@ -2747,7 +2844,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base64-url"."^1.2.1" =
+  by-spec."base64-url"."1.2.2" =
     self.by-version."base64-url"."1.2.2";
   by-version."base64-url"."1.2.2" = self.buildNodePackage {
     name = "base64-url-1.2.2";
@@ -2766,6 +2863,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."base64-url"."^1.2.1" =
+    self.by-version."base64-url"."1.2.2";
   by-spec."base64id"."0.1.0" =
     self.by-version."base64id"."0.1.0";
   by-version."base64id"."0.1.0" = self.buildNodePackage {
@@ -2864,9 +2963,26 @@
     cpu = [ ];
   };
   by-spec."basic-auth"."^1.0.0" =
-    self.by-version."basic-auth"."1.0.3";
+    self.by-version."basic-auth"."1.0.4";
+  by-version."basic-auth"."1.0.4" = self.buildNodePackage {
+    name = "basic-auth-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
+      name = "basic-auth-1.0.4.tgz";
+      sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."basic-auth"."~1.0.3" =
-    self.by-version."basic-auth"."1.0.3";
+    self.by-version."basic-auth"."1.0.4";
   by-spec."basic-auth-connect"."1.0.0" =
     self.by-version."basic-auth-connect"."1.0.0";
   by-version."basic-auth-connect"."1.0.0" = self.buildNodePackage {
@@ -2947,6 +3063,28 @@
   by-spec."batch"."^0.5.3" =
     self.by-version."batch"."0.5.3";
   by-spec."bcrypt"."*" =
+    self.by-version."bcrypt"."0.8.7";
+  by-version."bcrypt"."0.8.7" = self.buildNodePackage {
+    name = "bcrypt-0.8.7";
+    version = "0.8.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz";
+      name = "bcrypt-0.8.7.tgz";
+      sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093";
+    };
+    deps = {
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "bcrypt" = self.by-version."bcrypt"."0.8.7";
+  by-spec."bcrypt"."0.8.5" =
     self.by-version."bcrypt"."0.8.5";
   by-version."bcrypt"."0.8.5" = self.buildNodePackage {
     name = "bcrypt-0.8.5";
@@ -2967,11 +3105,8 @@
     os = [ ];
     cpu = [ ];
   };
-  "bcrypt" = self.by-version."bcrypt"."0.8.5";
-  by-spec."bcrypt"."0.8.5" =
-    self.by-version."bcrypt"."0.8.5";
   by-spec."bcrypt".">=0.5.0" =
-    self.by-version."bcrypt"."0.8.5";
+    self.by-version."bcrypt"."0.8.7";
   by-spec."bcryptjs"."2.3.0" =
     self.by-version."bcryptjs"."2.3.0";
   by-version."bcryptjs"."2.3.0" = self.buildNodePackage {
@@ -3029,6 +3164,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."bencode"."^0.10.0" =
+    self.by-version."bencode"."0.10.0";
+  by-version."bencode"."0.10.0" = self.buildNodePackage {
+    name = "bencode-0.10.0";
+    version = "0.10.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bencode/-/bencode-0.10.0.tgz";
+      name = "bencode-0.10.0.tgz";
+      sha1 = "717b36fc61c4e9cb3755f0a9f90996ee5b46f0d0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."bencode"."^0.6.0" =
     self.by-version."bencode"."0.6.0";
   by-version."bencode"."0.6.0" = self.buildNodePackage {
@@ -3166,7 +3320,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."big.js"."^3.0.2" =
+  by-spec."big.js"."^3.1.3" =
     self.by-version."big.js"."3.1.3";
   by-version."big.js"."3.1.3" = self.buildNodePackage {
     name = "big.js-3.1.3";
@@ -3224,15 +3378,15 @@
     cpu = [ ];
   };
   by-spec."binary-extensions"."^1.0.0" =
-    self.by-version."binary-extensions"."1.4.0";
-  by-version."binary-extensions"."1.4.0" = self.buildNodePackage {
-    name = "binary-extensions-1.4.0";
-    version = "1.4.0";
+    self.by-version."binary-extensions"."1.4.1";
+  by-version."binary-extensions"."1.4.1" = self.buildNodePackage {
+    name = "binary-extensions-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.4.0.tgz";
-      name = "binary-extensions-1.4.0.tgz";
-      sha1 = "d733ccb628986d7b326d88656e0ddbd3aac351b7";
+      url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.4.1.tgz";
+      name = "binary-extensions-1.4.1.tgz";
+      sha1 = "be94c78b44d9f9c336d0de3088545d5efa8511a8";
     };
     deps = {
     };
@@ -3308,11 +3462,11 @@
       "extend-3.0.0" = self.by-version."extend"."3.0.0";
       "ipaddr.js-0.1.9" = self.by-version."ipaddr.js"."0.1.9";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "moment-2.12.0" = self.by-version."moment"."2.12.0";
+      "moment-2.13.0" = self.by-version."moment"."2.13.0";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "passport-0.3.2" = self.by-version."passport"."0.3.2";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "tldtools-0.0.24" = self.by-version."tldtools"."0.0.24";
       "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
       "validator-1.5.1" = self.by-version."validator"."1.5.1";
@@ -3335,7 +3489,7 @@
       sha1 = "408ab1d2e776790528e3d8de52ae0375610067aa";
     };
     deps = {
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -3508,7 +3662,7 @@
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "embedly-1.0.4" = self.by-version."embedly"."1.0.4";
+      "embedly-2.0.1" = self.by-version."embedly"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -3556,8 +3710,8 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "async-0.1.18" = self.by-version."async"."0.1.18";
-      "fb-1.0.2" = self.by-version."fb"."1.0.2";
-      "passport-facebook-2.1.0" = self.by-version."passport-facebook"."2.1.0";
+      "fb-1.1.1" = self.by-version."fb"."1.1.1";
+      "passport-facebook-2.1.1" = self.by-version."passport-facebook"."2.1.1";
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
     };
     optionalDependencies = {
@@ -3607,7 +3761,7 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "q-1.0.1" = self.by-version."q"."1.0.1";
       "safe-regex-0.0.1" = self.by-version."safe-regex"."0.0.1";
-      "xml2json-0.9.0" = self.by-version."xml2json"."0.9.0";
+      "xml2json-0.9.1" = self.by-version."xml2json"."0.9.1";
     };
     optionalDependencies = {
     };
@@ -3740,7 +3894,7 @@
       sha1 = "c679c5192847db6cb6d93ed38b0800db819cc3be";
     };
     deps = {
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -3762,7 +3916,7 @@
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "passport-imgur-0.0.3" = self.by-version."passport-imgur"."0.0.3";
     };
     optionalDependencies = {
@@ -3786,7 +3940,7 @@
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-instagram-1.0.0" = self.by-version."passport-instagram"."1.0.0";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -3827,7 +3981,7 @@
       sha1 = "762ea8d08d6d662af6e6978741dac4cfd762b24c";
     };
     deps = {
-      "keen-js-3.4.0" = self.by-version."keen-js"."3.4.0";
+      "keen-js-3.4.1" = self.by-version."keen-js"."3.4.1";
     };
     optionalDependencies = {
     };
@@ -3849,7 +4003,7 @@
     };
     deps = {
       "passport-mailchimp-1.0.0" = self.by-version."passport-mailchimp"."1.0.0";
-      "mailchimp-1.1.6" = self.by-version."mailchimp"."1.1.6";
+      "mailchimp-1.2.0" = self.by-version."mailchimp"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -3913,7 +4067,7 @@
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -3935,7 +4089,7 @@
     };
     deps = {
       "mongodb-2.0.55" = self.by-version."mongodb"."2.0.55";
-      "assert-1.3.0" = self.by-version."assert"."1.3.0";
+      "assert-1.4.1" = self.by-version."assert"."1.4.1";
     };
     optionalDependencies = {
     };
@@ -3997,7 +4151,7 @@
       sha1 = "8cc71c54d9b0f9bd0c39069f8007020be1fdf26f";
     };
     deps = {
-      "pusher-1.2.1" = self.by-version."pusher"."1.2.1";
+      "pusher-1.3.0" = self.by-version."pusher"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -4019,8 +4173,8 @@
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "passport-soundcloud-0.1.2" = self.by-version."passport-soundcloud"."0.1.2";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "passport-soundcloud-0.2.0" = self.by-version."passport-soundcloud"."0.2.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -4061,15 +4215,15 @@
       sha1 = "4c2ff80f808b74df8453c1213cbe8132d99f98e2";
     };
     deps = {
-      "ejs-2.4.1" = self.by-version."ejs"."2.4.1";
+      "ejs-2.4.2" = self.by-version."ejs"."2.4.2";
       "favitest-1.0.7" = self.by-version."favitest"."1.0.7";
       "feedparser-1.1.4" = self.by-version."feedparser"."1.1.4";
       "htmlparser2-3.9.0" = self.by-version."htmlparser2"."3.9.0";
       "imagemagick-0.1.3" = self.by-version."imagemagick"."0.1.3";
-      "moment-2.12.0" = self.by-version."moment"."2.12.0";
+      "moment-2.13.0" = self.by-version."moment"."2.13.0";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "rss-1.2.1" = self.by-version."rss"."1.2.1";
       "send-0.9.3" = self.by-version."send"."0.9.3";
     };
@@ -4115,7 +4269,7 @@
     };
     deps = {
       "moment-2.5.1" = self.by-version."moment"."2.5.1";
-      "moment-timezone-0.5.3" = self.by-version."moment-timezone"."0.5.3";
+      "moment-timezone-0.5.4" = self.by-version."moment-timezone"."0.5.4";
     };
     optionalDependencies = {
     };
@@ -4246,7 +4400,7 @@
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "passport-wordpress-0.0.3" = self.by-version."passport-wordpress"."0.0.3";
+      "passport-wordpress-0.0.4" = self.by-version."passport-wordpress"."0.0.4";
     };
     optionalDependencies = {
     };
@@ -4269,7 +4423,7 @@
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "xml2json-0.9.0" = self.by-version."xml2json"."0.9.0";
+      "xml2json-0.9.1" = self.by-version."xml2json"."0.9.1";
     };
     optionalDependencies = {
     };
@@ -4291,10 +4445,10 @@
     };
     deps = {
       "JSONPath-0.10.0" = self.by-version."JSONPath"."0.10.0";
-      "amqp-0.2.4" = self.by-version."amqp"."0.2.4";
+      "amqp-0.2.6" = self.by-version."amqp"."0.2.6";
       "async-0.1.18" = self.by-version."async"."0.1.18";
       "base-converter-1.1.2" = self.by-version."base-converter"."1.1.2";
-      "bcrypt-0.8.5" = self.by-version."bcrypt"."0.8.5";
+      "bcrypt-0.8.7" = self.by-version."bcrypt"."0.8.7";
       "bip-pod-0.4.21" = self.by-version."bip-pod"."0.4.21";
       "bip-pod-crypto-0.3.3" = self.by-version."bip-pod-crypto"."0.3.3";
       "bip-pod-email-0.3.13" = self.by-version."bip-pod-email"."0.3.13";
@@ -4311,7 +4465,7 @@
       "config-0.4.36" = self.by-version."config"."0.4.36";
       "connect-2.30.2" = self.by-version."connect"."2.30.2";
       "connect-mongo-0.8.2" = self.by-version."connect-mongo"."0.8.2";
-      "cookie-parser-1.4.1" = self.by-version."cookie-parser"."1.4.1";
+      "cookie-parser-1.4.3" = self.by-version."cookie-parser"."1.4.3";
       "cron-1.1.0" = self.by-version."cron"."1.1.0";
       "dateformat-1.0.7-1.2.3" = self.by-version."dateformat"."1.0.7-1.2.3";
       "datejs-0.0.2" = self.by-version."datejs"."0.0.2";
@@ -4324,18 +4478,18 @@
       "htmlencode-0.0.4" = self.by-version."htmlencode"."0.0.4";
       "htmlparser2-3.9.0" = self.by-version."htmlparser2"."3.9.0";
       "imagemagick-0.1.3" = self.by-version."imagemagick"."0.1.3";
-      "inquirer-0.12.0" = self.by-version."inquirer"."0.12.0";
-      "ipaddr.js-1.1.0" = self.by-version."ipaddr.js"."1.1.0";
+      "inquirer-1.0.3" = self.by-version."inquirer"."1.0.3";
+      "ipaddr.js-1.1.1" = self.by-version."ipaddr.js"."1.1.1";
       "json-middleware-1.0.2" = self.by-version."json-middleware"."1.0.2";
-      "jsonwebtoken-5.7.0" = self.by-version."jsonwebtoken"."5.7.0";
+      "jsonwebtoken-7.0.0" = self.by-version."jsonwebtoken"."7.0.0";
       "ldapjs-0.7.1" = self.by-version."ldapjs"."0.7.1";
       "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
       "marked-0.3.5" = self.by-version."marked"."0.3.5";
       "method-override-1.0.2" = self.by-version."method-override"."1.0.2";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
-      "moment-2.12.0" = self.by-version."moment"."2.12.0";
-      "moment-timezone-0.5.3" = self.by-version."moment-timezone"."0.5.3";
+      "moment-2.13.0" = self.by-version."moment"."2.13.0";
+      "moment-timezone-0.5.4" = self.by-version."moment-timezone"."0.5.4";
       "mongoose-4.2.3" = self.by-version."mongoose"."4.2.3";
       "multer-0.1.8" = self.by-version."multer"."0.1.8";
       "node-fs-0.1.7" = self.by-version."node-fs"."0.1.7";
@@ -4344,7 +4498,7 @@
       "pkgcloud-1.3.0" = self.by-version."pkgcloud"."1.3.0";
       "posix-getopt-1.1.0" = self.by-version."posix-getopt"."1.1.0";
       "q-1.4.1" = self.by-version."q"."1.4.1";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "rrecur-2.0.0" = self.by-version."rrecur"."2.0.0";
       "sleep-3.0.1" = self.by-version."sleep"."3.0.1";
@@ -4459,7 +4613,7 @@
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "k-bucket-0.6.0" = self.by-version."k-bucket"."0.6.0";
-      "k-rpc-3.6.1" = self.by-version."k-rpc"."3.6.1";
+      "k-rpc-3.7.0" = self.by-version."k-rpc"."3.7.0";
       "lru-2.0.1" = self.by-version."lru"."2.0.1";
     };
     optionalDependencies = {
@@ -4514,23 +4668,23 @@
     };
     deps = {
       "bencode-0.8.0" = self.by-version."bencode"."0.8.0";
-      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "bn.js-4.11.4" = self.by-version."bn.js"."4.11.4";
       "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "ip-1.1.2" = self.by-version."ip"."1.1.2";
+      "ip-1.1.3" = self.by-version."ip"."1.1.3";
       "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
       "once-1.3.3" = self.by-version."once"."1.3.3";
       "random-iterate-1.0.1" = self.by-version."random-iterate"."1.0.1";
       "run-parallel-1.1.6" = self.by-version."run-parallel"."1.1.6";
       "run-series-1.1.4" = self.by-version."run-series"."1.1.4";
-      "simple-get-2.0.0" = self.by-version."simple-get"."2.0.0";
-      "simple-peer-6.0.3" = self.by-version."simple-peer"."6.0.3";
-      "simple-websocket-4.0.3" = self.by-version."simple-websocket"."4.0.3";
+      "simple-get-2.2.0" = self.by-version."simple-get"."2.2.0";
+      "simple-peer-6.0.4" = self.by-version."simple-peer"."6.0.4";
+      "simple-websocket-4.1.0" = self.by-version."simple-websocket"."4.1.0";
       "string2compact-1.2.2" = self.by-version."string2compact"."1.2.2";
       "uniq-1.0.1" = self.by-version."uniq"."1.0.1";
-      "ws-1.0.1" = self.by-version."ws"."1.0.1";
+      "ws-1.1.0" = self.by-version."ws"."1.1.0";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
@@ -4551,7 +4705,7 @@
       sha1 = "c06b797af085ea00bc527afc8efcf11de2232054";
     };
     deps = {
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
     };
     optionalDependencies = {
     };
@@ -4593,7 +4747,7 @@
       sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e";
     };
     deps = {
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
     };
     optionalDependencies = {
     };
@@ -4683,15 +4837,15 @@
     cpu = [ ];
   };
   by-spec."block-stream"."*" =
-    self.by-version."block-stream"."0.0.8";
-  by-version."block-stream"."0.0.8" = self.buildNodePackage {
-    name = "block-stream-0.0.8";
-    version = "0.0.8";
+    self.by-version."block-stream"."0.0.9";
+  by-version."block-stream"."0.0.9" = self.buildNodePackage {
+    name = "block-stream-0.0.9";
+    version = "0.0.9";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz";
-      name = "block-stream-0.0.8.tgz";
-      sha1 = "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b";
+      url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
+      name = "block-stream-0.0.9.tgz";
+      sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -4702,8 +4856,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."block-stream"."0.0.8" =
-    self.by-version."block-stream"."0.0.8";
+  by-spec."block-stream"."0.0.9" =
+    self.by-version."block-stream"."0.0.9";
   by-spec."bluebird"."2.10.2" =
     self.by-version."bluebird"."2.10.2";
   by-version."bluebird"."2.10.2" = self.buildNodePackage {
@@ -4743,15 +4897,15 @@
     cpu = [ ];
   };
   by-spec."bluebird".">= 2.0" =
-    self.by-version."bluebird"."3.3.4";
-  by-version."bluebird"."3.3.4" = self.buildNodePackage {
-    name = "bluebird-3.3.4";
-    version = "3.3.4";
+    self.by-version."bluebird"."3.4.0";
+  by-version."bluebird"."3.4.0" = self.buildNodePackage {
+    name = "bluebird-3.4.0";
+    version = "3.4.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/bluebird/-/bluebird-3.3.4.tgz";
-      name = "bluebird-3.3.4.tgz";
-      sha1 = "f780fe43e1a7a6510f67abd7d0d79533a40ddde6";
+      url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.0.tgz";
+      name = "bluebird-3.4.0.tgz";
+      sha1 = "28b847935a8bb56d7ff1c7eba3631b09d5a49b24";
     };
     deps = {
     };
@@ -4768,9 +4922,9 @@
   by-spec."bluebird"."^2.9.30" =
     self.by-version."bluebird"."2.10.2";
   by-spec."bluebird"."^3.0.5" =
-    self.by-version."bluebird"."3.3.4";
+    self.by-version."bluebird"."3.4.0";
   by-spec."bluebird"."^3.1.1" =
-    self.by-version."bluebird"."3.3.4";
+    self.by-version."bluebird"."3.4.0";
   by-spec."bluebird"."~3.2.2" =
     self.by-version."bluebird"."3.2.2";
   by-version."bluebird"."3.2.2" = self.buildNodePackage {
@@ -4829,15 +4983,15 @@
     cpu = [ ];
   };
   by-spec."bn.js"."^4.0.0" =
-    self.by-version."bn.js"."4.11.1";
-  by-version."bn.js"."4.11.1" = self.buildNodePackage {
-    name = "bn.js-4.11.1";
-    version = "4.11.1";
+    self.by-version."bn.js"."4.11.4";
+  by-version."bn.js"."4.11.4" = self.buildNodePackage {
+    name = "bn.js-4.11.4";
+    version = "4.11.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.1.tgz";
-      name = "bn.js-4.11.1.tgz";
-      sha1 = "ff1c52c52fd371e9d91419439bac5cfba2b41798";
+      url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.4.tgz";
+      name = "bn.js-4.11.4.tgz";
+      sha1 = "59f0735fa52ff7f00e2cdd1ad207b7c8603d374d";
     };
     deps = {
     };
@@ -4848,11 +5002,11 @@
     cpu = [ ];
   };
   by-spec."bn.js"."^4.1.0" =
-    self.by-version."bn.js"."4.11.1";
+    self.by-version."bn.js"."4.11.4";
   by-spec."bn.js"."^4.1.1" =
-    self.by-version."bn.js"."4.11.1";
+    self.by-version."bn.js"."4.11.4";
   by-spec."bn.js"."^4.4.0" =
-    self.by-version."bn.js"."4.11.1";
+    self.by-version."bn.js"."4.11.4";
   by-spec."bncode"."^0.2.3" =
     self.by-version."bncode"."0.2.3";
   by-version."bncode"."0.2.3" = self.buildNodePackage {
@@ -4904,7 +5058,7 @@
     };
     deps = {
       "bytes-2.2.0" = self.by-version."bytes"."2.2.0";
-      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "content-type-1.0.2" = self.by-version."content-type"."1.0.2";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "depd-1.1.0" = self.by-version."depd"."1.1.0";
       "http-errors-1.4.0" = self.by-version."http-errors"."1.4.0";
@@ -4912,7 +5066,7 @@
       "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
       "qs-6.1.0" = self.by-version."qs"."6.1.0";
       "raw-body-2.1.6" = self.by-version."raw-body"."2.1.6";
-      "type-is-1.6.12" = self.by-version."type-is"."1.6.12";
+      "type-is-1.6.13" = self.by-version."type-is"."1.6.13";
     };
     optionalDependencies = {
     };
@@ -4947,11 +5101,38 @@
     cpu = [ ];
   };
   by-spec."body-parser".">=1.9.2 <2.0.0-0" =
-    self.by-version."body-parser"."1.15.0";
+    self.by-version."body-parser"."1.15.1";
+  by-version."body-parser"."1.15.1" = self.buildNodePackage {
+    name = "body-parser-1.15.1";
+    version = "1.15.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.1.tgz";
+      name = "body-parser-1.15.1.tgz";
+      sha1 = "9bceef0669b8f8b943f0ad8ce5d95716bd740fd2";
+    };
+    deps = {
+      "bytes-2.3.0" = self.by-version."bytes"."2.3.0";
+      "content-type-1.0.2" = self.by-version."content-type"."1.0.2";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.1.0" = self.by-version."depd"."1.1.0";
+      "http-errors-1.4.0" = self.by-version."http-errors"."1.4.0";
+      "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "qs-6.1.0" = self.by-version."qs"."6.1.0";
+      "raw-body-2.1.6" = self.by-version."raw-body"."2.1.6";
+      "type-is-1.6.13" = self.by-version."type-is"."1.6.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."body-parser"."^1.12.2" =
-    self.by-version."body-parser"."1.15.0";
+    self.by-version."body-parser"."1.15.1";
   by-spec."body-parser"."^1.12.4" =
-    self.by-version."body-parser"."1.15.0";
+    self.by-version."body-parser"."1.15.1";
   by-spec."body-parser"."~1.13.2" =
     self.by-version."body-parser"."1.13.3";
   by-version."body-parser"."1.13.3" = self.buildNodePackage {
@@ -4965,7 +5146,7 @@
     };
     deps = {
       "bytes-2.1.0" = self.by-version."bytes"."2.1.0";
-      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "content-type-1.0.2" = self.by-version."content-type"."1.0.2";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
@@ -4973,7 +5154,7 @@
       "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
       "qs-4.0.0" = self.by-version."qs"."4.0.0";
       "raw-body-2.1.6" = self.by-version."raw-body"."2.1.6";
-      "type-is-1.6.12" = self.by-version."type-is"."1.6.12";
+      "type-is-1.6.13" = self.by-version."type-is"."1.6.13";
     };
     optionalDependencies = {
     };
@@ -4996,7 +5177,7 @@
     };
     deps = {
       "bytes-2.2.0" = self.by-version."bytes"."2.2.0";
-      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "content-type-1.0.2" = self.by-version."content-type"."1.0.2";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "depd-1.1.0" = self.by-version."depd"."1.1.0";
       "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
@@ -5004,7 +5185,32 @@
       "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
       "qs-5.2.0" = self.by-version."qs"."5.2.0";
       "raw-body-2.1.6" = self.by-version."raw-body"."2.1.6";
-      "type-is-1.6.12" = self.by-version."type-is"."1.6.12";
+      "type-is-1.6.13" = self.by-version."type-is"."1.6.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bonjour"."^3.3.1" =
+    self.by-version."bonjour"."3.5.0";
+  by-version."bonjour"."3.5.0" = self.buildNodePackage {
+    name = "bonjour-3.5.0";
+    version = "3.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz";
+      name = "bonjour-3.5.0.tgz";
+      sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5";
+    };
+    deps = {
+      "array-flatten-2.1.0" = self.by-version."array-flatten"."2.1.0";
+      "deep-equal-1.0.1" = self.by-version."deep-equal"."1.0.1";
+      "dns-equal-1.0.0" = self.by-version."dns-equal"."1.0.0";
+      "dns-txt-2.0.2" = self.by-version."dns-txt"."2.0.2";
+      "multicast-dns-6.0.1" = self.by-version."multicast-dns"."6.0.1";
+      "multicast-dns-service-types-1.1.0" = self.by-version."multicast-dns-service-types"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -5205,6 +5411,65 @@
     cpu = [ ];
   };
   "bower2nix" = self.by-version."bower2nix"."3.0.1";
+  by-spec."bplist-creator"."0.0.4" =
+    self.by-version."bplist-creator"."0.0.4";
+  by-version."bplist-creator"."0.0.4" = self.buildNodePackage {
+    name = "bplist-creator-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.4.tgz";
+      name = "bplist-creator-0.0.4.tgz";
+      sha1 = "4ac0496782e127a85c1d2026a4f5eb22a7aff991";
+    };
+    deps = {
+      "stream-buffers-0.2.6" = self.by-version."stream-buffers"."0.2.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bplist-creator"."^0.0.6" =
+    self.by-version."bplist-creator"."0.0.6";
+  by-version."bplist-creator"."0.0.6" = self.buildNodePackage {
+    name = "bplist-creator-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.6.tgz";
+      name = "bplist-creator-0.0.6.tgz";
+      sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e";
+    };
+    deps = {
+      "stream-buffers-2.2.0" = self.by-version."stream-buffers"."2.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bplist-parser"."0.0.6" =
+    self.by-version."bplist-parser"."0.0.6";
+  by-version."bplist-parser"."0.0.6" = self.buildNodePackage {
+    name = "bplist-parser-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz";
+      name = "bplist-parser-0.0.6.tgz";
+      sha1 = "38da3471817df9d44ab3892e27707bbbd75a11b9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."bplist-parser"."^0.1.0" =
     self.by-version."bplist-parser"."0.1.1";
   by-version."bplist-parser"."0.1.1" = self.buildNodePackage {
@@ -5225,19 +5490,21 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."bplist-parser"."^0.1.1" =
+    self.by-version."bplist-parser"."0.1.1";
   by-spec."brace-expansion"."^1.0.0" =
-    self.by-version."brace-expansion"."1.1.3";
-  by-version."brace-expansion"."1.1.3" = self.buildNodePackage {
-    name = "brace-expansion-1.1.3";
-    version = "1.1.3";
+    self.by-version."brace-expansion"."1.1.4";
+  by-version."brace-expansion"."1.1.4" = self.buildNodePackage {
+    name = "brace-expansion-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz";
-      name = "brace-expansion-1.1.3.tgz";
-      sha1 = "46bff50115d47fc9ab89854abb87d98078a10991";
+      url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz";
+      name = "brace-expansion-1.1.4.tgz";
+      sha1 = "464a204c77f482c085c2a36c456bbfbafb67a127";
     };
     deps = {
-      "balanced-match-0.3.0" = self.by-version."balanced-match"."0.3.0";
+      "balanced-match-0.4.1" = self.by-version."balanced-match"."0.4.1";
       "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1";
     };
     optionalDependencies = {
@@ -5267,18 +5534,18 @@
     cpu = [ ];
   };
   by-spec."braces"."^1.8.2" =
-    self.by-version."braces"."1.8.3";
-  by-version."braces"."1.8.3" = self.buildNodePackage {
-    name = "braces-1.8.3";
-    version = "1.8.3";
+    self.by-version."braces"."1.8.5";
+  by-version."braces"."1.8.5" = self.buildNodePackage {
+    name = "braces-1.8.5";
+    version = "1.8.5";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/braces/-/braces-1.8.3.tgz";
-      name = "braces-1.8.3.tgz";
-      sha1 = "35d4e7dda632b33e215d38a8a9cf4329c9c75d2c";
+      url = "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz";
+      name = "braces-1.8.5.tgz";
+      sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7";
     };
     deps = {
-      "expand-range-1.8.1" = self.by-version."expand-range"."1.8.1";
+      "expand-range-1.8.2" = self.by-version."expand-range"."1.8.2";
       "preserve-0.2.0" = self.by-version."preserve"."0.2.0";
       "repeat-element-1.1.2" = self.by-version."repeat-element"."1.1.2";
     };
@@ -5415,7 +5682,7 @@
       sha1 = "8dae95a20ca43b3fea201faa6cfaa84ff4a0d484";
     };
     deps = {
-      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "JSONStream-1.1.2" = self.by-version."JSONStream"."1.1.2";
       "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
       "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10";
       "defined-1.0.0" = self.by-version."defined"."1.0.0";
@@ -5440,8 +5707,8 @@
       sha1 = "779887c792eaa1f64a46a22c8f1051cdcd96755f";
     };
     deps = {
-      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
-      "combine-source-map-0.7.1" = self.by-version."combine-source-map"."0.7.1";
+      "JSONStream-1.1.2" = self.by-version."JSONStream"."1.1.2";
+      "combine-source-map-0.7.2" = self.by-version."combine-source-map"."0.7.2";
       "defined-1.0.0" = self.by-version."defined"."1.0.0";
       "through2-2.0.1" = self.by-version."through2"."2.0.1";
       "umd-3.0.1" = self.by-version."umd"."3.0.1";
@@ -5474,15 +5741,15 @@
   by-spec."browser-request"."^0.3.3" =
     self.by-version."browser-request"."0.3.3";
   by-spec."browser-resolve"."^1.11.0" =
-    self.by-version."browser-resolve"."1.11.1";
-  by-version."browser-resolve"."1.11.1" = self.buildNodePackage {
-    name = "browser-resolve-1.11.1";
-    version = "1.11.1";
+    self.by-version."browser-resolve"."1.11.2";
+  by-version."browser-resolve"."1.11.2" = self.buildNodePackage {
+    name = "browser-resolve-1.11.2";
+    version = "1.11.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.1.tgz";
-      name = "browser-resolve-1.11.1.tgz";
-      sha1 = "73c3c2a1d3a68a6e17d88f0cadb13ea24632d496";
+      url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz";
+      name = "browser-resolve-1.11.2.tgz";
+      sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce";
     };
     deps = {
       "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
@@ -5494,9 +5761,9 @@
     cpu = [ ];
   };
   by-spec."browser-resolve"."^1.7.0" =
-    self.by-version."browser-resolve"."1.11.1";
+    self.by-version."browser-resolve"."1.11.2";
   by-spec."browser-resolve"."^1.7.1" =
-    self.by-version."browser-resolve"."1.11.1";
+    self.by-version."browser-resolve"."1.11.2";
   by-spec."browserchannel"."*" =
     self.by-version."browserchannel"."2.0.0";
   by-version."browserchannel"."2.0.0" = self.buildNodePackage {
@@ -5511,7 +5778,7 @@
     deps = {
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
       "connect-2.30.2" = self.by-version."connect"."2.30.2";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0";
     };
     optionalDependencies = {
@@ -5522,23 +5789,23 @@
   };
   "browserchannel" = self.by-version."browserchannel"."2.0.0";
   by-spec."browserify"."*" =
-    self.by-version."browserify"."13.0.0";
-  by-version."browserify"."13.0.0" = self.buildNodePackage {
-    name = "browserify-13.0.0";
-    version = "13.0.0";
+    self.by-version."browserify"."13.0.1";
+  by-version."browserify"."13.0.1" = self.buildNodePackage {
+    name = "browserify-13.0.1";
+    version = "13.0.1";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-13.0.0.tgz";
-      name = "browserify-13.0.0.tgz";
-      sha1 = "8f223bb24ff4ee4335e6bea9671de294e43ba6a3";
+      url = "https://registry.npmjs.org/browserify/-/browserify-13.0.1.tgz";
+      name = "browserify-13.0.1.tgz";
+      sha1 = "d37179cbb222179ecf730ec7e625e998677902d4";
     };
     deps = {
-      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "JSONStream-1.1.2" = self.by-version."JSONStream"."1.1.2";
       "assert-1.3.0" = self.by-version."assert"."1.3.0";
       "browser-pack-6.0.1" = self.by-version."browser-pack"."6.0.1";
-      "browser-resolve-1.11.1" = self.by-version."browser-resolve"."1.11.1";
+      "browser-resolve-1.11.2" = self.by-version."browser-resolve"."1.11.2";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
-      "buffer-4.5.1" = self.by-version."buffer"."4.5.1";
+      "buffer-4.6.0" = self.by-version."buffer"."4.6.0";
       "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
       "constants-browserify-1.0.0" = self.by-version."constants-browserify"."1.0.0";
@@ -5551,25 +5818,24 @@
       "glob-5.0.15" = self.by-version."glob"."5.0.15";
       "has-1.0.1" = self.by-version."has"."1.0.1";
       "htmlescape-1.1.1" = self.by-version."htmlescape"."1.1.1";
-      "stream-http-2.2.1" = self.by-version."stream-http"."2.2.1";
       "https-browserify-0.0.1" = self.by-version."https-browserify"."0.0.1";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "insert-module-globals-7.0.1" = self.by-version."insert-module-globals"."7.0.1";
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "labeled-stream-splicer-2.0.0" = self.by-version."labeled-stream-splicer"."2.0.0";
-      "module-deps-4.0.5" = self.by-version."module-deps"."4.0.5";
+      "module-deps-4.0.7" = self.by-version."module-deps"."4.0.7";
       "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
       "parents-1.0.1" = self.by-version."parents"."1.0.1";
       "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
-      "process-0.11.2" = self.by-version."process"."0.11.2";
+      "process-0.11.4" = self.by-version."process"."0.11.4";
       "punycode-1.4.1" = self.by-version."punycode"."1.4.1";
       "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1";
       "read-only-stream-2.0.0" = self.by-version."read-only-stream"."2.0.0";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
       "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
       "shasum-1.0.2" = self.by-version."shasum"."1.0.2";
-      "shell-quote-1.5.0" = self.by-version."shell-quote"."1.5.0";
+      "shell-quote-1.6.0" = self.by-version."shell-quote"."1.6.0";
       "stream-browserify-2.0.1" = self.by-version."stream-browserify"."2.0.1";
+      "stream-http-2.3.0" = self.by-version."stream-http"."2.3.0";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "subarg-1.0.0" = self.by-version."subarg"."1.0.0";
       "syntax-error-1.1.6" = self.by-version."syntax-error"."1.1.6";
@@ -5587,7 +5853,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "browserify" = self.by-version."browserify"."13.0.0";
+  "browserify" = self.by-version."browserify"."13.0.1";
   by-spec."browserify"."10.1.3" =
     self.by-version."browserify"."10.1.3";
   by-version."browserify"."10.1.3" = self.buildNodePackage {
@@ -5600,10 +5866,10 @@
       sha1 = "6605dcffbb918c6a69d9c60201d2397ef7ce20ff";
     };
     deps = {
-      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "JSONStream-1.1.2" = self.by-version."JSONStream"."1.1.2";
       "assert-1.3.0" = self.by-version."assert"."1.3.0";
       "browser-pack-4.0.4" = self.by-version."browser-pack"."4.0.4";
-      "browser-resolve-1.11.1" = self.by-version."browser-resolve"."1.11.1";
+      "browser-resolve-1.11.2" = self.by-version."browser-resolve"."1.11.2";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
       "buffer-3.6.0" = self.by-version."buffer"."3.6.0";
       "builtins-0.0.7" = self.by-version."builtins"."0.0.7";
@@ -5631,11 +5897,11 @@
       "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
       "parents-1.0.1" = self.by-version."parents"."1.0.1";
       "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
-      "process-0.11.2" = self.by-version."process"."0.11.2";
+      "process-0.11.4" = self.by-version."process"."0.11.4";
       "punycode-1.4.1" = self.by-version."punycode"."1.4.1";
       "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1";
       "read-only-stream-1.1.1" = self.by-version."read-only-stream"."1.1.1";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
       "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
       "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
       "shasum-1.0.2" = self.by-version."shasum"."1.0.2";
@@ -5740,7 +6006,7 @@
       sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
     };
     deps = {
-      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "bn.js-4.11.4" = self.by-version."bn.js"."4.11.4";
       "randombytes-2.0.3" = self.by-version."randombytes"."2.0.3";
     };
     optionalDependencies = {
@@ -5761,11 +6027,11 @@
       sha1 = "10773910c3c206d5420a46aad8694f820b85968f";
     };
     deps = {
-      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "bn.js-4.11.4" = self.by-version."bn.js"."4.11.4";
       "browserify-rsa-4.0.1" = self.by-version."browserify-rsa"."4.0.1";
       "create-hash-1.1.2" = self.by-version."create-hash"."1.1.2";
       "create-hmac-1.1.4" = self.by-version."create-hmac"."1.1.4";
-      "elliptic-6.2.3" = self.by-version."elliptic"."6.2.3";
+      "elliptic-6.2.8" = self.by-version."elliptic"."6.2.8";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "parse-asn1-5.0.0" = self.by-version."parse-asn1"."5.0.0";
     };
@@ -5941,7 +6207,7 @@
     self.by-version."bson"."0.4.23";
   by-spec."bson"."~0.4.20" =
     self.by-version."bson"."0.4.23";
-  by-spec."bson"."~0.4.21" =
+  by-spec."bson"."~0.4.23" =
     self.by-version."bson"."0.4.23";
   by-spec."buffer"."^3.0.0" =
     self.by-version."buffer"."3.6.0";
@@ -5965,18 +6231,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."buffer"."^3.0.3" =
-    self.by-version."buffer"."3.6.0";
   by-spec."buffer"."^4.1.0" =
-    self.by-version."buffer"."4.5.1";
-  by-version."buffer"."4.5.1" = self.buildNodePackage {
-    name = "buffer-4.5.1";
-    version = "4.5.1";
+    self.by-version."buffer"."4.6.0";
+  by-version."buffer"."4.6.0" = self.buildNodePackage {
+    name = "buffer-4.6.0";
+    version = "4.6.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/buffer/-/buffer-4.5.1.tgz";
-      name = "buffer-4.5.1.tgz";
-      sha1 = "237b5bdef693c4c332385c1ded4ef4646e232d73";
+      url = "https://registry.npmjs.org/buffer/-/buffer-4.6.0.tgz";
+      name = "buffer-4.6.0.tgz";
+      sha1 = "fe50a7de503ebaad1b568d05967207be4024c348";
     };
     deps = {
       "base64-js-1.1.2" = self.by-version."base64-js"."1.1.2";
@@ -5990,7 +6254,7 @@
     cpu = [ ];
   };
   by-spec."buffer"."^4.3.0" =
-    self.by-version."buffer"."4.5.1";
+    self.by-version."buffer"."4.6.0";
   by-spec."buffer-crc32"."0.1.1" =
     self.by-version."buffer-crc32"."0.1.1";
   by-version."buffer-crc32"."0.1.1" = self.buildNodePackage {
@@ -6124,6 +6388,44 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."buffer-indexof"."^1.0.0" =
+    self.by-version."buffer-indexof"."1.0.0";
+  by-version."buffer-indexof"."1.0.0" = self.buildNodePackage {
+    name = "buffer-indexof-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.0.0.tgz";
+      name = "buffer-indexof-1.0.0.tgz";
+      sha1 = "0f23779be8134b56251bb91f7fe4850a2e7be6ff";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."buffer-shims"."^1.0.0" =
+    self.by-version."buffer-shims"."1.0.0";
+  by-version."buffer-shims"."1.0.0" = self.buildNodePackage {
+    name = "buffer-shims-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
+      name = "buffer-shims-1.0.0.tgz";
+      sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."buffer-xor"."^1.0.2" =
     self.by-version."buffer-xor"."1.0.3";
   by-version."buffer-xor"."1.0.3" = self.buildNodePackage {
@@ -6164,15 +6466,15 @@
     cpu = [ ];
   };
   by-spec."buffertools"."*" =
-    self.by-version."buffertools"."2.1.3";
-  by-version."buffertools"."2.1.3" = self.buildNodePackage {
-    name = "buffertools-2.1.3";
-    version = "2.1.3";
+    self.by-version."buffertools"."2.1.4";
+  by-version."buffertools"."2.1.4" = self.buildNodePackage {
+    name = "buffertools-2.1.4";
+    version = "2.1.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/buffertools/-/buffertools-2.1.3.tgz";
-      name = "buffertools-2.1.3.tgz";
-      sha1 = "34d3bf0565ed79e29877c2a6217ccfce9a3b3423";
+      url = "https://registry.npmjs.org/buffertools/-/buffertools-2.1.4.tgz";
+      name = "buffertools-2.1.4.tgz";
+      sha1 = "62d4e1584c0090a0c7d3587f25934a84b8b38de4";
     };
     deps = {
     };
@@ -6182,7 +6484,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "buffertools" = self.by-version."buffertools"."2.1.3";
+  "buffertools" = self.by-version."buffertools"."2.1.4";
   by-spec."bufferutil"."1.2.x" =
     self.by-version."bufferutil"."1.2.1";
   by-version."bufferutil"."1.2.1" = self.buildNodePackage {
@@ -6196,7 +6498,7 @@
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -6223,24 +6525,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."buildmail"."3.6.0" =
-    self.by-version."buildmail"."3.6.0";
-  by-version."buildmail"."3.6.0" = self.buildNodePackage {
-    name = "buildmail-3.6.0";
-    version = "3.6.0";
+  by-spec."buildmail"."3.7.0" =
+    self.by-version."buildmail"."3.7.0";
+  by-version."buildmail"."3.7.0" = self.buildNodePackage {
+    name = "buildmail-3.7.0";
+    version = "3.7.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/buildmail/-/buildmail-3.6.0.tgz";
-      name = "buildmail-3.6.0.tgz";
-      sha1 = "460088de78b4ad6b5475cdc88370212b77081617";
+      url = "https://registry.npmjs.org/buildmail/-/buildmail-3.7.0.tgz";
+      name = "buildmail-3.7.0.tgz";
+      sha1 = "5f40b77c1c3c1ceb1490c1181284437de3045342";
     };
     deps = {
       "addressparser-1.0.1" = self.by-version."addressparser"."1.0.1";
       "libbase64-0.1.0" = self.by-version."libbase64"."0.1.0";
       "libmime-2.0.3" = self.by-version."libmime"."2.0.3";
       "libqp-1.1.0" = self.by-version."libqp"."1.1.0";
-      "nodemailer-fetch-1.3.0" = self.by-version."nodemailer-fetch"."1.3.0";
-      "nodemailer-shared-1.0.4" = self.by-version."nodemailer-shared"."1.0.4";
+      "nodemailer-fetch-1.4.0" = self.by-version."nodemailer-fetch"."1.4.0";
+      "nodemailer-shared-1.0.5" = self.by-version."nodemailer-shared"."1.0.5";
     };
     optionalDependencies = {
     };
@@ -6248,23 +6550,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."buildmail"."^1.2.4" =
-    self.by-version."buildmail"."1.3.0";
-  by-version."buildmail"."1.3.0" = self.buildNodePackage {
-    name = "buildmail-1.3.0";
-    version = "1.3.0";
+  by-spec."buildmail"."^2.0.0" =
+    self.by-version."buildmail"."2.0.0";
+  by-version."buildmail"."2.0.0" = self.buildNodePackage {
+    name = "buildmail-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/buildmail/-/buildmail-1.3.0.tgz";
-      name = "buildmail-1.3.0.tgz";
-      sha1 = "f5e4b75026147d5ebe1a24dc61312a3cff4df725";
+      url = "https://registry.npmjs.org/buildmail/-/buildmail-2.0.0.tgz";
+      name = "buildmail-2.0.0.tgz";
+      sha1 = "f0b7b0a59e9a4a1b5066bbfa051d248f3832eece";
     };
     deps = {
       "addressparser-0.3.2" = self.by-version."addressparser"."0.3.2";
-      "hyperquest-1.3.0" = self.by-version."hyperquest"."1.3.0";
       "libbase64-0.1.0" = self.by-version."libbase64"."0.1.0";
       "libmime-1.2.0" = self.by-version."libmime"."1.2.0";
       "libqp-1.1.0" = self.by-version."libqp"."1.1.0";
+      "needle-0.10.0" = self.by-version."needle"."0.10.0";
     };
     optionalDependencies = {
     };
@@ -6375,15 +6677,15 @@
     cpu = [ ];
   };
   by-spec."bunyan".">=0.22.1 <2.0.0-0" =
-    self.by-version."bunyan"."1.8.0";
-  by-version."bunyan"."1.8.0" = self.buildNodePackage {
-    name = "bunyan-1.8.0";
-    version = "1.8.0";
+    self.by-version."bunyan"."1.8.1";
+  by-version."bunyan"."1.8.1" = self.buildNodePackage {
+    name = "bunyan-1.8.1";
+    version = "1.8.1";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.0.tgz";
-      name = "bunyan-1.8.0.tgz";
-      sha1 = "8a4d4cc1dbb144f5298eb86c10431a934f8df053";
+      url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.1.tgz";
+      name = "bunyan-1.8.1.tgz";
+      sha1 = "68c6a4a502d5620bc9f72d6736810c1b1898097f";
     };
     deps = {
     };
@@ -6391,14 +6693,14 @@
       "dtrace-provider-0.6.0" = self.by-version."dtrace-provider"."0.6.0";
       "mv-2.1.1" = self.by-version."mv"."2.1.1";
       "safe-json-stringify-1.0.3" = self.by-version."safe-json-stringify"."1.0.3";
-      "moment-2.12.0" = self.by-version."moment"."2.12.0";
+      "moment-2.13.0" = self.by-version."moment"."2.13.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
   by-spec."bunyan"."^1.4.0" =
-    self.by-version."bunyan"."1.8.0";
+    self.by-version."bunyan"."1.8.1";
   by-spec."bunyan"."~1.0.0" =
     self.by-version."bunyan"."1.0.1";
   by-version."bunyan"."1.0.1" = self.buildNodePackage {
@@ -6432,7 +6734,7 @@
     };
     deps = {
       "dicer-0.2.5" = self.by-version."dicer"."0.2.5";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
     };
     optionalDependencies = {
     };
@@ -6784,6 +7086,27 @@
   };
   by-spec."camelcase"."^2.0.1" =
     self.by-version."camelcase"."2.1.1";
+  by-spec."camelcase"."^2.1.1" =
+    self.by-version."camelcase"."2.1.1";
+  by-spec."camelcase"."^3.0.0" =
+    self.by-version."camelcase"."3.0.0";
+  by-version."camelcase"."3.0.0" = self.buildNodePackage {
+    name = "camelcase-3.0.0";
+    version = "3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+      name = "camelcase-3.0.0.tgz";
+      sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."camelcase-keys"."^1.0.0" =
     self.by-version."camelcase-keys"."1.0.0";
   by-version."camelcase-keys"."1.0.0" = self.buildNodePackage {
@@ -6903,15 +7226,15 @@
     cpu = [ ];
   };
   by-spec."castnow"."*" =
-    self.by-version."castnow"."0.4.15";
-  by-version."castnow"."0.4.15" = self.buildNodePackage {
-    name = "castnow-0.4.15";
-    version = "0.4.15";
+    self.by-version."castnow"."0.4.17";
+  by-version."castnow"."0.4.17" = self.buildNodePackage {
+    name = "castnow-0.4.17";
+    version = "0.4.17";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/castnow/-/castnow-0.4.15.tgz";
-      name = "castnow-0.4.15.tgz";
-      sha1 = "bd4867334e7cb0df5f53b851021b3da8772fca68";
+      url = "https://registry.npmjs.org/castnow/-/castnow-0.4.17.tgz";
+      name = "castnow-0.4.17.tgz";
+      sha1 = "7d9ce3c5605b5aa74ae5348c826443374d5863a8";
     };
     deps = {
       "array-loop-1.0.0" = self.by-version."array-loop"."1.0.0";
@@ -6921,16 +7244,15 @@
       "debounced-seeker-1.0.0" = self.by-version."debounced-seeker"."1.0.0";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "fs-extended-0.2.1" = self.by-version."fs-extended"."0.2.1";
-      "get-youtube-id-0.1.3" = self.by-version."get-youtube-id"."0.1.3";
       "got-1.2.2" = self.by-version."got"."1.2.2";
       "internal-ip-1.2.0" = self.by-version."internal-ip"."1.2.0";
       "keypress-0.2.1" = self.by-version."keypress"."0.2.1";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
-      "peerflix-0.29.2" = self.by-version."peerflix"."0.29.2";
+      "peerflix-0.34.0" = self.by-version."peerflix"."0.34.0";
       "playerui-1.2.0" = self.by-version."playerui"."1.2.0";
       "query-string-1.0.1" = self.by-version."query-string"."1.0.1";
-      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
+      "range-parser-1.2.0" = self.by-version."range-parser"."1.2.0";
       "read-torrent-1.3.0" = self.by-version."read-torrent"."1.3.0";
       "router-0.6.2" = self.by-version."router"."0.6.2";
       "srt2vtt-1.3.1" = self.by-version."srt2vtt"."1.3.1";
@@ -6944,7 +7266,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "castnow" = self.by-version."castnow"."0.4.15";
+  "castnow" = self.by-version."castnow"."0.4.17";
   by-spec."castv2"."~0.1.4" =
     self.by-version."castv2"."0.1.6";
   by-version."castv2"."0.1.6" = self.buildNodePackage {
@@ -7000,7 +7322,7 @@
     };
     deps = {
       "align-text-0.1.4" = self.by-version."align-text"."0.1.4";
-      "lazy-cache-1.0.3" = self.by-version."lazy-cache"."1.0.3";
+      "lazy-cache-1.0.4" = self.by-version."lazy-cache"."1.0.4";
     };
     optionalDependencies = {
     };
@@ -7020,7 +7342,7 @@
       sha1 = "4d02637b067fe958bdbfdd3a40ec56fef7373247";
     };
     deps = {
-      "assertion-error-1.0.1" = self.by-version."assertion-error"."1.0.1";
+      "assertion-error-1.0.2" = self.by-version."assertion-error"."1.0.2";
       "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3";
       "type-detect-1.0.0" = self.by-version."type-detect"."1.0.0";
     };
@@ -7236,16 +7558,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chokidar"."^1.0.0" =
-    self.by-version."chokidar"."1.4.3";
-  by-version."chokidar"."1.4.3" = self.buildNodePackage {
-    name = "chokidar-1.4.3";
-    version = "1.4.3";
+  by-spec."chokidar"."^1.0.1" =
+    self.by-version."chokidar"."1.5.2";
+  by-version."chokidar"."1.5.2" = self.buildNodePackage {
+    name = "chokidar-1.5.2";
+    version = "1.5.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/chokidar/-/chokidar-1.4.3.tgz";
-      name = "chokidar-1.4.3.tgz";
-      sha1 = "5fe733a4d9acaea51b26454b7e59559163d0dbb2";
+      url = "https://registry.npmjs.org/chokidar/-/chokidar-1.5.2.tgz";
+      name = "chokidar-1.5.2.tgz";
+      sha1 = "293e728640cc93dd8277424334b3c6d4ad3a348a";
     };
     deps = {
       "anymatch-1.3.0" = self.by-version."anymatch"."1.3.0";
@@ -7258,18 +7580,16 @@
       "readdirp-2.0.0" = self.by-version."readdirp"."2.0.0";
     };
     optionalDependencies = {
-      "fsevents-1.0.11" = self.by-version."fsevents"."1.0.11";
+      "fsevents-1.0.12" = self.by-version."fsevents"."1.0.12";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chokidar"."^1.0.1" =
-    self.by-version."chokidar"."1.4.3";
-  by-spec."chokidar"."^1.2.0" =
-    self.by-version."chokidar"."1.4.3";
   by-spec."chokidar"."^1.4.1" =
-    self.by-version."chokidar"."1.4.3";
+    self.by-version."chokidar"."1.5.2";
+  by-spec."chokidar"."^1.4.3" =
+    self.by-version."chokidar"."1.5.2";
   by-spec."chownr"."0" =
     self.by-version."chownr"."0.0.2";
   by-version."chownr"."0.0.2" = self.buildNodePackage {
@@ -7400,16 +7720,36 @@
   };
   by-spec."cipher-base"."^1.0.1" =
     self.by-version."cipher-base"."1.0.2";
+  by-spec."clap"."^1.0.9" =
+    self.by-version."clap"."1.1.1";
+  by-version."clap"."1.1.1" = self.buildNodePackage {
+    name = "clap-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/clap/-/clap-1.1.1.tgz";
+      name = "clap-1.1.1.tgz";
+      sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d";
+    };
+    deps = {
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."clean-css"."^3.1.9" =
-    self.by-version."clean-css"."3.4.11";
-  by-version."clean-css"."3.4.11" = self.buildNodePackage {
-    name = "clean-css-3.4.11";
-    version = "3.4.11";
+    self.by-version."clean-css"."3.4.17";
+  by-version."clean-css"."3.4.17" = self.buildNodePackage {
+    name = "clean-css-3.4.17";
+    version = "3.4.17";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.11.tgz";
-      name = "clean-css-3.4.11.tgz";
-      sha1 = "171a76f8fca5d74877d7d80b511ce3e73c86333d";
+      url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.17.tgz";
+      name = "clean-css-3.4.17.tgz";
+      sha1 = "199c3926b224761b9fc890d2354c9ce0db678669";
     };
     deps = {
       "commander-2.8.1" = self.by-version."commander"."2.8.1";
@@ -7422,7 +7762,7 @@
     cpu = [ ];
   };
   by-spec."clean-css"."~3.4.2" =
-    self.by-version."clean-css"."3.4.11";
+    self.by-version."clean-css"."3.4.17";
   by-spec."cli"."0.6.x" =
     self.by-version."cli"."0.6.6";
   by-version."cli"."0.6.6" = self.buildNodePackage {
@@ -7611,15 +7951,15 @@
     cpu = [ ];
   };
   by-spec."cliui"."^3.0.3" =
-    self.by-version."cliui"."3.1.2";
-  by-version."cliui"."3.1.2" = self.buildNodePackage {
-    name = "cliui-3.1.2";
-    version = "3.1.2";
+    self.by-version."cliui"."3.2.0";
+  by-version."cliui"."3.2.0" = self.buildNodePackage {
+    name = "cliui-3.2.0";
+    version = "3.2.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/cliui/-/cliui-3.1.2.tgz";
-      name = "cliui-3.1.2.tgz";
-      sha1 = "5ebdc752ce6740ca0df470a3b215e82a5da0277c";
+      url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz";
+      name = "cliui-3.2.0.tgz";
+      sha1 = "120601537a916d29940f934da3b48d585a39213d";
     };
     deps = {
       "string-width-1.0.1" = self.by-version."string-width"."1.0.1";
@@ -7632,6 +7972,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."cliui"."^3.2.0" =
+    self.by-version."cliui"."3.2.0";
   by-spec."clivas"."^0.1.4" =
     self.by-version."clivas"."0.1.4";
   by-version."clivas"."0.1.4" = self.buildNodePackage {
@@ -7766,7 +8108,7 @@
       sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb";
     };
     deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
     };
     optionalDependencies = {
@@ -7790,7 +8132,7 @@
       "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
       "extsprintf-1.3.0" = self.by-version."extsprintf"."1.3.0";
       "verror-1.6.1" = self.by-version."verror"."1.6.1";
-      "dashdash-1.13.0" = self.by-version."dashdash"."1.13.0";
+      "dashdash-1.14.0" = self.by-version."dashdash"."1.14.0";
     };
     optionalDependencies = {
     };
@@ -7836,6 +8178,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."coa"."~1.0.1" =
+    self.by-version."coa"."1.0.1";
+  by-version."coa"."1.0.1" = self.buildNodePackage {
+    name = "coa-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coa/-/coa-1.0.1.tgz";
+      name = "coa-1.0.1.tgz";
+      sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3";
+    };
+    deps = {
+      "q-1.4.1" = self.by-version."q"."1.4.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."code-point-at"."^1.0.0" =
     self.by-version."code-point-at"."1.0.0";
   by-version."code-point-at"."1.0.0" = self.buildNodePackage {
@@ -8150,7 +8512,7 @@
     };
     deps = {
       "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
-      "wcwidth-1.0.0" = self.by-version."wcwidth"."1.0.0";
+      "wcwidth-1.0.1" = self.by-version."wcwidth"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -8204,21 +8566,21 @@
     cpu = [ ];
   };
   by-spec."combine-source-map"."~0.7.1" =
-    self.by-version."combine-source-map"."0.7.1";
-  by-version."combine-source-map"."0.7.1" = self.buildNodePackage {
-    name = "combine-source-map-0.7.1";
-    version = "0.7.1";
+    self.by-version."combine-source-map"."0.7.2";
+  by-version."combine-source-map"."0.7.2" = self.buildNodePackage {
+    name = "combine-source-map-0.7.2";
+    version = "0.7.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.1.tgz";
-      name = "combine-source-map-0.7.1.tgz";
-      sha1 = "1720771dee7f3221ce3c62a104ee9a963f12009e";
+      url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz";
+      name = "combine-source-map-0.7.2.tgz";
+      sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e";
     };
     deps = {
       "convert-source-map-1.1.3" = self.by-version."convert-source-map"."1.1.3";
-      "inline-source-map-0.6.1" = self.by-version."inline-source-map"."0.6.1";
+      "inline-source-map-0.6.2" = self.by-version."inline-source-map"."0.6.2";
       "lodash.memoize-3.0.4" = self.by-version."lodash.memoize"."3.0.4";
-      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
     };
     optionalDependencies = {
     };
@@ -8500,7 +8862,7 @@
       "commander-2.9.0" = self.by-version."commander"."2.9.0";
       "detective-4.3.1" = self.by-version."detective"."4.3.1";
       "glob-5.0.15" = self.by-version."glob"."5.0.15";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "private-0.1.6" = self.by-version."private"."0.1.6";
@@ -8529,7 +8891,7 @@
       sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49";
     };
     deps = {
-      "ipaddr.js-1.1.0" = self.by-version."ipaddr.js"."1.1.0";
+      "ipaddr.js-1.1.1" = self.by-version."ipaddr.js"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -8595,7 +8957,26 @@
     cpu = [ ];
   };
   by-spec."component-emitter"."^1.1.3" =
-    self.by-version."component-emitter"."1.2.0";
+    self.by-version."component-emitter"."1.2.1";
+  by-version."component-emitter"."1.2.1" = self.buildNodePackage {
+    name = "component-emitter-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+      name = "component-emitter-1.2.1.tgz";
+      sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."component-emitter"."~1.2.0" =
+    self.by-version."component-emitter"."1.2.1";
   by-spec."component-inherit"."0.0.3" =
     self.by-version."component-inherit"."0.0.3";
   by-version."component-inherit"."0.0.3" = self.buildNodePackage {
@@ -8630,7 +9011,7 @@
       "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
       "crc32-stream-0.3.4" = self.by-version."crc32-stream"."0.3.4";
       "node-int64-0.3.3" = self.by-version."node-int64"."0.3.3";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
     };
     optionalDependencies = {
     };
@@ -8658,18 +9039,18 @@
     cpu = [ ];
   };
   by-spec."compressible"."~2.0.5" =
-    self.by-version."compressible"."2.0.7";
-  by-version."compressible"."2.0.7" = self.buildNodePackage {
-    name = "compressible-2.0.7";
-    version = "2.0.7";
+    self.by-version."compressible"."2.0.8";
+  by-version."compressible"."2.0.8" = self.buildNodePackage {
+    name = "compressible-2.0.8";
+    version = "2.0.8";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/compressible/-/compressible-2.0.7.tgz";
-      name = "compressible-2.0.7.tgz";
-      sha1 = "2058c52722fd3f1538a4f22ab14d0635904d19ae";
+      url = "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz";
+      name = "compressible-2.0.8.tgz";
+      sha1 = "7162e6c46d3b9d200ffb45cb4e4a0f7832732503";
     };
     deps = {
-      "mime-db-1.22.0" = self.by-version."mime-db"."1.22.0";
+      "mime-db-1.23.0" = self.by-version."mime-db"."1.23.0";
     };
     optionalDependencies = {
     };
@@ -8677,8 +9058,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."compressible"."~2.0.7" =
-    self.by-version."compressible"."2.0.7";
+  by-spec."compressible"."~2.0.8" =
+    self.by-version."compressible"."2.0.8";
   by-spec."compression"."1.0.0" =
     self.by-version."compression"."1.0.0";
   by-version."compression"."1.0.0" = self.buildNodePackage {
@@ -8702,20 +9083,20 @@
     cpu = [ ];
   };
   by-spec."compression".">=1.2.0 <2.0.0-0" =
-    self.by-version."compression"."1.6.1";
-  by-version."compression"."1.6.1" = self.buildNodePackage {
-    name = "compression-1.6.1";
-    version = "1.6.1";
+    self.by-version."compression"."1.6.2";
+  by-version."compression"."1.6.2" = self.buildNodePackage {
+    name = "compression-1.6.2";
+    version = "1.6.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/compression/-/compression-1.6.1.tgz";
-      name = "compression-1.6.1.tgz";
-      sha1 = "1bf4f96fd72019a3fd11513b4fc4dcd3bd16db55";
+      url = "https://registry.npmjs.org/compression/-/compression-1.6.2.tgz";
+      name = "compression-1.6.2.tgz";
+      sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3";
     };
     deps = {
-      "accepts-1.3.2" = self.by-version."accepts"."1.3.2";
-      "bytes-2.2.0" = self.by-version."bytes"."2.2.0";
-      "compressible-2.0.7" = self.by-version."compressible"."2.0.7";
+      "accepts-1.3.3" = self.by-version."accepts"."1.3.3";
+      "bytes-2.3.0" = self.by-version."bytes"."2.3.0";
+      "compressible-2.0.8" = self.by-version."compressible"."2.0.8";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
       "vary-1.1.0" = self.by-version."vary"."1.1.0";
@@ -8726,10 +9107,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."compression"."^1.5.0" =
-    self.by-version."compression"."1.6.1";
   by-spec."compression"."^1.6.0" =
-    self.by-version."compression"."1.6.1";
+    self.by-version."compression"."1.6.2";
   by-spec."compression"."~1.5.2" =
     self.by-version."compression"."1.5.2";
   by-version."compression"."1.5.2" = self.buildNodePackage {
@@ -8744,7 +9123,7 @@
     deps = {
       "accepts-1.2.13" = self.by-version."accepts"."1.2.13";
       "bytes-2.1.0" = self.by-version."bytes"."2.1.0";
-      "compressible-2.0.7" = self.by-version."compressible"."2.0.7";
+      "compressible-2.0.8" = self.by-version."compressible"."2.0.8";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
       "vary-1.0.1" = self.by-version."vary"."1.0.1";
@@ -8824,6 +9203,8 @@
     self.by-version."concat-stream"."1.5.1";
   by-spec."concat-stream"."^1.4.7" =
     self.by-version."concat-stream"."1.5.1";
+  by-spec."concat-stream"."^1.5.1" =
+    self.by-version."concat-stream"."1.5.1";
   by-spec."concat-stream"."~1.4.1" =
     self.by-version."concat-stream"."1.4.10";
   by-version."concat-stream"."1.4.10" = self.buildNodePackage {
@@ -8838,7 +9219,7 @@
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
     };
     optionalDependencies = {
     };
@@ -8932,12 +9313,12 @@
       sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021";
     };
     deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
-      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
       "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1";
       "osenv-0.1.3" = self.by-version."osenv"."0.1.3";
-      "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
+      "uuid-2.0.2" = self.by-version."uuid"."2.0.2";
       "write-file-atomic-1.1.4" = self.by-version."write-file-atomic"."1.1.4";
       "xdg-basedir-2.0.0" = self.by-version."xdg-basedir"."2.0.0";
     };
@@ -8959,7 +9340,7 @@
       sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807";
     };
     deps = {
-      "qs-6.1.0" = self.by-version."qs"."6.1.0";
+      "qs-6.2.0" = self.by-version."qs"."6.2.0";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "formidable-1.0.17" = self.by-version."formidable"."1.0.17";
     };
@@ -9091,7 +9472,7 @@
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
       "compression-1.5.2" = self.by-version."compression"."1.5.2";
       "connect-timeout-1.6.2" = self.by-version."connect-timeout"."1.6.2";
-      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "content-type-1.0.2" = self.by-version."content-type"."1.0.2";
       "csurf-1.8.3" = self.by-version."csurf"."1.8.3";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "depd-1.0.1" = self.by-version."depd"."1.0.1";
@@ -9100,7 +9481,7 @@
       "finalhandler-0.4.0" = self.by-version."finalhandler"."0.4.0";
       "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
       "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
-      "method-override-2.3.5" = self.by-version."method-override"."2.3.5";
+      "method-override-2.3.6" = self.by-version."method-override"."2.3.6";
       "morgan-1.6.1" = self.by-version."morgan"."1.6.1";
       "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2";
       "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
@@ -9110,8 +9491,8 @@
       "response-time-2.3.1" = self.by-version."response-time"."2.3.1";
       "serve-favicon-2.3.0" = self.by-version."serve-favicon"."2.3.0";
       "serve-index-1.7.3" = self.by-version."serve-index"."1.7.3";
-      "serve-static-1.10.2" = self.by-version."serve-static"."1.10.2";
-      "type-is-1.6.12" = self.by-version."type-is"."1.6.12";
+      "serve-static-1.10.3" = self.by-version."serve-static"."1.10.3";
+      "type-is-1.6.13" = self.by-version."type-is"."1.6.13";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
       "vhost-3.0.2" = self.by-version."vhost"."3.0.2";
     };
@@ -9198,7 +9579,7 @@
   };
   by-spec."connect"."~2" =
     self.by-version."connect"."2.30.2";
-  by-spec."connect-busboy"."^0.0.2" =
+  by-spec."connect-busboy"."~0.0.2" =
     self.by-version."connect-busboy"."0.0.2";
   by-version."connect-busboy"."0.0.2" = self.buildNodePackage {
     name = "connect-busboy-0.0.2";
@@ -9279,19 +9660,19 @@
   };
   "connect-jade-static" = self.by-version."connect-jade-static"."0.2.2";
   by-spec."connect-mongo"."*" =
-    self.by-version."connect-mongo"."1.1.0";
-  by-version."connect-mongo"."1.1.0" = self.buildNodePackage {
-    name = "connect-mongo-1.1.0";
-    version = "1.1.0";
+    self.by-version."connect-mongo"."1.2.0";
+  by-version."connect-mongo"."1.2.0" = self.buildNodePackage {
+    name = "connect-mongo-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/connect-mongo/-/connect-mongo-1.1.0.tgz";
-      name = "connect-mongo-1.1.0.tgz";
-      sha1 = "b9de9433afd4807d8965377dfb73e67507bd2439";
+      url = "https://registry.npmjs.org/connect-mongo/-/connect-mongo-1.2.0.tgz";
+      name = "connect-mongo-1.2.0.tgz";
+      sha1 = "280e9617ccdb9d2984814fb1a2279dac89cfe99b";
     };
     deps = {
-      "bluebird-3.3.4" = self.by-version."bluebird"."3.3.4";
-      "mongodb-2.1.16" = self.by-version."mongodb"."2.1.16";
+      "bluebird-3.4.0" = self.by-version."bluebird"."3.4.0";
+      "mongodb-2.1.21" = self.by-version."mongodb"."2.1.21";
     };
     optionalDependencies = {
     };
@@ -9299,7 +9680,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "connect-mongo" = self.by-version."connect-mongo"."1.1.0";
+  "connect-mongo" = self.by-version."connect-mongo"."1.2.0";
   by-spec."connect-mongo"."0.8.2" =
     self.by-version."connect-mongo"."0.8.2";
   by-version."connect-mongo"."0.8.2" = self.buildNodePackage {
@@ -9314,7 +9695,7 @@
     deps = {
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "depd-1.1.0" = self.by-version."depd"."1.1.0";
-      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
       "mongodb-2.0.55" = self.by-version."mongodb"."2.0.55";
     };
     optionalDependencies = {
@@ -9431,25 +9812,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."constants-browserify"."0.0.1" =
-    self.by-version."constants-browserify"."0.0.1";
-  by-version."constants-browserify"."0.0.1" = self.buildNodePackage {
-    name = "constants-browserify-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz";
-      name = "constants-browserify-0.0.1.tgz";
-      sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."constants-browserify"."^1.0.0" =
     self.by-version."constants-browserify"."1.0.0";
   by-version."constants-browserify"."1.0.0" = self.buildNodePackage {
@@ -9471,8 +9833,66 @@
   };
   by-spec."constants-browserify"."~0.0.1" =
     self.by-version."constants-browserify"."0.0.1";
+  by-version."constants-browserify"."0.0.1" = self.buildNodePackage {
+    name = "constants-browserify-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz";
+      name = "constants-browserify-0.0.1.tgz";
+      sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."constants-browserify"."~1.0.0" =
     self.by-version."constants-browserify"."1.0.0";
+  by-spec."consume-http-header"."^1.0.0" =
+    self.by-version."consume-http-header"."1.0.0";
+  by-version."consume-http-header"."1.0.0" = self.buildNodePackage {
+    name = "consume-http-header-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/consume-http-header/-/consume-http-header-1.0.0.tgz";
+      name = "consume-http-header-1.0.0.tgz";
+      sha1 = "95976d74f7f1b38dfb13fd9b3b68b91a0240556f";
+    };
+    deps = {
+      "consume-until-1.0.0" = self.by-version."consume-until"."1.0.0";
+      "http-headers-3.0.1" = self.by-version."http-headers"."3.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."consume-until"."^1.0.0" =
+    self.by-version."consume-until"."1.0.0";
+  by-version."consume-until"."1.0.0" = self.buildNodePackage {
+    name = "consume-until-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/consume-until/-/consume-until-1.0.0.tgz";
+      name = "consume-until-1.0.0.tgz";
+      sha1 = "75b91fa9f16663e51f98e863af995b9164068c1a";
+    };
+    deps = {
+      "buffer-indexof-1.0.0" = self.by-version."buffer-indexof"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."content-disposition"."0.5.0" =
     self.by-version."content-disposition"."0.5.0";
   by-version."content-disposition"."0.5.0" = self.buildNodePackage {
@@ -9512,15 +9932,15 @@
     cpu = [ ];
   };
   by-spec."content-type"."~1.0.1" =
-    self.by-version."content-type"."1.0.1";
-  by-version."content-type"."1.0.1" = self.buildNodePackage {
-    name = "content-type-1.0.1";
-    version = "1.0.1";
+    self.by-version."content-type"."1.0.2";
+  by-version."content-type"."1.0.2" = self.buildNodePackage {
+    name = "content-type-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz";
-      name = "content-type-1.0.1.tgz";
-      sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600";
+      url = "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz";
+      name = "content-type-1.0.2.tgz";
+      sha1 = "b7d113aee7a8dd27bd21133c4dc2529df1721eed";
     };
     deps = {
     };
@@ -9543,7 +9963,7 @@
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -9553,6 +9973,25 @@
   };
   by-spec."contextify"."~0.1.5" =
     self.by-version."contextify"."0.1.15";
+  by-spec."convert-source-map"."^1.1.1" =
+    self.by-version."convert-source-map"."1.2.0";
+  by-version."convert-source-map"."1.2.0" = self.buildNodePackage {
+    name = "convert-source-map-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.2.0.tgz";
+      name = "convert-source-map-1.2.0.tgz";
+      sha1 = "44c08c2506f10fb3ca6fd888d5a3444cf8d6a669";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."convert-source-map"."~0.3.0" =
     self.by-version."convert-source-map"."0.3.5";
   by-version."convert-source-map"."0.3.5" = self.buildNodePackage {
@@ -9724,6 +10163,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."cookie"."0.3.1" =
+    self.by-version."cookie"."0.3.1";
+  by-version."cookie"."0.3.1" = self.buildNodePackage {
+    name = "cookie-0.3.1";
+    version = "0.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz";
+      name = "cookie-0.3.1.tgz";
+      sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."cookie-jar"."~0.2.0" =
     self.by-version."cookie-jar"."0.2.0";
   by-version."cookie-jar"."0.2.0" = self.buildNodePackage {
@@ -9784,18 +10242,18 @@
     cpu = [ ];
   };
   by-spec."cookie-parser"."^1.0.1" =
-    self.by-version."cookie-parser"."1.4.1";
-  by-version."cookie-parser"."1.4.1" = self.buildNodePackage {
-    name = "cookie-parser-1.4.1";
-    version = "1.4.1";
+    self.by-version."cookie-parser"."1.4.3";
+  by-version."cookie-parser"."1.4.3" = self.buildNodePackage {
+    name = "cookie-parser-1.4.3";
+    version = "1.4.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.1.tgz";
-      name = "cookie-parser-1.4.1.tgz";
-      sha1 = "6b0ee6a8dec27a063af42d188a592cc1d72ba4f4";
+      url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz";
+      name = "cookie-parser-1.4.3.tgz";
+      sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
     };
     deps = {
-      "cookie-0.2.3" = self.by-version."cookie"."0.2.3";
+      "cookie-0.3.1" = self.by-version."cookie"."0.3.1";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
     };
     optionalDependencies = {
@@ -9826,7 +10284,7 @@
     cpu = [ ];
   };
   by-spec."cookie-parser"."~1.4.1" =
-    self.by-version."cookie-parser"."1.4.1";
+    self.by-version."cookie-parser"."1.4.3";
   by-spec."cookie-signature"."1.0.1" =
     self.by-version."cookie-signature"."1.0.1";
   by-version."cookie-signature"."1.0.1" = self.buildNodePackage {
@@ -9924,6 +10382,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."cookiejar"."2.0.6" =
+    self.by-version."cookiejar"."2.0.6";
+  by-version."cookiejar"."2.0.6" = self.buildNodePackage {
+    name = "cookiejar-2.0.6";
+    version = "2.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.6.tgz";
+      name = "cookiejar-2.0.6.tgz";
+      sha1 = "0abf356ad00d1c5a219d88d44518046dd026acfe";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."cookies"."0.1.x" =
     self.by-version."cookies"."0.1.6";
   by-version."cookies"."0.1.6" = self.buildNodePackage {
@@ -9967,24 +10444,24 @@
   by-spec."cookies".">=0.5.0 <1.0.0-0" =
     self.by-version."cookies"."0.6.1";
   by-spec."cordova"."*" =
-    self.by-version."cordova"."6.1.1";
-  by-version."cordova"."6.1.1" = self.buildNodePackage {
-    name = "cordova-6.1.1";
-    version = "6.1.1";
+    self.by-version."cordova"."6.2.1-nightly.2016.6.10.486bdab5";
+  by-version."cordova"."6.2.1-nightly.2016.6.10.486bdab5" = self.buildNodePackage {
+    name = "cordova-6.2.1-nightly.2016.6.10.486bdab5";
+    version = "6.2.1-nightly.2016.6.10.486bdab5";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/cordova/-/cordova-6.1.1.tgz";
-      name = "cordova-6.1.1.tgz";
-      sha1 = "156488fe453182941e6034516d4e0f2f85dd47bc";
+      url = "https://registry.npmjs.org/cordova/-/cordova-6.2.1-nightly.2016.6.10.486bdab5.tgz";
+      name = "cordova-6.2.1-nightly.2016.6.10.486bdab5.tgz";
+      sha1 = "4601f890bb77e8788cf64ba1f561eac4b2cbb702";
     };
     deps = {
-      "ansi-0.3.1" = self.by-version."ansi"."0.3.1";
-      "cordova-lib-6.1.1" = self.by-version."cordova-lib"."6.1.1";
-      "cordova-common-1.1.1" = self.by-version."cordova-common"."1.1.1";
+      "cordova-lib-6.2.1-nightly.2016.6.10.d28eed63" = self.by-version."cordova-lib"."6.2.1-nightly.2016.6.10.d28eed63";
+      "cordova-common-1.3.0" = self.by-version."cordova-common"."1.3.0";
       "q-1.0.1" = self.by-version."q"."1.0.1";
       "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
       "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
       "update-notifier-0.5.0" = self.by-version."update-notifier"."0.5.0";
+      "insight-0.8.2" = self.by-version."insight"."0.8.2";
     };
     optionalDependencies = {
     };
@@ -9992,7 +10469,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "cordova" = self.by-version."cordova"."6.1.1";
+  "cordova" = self.by-version."cordova"."6.2.1-nightly.2016.6.10.486bdab5";
   by-spec."cordova-app-hello-world"."3.10.0" =
     self.by-version."cordova-app-hello-world"."3.10.0";
   by-version."cordova-app-hello-world"."3.10.0" = self.buildNodePackage {
@@ -10012,16 +10489,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cordova-common"."1.1.x" =
-    self.by-version."cordova-common"."1.1.1";
-  by-version."cordova-common"."1.1.1" = self.buildNodePackage {
-    name = "cordova-common-1.1.1";
-    version = "1.1.1";
+  by-spec."cordova-common"."1.3.x" =
+    self.by-version."cordova-common"."1.3.0";
+  by-version."cordova-common"."1.3.0" = self.buildNodePackage {
+    name = "cordova-common-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.1.1.tgz";
-      name = "cordova-common-1.1.1.tgz";
-      sha1 = "4f74e182fe706b7a0ad626b0b3d303910af21d25";
+      url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.3.0.tgz";
+      name = "cordova-common-1.3.0.tgz";
+      sha1 = "f75161f6aa7cef5486fd5d69a3b0a1f628334491";
     };
     deps = {
       "ansi-0.3.1" = self.by-version."ansi"."0.3.1";
@@ -10029,6 +10506,7 @@
       "cordova-registry-mapper-1.1.15" = self.by-version."cordova-registry-mapper"."1.1.15";
       "elementtree-0.1.6" = self.by-version."elementtree"."0.1.6";
       "glob-5.0.15" = self.by-version."glob"."5.0.15";
+      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
       "osenv-0.1.3" = self.by-version."osenv"."0.1.3";
       "plist-1.2.0" = self.by-version."plist"."1.2.0";
       "q-1.4.1" = self.by-version."q"."1.4.1";
@@ -10043,8 +10521,32 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cordova-common"."^1.1.0" =
-    self.by-version."cordova-common"."1.1.1";
+  by-spec."cordova-common"."^1.3.0" =
+    self.by-version."cordova-common"."1.3.0";
+  by-spec."cordova-fetch"."1.0.0" =
+    self.by-version."cordova-fetch"."1.0.0";
+  by-version."cordova-fetch"."1.0.0" = self.buildNodePackage {
+    name = "cordova-fetch-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.0.tgz";
+      name = "cordova-fetch-1.0.0.tgz";
+      sha1 = "54b1044f2ccc39169131b50f35e7ce24159264e6";
+    };
+    deps = {
+      "cordova-common-1.3.0" = self.by-version."cordova-common"."1.3.0";
+      "dependency-ls-1.0.0" = self.by-version."dependency-ls"."1.0.0";
+      "is-url-1.2.1" = self.by-version."is-url"."1.2.1";
+      "q-1.4.1" = self.by-version."q"."1.4.1";
+      "shelljs-0.7.0" = self.by-version."shelljs"."0.7.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."cordova-js"."4.1.4" =
     self.by-version."cordova-js"."4.1.4";
   by-version."cordova-js"."4.1.4" = self.buildNodePackage {
@@ -10065,30 +10567,31 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cordova-lib"."6.1.1" =
-    self.by-version."cordova-lib"."6.1.1";
-  by-version."cordova-lib"."6.1.1" = self.buildNodePackage {
-    name = "cordova-lib-6.1.1";
-    version = "6.1.1";
+  by-spec."cordova-lib"."6.2.1-nightly.2016.6.10.d28eed63" =
+    self.by-version."cordova-lib"."6.2.1-nightly.2016.6.10.d28eed63";
+  by-version."cordova-lib"."6.2.1-nightly.2016.6.10.d28eed63" = self.buildNodePackage {
+    name = "cordova-lib-6.2.1-nightly.2016.6.10.d28eed63";
+    version = "6.2.1-nightly.2016.6.10.d28eed63";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.1.1.tgz";
-      name = "cordova-lib-6.1.1.tgz";
-      sha1 = "d527ceca6f91476ad759d339886f26f7d7af810f";
+      url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.2.1-nightly.2016.6.10.d28eed63.tgz";
+      name = "cordova-lib-6.2.1-nightly.2016.6.10.d28eed63.tgz";
+      sha1 = "e1601b52037ce34243465f18d2ba00d34596e97c";
     };
     deps = {
       "aliasify-1.9.0" = self.by-version."aliasify"."1.9.0";
       "cordova-app-hello-world-3.10.0" = self.by-version."cordova-app-hello-world"."3.10.0";
-      "cordova-common-1.1.1" = self.by-version."cordova-common"."1.1.1";
+      "cordova-common-1.3.0" = self.by-version."cordova-common"."1.3.0";
+      "cordova-fetch-1.0.0" = self.by-version."cordova-fetch"."1.0.0";
       "cordova-js-4.1.4" = self.by-version."cordova-js"."4.1.4";
       "cordova-registry-mapper-1.1.15" = self.by-version."cordova-registry-mapper"."1.1.15";
       "cordova-serve-1.0.0" = self.by-version."cordova-serve"."1.0.0";
       "dep-graph-1.1.0" = self.by-version."dep-graph"."1.1.0";
       "elementtree-0.1.6" = self.by-version."elementtree"."0.1.6";
       "glob-5.0.15" = self.by-version."glob"."5.0.15";
-      "init-package-json-1.9.3" = self.by-version."init-package-json"."1.9.3";
+      "init-package-json-1.9.4" = self.by-version."init-package-json"."1.9.4";
       "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
-      "npm-2.15.3" = self.by-version."npm"."2.15.3";
+      "npm-2.15.6" = self.by-version."npm"."2.15.6";
       "opener-1.4.1" = self.by-version."opener"."1.4.1";
       "plist-1.2.0" = self.by-version."plist"."1.2.0";
       "properties-parser-0.2.3" = self.by-version."properties-parser"."0.2.3";
@@ -10100,7 +10603,7 @@
       "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
       "unorm-1.3.3" = self.by-version."unorm"."1.3.3";
       "valid-identifier-0.0.1" = self.by-version."valid-identifier"."0.0.1";
-      "xcode-0.8.0" = self.by-version."xcode"."0.8.0";
+      "xcode-0.8.8" = self.by-version."xcode"."0.8.8";
     };
     optionalDependencies = {
     };
@@ -10142,7 +10645,7 @@
     };
     deps = {
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
-      "compression-1.6.1" = self.by-version."compression"."1.6.1";
+      "compression-1.6.2" = self.by-version."compression"."1.6.2";
       "express-4.13.4" = self.by-version."express"."4.13.4";
       "q-1.4.1" = self.by-version."q"."1.4.1";
     };
@@ -10152,16 +10655,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."core-js"."^0.8.1" =
-    self.by-version."core-js"."0.8.4";
-  by-version."core-js"."0.8.4" = self.buildNodePackage {
-    name = "core-js-0.8.4";
-    version = "0.8.4";
+  by-spec."core-decorators"."^0.12.3" =
+    self.by-version."core-decorators"."0.12.3";
+  by-version."core-decorators"."0.12.3" = self.buildNodePackage {
+    name = "core-decorators-0.12.3";
+    version = "0.12.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/core-js/-/core-js-0.8.4.tgz";
-      name = "core-js-0.8.4.tgz";
-      sha1 = "c22665f1e0d1b9c3c5e1b08dabd1f108695e4fcf";
+      url = "https://registry.npmjs.org/core-decorators/-/core-decorators-0.12.3.tgz";
+      name = "core-decorators-0.12.3.tgz";
+      sha1 = "6b3f83378e680d48b0c08da4489899b7532dcb43";
     };
     deps = {
     };
@@ -10191,15 +10694,36 @@
     cpu = [ ];
   };
   by-spec."core-js"."^2.1.0" =
-    self.by-version."core-js"."2.2.2";
-  by-version."core-js"."2.2.2" = self.buildNodePackage {
-    name = "core-js-2.2.2";
-    version = "2.2.2";
+    self.by-version."core-js"."2.4.0";
+  by-version."core-js"."2.4.0" = self.buildNodePackage {
+    name = "core-js-2.4.0";
+    version = "2.4.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/core-js/-/core-js-2.2.2.tgz";
-      name = "core-js-2.2.2.tgz";
-      sha1 = "79a0f3a9495507641a5bf7ce275fa494649180bf";
+      url = "https://registry.npmjs.org/core-js/-/core-js-2.4.0.tgz";
+      name = "core-js-2.4.0.tgz";
+      sha1 = "df408ab46d01aff91c01c3e7971935d422c54f81";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."core-js"."^2.4.0" =
+    self.by-version."core-js"."2.4.0";
+  by-spec."core-js"."~0.8.4" =
+    self.by-version."core-js"."0.8.4";
+  by-version."core-js"."0.8.4" = self.buildNodePackage {
+    name = "core-js-0.8.4";
+    version = "0.8.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/core-js/-/core-js-0.8.4.tgz";
+      name = "core-js-0.8.4.tgz";
+      sha1 = "c22665f1e0d1b9c3c5e1b08dabd1f108695e4fcf";
     };
     deps = {
     };
@@ -10264,7 +10788,7 @@
       sha1 = "007c70ef80089dbae6f59eeeec37480799b39595";
     };
     deps = {
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -10385,7 +10909,7 @@
       sha1 = "73bc25b45fac1db6632231a7bfce8927e9f06552";
     };
     deps = {
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
       "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
     };
     optionalDependencies = {
@@ -10406,8 +10930,8 @@
       sha1 = "888c723596cdf7612f6498233eebd7a35301737d";
     };
     deps = {
-      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
-      "elliptic-6.2.3" = self.by-version."elliptic"."6.2.3";
+      "bn.js-4.11.4" = self.by-version."bn.js"."4.11.4";
+      "elliptic-6.2.8" = self.by-version."elliptic"."6.2.8";
     };
     optionalDependencies = {
     };
@@ -10519,7 +11043,7 @@
       sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332";
     };
     deps = {
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -10641,44 +11165,22 @@
     self.by-version."crypto-browserify"."3.11.0";
   by-spec."crypto-browserify"."^3.2.6" =
     self.by-version."crypto-browserify"."3.11.0";
-  by-spec."crypto-browserify"."~3.2.6" =
-    self.by-version."crypto-browserify"."3.2.8";
-  by-version."crypto-browserify"."3.2.8" = self.buildNodePackage {
-    name = "crypto-browserify-3.2.8";
-    version = "3.2.8";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz";
-      name = "crypto-browserify-3.2.8.tgz";
-      sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189";
-    };
-    deps = {
-      "pbkdf2-compat-2.0.1" = self.by-version."pbkdf2-compat"."2.0.1";
-      "ripemd160-0.2.0" = self.by-version."ripemd160"."0.2.0";
-      "sha.js-2.2.6" = self.by-version."sha.js"."2.2.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."csrf"."~3.0.0" =
-    self.by-version."csrf"."3.0.1";
-  by-version."csrf"."3.0.1" = self.buildNodePackage {
-    name = "csrf-3.0.1";
-    version = "3.0.1";
+    self.by-version."csrf"."3.0.3";
+  by-version."csrf"."3.0.3" = self.buildNodePackage {
+    name = "csrf-3.0.3";
+    version = "3.0.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/csrf/-/csrf-3.0.1.tgz";
-      name = "csrf-3.0.1.tgz";
-      sha1 = "985b218d7e2e558ed3d980fa38f694ba682784c2";
+      url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz";
+      name = "csrf-3.0.3.tgz";
+      sha1 = "69d13220de95762808bb120f7533a994fc4293b5";
     };
     deps = {
-      "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1";
+      "base64-url-1.2.2" = self.by-version."base64-url"."1.2.2";
       "rndm-1.2.0" = self.by-version."rndm"."1.2.0";
-      "scmp-1.0.0" = self.by-version."scmp"."1.0.0";
-      "uid-safe-2.1.0" = self.by-version."uid-safe"."2.1.0";
+      "tsscmp-1.0.5" = self.by-version."tsscmp"."1.0.5";
+      "uid-safe-2.1.1" = self.by-version."uid-safe"."2.1.1";
     };
     optionalDependencies = {
     };
@@ -10806,6 +11308,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."csso"."~2.0.0" =
+    self.by-version."csso"."2.0.0";
+  by-version."csso"."2.0.0" = self.buildNodePackage {
+    name = "csso-2.0.0";
+    version = "2.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/csso/-/csso-2.0.0.tgz";
+      name = "csso-2.0.0.tgz";
+      sha1 = "178b43a44621221c27756086f531e02f42900ee8";
+    };
+    deps = {
+      "clap-1.1.1" = self.by-version."clap"."1.1.1";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."cssom"."0.3.x" =
     self.by-version."cssom"."0.3.1";
   by-version."cssom"."0.3.1" = self.buildNodePackage {
@@ -10830,15 +11353,15 @@
   by-spec."cssom"."~0.3.0" =
     self.by-version."cssom"."0.3.1";
   by-spec."cssstyle".">= 0.2.21 < 0.3.0" =
-    self.by-version."cssstyle"."0.2.34";
-  by-version."cssstyle"."0.2.34" = self.buildNodePackage {
-    name = "cssstyle-0.2.34";
-    version = "0.2.34";
+    self.by-version."cssstyle"."0.2.36";
+  by-version."cssstyle"."0.2.36" = self.buildNodePackage {
+    name = "cssstyle-0.2.36";
+    version = "0.2.36";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.34.tgz";
-      name = "cssstyle-0.2.34.tgz";
-      sha1 = "7a7a1bd44b60753926a6738e7bc075f15d97c970";
+      url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.36.tgz";
+      name = "cssstyle-0.2.36.tgz";
+      sha1 = "5cfed6b1a4526b58d77673d51b3520856fb6af3e";
     };
     deps = {
       "cssom-0.3.1" = self.by-version."cssom"."0.3.1";
@@ -10850,7 +11373,7 @@
     cpu = [ ];
   };
   by-spec."cssstyle"."~0.2.9" =
-    self.by-version."cssstyle"."0.2.34";
+    self.by-version."cssstyle"."0.2.36";
   by-spec."csurf"."1.1.0" =
     self.by-version."csurf"."1.1.0";
   by-version."csurf"."1.1.0" = self.buildNodePackage {
@@ -10886,7 +11409,7 @@
     deps = {
       "cookie-0.1.3" = self.by-version."cookie"."0.1.3";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "csrf-3.0.1" = self.by-version."csrf"."3.0.1";
+      "csrf-3.0.3" = self.by-version."csrf"."3.0.3";
       "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
     };
     optionalDependencies = {
@@ -10908,7 +11431,7 @@
     };
     deps = {
       "csv-generate-0.0.6" = self.by-version."csv-generate"."0.0.6";
-      "csv-parse-1.0.4" = self.by-version."csv-parse"."1.0.4";
+      "csv-parse-1.1.1" = self.by-version."csv-parse"."1.1.1";
       "stream-transform-0.1.1" = self.by-version."stream-transform"."0.1.1";
       "csv-stringify-0.0.8" = self.by-version."csv-stringify"."0.0.8";
     };
@@ -10938,15 +11461,15 @@
     cpu = [ ];
   };
   by-spec."csv-parse"."^1.0.0" =
-    self.by-version."csv-parse"."1.0.4";
-  by-version."csv-parse"."1.0.4" = self.buildNodePackage {
-    name = "csv-parse-1.0.4";
-    version = "1.0.4";
+    self.by-version."csv-parse"."1.1.1";
+  by-version."csv-parse"."1.1.1" = self.buildNodePackage {
+    name = "csv-parse-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.0.4.tgz";
-      name = "csv-parse-1.0.4.tgz";
-      sha1 = "200ad360b07c3e8986ddc990b7bc070bc85f147a";
+      url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.1.tgz";
+      name = "csv-parse-1.1.1.tgz";
+      sha1 = "01f9013753c4d6b8d82ccf66c6770c52d3fc438f";
     };
     deps = {
     };
@@ -10994,6 +11517,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."currently-unhandled"."^0.4.1" =
+    self.by-version."currently-unhandled"."0.4.1";
+  by-version."currently-unhandled"."0.4.1" = self.buildNodePackage {
+    name = "currently-unhandled-0.4.1";
+    version = "0.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz";
+      name = "currently-unhandled-0.4.1.tgz";
+      sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
+    };
+    deps = {
+      "array-find-index-1.0.1" = self.by-version."array-find-index"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."custom-event"."~1.0.0" =
     self.by-version."custom-event"."1.0.0";
   by-version."custom-event"."1.0.0" = self.buildNodePackage {
@@ -11114,15 +11657,15 @@
     cpu = [ ];
   };
   by-spec."dashdash".">=1.10.1 <2.0.0" =
-    self.by-version."dashdash"."1.13.0";
-  by-version."dashdash"."1.13.0" = self.buildNodePackage {
-    name = "dashdash-1.13.0";
-    version = "1.13.0";
+    self.by-version."dashdash"."1.14.0";
+  by-version."dashdash"."1.14.0" = self.buildNodePackage {
+    name = "dashdash-1.14.0";
+    version = "1.14.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz";
-      name = "dashdash-1.13.0.tgz";
-      sha1 = "a5aae6fd9d8e156624eb0dd9259eb12ba245385a";
+      url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz";
+      name = "dashdash-1.14.0.tgz";
+      sha1 = "29e486c5418bf0f356034a993d51686a33e84141";
     };
     deps = {
       "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0";
@@ -11133,8 +11676,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."dashdash"."^1.12.0" =
+    self.by-version."dashdash"."1.14.0";
   by-spec."dashdash"."^1.7.1" =
-    self.by-version."dashdash"."1.13.0";
+    self.by-version."dashdash"."1.14.0";
   by-spec."data-uri-to-buffer"."0" =
     self.by-version."data-uri-to-buffer"."0.0.4";
   by-version."data-uri-to-buffer"."0.0.4" = self.buildNodePackage {
@@ -11464,6 +12009,8 @@
     self.by-version."debug"."2.2.0";
   by-spec."debug"."^2.1.1" =
     self.by-version."debug"."2.2.0";
+  by-spec."debug"."^2.1.2" =
+    self.by-version."debug"."2.2.0";
   by-spec."debug"."^2.1.3" =
     self.by-version."debug"."2.2.0";
   by-spec."debug"."^2.2.0" =
@@ -11597,6 +12144,8 @@
   };
   by-spec."deep-equal"."^1.0.0" =
     self.by-version."deep-equal"."1.0.1";
+  by-spec."deep-equal"."^1.0.1" =
+    self.by-version."deep-equal"."1.0.1";
   by-spec."deep-equal"."~0.1.0" =
     self.by-version."deep-equal"."0.1.2";
   by-version."deep-equal"."0.1.2" = self.buildNodePackage {
@@ -11756,6 +12305,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."defaults"."^1.0.3" =
+    self.by-version."defaults"."1.0.3";
   by-spec."deferred-leveldown"."~0.2.0" =
     self.by-version."deferred-leveldown"."0.2.0";
   by-version."deferred-leveldown"."0.2.0" = self.buildNodePackage {
@@ -11877,12 +12428,12 @@
       sha1 = "9a50f04bf37325e283b4f44e985336c252456bd5";
     };
     deps = {
-      "globby-4.0.0" = self.by-version."globby"."4.0.0";
+      "globby-4.1.0" = self.by-version."globby"."4.1.0";
       "is-path-cwd-1.0.0" = self.by-version."is-path-cwd"."1.0.0";
       "is-path-in-cwd-1.0.0" = self.by-version."is-path-in-cwd"."1.0.0";
-      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
       "pify-2.3.0" = self.by-version."pify"."2.3.0";
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+      "pinkie-promise-2.0.1" = self.by-version."pinkie-promise"."2.0.1";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
     };
     optionalDependencies = {
@@ -12065,6 +12616,26 @@
   };
   by-spec."depd"."~1.1.0" =
     self.by-version."depd"."1.1.0";
+  by-spec."dependency-ls"."^1.0.0" =
+    self.by-version."dependency-ls"."1.0.0";
+  by-version."dependency-ls"."1.0.0" = self.buildNodePackage {
+    name = "dependency-ls-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.0.0.tgz";
+      name = "dependency-ls-1.0.0.tgz";
+      sha1 = "311dc9fa9a840bee4c6ca33954556e5cf09cb5c9";
+    };
+    deps = {
+      "q-1.4.1" = self.by-version."q"."1.4.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."deprecate"."^0.1.0" =
     self.by-version."deprecate"."0.1.0";
   by-version."deprecate"."0.1.0" = self.buildNodePackage {
@@ -12115,7 +12686,7 @@
       sha1 = "29dfff53e17b36aecae7530adbbbf622c2ed1a71";
     };
     deps = {
-      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "JSONStream-1.1.2" = self.by-version."JSONStream"."1.1.2";
       "shasum-1.0.2" = self.by-version."shasum"."1.0.2";
       "subarg-1.0.0" = self.by-version."subarg"."1.0.0";
       "through2-1.1.1" = self.by-version."through2"."1.1.1";
@@ -12138,7 +12709,7 @@
       sha1 = "091724902e84658260eb910748cccd1af6e21fb5";
     };
     deps = {
-      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "JSONStream-1.1.2" = self.by-version."JSONStream"."1.1.2";
       "shasum-1.0.2" = self.by-version."shasum"."1.0.2";
       "subarg-1.0.0" = self.by-version."subarg"."1.0.0";
       "through2-2.0.1" = self.by-version."through2"."2.0.1";
@@ -12243,8 +12814,8 @@
       sha1 = "7f742de066fc748bc8db820569dddce49bf0d456";
     };
     deps = {
-      "asap-2.0.3" = self.by-version."asap"."2.0.3";
-      "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
+      "asap-2.0.4" = self.by-version."asap"."2.0.4";
+      "wrappy-1.0.2" = self.by-version."wrappy"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -12290,7 +12861,7 @@
     };
     deps = {
       "streamsearch-0.1.2" = self.by-version."streamsearch"."0.1.2";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
     };
     optionalDependencies = {
     };
@@ -12337,15 +12908,15 @@
     cpu = [ ];
   };
   by-spec."diff"."2.2.*" =
-    self.by-version."diff"."2.2.2";
-  by-version."diff"."2.2.2" = self.buildNodePackage {
-    name = "diff-2.2.2";
-    version = "2.2.2";
+    self.by-version."diff"."2.2.3";
+  by-version."diff"."2.2.3" = self.buildNodePackage {
+    name = "diff-2.2.3";
+    version = "2.2.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/diff/-/diff-2.2.2.tgz";
-      name = "diff-2.2.2.tgz";
-      sha1 = "5f813f994a0caa1a2ef79200759c4b89ca233a81";
+      url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
+      name = "diff-2.2.3.tgz";
+      sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
     };
     deps = {
     };
@@ -12388,7 +12959,7 @@
       sha1 = "8b54af41c180befd9cb1caa130a3d76081ae4a07";
     };
     deps = {
-      "diff-2.2.2" = self.by-version."diff"."2.2.2";
+      "diff-2.2.3" = self.by-version."diff"."2.2.3";
     };
     optionalDependencies = {
     };
@@ -12408,7 +12979,7 @@
       sha1 = "b5835739270cfe26acf632099fded2a07f209e5e";
     };
     deps = {
-      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "bn.js-4.11.4" = self.by-version."bn.js"."4.11.4";
       "miller-rabin-4.0.0" = self.by-version."miller-rabin"."4.0.0";
       "randombytes-2.0.3" = self.by-version."randombytes"."2.0.3";
     };
@@ -12503,6 +13074,65 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."dns-equal"."^1.0.0" =
+    self.by-version."dns-equal"."1.0.0";
+  by-version."dns-equal"."1.0.0" = self.buildNodePackage {
+    name = "dns-equal-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz";
+      name = "dns-equal-1.0.0.tgz";
+      sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."dns-packet"."^1.0.1" =
+    self.by-version."dns-packet"."1.1.0";
+  by-version."dns-packet"."1.1.0" = self.buildNodePackage {
+    name = "dns-packet-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.0.tgz";
+      name = "dns-packet-1.1.0.tgz";
+      sha1 = "c11ce43bd9977aa789af72de06b6e4ad6e84730d";
+    };
+    deps = {
+      "ip-1.1.3" = self.by-version."ip"."1.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."dns-txt"."^2.0.2" =
+    self.by-version."dns-txt"."2.0.2";
+  by-version."dns-txt"."2.0.2" = self.buildNodePackage {
+    name = "dns-txt-2.0.2";
+    version = "2.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz";
+      name = "dns-txt-2.0.2.tgz";
+      sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6";
+    };
+    deps = {
+      "buffer-indexof-1.0.0" = self.by-version."buffer-indexof"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."docker-parse-image"."^3.0.1" =
     self.by-version."docker-parse-image"."3.0.1";
   by-version."docker-parse-image"."3.0.1" = self.buildNodePackage {
@@ -12535,7 +13165,7 @@
     };
     deps = {
       "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
-      "basic-auth-1.0.3" = self.by-version."basic-auth"."1.0.3";
+      "basic-auth-1.0.4" = self.by-version."basic-auth"."1.0.4";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
       "cors-2.7.1" = self.by-version."cors"."2.7.1";
       "docker-parse-image-3.0.1" = self.by-version."docker-parse-image"."3.0.1";
@@ -12558,7 +13188,7 @@
       "sorted-union-stream-1.0.2" = self.by-version."sorted-union-stream"."1.0.2";
       "split2-0.2.1" = self.by-version."split2"."0.2.1";
       "stream-collector-1.0.1" = self.by-version."stream-collector"."1.0.1";
-      "tar-stream-1.5.1" = self.by-version."tar-stream"."1.5.1";
+      "tar-stream-1.5.2" = self.by-version."tar-stream"."1.5.2";
       "through2-0.6.5" = self.by-version."through2"."0.6.5";
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
@@ -12570,16 +13200,16 @@
     cpu = [ ];
   };
   "docker-registry-server" = self.by-version."docker-registry-server"."2.2.0";
-  by-spec."doctrine"."^1.2.1" =
-    self.by-version."doctrine"."1.2.1";
-  by-version."doctrine"."1.2.1" = self.buildNodePackage {
-    name = "doctrine-1.2.1";
-    version = "1.2.1";
+  by-spec."doctrine"."^1.2.2" =
+    self.by-version."doctrine"."1.2.2";
+  by-version."doctrine"."1.2.2" = self.buildNodePackage {
+    name = "doctrine-1.2.2";
+    version = "1.2.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/doctrine/-/doctrine-1.2.1.tgz";
-      name = "doctrine-1.2.1.tgz";
-      sha1 = "ac0c649d70b9501e16e97acb7ec4e27168f746a3";
+      url = "https://registry.npmjs.org/doctrine/-/doctrine-1.2.2.tgz";
+      name = "doctrine-1.2.2.tgz";
+      sha1 = "9e9867210149548b95ec51469dae4caad312308e";
     };
     deps = {
       "esutils-1.1.6" = self.by-version."esutils"."1.1.6";
@@ -12762,15 +13392,15 @@
   by-spec."domhandler"."^2.3.0" =
     self.by-version."domhandler"."2.3.0";
   by-spec."domino"."~1.0.19" =
-    self.by-version."domino"."1.0.24";
-  by-version."domino"."1.0.24" = self.buildNodePackage {
-    name = "domino-1.0.24";
-    version = "1.0.24";
+    self.by-version."domino"."1.0.25";
+  by-version."domino"."1.0.25" = self.buildNodePackage {
+    name = "domino-1.0.25";
+    version = "1.0.25";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/domino/-/domino-1.0.24.tgz";
-      name = "domino-1.0.24.tgz";
-      sha1 = "a3fab865851197f22943d3a1ec0f507e1ff008e1";
+      url = "https://registry.npmjs.org/domino/-/domino-1.0.25.tgz";
+      name = "domino-1.0.25.tgz";
+      sha1 = "adcd6da0505ba5103cba64a0cb38e2bb9e3a052d";
     };
     deps = {
     };
@@ -12913,7 +13543,7 @@
       sha1 = "0b078d5517937d873101452d9146737557b75e51";
     };
     deps = {
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -12954,7 +13584,7 @@
       sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db";
     };
     deps = {
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
     };
     optionalDependencies = {
     };
@@ -12974,7 +13604,7 @@
       sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
     };
     deps = {
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -13002,7 +13632,7 @@
     deps = {
       "end-of-stream-1.0.0" = self.by-version."end-of-stream"."1.0.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -13032,6 +13662,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ecc-jsbn"."~0.1.1" =
+    self.by-version."ecc-jsbn"."0.1.1";
   by-spec."ecdsa-sig-formatter"."^1.0.0" =
     self.by-version."ecdsa-sig-formatter"."1.0.5";
   by-version."ecdsa-sig-formatter"."1.0.5" = self.buildNodePackage {
@@ -13086,11 +13718,11 @@
     deps = {
       "async-1.5.2" = self.by-version."async"."1.5.2";
       "colors-1.1.2" = self.by-version."colors"."1.1.2";
-      "google-auth-library-0.9.7" = self.by-version."google-auth-library"."0.9.7";
+      "google-auth-library-0.9.8" = self.by-version."google-auth-library"."0.9.8";
       "google-oauth-jwt-0.1.7" = self.by-version."google-oauth-jwt"."0.1.7";
       "googleclientlogin-0.2.8" = self.by-version."googleclientlogin"."0.2.8";
       "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "xml2js-0.4.16" = self.by-version."xml2js"."0.4.16";
     };
     optionalDependencies = {
@@ -13233,15 +13865,15 @@
     cpu = [ ];
   };
   by-spec."ejs".">=0.7.1" =
-    self.by-version."ejs"."2.4.1";
-  by-version."ejs"."2.4.1" = self.buildNodePackage {
-    name = "ejs-2.4.1";
-    version = "2.4.1";
+    self.by-version."ejs"."2.4.2";
+  by-version."ejs"."2.4.2" = self.buildNodePackage {
+    name = "ejs-2.4.2";
+    version = "2.4.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/ejs/-/ejs-2.4.1.tgz";
-      name = "ejs-2.4.1.tgz";
-      sha1 = "82e15b1b2a1f948b18097476ba2bd7c66f4d1566";
+      url = "https://registry.npmjs.org/ejs/-/ejs-2.4.2.tgz";
+      name = "ejs-2.4.2.tgz";
+      sha1 = "7057eb4812958fb731841cd9ca353343efe597b1";
     };
     deps = {
     };
@@ -13274,18 +13906,18 @@
   by-spec."elementtree"."^0.1.6" =
     self.by-version."elementtree"."0.1.6";
   by-spec."elliptic"."^6.0.0" =
-    self.by-version."elliptic"."6.2.3";
-  by-version."elliptic"."6.2.3" = self.buildNodePackage {
-    name = "elliptic-6.2.3";
-    version = "6.2.3";
+    self.by-version."elliptic"."6.2.8";
+  by-version."elliptic"."6.2.8" = self.buildNodePackage {
+    name = "elliptic-6.2.8";
+    version = "6.2.8";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/elliptic/-/elliptic-6.2.3.tgz";
-      name = "elliptic-6.2.3.tgz";
-      sha1 = "18e46d7306b0951275a2d42063270a14b74ebe99";
+      url = "https://registry.npmjs.org/elliptic/-/elliptic-6.2.8.tgz";
+      name = "elliptic-6.2.8.tgz";
+      sha1 = "44a25b3d1550bebb74d0b6d22d89940206b51739";
     };
     deps = {
-      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "bn.js-4.11.4" = self.by-version."bn.js"."4.11.4";
       "brorand-1.0.5" = self.by-version."brorand"."1.0.5";
       "hash.js-1.0.3" = self.by-version."hash.js"."1.0.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -13297,19 +13929,19 @@
     cpu = [ ];
   };
   by-spec."embedly".">=1.0.2" =
-    self.by-version."embedly"."1.0.4";
-  by-version."embedly"."1.0.4" = self.buildNodePackage {
-    name = "embedly-1.0.4";
-    version = "1.0.4";
+    self.by-version."embedly"."2.0.1";
+  by-version."embedly"."2.0.1" = self.buildNodePackage {
+    name = "embedly-2.0.1";
+    version = "2.0.1";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/embedly/-/embedly-1.0.4.tgz";
-      name = "embedly-1.0.4.tgz";
-      sha1 = "2f778885b44a3cf6c377c1dc31ce1321956733a6";
+      url = "https://registry.npmjs.org/embedly/-/embedly-2.0.1.tgz";
+      name = "embedly-2.0.1.tgz";
+      sha1 = "90db472fc54001299c518ffe5468fef93526f301";
     };
     deps = {
       "batbelt-0.0.2" = self.by-version."batbelt"."0.0.2";
-      "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
+      "superagent-1.8.3" = self.by-version."superagent"."1.8.3";
       "sprintf-0.1.1" = self.by-version."sprintf"."0.1.1";
       "hashish-0.0.4" = self.by-version."hashish"."0.0.4";
     };
@@ -13339,6 +13971,44 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."emojis-list"."^2.0.0" =
+    self.by-version."emojis-list"."2.0.1";
+  by-version."emojis-list"."2.0.1" = self.buildNodePackage {
+    name = "emojis-list-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.0.1.tgz";
+      name = "emojis-list-2.0.1.tgz";
+      sha1 = "a174d9d0838eb36af3d0590bb6d3e8dcd94f4fbd";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."encodeurl"."~1.0.1" =
+    self.by-version."encodeurl"."1.0.1";
+  by-version."encodeurl"."1.0.1" = self.buildNodePackage {
+    name = "encodeurl-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz";
+      name = "encodeurl-1.0.1.tgz";
+      sha1 = "79e3d58655346909fe6f0f45a5de68103b294d20";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."encoding"."^0.1.11" =
     self.by-version."encoding"."0.1.12";
   by-version."encoding"."0.1.12" = self.buildNodePackage {
@@ -13469,16 +14139,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."engine.io"."1.6.8" =
-    self.by-version."engine.io"."1.6.8";
-  by-version."engine.io"."1.6.8" = self.buildNodePackage {
-    name = "engine.io-1.6.8";
-    version = "1.6.8";
+  by-spec."engine.io"."1.6.9" =
+    self.by-version."engine.io"."1.6.9";
+  by-version."engine.io"."1.6.9" = self.buildNodePackage {
+    name = "engine.io-1.6.9";
+    version = "1.6.9";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.8.tgz";
-      name = "engine.io-1.6.8.tgz";
-      sha1 = "de05a06b757e7517695e088c7b051c47819f511b";
+      url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.9.tgz";
+      name = "engine.io-1.6.9.tgz";
+      sha1 = "1fe2fe827adb5d6f296e1002403edfa046bb6975";
     };
     deps = {
       "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
@@ -13523,16 +14193,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."engine.io-client"."1.6.8" =
-    self.by-version."engine.io-client"."1.6.8";
-  by-version."engine.io-client"."1.6.8" = self.buildNodePackage {
-    name = "engine.io-client-1.6.8";
-    version = "1.6.8";
+  by-spec."engine.io-client"."1.6.9" =
+    self.by-version."engine.io-client"."1.6.9";
+  by-version."engine.io-client"."1.6.9" = self.buildNodePackage {
+    name = "engine.io-client-1.6.9";
+    version = "1.6.9";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.8.tgz";
-      name = "engine.io-client-1.6.8.tgz";
-      sha1 = "6e2db11648b45e405c46b172ea3e3dac37cc0ceb";
+      url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz";
+      name = "engine.io-client-1.6.9.tgz";
+      sha1 = "1d6ad48048a5083c95096943b29d36efdb212401";
     };
     deps = {
       "has-cors-1.1.0" = self.by-version."has-cors"."1.1.0";
@@ -13617,7 +14287,7 @@
     deps = {
       "tapable-0.1.10" = self.by-version."tapable"."0.1.10";
       "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
     };
     optionalDependencies = {
     };
@@ -13639,8 +14309,8 @@
     deps = {
       "tapable-0.2.4" = self.by-version."tapable"."0.2.4";
       "memory-fs-0.3.0" = self.by-version."memory-fs"."0.3.0";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
-      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
     };
     optionalDependencies = {
     };
@@ -13648,8 +14318,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."enhanced-resolve"."~0.9.0" =
-    self.by-version."enhanced-resolve"."0.9.1";
   by-spec."ent"."~2.2.0" =
     self.by-version."ent"."2.2.0";
   by-version."ent"."2.2.0" = self.buildNodePackage {
@@ -13805,7 +14473,7 @@
       sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f";
     };
     deps = {
-      "accepts-1.3.2" = self.by-version."accepts"."1.3.2";
+      "accepts-1.3.3" = self.by-version."accepts"."1.3.3";
       "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
     };
     optionalDependencies = {
@@ -13866,9 +14534,7 @@
     self.by-version."es5-ext"."0.10.11";
   by-spec."es5-ext"."~0.10.7" =
     self.by-version."es5-ext"."0.10.11";
-  by-spec."es5-ext"."~0.10.8" =
-    self.by-version."es5-ext"."0.10.11";
-  by-spec."es6-collections"."^0.5.5" =
+  by-spec."es6-collections"."^0.5.6" =
     self.by-version."es6-collections"."0.5.6";
   by-version."es6-collections"."0.5.6" = self.buildNodePackage {
     name = "es6-collections-0.5.6";
@@ -13901,7 +14567,7 @@
     deps = {
       "d-0.1.1" = self.by-version."d"."0.1.1";
       "es5-ext-0.10.11" = self.by-version."es5-ext"."0.10.11";
-      "es6-symbol-3.0.2" = self.by-version."es6-symbol"."3.0.2";
+      "es6-symbol-3.1.0" = self.by-version."es6-symbol"."3.1.0";
     };
     optionalDependencies = {
     };
@@ -13910,22 +14576,22 @@
     cpu = [ ];
   };
   by-spec."es6-map"."^0.1.3" =
-    self.by-version."es6-map"."0.1.3";
-  by-version."es6-map"."0.1.3" = self.buildNodePackage {
-    name = "es6-map-0.1.3";
-    version = "0.1.3";
+    self.by-version."es6-map"."0.1.4";
+  by-version."es6-map"."0.1.4" = self.buildNodePackage {
+    name = "es6-map-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.3.tgz";
-      name = "es6-map-0.1.3.tgz";
-      sha1 = "fe58c6654c6acd54e4397cdb72379d59b6ad5894";
+      url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.4.tgz";
+      name = "es6-map-0.1.4.tgz";
+      sha1 = "a34b147be224773a4d7da8072794cefa3632b897";
     };
     deps = {
       "d-0.1.1" = self.by-version."d"."0.1.1";
       "es5-ext-0.10.11" = self.by-version."es5-ext"."0.10.11";
       "es6-iterator-2.0.0" = self.by-version."es6-iterator"."2.0.0";
       "es6-set-0.1.4" = self.by-version."es6-set"."0.1.4";
-      "es6-symbol-3.0.2" = self.by-version."es6-symbol"."3.0.2";
+      "es6-symbol-3.1.0" = self.by-version."es6-symbol"."3.1.0";
       "event-emitter-0.3.4" = self.by-version."event-emitter"."0.3.4";
     };
     optionalDependencies = {
@@ -13992,15 +14658,15 @@
     cpu = [ ];
   };
   by-spec."es6-promise"."^3.0.2" =
-    self.by-version."es6-promise"."3.1.2";
-  by-version."es6-promise"."3.1.2" = self.buildNodePackage {
-    name = "es6-promise-3.1.2";
-    version = "3.1.2";
+    self.by-version."es6-promise"."3.2.1";
+  by-version."es6-promise"."3.2.1" = self.buildNodePackage {
+    name = "es6-promise-3.2.1";
+    version = "3.2.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.1.2.tgz";
-      name = "es6-promise-3.1.2.tgz";
-      sha1 = "795e25ceb47f7babb263d151afbedd92d18e6a07";
+      url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz";
+      name = "es6-promise-3.2.1.tgz";
+      sha1 = "ec56233868032909207170c39448e24449dd1fc4";
     };
     deps = {
     };
@@ -14025,7 +14691,7 @@
       "d-0.1.1" = self.by-version."d"."0.1.1";
       "es5-ext-0.10.11" = self.by-version."es5-ext"."0.10.11";
       "es6-iterator-2.0.0" = self.by-version."es6-iterator"."2.0.0";
-      "es6-symbol-3.0.2" = self.by-version."es6-symbol"."3.0.2";
+      "es6-symbol-3.1.0" = self.by-version."es6-symbol"."3.1.0";
       "event-emitter-0.3.4" = self.by-version."event-emitter"."0.3.4";
     };
     optionalDependencies = {
@@ -14054,15 +14720,15 @@
     cpu = [ ];
   };
   by-spec."es6-shim".">=0.10.0 <1.0.0-0" =
-    self.by-version."es6-shim"."0.35.0";
-  by-version."es6-shim"."0.35.0" = self.buildNodePackage {
-    name = "es6-shim-0.35.0";
-    version = "0.35.0";
+    self.by-version."es6-shim"."0.35.1";
+  by-version."es6-shim"."0.35.1" = self.buildNodePackage {
+    name = "es6-shim-0.35.1";
+    version = "0.35.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.0.tgz";
-      name = "es6-shim-0.35.0.tgz";
-      sha1 = "272d927950889eabe299927cdc9c0010b7bfc00a";
+      url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.1.tgz";
+      name = "es6-shim-0.35.1.tgz";
+      sha1 = "a23524009005b031ab4a352ac196dfdfd1144ab7";
     };
     deps = {
     };
@@ -14073,6 +14739,29 @@
     cpu = [ ];
   };
   by-spec."es6-symbol"."3" =
+    self.by-version."es6-symbol"."3.1.0";
+  by-version."es6-symbol"."3.1.0" = self.buildNodePackage {
+    name = "es6-symbol-3.1.0";
+    version = "3.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.0.tgz";
+      name = "es6-symbol-3.1.0.tgz";
+      sha1 = "94481c655e7a7cad82eba832d97d5433496d7ffa";
+    };
+    deps = {
+      "d-0.1.1" = self.by-version."d"."0.1.1";
+      "es5-ext-0.10.11" = self.by-version."es5-ext"."0.10.11";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."es6-symbol"."^3.0.2" =
+    self.by-version."es6-symbol"."3.1.0";
+  by-spec."es6-symbol"."~3.0.2" =
     self.by-version."es6-symbol"."3.0.2";
   by-version."es6-symbol"."3.0.2" = self.buildNodePackage {
     name = "es6-symbol-3.0.2";
@@ -14093,12 +14782,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."es6-symbol"."^3.0.2" =
-    self.by-version."es6-symbol"."3.0.2";
-  by-spec."es6-symbol"."~3.0.1" =
-    self.by-version."es6-symbol"."3.0.2";
-  by-spec."es6-symbol"."~3.0.2" =
-    self.by-version."es6-symbol"."3.0.2";
+  by-spec."es6-symbol"."~3.1.0" =
+    self.by-version."es6-symbol"."3.1.0";
   by-spec."es6-weak-map"."^2.0.1" =
     self.by-version."es6-weak-map"."2.0.1";
   by-version."es6-weak-map"."2.0.1" = self.buildNodePackage {
@@ -14114,7 +14799,7 @@
       "d-0.1.1" = self.by-version."d"."0.1.1";
       "es5-ext-0.10.11" = self.by-version."es5-ext"."0.10.11";
       "es6-iterator-2.0.0" = self.by-version."es6-iterator"."2.0.0";
-      "es6-symbol-3.0.2" = self.by-version."es6-symbol"."3.0.2";
+      "es6-symbol-3.1.0" = self.by-version."es6-symbol"."3.1.0";
     };
     optionalDependencies = {
     };
@@ -14241,6 +14926,8 @@
   };
   by-spec."escape-string-regexp"."^1.0.2" =
     self.by-version."escape-string-regexp"."1.0.5";
+  by-spec."escape-string-regexp"."^1.0.5" =
+    self.by-version."escape-string-regexp"."1.0.5";
   by-spec."escodegen"."1.8.x" =
     self.by-version."escodegen"."1.8.0";
   by-version."escodegen"."1.8.0" = self.buildNodePackage {
@@ -14304,7 +14991,7 @@
       sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
     };
     deps = {
-      "es6-map-0.1.3" = self.by-version."es6-map"."0.1.3";
+      "es6-map-0.1.4" = self.by-version."es6-map"."0.1.4";
       "es6-weak-map-2.0.1" = self.by-version."es6-weak-map"."2.0.1";
       "esrecurse-4.1.0" = self.by-version."esrecurse"."4.1.0";
       "estraverse-4.2.0" = self.by-version."estraverse"."4.2.0";
@@ -14316,37 +15003,38 @@
     cpu = [ ];
   };
   by-spec."eslint"."*" =
-    self.by-version."eslint"."2.7.0";
-  by-version."eslint"."2.7.0" = self.buildNodePackage {
-    name = "eslint-2.7.0";
-    version = "2.7.0";
+    self.by-version."eslint"."2.12.0";
+  by-version."eslint"."2.12.0" = self.buildNodePackage {
+    name = "eslint-2.12.0";
+    version = "2.12.0";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-2.7.0.tgz";
-      name = "eslint-2.7.0.tgz";
-      sha1 = "b02ac247d13ec45ea5b44a3c383ddb6feda08b00";
+      url = "https://registry.npmjs.org/eslint/-/eslint-2.12.0.tgz";
+      name = "eslint-2.12.0.tgz";
+      sha1 = "96d36a3c7ff89fa9655cf3bc24ea7a10296762a6";
     };
     deps = {
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
       "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "doctrine-1.2.1" = self.by-version."doctrine"."1.2.1";
-      "es6-map-0.1.3" = self.by-version."es6-map"."0.1.3";
+      "doctrine-1.2.2" = self.by-version."doctrine"."1.2.2";
+      "es6-map-0.1.4" = self.by-version."es6-map"."0.1.4";
       "escope-3.6.0" = self.by-version."escope"."3.6.0";
-      "espree-3.1.3" = self.by-version."espree"."3.1.3";
+      "espree-3.1.4" = self.by-version."espree"."3.1.4";
       "estraverse-4.2.0" = self.by-version."estraverse"."4.2.0";
       "esutils-2.0.2" = self.by-version."esutils"."2.0.2";
       "file-entry-cache-1.2.4" = self.by-version."file-entry-cache"."1.2.4";
       "glob-7.0.3" = self.by-version."glob"."7.0.3";
-      "globals-9.4.0" = self.by-version."globals"."9.4.0";
-      "ignore-3.0.14" = self.by-version."ignore"."3.0.14";
+      "globals-9.8.0" = self.by-version."globals"."9.8.0";
+      "ignore-3.1.2" = self.by-version."ignore"."3.1.2";
       "imurmurhash-0.1.4" = self.by-version."imurmurhash"."0.1.4";
       "inquirer-0.12.0" = self.by-version."inquirer"."0.12.0";
       "is-my-json-valid-2.13.1" = self.by-version."is-my-json-valid"."2.13.1";
       "is-resolvable-1.0.0" = self.by-version."is-resolvable"."1.0.0";
-      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "js-yaml-3.6.1" = self.by-version."js-yaml"."3.6.1";
       "json-stable-stringify-1.0.1" = self.by-version."json-stable-stringify"."1.0.1";
-      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "levn-0.3.0" = self.by-version."levn"."0.3.0";
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "optionator-0.8.1" = self.by-version."optionator"."0.8.1";
       "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
@@ -14366,23 +15054,23 @@
     os = [ ];
     cpu = [ ];
   };
-  "eslint" = self.by-version."eslint"."2.7.0";
+  "eslint" = self.by-version."eslint"."2.12.0";
   by-spec."eslint".">0.7.3" =
-    self.by-version."eslint"."2.7.0";
-  by-spec."espree"."3.1.3" =
-    self.by-version."espree"."3.1.3";
-  by-version."espree"."3.1.3" = self.buildNodePackage {
-    name = "espree-3.1.3";
-    version = "3.1.3";
+    self.by-version."eslint"."2.12.0";
+  by-spec."espree"."3.1.4" =
+    self.by-version."espree"."3.1.4";
+  by-version."espree"."3.1.4" = self.buildNodePackage {
+    name = "espree-3.1.4";
+    version = "3.1.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/espree/-/espree-3.1.3.tgz";
-      name = "espree-3.1.3.tgz";
-      sha1 = "a77ca630986c19b74d95541b845298cd6faa228c";
+      url = "https://registry.npmjs.org/espree/-/espree-3.1.4.tgz";
+      name = "espree-3.1.4.tgz";
+      sha1 = "0726d7ac83af97a7c8498da9b363a3609d2a68a1";
     };
     deps = {
-      "acorn-3.0.4" = self.by-version."acorn"."3.0.4";
-      "acorn-jsx-2.0.1" = self.by-version."acorn-jsx"."2.0.1";
+      "acorn-3.2.0" = self.by-version."acorn"."3.2.0";
+      "acorn-jsx-3.0.1" = self.by-version."acorn-jsx"."3.0.1";
     };
     optionalDependencies = {
     };
@@ -14409,8 +15097,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima"."^2.5.0" =
-    self.by-version."esprima"."2.7.2";
   by-spec."esprima"."^2.6.0" =
     self.by-version."esprima"."2.7.2";
   by-spec."esprima"."^2.7" =
@@ -14525,7 +15211,7 @@
     };
     deps = {
       "estraverse-4.1.1" = self.by-version."estraverse"."4.1.1";
-      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
     };
     optionalDependencies = {
     };
@@ -14933,7 +15619,7 @@
       "oauth-0.9.14" = self.by-version."oauth"."0.9.14";
       "request-2.9.203" = self.by-version."request"."2.9.203";
       "connect-2.3.9" = self.by-version."connect"."2.3.9";
-      "openid-2.0.0" = self.by-version."openid"."2.0.0";
+      "openid-2.0.1" = self.by-version."openid"."2.0.1";
       "xml2js-0.4.16" = self.by-version."xml2js"."0.4.16";
       "node-swt-0.1.1" = self.by-version."node-swt"."0.1.1";
       "node-wsfederation-0.1.1" = self.by-version."node-wsfederation"."0.1.1";
@@ -15091,15 +15777,15 @@
     cpu = [ ];
   };
   by-spec."expand-range"."^1.8.1" =
-    self.by-version."expand-range"."1.8.1";
-  by-version."expand-range"."1.8.1" = self.buildNodePackage {
-    name = "expand-range-1.8.1";
-    version = "1.8.1";
+    self.by-version."expand-range"."1.8.2";
+  by-version."expand-range"."1.8.2" = self.buildNodePackage {
+    name = "expand-range-1.8.2";
+    version = "1.8.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.1.tgz";
-      name = "expand-range-1.8.1.tgz";
-      sha1 = "acbd63e56efd9139722b755f099b9db5ac1f33f6";
+      url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz";
+      name = "expand-range-1.8.2.tgz";
+      sha1 = "a299effd335fe2721ebae8e257ec79644fc85337";
     };
     deps = {
       "fill-range-2.2.3" = self.by-version."fill-range"."2.2.3";
@@ -15125,7 +15811,7 @@
       "accepts-1.2.13" = self.by-version."accepts"."1.2.13";
       "array-flatten-1.1.0" = self.by-version."array-flatten"."1.1.0";
       "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
-      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "content-type-1.0.2" = self.by-version."content-type"."1.0.2";
       "cookie-0.1.3" = self.by-version."cookie"."0.1.3";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
@@ -15145,8 +15831,8 @@
       "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
       "router-1.1.4" = self.by-version."router"."1.1.4";
       "send-0.13.0" = self.by-version."send"."0.13.0";
-      "serve-static-1.10.2" = self.by-version."serve-static"."1.10.2";
-      "type-is-1.6.12" = self.by-version."type-is"."1.6.12";
+      "serve-static-1.10.3" = self.by-version."serve-static"."1.10.3";
+      "type-is-1.6.13" = self.by-version."type-is"."1.6.13";
       "vary-1.0.1" = self.by-version."vary"."1.0.1";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
@@ -15252,10 +15938,10 @@
       sha1 = "0c2903ee5c54e63d65a96170764703550665a3de";
     };
     deps = {
-      "basic-auth-1.0.3" = self.by-version."basic-auth"."1.0.3";
+      "basic-auth-1.0.4" = self.by-version."basic-auth"."1.0.4";
       "connect-2.30.2" = self.by-version."connect"."2.30.2";
       "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
-      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "content-type-1.0.2" = self.by-version."content-type"."1.0.2";
       "commander-2.6.0" = self.by-version."commander"."2.6.0";
       "cookie-0.1.3" = self.by-version."cookie"."0.1.3";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
@@ -15295,7 +15981,7 @@
       "accepts-1.2.13" = self.by-version."accepts"."1.2.13";
       "array-flatten-1.1.1" = self.by-version."array-flatten"."1.1.1";
       "content-disposition-0.5.1" = self.by-version."content-disposition"."0.5.1";
-      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "content-type-1.0.2" = self.by-version."content-type"."1.0.2";
       "cookie-0.1.5" = self.by-version."cookie"."0.1.5";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
@@ -15313,8 +15999,8 @@
       "qs-4.0.0" = self.by-version."qs"."4.0.0";
       "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
       "send-0.13.1" = self.by-version."send"."0.13.1";
-      "serve-static-1.10.2" = self.by-version."serve-static"."1.10.2";
-      "type-is-1.6.12" = self.by-version."type-is"."1.6.12";
+      "serve-static-1.10.3" = self.by-version."serve-static"."1.10.3";
+      "type-is-1.6.13" = self.by-version."type-is"."1.6.13";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
       "vary-1.0.1" = self.by-version."vary"."1.0.1";
     };
@@ -15375,8 +16061,6 @@
     self.by-version."express"."4.13.4";
   by-spec."express"."^4.12.3" =
     self.by-version."express"."4.13.4";
-  by-spec."express"."^4.12.4" =
-    self.by-version."express"."4.13.4";
   by-spec."express"."^4.13.3" =
     self.by-version."express"."4.13.4";
   by-spec."express"."~3.5.1" =
@@ -15410,6 +16094,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."express"."~4.13.3" =
+    self.by-version."express"."4.13.4";
   by-spec."express"."~4.13.4" =
     self.by-version."express"."4.13.4";
   by-spec."express-form"."*" =
@@ -15436,7 +16122,7 @@
     cpu = [ ];
   };
   "express-form" = self.by-version."express-form"."0.12.5";
-  by-spec."express-handlebars"."^2.0.1" =
+  by-spec."express-handlebars"."~2.0.1" =
     self.by-version."express-handlebars"."2.0.1";
   by-version."express-handlebars"."2.0.1" = self.buildNodePackage {
     name = "express-handlebars-2.0.1";
@@ -15648,6 +16334,8 @@
   "extend" = self.by-version."extend"."3.0.0";
   by-spec."extend"."3" =
     self.by-version."extend"."3.0.0";
+  by-spec."extend"."3.0.0" =
+    self.by-version."extend"."3.0.0";
   by-spec."extend".">=1.1.3" =
     self.by-version."extend"."3.0.0";
   by-spec."extend"."^1.2.1" =
@@ -15715,6 +16403,26 @@
   };
   by-spec."extend"."~3.0.0" =
     self.by-version."extend"."3.0.0";
+  by-spec."extend-shallow"."^2.0.1" =
+    self.by-version."extend-shallow"."2.0.1";
+  by-version."extend-shallow"."2.0.1" = self.buildNodePackage {
+    name = "extend-shallow-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz";
+      name = "extend-shallow-2.0.1.tgz";
+      sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
+    };
+    deps = {
+      "is-extendable-0.1.1" = self.by-version."is-extendable"."0.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."extend.js"."0.0.2" =
     self.by-version."extend.js"."0.0.2";
   by-version."extend.js"."0.0.2" = self.buildNodePackage {
@@ -15960,15 +16668,15 @@
     cpu = [ ];
   };
   by-spec."fast-json-patch"."0.5.x" =
-    self.by-version."fast-json-patch"."0.5.6";
-  by-version."fast-json-patch"."0.5.6" = self.buildNodePackage {
-    name = "fast-json-patch-0.5.6";
-    version = "0.5.6";
+    self.by-version."fast-json-patch"."0.5.7";
+  by-version."fast-json-patch"."0.5.7" = self.buildNodePackage {
+    name = "fast-json-patch-0.5.7";
+    version = "0.5.7";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz";
-      name = "fast-json-patch-0.5.6.tgz";
-      sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402";
+      url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.7.tgz";
+      name = "fast-json-patch-0.5.7.tgz";
+      sha1 = "b5a8f49d259624596ef98b872f3fda895b4d8665";
     };
     deps = {
     };
@@ -16012,7 +16720,7 @@
       "htmlparser2-3.9.0" = self.by-version."htmlparser2"."3.9.0";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "q-1.4.1" = self.by-version."q"."1.4.1";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "tldtools-0.0.19" = self.by-version."tldtools"."0.0.19";
     };
     optionalDependencies = {
@@ -16035,7 +16743,7 @@
       sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50";
     };
     deps = {
-      "websocket-driver-0.6.4" = self.by-version."websocket-driver"."0.6.4";
+      "websocket-driver-0.6.5" = self.by-version."websocket-driver"."0.6.5";
     };
     optionalDependencies = {
     };
@@ -16056,7 +16764,7 @@
       sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
     };
     deps = {
-      "websocket-driver-0.6.4" = self.by-version."websocket-driver"."0.6.4";
+      "websocket-driver-0.6.5" = self.by-version."websocket-driver"."0.6.5";
     };
     optionalDependencies = {
     };
@@ -16065,19 +16773,21 @@
     cpu = [ ];
   };
   by-spec."fb".">=0.0.9" =
-    self.by-version."fb"."1.0.2";
-  by-version."fb"."1.0.2" = self.buildNodePackage {
-    name = "fb-1.0.2";
-    version = "1.0.2";
+    self.by-version."fb"."1.1.1";
+  by-version."fb"."1.1.1" = self.buildNodePackage {
+    name = "fb-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/fb/-/fb-1.0.2.tgz";
-      name = "fb-1.0.2.tgz";
-      sha1 = "4872ccfa1fc1ce01392e6026826a8197439c01fa";
+      url = "https://registry.npmjs.org/fb/-/fb-1.1.1.tgz";
+      name = "fb-1.1.1.tgz";
+      sha1 = "b3f036689e55098d6f88a6dee6551d0316fd6b57";
     };
     deps = {
+      "babel-runtime-6.9.2" = self.by-version."babel-runtime"."6.9.2";
+      "core-decorators-0.12.3" = self.by-version."core-decorators"."0.12.3";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -16086,21 +16796,22 @@
     cpu = [ ];
   };
   by-spec."fbjs"."^0.8.0" =
-    self.by-version."fbjs"."0.8.0";
-  by-version."fbjs"."0.8.0" = self.buildNodePackage {
-    name = "fbjs-0.8.0";
-    version = "0.8.0";
+    self.by-version."fbjs"."0.8.3";
+  by-version."fbjs"."0.8.3" = self.buildNodePackage {
+    name = "fbjs-0.8.3";
+    version = "0.8.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.0.tgz";
-      name = "fbjs-0.8.0.tgz";
-      sha1 = "1903b52cc9ad6fc7e1df152ae0c89829a833ad46";
+      url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.3.tgz";
+      name = "fbjs-0.8.3.tgz";
+      sha1 = "d98a77d387fda2c33bc3d5588fce31f3553cb1c8";
     };
     deps = {
-      "babel-plugin-syntax-flow-6.5.0" = self.by-version."babel-plugin-syntax-flow"."6.5.0";
       "core-js-1.2.6" = self.by-version."core-js"."1.2.6";
+      "immutable-3.8.1" = self.by-version."immutable"."3.8.1";
       "isomorphic-fetch-2.2.1" = self.by-version."isomorphic-fetch"."2.2.1";
-      "loose-envify-1.1.0" = self.by-version."loose-envify"."1.1.0";
+      "loose-envify-1.2.0" = self.by-version."loose-envify"."1.2.0";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
       "promise-7.1.1" = self.by-version."promise"."7.1.1";
       "ua-parser-js-0.7.10" = self.by-version."ua-parser-js"."0.7.10";
     };
@@ -16145,7 +16856,7 @@
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
       "addressparser-0.1.3" = self.by-version."addressparser"."0.1.3";
       "array-indexofobject-0.0.1" = self.by-version."array-indexofobject"."0.0.1";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
     };
     optionalDependencies = {
     };
@@ -16168,7 +16879,7 @@
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
       "addressparser-0.1.3" = self.by-version."addressparser"."0.1.3";
       "array-indexofobject-0.0.1" = self.by-version."array-indexofobject"."0.0.1";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
     };
     optionalDependencies = {
     };
@@ -16218,17 +16929,19 @@
     cpu = [ ];
   };
   by-spec."figures"."^1.0.1" =
-    self.by-version."figures"."1.5.0";
-  by-version."figures"."1.5.0" = self.buildNodePackage {
-    name = "figures-1.5.0";
-    version = "1.5.0";
+    self.by-version."figures"."1.7.0";
+  by-version."figures"."1.7.0" = self.buildNodePackage {
+    name = "figures-1.7.0";
+    version = "1.7.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/figures/-/figures-1.5.0.tgz";
-      name = "figures-1.5.0.tgz";
-      sha1 = "56d8a0949c19643af764d573a648d384218da737";
+      url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz";
+      name = "figures-1.7.0.tgz";
+      sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e";
     };
     deps = {
+      "escape-string-regexp-1.0.5" = self.by-version."escape-string-regexp"."1.0.5";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
     };
     optionalDependencies = {
     };
@@ -16237,7 +16950,7 @@
     cpu = [ ];
   };
   by-spec."figures"."^1.3.5" =
-    self.by-version."figures"."1.5.0";
+    self.by-version."figures"."1.7.0";
   by-spec."file-entry-cache"."^1.1.1" =
     self.by-version."file-entry-cache"."1.2.4";
   by-version."file-entry-cache"."1.2.4" = self.buildNodePackage {
@@ -16251,7 +16964,7 @@
     };
     deps = {
       "flat-cache-1.0.10" = self.by-version."flat-cache"."1.0.10";
-      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
     };
     optionalDependencies = {
     };
@@ -16351,7 +17064,7 @@
     };
     deps = {
       "is-number-2.1.0" = self.by-version."is-number"."2.1.0";
-      "isobject-2.0.0" = self.by-version."isobject"."2.0.0";
+      "isobject-2.1.0" = self.by-version."isobject"."2.1.0";
       "randomatic-1.1.5" = self.by-version."randomatic"."1.1.5";
       "repeat-element-1.1.2" = self.by-version."repeat-element"."1.1.2";
       "repeat-string-1.5.4" = self.by-version."repeat-string"."1.5.4";
@@ -16501,7 +17214,7 @@
     };
     deps = {
       "path-exists-2.1.0" = self.by-version."path-exists"."2.1.0";
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+      "pinkie-promise-2.0.1" = self.by-version."pinkie-promise"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -16646,7 +17359,7 @@
     };
     deps = {
       "del-2.2.0" = self.by-version."del"."2.2.0";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "read-json-sync-1.1.1" = self.by-version."read-json-sync"."1.1.1";
       "write-0.2.1" = self.by-version."write"."0.2.1";
     };
@@ -16727,18 +17440,19 @@
     cpu = [ ];
   };
   by-spec."fluent-ffmpeg"."^2.0.0-rc3" =
-    self.by-version."fluent-ffmpeg"."2.0.1";
-  by-version."fluent-ffmpeg"."2.0.1" = self.buildNodePackage {
-    name = "fluent-ffmpeg-2.0.1";
-    version = "2.0.1";
+    self.by-version."fluent-ffmpeg"."2.1.0";
+  by-version."fluent-ffmpeg"."2.1.0" = self.buildNodePackage {
+    name = "fluent-ffmpeg-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.0.1.tgz";
-      name = "fluent-ffmpeg-2.0.1.tgz";
-      sha1 = "4dddcbb82da348158380d5282d21fd4ea64bf4ce";
+      url = "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.1.0.tgz";
+      name = "fluent-ffmpeg-2.1.0.tgz";
+      sha1 = "e6ab85e75ba8e49119a3900cd9df10d39831d392";
     };
     deps = {
       "async-1.5.2" = self.by-version."async"."1.5.2";
+      "which-1.2.10" = self.by-version."which"."1.2.10";
     };
     optionalDependencies = {
     };
@@ -16884,15 +17598,15 @@
     cpu = [ ];
   };
   by-spec."forever"."*" =
-    self.by-version."forever"."0.15.1";
-  by-version."forever"."0.15.1" = self.buildNodePackage {
-    name = "forever-0.15.1";
-    version = "0.15.1";
+    self.by-version."forever"."0.15.2";
+  by-version."forever"."0.15.2" = self.buildNodePackage {
+    name = "forever-0.15.2";
+    version = "0.15.2";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/forever/-/forever-0.15.1.tgz";
-      name = "forever-0.15.1.tgz";
-      sha1 = "5e4e3d4ef946bef88ddcb9cc7412e478ad19e04e";
+      url = "https://registry.npmjs.org/forever/-/forever-0.15.2.tgz";
+      name = "forever-0.15.2.tgz";
+      sha1 = "fbf21a791ac76bc1a9149a322bc177f338cf5cf9";
     };
     deps = {
       "cliff-0.1.10" = self.by-version."cliff"."0.1.10";
@@ -16917,7 +17631,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "forever" = self.by-version."forever"."0.15.1";
+  "forever" = self.by-version."forever"."0.15.2";
   by-spec."forever-agent"."~0.2.0" =
     self.by-version."forever-agent"."0.2.0";
   by-version."forever-agent"."0.2.0" = self.buildNodePackage {
@@ -16990,7 +17704,7 @@
     };
     deps = {
       "broadway-0.3.6" = self.by-version."broadway"."0.3.6";
-      "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
+      "chokidar-1.5.2" = self.by-version."chokidar"."1.5.2";
       "minimatch-2.0.10" = self.by-version."minimatch"."2.0.10";
       "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3";
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
@@ -17040,7 +17754,7 @@
     };
     deps = {
       "broadway-0.3.6" = self.by-version."broadway"."0.3.6";
-      "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
+      "chokidar-1.5.2" = self.by-version."chokidar"."1.5.2";
       "minimatch-2.0.10" = self.by-version."minimatch"."2.0.10";
       "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3";
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
@@ -17073,6 +17787,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."form-data"."1.0.0-rc3" =
+    self.by-version."form-data"."1.0.0-rc3";
+  by-version."form-data"."1.0.0-rc3" = self.buildNodePackage {
+    name = "form-data-1.0.0-rc3";
+    version = "1.0.0-rc3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz";
+      name = "form-data-1.0.0-rc3.tgz";
+      sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577";
+    };
+    deps = {
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "mime-types-2.1.11" = self.by-version."mime-types"."2.1.11";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."form-data".">=0.1.2" =
     self.by-version."form-data"."0.2.0";
   by-version."form-data"."0.2.0" = self.buildNodePackage {
@@ -17131,7 +17867,7 @@
     deps = {
       "async-1.5.2" = self.by-version."async"."1.5.2";
       "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "mime-types-2.1.11" = self.by-version."mime-types"."2.1.11";
     };
     optionalDependencies = {
     };
@@ -17248,6 +17984,8 @@
   };
   by-spec."formidable"."^1.0.14" =
     self.by-version."formidable"."1.0.17";
+  by-spec."formidable"."~1.0.14" =
+    self.by-version."formidable"."1.0.17";
   by-spec."forwarded"."~0.1.0" =
     self.by-version."forwarded"."0.1.0";
   by-version."forwarded"."0.1.0" = self.buildNodePackage {
@@ -17396,7 +18134,7 @@
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
     };
     optionalDependencies = {
     };
@@ -17448,21 +18186,20 @@
     cpu = [ ];
   };
   by-spec."fs-chunk-store"."^1.3.0" =
-    self.by-version."fs-chunk-store"."1.4.0";
-  by-version."fs-chunk-store"."1.4.0" = self.buildNodePackage {
-    name = "fs-chunk-store-1.4.0";
-    version = "1.4.0";
+    self.by-version."fs-chunk-store"."1.6.2";
+  by-version."fs-chunk-store"."1.6.2" = self.buildNodePackage {
+    name = "fs-chunk-store-1.6.2";
+    version = "1.6.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.4.0.tgz";
-      name = "fs-chunk-store-1.4.0.tgz";
-      sha1 = "66cfa534780c6ade87a6d4c1e6ffac9be89318a7";
+      url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.2.tgz";
+      name = "fs-chunk-store-1.6.2.tgz";
+      sha1 = "0a72e4c2e42885008c8bf0660204ebebc8cb62cc";
     };
     deps = {
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
-      "path-exists-2.1.0" = self.by-version."path-exists"."2.1.0";
-      "random-access-file-0.3.2" = self.by-version."random-access-file"."0.3.2";
+      "random-access-file-1.2.0" = self.by-version."random-access-file"."1.2.0";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "run-parallel-1.1.6" = self.by-version."run-parallel"."1.1.6";
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
@@ -17485,7 +18222,7 @@
       sha1 = "9c1f9a20b8e7e012e0a914b5e19132724f44f69e";
     };
     deps = {
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -17526,9 +18263,9 @@
       sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9";
     };
     deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
-      "jsonfile-2.2.3" = self.by-version."jsonfile"."2.2.3";
-      "klaw-1.1.3" = self.by-version."klaw"."1.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
+      "jsonfile-2.3.1" = self.by-version."jsonfile"."2.3.1";
+      "klaw-1.3.0" = self.by-version."klaw"."1.3.0";
       "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
     };
@@ -17588,19 +18325,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fs-vacuum"."~1.2.7" =
-    self.by-version."fs-vacuum"."1.2.7";
-  by-version."fs-vacuum"."1.2.7" = self.buildNodePackage {
-    name = "fs-vacuum-1.2.7";
-    version = "1.2.7";
+  by-spec."fs-vacuum"."~1.2.9" =
+    self.by-version."fs-vacuum"."1.2.9";
+  by-version."fs-vacuum"."1.2.9" = self.buildNodePackage {
+    name = "fs-vacuum-1.2.9";
+    version = "1.2.9";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.7.tgz";
-      name = "fs-vacuum-1.2.7.tgz";
-      sha1 = "75e501f9d2889ba2fe9fe12f936ba5dad50ca35a";
+      url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.9.tgz";
+      name = "fs-vacuum-1.2.9.tgz";
+      sha1 = "4f90193ab8ea02890995bcd4e804659a5d366b2d";
     };
     deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
     };
@@ -17622,7 +18359,7 @@
       sha1 = "f7fc91c3ae1eead07c998bc5d0dd41f2dbebd335";
     };
     deps = {
-      "async-2.0.0-rc.3" = self.by-version."async"."2.0.0-rc.3";
+      "async-2.0.0-rc.6" = self.by-version."async"."2.0.0-rc.6";
     };
     optionalDependencies = {
     };
@@ -17643,10 +18380,10 @@
       sha1 = "e49aaddf288f87d46ff9e882f216a13abc40778b";
     };
     deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "iferr-0.1.5" = self.by-version."iferr"."0.1.5";
       "imurmurhash-0.1.4" = self.by-version."imurmurhash"."0.1.4";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -17698,19 +18435,19 @@
     cpu = [ ];
   };
   by-spec."fsevents"."^1.0.0" =
-    self.by-version."fsevents"."1.0.11";
-  by-version."fsevents"."1.0.11" = self.buildNodePackage {
-    name = "fsevents-1.0.11";
-    version = "1.0.11";
+    self.by-version."fsevents"."1.0.12";
+  by-version."fsevents"."1.0.12" = self.buildNodePackage {
+    name = "fsevents-1.0.12";
+    version = "1.0.12";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.11.tgz";
-      name = "fsevents-1.0.11.tgz";
-      sha1 = "303d4051e411a95a7ad187e6f8ccffe936ca78ac";
+      url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.12.tgz";
+      name = "fsevents-1.0.12.tgz";
+      sha1 = "7929e211c0b31f37f2f0fc346f315e403d7ed33b";
     };
     deps = {
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
-      "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
+      "node-pre-gyp-0.6.28" = self.by-version."node-pre-gyp"."0.6.28";
     };
     optionalDependencies = {
     };
@@ -17719,18 +18456,18 @@
     cpu = [ ];
   };
   by-spec."fstream"."^1.0.0" =
-    self.by-version."fstream"."1.0.8";
-  by-version."fstream"."1.0.8" = self.buildNodePackage {
-    name = "fstream-1.0.8";
-    version = "1.0.8";
+    self.by-version."fstream"."1.0.9";
+  by-version."fstream"."1.0.9" = self.buildNodePackage {
+    name = "fstream-1.0.9";
+    version = "1.0.9";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz";
-      name = "fstream-1.0.8.tgz";
-      sha1 = "7e8d7a73abb3647ef36e4b8a15ca801dba03d038";
+      url = "https://registry.npmjs.org/fstream/-/fstream-1.0.9.tgz";
+      name = "fstream-1.0.9.tgz";
+      sha1 = "5d9c2f0270e475fa8eb9db60e26975a3ae8d2abc";
     };
     deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
@@ -17742,7 +18479,7 @@
     cpu = [ ];
   };
   by-spec."fstream"."^1.0.2" =
-    self.by-version."fstream"."1.0.8";
+    self.by-version."fstream"."1.0.9";
   by-spec."fstream"."~0.1.8" =
     self.by-version."fstream"."0.1.31";
   by-version."fstream"."0.1.31" = self.buildNodePackage {
@@ -17767,20 +18504,20 @@
     cpu = [ ];
   };
   by-spec."fstream"."~1.0.8" =
-    self.by-version."fstream"."1.0.8";
+    self.by-version."fstream"."1.0.9";
   by-spec."fstream-ignore"."^1.0.0" =
-    self.by-version."fstream-ignore"."1.0.3";
-  by-version."fstream-ignore"."1.0.3" = self.buildNodePackage {
-    name = "fstream-ignore-1.0.3";
-    version = "1.0.3";
+    self.by-version."fstream-ignore"."1.0.5";
+  by-version."fstream-ignore"."1.0.5" = self.buildNodePackage {
+    name = "fstream-ignore-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz";
-      name = "fstream-ignore-1.0.3.tgz";
-      sha1 = "4c74d91fa88b22b42f4f86a18a2820dd79d8fcdd";
+      url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz";
+      name = "fstream-ignore-1.0.5.tgz";
+      sha1 = "9c31dae34767018fe1d249b24dada67d092da105";
     };
     deps = {
-      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
+      "fstream-1.0.9" = self.by-version."fstream"."1.0.9";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
     };
@@ -17791,7 +18528,7 @@
     cpu = [ ];
   };
   by-spec."fstream-ignore"."~1.0.3" =
-    self.by-version."fstream-ignore"."1.0.3";
+    self.by-version."fstream-ignore"."1.0.5";
   by-spec."fstream-npm"."~1.0.7" =
     self.by-version."fstream-npm"."1.0.7";
   by-version."fstream-npm"."1.0.7" = self.buildNodePackage {
@@ -17804,7 +18541,28 @@
       sha1 = "7ed0d1ac13d7686dd9e1bf6ceb8be273bf6d2f86";
     };
     deps = {
-      "fstream-ignore-1.0.3" = self.by-version."fstream-ignore"."1.0.3";
+      "fstream-ignore-1.0.5" = self.by-version."fstream-ignore"."1.0.5";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fstream-npm"."~1.1.0" =
+    self.by-version."fstream-npm"."1.1.0";
+  by-version."fstream-npm"."1.1.0" = self.buildNodePackage {
+    name = "fstream-npm-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.1.0.tgz";
+      name = "fstream-npm-1.1.0.tgz";
+      sha1 = "80e09743485eaa70d57e89d1ff8fafa366cdefea";
+    };
+    deps = {
+      "fstream-ignore-1.0.5" = self.by-version."fstream-ignore"."1.0.5";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
@@ -17826,7 +18584,7 @@
     };
     deps = {
       "xregexp-2.0.0" = self.by-version."xregexp"."2.0.0";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
     };
     optionalDependencies = {
     };
@@ -17866,7 +18624,7 @@
     };
     deps = {
       "jws-3.0.0" = self.by-version."jws"."3.0.0";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -17890,9 +18648,36 @@
     deps = {
       "ansi-0.3.1" = self.by-version."ansi"."0.3.1";
       "has-unicode-2.0.0" = self.by-version."has-unicode"."2.0.0";
-      "lodash.pad-4.2.0" = self.by-version."lodash.pad"."4.2.0";
-      "lodash.padend-4.3.0" = self.by-version."lodash.padend"."4.3.0";
-      "lodash.padstart-4.3.0" = self.by-version."lodash.padstart"."4.3.0";
+      "lodash.pad-4.4.0" = self.by-version."lodash.pad"."4.4.0";
+      "lodash.padend-4.5.0" = self.by-version."lodash.padend"."4.5.0";
+      "lodash.padstart-4.5.0" = self.by-version."lodash.padstart"."4.5.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."gauge"."~2.5.0" =
+    self.by-version."gauge"."2.5.0";
+  by-version."gauge"."2.5.0" = self.buildNodePackage {
+    name = "gauge-2.5.0";
+    version = "2.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/gauge/-/gauge-2.5.0.tgz";
+      name = "gauge-2.5.0.tgz";
+      sha1 = "15094f34e20bfce7b3e6ff439818e28027aa2440";
+    };
+    deps = {
+      "aproba-1.0.3" = self.by-version."aproba"."1.0.3";
+      "has-color-0.1.7" = self.by-version."has-color"."0.1.7";
+      "has-unicode-2.0.0" = self.by-version."has-unicode"."2.0.0";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
+      "signal-exit-2.1.2" = self.by-version."signal-exit"."2.1.2";
+      "string-width-1.0.1" = self.by-version."string-width"."1.0.1";
+      "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
+      "wide-align-1.1.0" = self.by-version."wide-align"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -17937,7 +18722,7 @@
       "gapitoken-0.1.5" = self.by-version."gapitoken"."0.1.5";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "protobufjs-3.8.2" = self.by-version."protobufjs"."3.8.2";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "stream-events-1.0.1" = self.by-version."stream-events"."1.0.1";
       "through2-0.6.5" = self.by-version."through2"."0.6.5";
     };
@@ -18119,26 +18904,7 @@
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "extend-3.0.0" = self.by-version."extend"."3.0.0";
       "file-uri-to-path-0.0.2" = self.by-version."file-uri-to-path"."0.0.2";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."get-youtube-id"."^0.1.3" =
-    self.by-version."get-youtube-id"."0.1.3";
-  by-version."get-youtube-id"."0.1.3" = self.buildNodePackage {
-    name = "get-youtube-id-0.1.3";
-    version = "0.1.3";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/get-youtube-id/-/get-youtube-id-0.1.3.tgz";
-      name = "get-youtube-id-0.1.3.tgz";
-      sha1 = "eb76a0534cb7e9d1fcce5d4b61a0820d32d6855d";
-    };
-    deps = {
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -18185,6 +18951,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."getpass"."^0.1.1" =
+    self.by-version."getpass"."0.1.6";
+  by-version."getpass"."0.1.6" = self.buildNodePackage {
+    name = "getpass-0.1.6";
+    version = "0.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz";
+      name = "getpass-0.1.6.tgz";
+      sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6";
+    };
+    deps = {
+      "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."git-run"."*" =
     self.by-version."git-run"."0.5.1";
   by-version."git-run"."0.5.1" = self.buildNodePackage {
@@ -18298,7 +19084,7 @@
       sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
     };
     deps = {
-      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+      "inflight-1.0.5" = self.by-version."inflight"."1.0.5";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimatch-2.0.10" = self.by-version."minimatch"."2.0.10";
       "once-1.3.3" = self.by-version."once"."1.3.3";
@@ -18309,28 +19095,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."glob"."3.2.3" =
-    self.by-version."glob"."3.2.3";
-  by-version."glob"."3.2.3" = self.buildNodePackage {
-    name = "glob-3.2.3";
-    version = "3.2.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
-      name = "glob-3.2.3.tgz";
-      sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
-    };
-    deps = {
-      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
-      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."glob"."3.2.11" =
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."3.2.x" =
     self.by-version."glob"."3.2.11";
   by-spec."glob"."5.x" =
@@ -18345,7 +19111,7 @@
       sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
     };
     deps = {
-      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+      "inflight-1.0.5" = self.by-version."inflight"."1.0.5";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
       "once-1.3.3" = self.by-version."once"."1.3.3";
@@ -18369,7 +19135,31 @@
       sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22";
     };
     deps = {
-      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+      "inflight-1.0.5" = self.by-version."inflight"."1.0.5";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."glob"."7.0.x" =
+    self.by-version."glob"."7.0.3";
+  by-version."glob"."7.0.3" = self.buildNodePackage {
+    name = "glob-7.0.3";
+    version = "7.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz";
+      name = "glob-7.0.3.tgz";
+      sha1 = "0aa235931a4a96ac13d60ffac2fb877bd6ed4f58";
+    };
+    deps = {
+      "inflight-1.0.5" = self.by-version."inflight"."1.0.5";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
       "once-1.3.3" = self.by-version."once"."1.3.3";
@@ -18403,28 +19193,6 @@
     self.by-version."glob"."6.0.4";
   by-spec."glob"."^7.0.0" =
     self.by-version."glob"."7.0.3";
-  by-version."glob"."7.0.3" = self.buildNodePackage {
-    name = "glob-7.0.3";
-    version = "7.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz";
-      name = "glob-7.0.3.tgz";
-      sha1 = "0aa235931a4a96ac13d60ffac2fb877bd6ed4f58";
-    };
-    deps = {
-      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
-      "once-1.3.3" = self.by-version."once"."1.3.3";
-      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."glob"."^7.0.3" =
     self.by-version."glob"."7.0.3";
   by-spec."glob"."~ 3.2.1" =
@@ -18490,7 +19258,7 @@
       sha1 = "80fbb08ca540f238acce5d11d1e9bc41e75173d3";
     };
     deps = {
-      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+      "inflight-1.0.5" = self.by-version."inflight"."1.0.5";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimatch-2.0.10" = self.by-version."minimatch"."2.0.10";
       "once-1.3.3" = self.by-version."once"."1.3.3";
@@ -18573,6 +19341,33 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."glob-stream"."^5.3.2" =
+    self.by-version."glob-stream"."5.3.2";
+  by-version."glob-stream"."5.3.2" = self.buildNodePackage {
+    name = "glob-stream-5.3.2";
+    version = "5.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.2.tgz";
+      name = "glob-stream-5.3.2.tgz";
+      sha1 = "cdfdaf7c3243cd53430a84dc934fa39d8c5da1a5";
+    };
+    deps = {
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+      "glob-5.0.15" = self.by-version."glob"."5.0.15";
+      "glob-parent-2.0.0" = self.by-version."glob-parent"."2.0.0";
+      "micromatch-2.3.8" = self.by-version."micromatch"."2.3.8";
+      "ordered-read-streams-0.3.0" = self.by-version."ordered-read-streams"."0.3.0";
+      "through2-0.6.5" = self.by-version."through2"."0.6.5";
+      "to-absolute-glob-0.1.1" = self.by-version."to-absolute-glob"."0.1.1";
+      "unique-stream-2.2.1" = self.by-version."unique-stream"."2.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."glob-watcher"."^0.0.6" =
     self.by-version."glob-watcher"."0.0.6";
   by-version."glob-watcher"."0.0.6" = self.buildNodePackage {
@@ -18633,15 +19428,15 @@
     cpu = [ ];
   };
   by-spec."globals"."^9.2.0" =
-    self.by-version."globals"."9.4.0";
-  by-version."globals"."9.4.0" = self.buildNodePackage {
-    name = "globals-9.4.0";
-    version = "9.4.0";
+    self.by-version."globals"."9.8.0";
+  by-version."globals"."9.8.0" = self.buildNodePackage {
+    name = "globals-9.8.0";
+    version = "9.8.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/globals/-/globals-9.4.0.tgz";
-      name = "globals-9.4.0.tgz";
-      sha1 = "e89906bbd58b40305e5691ef934324e93325b35f";
+      url = "https://registry.npmjs.org/globals/-/globals-9.8.0.tgz";
+      name = "globals-9.8.0.tgz";
+      sha1 = "a436ecf6214e5f73f110a400305325330a7cfd50";
     };
     deps = {
     };
@@ -18652,23 +19447,23 @@
     cpu = [ ];
   };
   by-spec."globby"."^4.0.0" =
-    self.by-version."globby"."4.0.0";
-  by-version."globby"."4.0.0" = self.buildNodePackage {
-    name = "globby-4.0.0";
-    version = "4.0.0";
+    self.by-version."globby"."4.1.0";
+  by-version."globby"."4.1.0" = self.buildNodePackage {
+    name = "globby-4.1.0";
+    version = "4.1.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/globby/-/globby-4.0.0.tgz";
-      name = "globby-4.0.0.tgz";
-      sha1 = "36ff06c5a9dc1dbc201f700074992882857e9817";
+      url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz";
+      name = "globby-4.1.0.tgz";
+      sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8";
     };
     deps = {
       "array-union-1.0.1" = self.by-version."array-union"."1.0.1";
       "arrify-1.0.1" = self.by-version."arrify"."1.0.1";
       "glob-6.0.4" = self.by-version."glob"."6.0.4";
-      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
       "pify-2.3.0" = self.by-version."pify"."2.3.0";
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+      "pinkie-promise-2.0.1" = self.by-version."pinkie-promise"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -18719,19 +19514,19 @@
     cpu = [ ];
   };
   by-spec."google-auth-library"."^0.9.6" =
-    self.by-version."google-auth-library"."0.9.7";
-  by-version."google-auth-library"."0.9.7" = self.buildNodePackage {
-    name = "google-auth-library-0.9.7";
-    version = "0.9.7";
+    self.by-version."google-auth-library"."0.9.8";
+  by-version."google-auth-library"."0.9.8" = self.buildNodePackage {
+    name = "google-auth-library-0.9.8";
+    version = "0.9.8";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.9.7.tgz";
-      name = "google-auth-library-0.9.7.tgz";
-      sha1 = "f181f276bfe1e2be9ad368a2db2076db3a7e8c88";
+      url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.9.8.tgz";
+      name = "google-auth-library-0.9.8.tgz";
+      sha1 = "667acb8cc2242d8da83f7d308d76ac434ef53679";
     };
     deps = {
       "async-1.4.2" = self.by-version."async"."1.4.2";
-      "gtoken-1.2.0" = self.by-version."gtoken"."1.2.0";
+      "gtoken-1.2.1" = self.by-version."gtoken"."1.2.1";
       "lodash.noop-3.0.1" = self.by-version."lodash.noop"."3.0.1";
       "jws-3.0.0" = self.by-version."jws"."3.0.0";
       "request-2.60.0" = self.by-version."request"."2.60.0";
@@ -18755,7 +19550,7 @@
       sha1 = "3ebb79848aba2602aecc0b482244253df8238033";
     };
     deps = {
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
     };
     optionalDependencies = {
@@ -18882,13 +19677,13 @@
     deps = {
       "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3";
       "infinity-agent-2.0.3" = self.by-version."infinity-agent"."2.0.3";
-      "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1";
+      "is-stream-1.1.0" = self.by-version."is-stream"."1.1.0";
       "lowercase-keys-1.0.0" = self.by-version."lowercase-keys"."1.0.0";
       "nested-error-stacks-1.0.2" = self.by-version."nested-error-stacks"."1.0.2";
       "object-assign-2.1.1" = self.by-version."object-assign"."2.1.1";
-      "prepend-http-1.0.3" = self.by-version."prepend-http"."1.0.3";
+      "prepend-http-1.0.4" = self.by-version."prepend-http"."1.0.4";
       "read-all-stream-2.2.0" = self.by-version."read-all-stream"."2.2.0";
-      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
+      "statuses-1.3.0" = self.by-version."statuses"."1.3.0";
       "timed-out-2.0.0" = self.by-version."timed-out"."2.0.0";
     };
     optionalDependencies = {
@@ -18912,11 +19707,11 @@
       "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3";
       "infinity-agent-2.0.3" = self.by-version."infinity-agent"."2.0.3";
       "is-redirect-1.0.0" = self.by-version."is-redirect"."1.0.0";
-      "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1";
+      "is-stream-1.1.0" = self.by-version."is-stream"."1.1.0";
       "lowercase-keys-1.0.0" = self.by-version."lowercase-keys"."1.0.0";
       "nested-error-stacks-1.0.2" = self.by-version."nested-error-stacks"."1.0.2";
       "object-assign-3.0.0" = self.by-version."object-assign"."3.0.0";
-      "prepend-http-1.0.3" = self.by-version."prepend-http"."1.0.3";
+      "prepend-http-1.0.4" = self.by-version."prepend-http"."1.0.4";
       "read-all-stream-3.1.0" = self.by-version."read-all-stream"."3.1.0";
       "timed-out-2.0.0" = self.by-version."timed-out"."2.0.0";
     };
@@ -18947,16 +19742,16 @@
   };
   by-spec."graceful-fs"."^3.0.2" =
     self.by-version."graceful-fs"."3.0.8";
-  by-spec."graceful-fs"."^4.1.2" =
-    self.by-version."graceful-fs"."4.1.3";
-  by-version."graceful-fs"."4.1.3" = self.buildNodePackage {
-    name = "graceful-fs-4.1.3";
-    version = "4.1.3";
+  by-spec."graceful-fs"."^4.0.0" =
+    self.by-version."graceful-fs"."4.1.4";
+  by-version."graceful-fs"."4.1.4" = self.buildNodePackage {
+    name = "graceful-fs-4.1.4";
+    version = "4.1.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz";
-      name = "graceful-fs-4.1.3.tgz";
-      sha1 = "92033ce11113c41e2628d61fdfa40bc10dc0155c";
+      url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.4.tgz";
+      name = "graceful-fs-4.1.4.tgz";
+      sha1 = "ef089d2880f033b011823ce5c8fae798da775dbd";
     };
     deps = {
     };
@@ -18966,6 +19761,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."graceful-fs"."^4.1.2" =
+    self.by-version."graceful-fs"."4.1.4";
   by-spec."graceful-fs"."~1" =
     self.by-version."graceful-fs"."1.2.3";
   by-version."graceful-fs"."1.2.3" = self.buildNodePackage {
@@ -19008,8 +19805,8 @@
   };
   by-spec."graceful-fs"."~3.0.2" =
     self.by-version."graceful-fs"."3.0.8";
-  by-spec."graceful-fs"."~4.1.3" =
-    self.by-version."graceful-fs"."4.1.3";
+  by-spec."graceful-fs"."~4.1.4" =
+    self.by-version."graceful-fs"."4.1.4";
   by-spec."graceful-readlink".">= 1.0.0" =
     self.by-version."graceful-readlink"."1.0.1";
   by-version."graceful-readlink"."1.0.1" = self.buildNodePackage {
@@ -19050,16 +19847,16 @@
     cpu = [ ];
   };
   "gridfs-stream" = self.by-version."gridfs-stream"."1.1.1";
-  by-spec."growl"."1.8.1" =
-    self.by-version."growl"."1.8.1";
-  by-version."growl"."1.8.1" = self.buildNodePackage {
-    name = "growl-1.8.1";
-    version = "1.8.1";
+  by-spec."growl"."1.9.2" =
+    self.by-version."growl"."1.9.2";
+  by-version."growl"."1.9.2" = self.buildNodePackage {
+    name = "growl-1.9.2";
+    version = "1.9.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz";
-      name = "growl-1.8.1.tgz";
-      sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428";
+      url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz";
+      name = "growl-1.9.2.tgz";
+      sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f";
     };
     deps = {
     };
@@ -19184,7 +19981,7 @@
     };
     deps = {
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
-      "clean-css-3.4.11" = self.by-version."clean-css"."3.4.11";
+      "clean-css-3.4.17" = self.by-version."clean-css"."3.4.17";
       "maxmin-1.1.0" = self.by-version."maxmin"."1.1.0";
     };
     optionalDependencies = {
@@ -19206,7 +20003,7 @@
       sha1 = "6f2096e43262b49d5eaf13b1532dfca00ac9c9b0";
     };
     deps = {
-      "eslint-2.7.0" = self.by-version."eslint"."2.7.0";
+      "eslint-2.12.0" = self.by-version."eslint"."2.12.0";
     };
     optionalDependencies = {
     };
@@ -19230,7 +20027,7 @@
     deps = {
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
       "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
-      "jshint-2.9.1" = self.by-version."jshint"."2.9.1";
+      "jshint-2.9.2" = self.by-version."jshint"."2.9.2";
     };
     optionalDependencies = {
     };
@@ -19241,21 +20038,21 @@
   };
   "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."1.0.0";
   by-spec."grunt-contrib-less"."*" =
-    self.by-version."grunt-contrib-less"."1.2.0";
-  by-version."grunt-contrib-less"."1.2.0" = self.buildNodePackage {
-    name = "grunt-contrib-less-1.2.0";
-    version = "1.2.0";
+    self.by-version."grunt-contrib-less"."1.3.0";
+  by-version."grunt-contrib-less"."1.3.0" = self.buildNodePackage {
+    name = "grunt-contrib-less-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.2.0.tgz";
-      name = "grunt-contrib-less-1.2.0.tgz";
-      sha1 = "72268e935e8eca73c2dfd515d0bdb97dfbd76295";
+      url = "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.3.0.tgz";
+      name = "grunt-contrib-less-1.3.0.tgz";
+      sha1 = "518ef7c86dc60e159e65108aa75db93a9c8ff5d4";
     };
     deps = {
-      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
       "less-2.6.1" = self.by-version."less"."2.6.1";
-      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
     };
     optionalDependencies = {
     };
@@ -19263,7 +20060,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."1.2.0";
+  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."1.3.0";
   by-spec."grunt-contrib-requirejs"."*" =
     self.by-version."grunt-contrib-requirejs"."1.0.0";
   by-version."grunt-contrib-requirejs"."1.0.0" = self.buildNodePackage {
@@ -19298,7 +20095,7 @@
     };
     deps = {
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
-      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
       "maxmin-1.1.0" = self.by-version."maxmin"."1.1.0";
       "uglify-js-2.6.2" = self.by-version."uglify-js"."2.6.2";
       "uri-path-1.0.0" = self.by-version."uri-path"."1.0.0";
@@ -19311,15 +20108,15 @@
   };
   "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."1.0.1";
   by-spec."grunt-karma"."*" =
-    self.by-version."grunt-karma"."0.12.2";
-  by-version."grunt-karma"."0.12.2" = self.buildNodePackage {
-    name = "grunt-karma-0.12.2";
-    version = "0.12.2";
+    self.by-version."grunt-karma"."2.0.0";
+  by-version."grunt-karma"."2.0.0" = self.buildNodePackage {
+    name = "grunt-karma-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/grunt-karma/-/grunt-karma-0.12.2.tgz";
-      name = "grunt-karma-0.12.2.tgz";
-      sha1 = "d52676ab94779e4b20052b5f3519eb32653dc566";
+      url = "https://registry.npmjs.org/grunt-karma/-/grunt-karma-2.0.0.tgz";
+      name = "grunt-karma-2.0.0.tgz";
+      sha1 = "753583d115dfdc055fe57e58f96d6b3c7e612118";
     };
     deps = {
       "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
@@ -19332,7 +20129,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "grunt-karma" = self.by-version."grunt-karma"."0.12.2";
+  "grunt-karma" = self.by-version."grunt-karma"."2.0.0";
   by-spec."grunt-known-options"."~1.1.0" =
     self.by-version."grunt-known-options"."1.1.0";
   by-version."grunt-known-options"."1.1.0" = self.buildNodePackage {
@@ -19487,7 +20284,7 @@
       "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
       "lodash-4.3.0" = self.by-version."lodash"."4.3.0";
       "underscore.string-3.2.3" = self.by-version."underscore.string"."3.2.3";
-      "which-1.2.4" = self.by-version."which"."1.2.4";
+      "which-1.2.10" = self.by-version."which"."1.2.10";
     };
     optionalDependencies = {
     };
@@ -19518,21 +20315,21 @@
   };
   "grunt-sed" = self.by-version."grunt-sed"."0.1.1";
   by-spec."gtoken"."^1.1.0" =
-    self.by-version."gtoken"."1.2.0";
-  by-version."gtoken"."1.2.0" = self.buildNodePackage {
-    name = "gtoken-1.2.0";
-    version = "1.2.0";
+    self.by-version."gtoken"."1.2.1";
+  by-version."gtoken"."1.2.1" = self.buildNodePackage {
+    name = "gtoken-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/gtoken/-/gtoken-1.2.0.tgz";
-      name = "gtoken-1.2.0.tgz";
-      sha1 = "bdab238758c355cecff569375efd76e236331b13";
+      url = "https://registry.npmjs.org/gtoken/-/gtoken-1.2.1.tgz";
+      name = "gtoken-1.2.1.tgz";
+      sha1 = "90153a547c2fc1cd24a4d3d2ab3b5aba0a26897a";
     };
     deps = {
       "google-p12-pem-0.1.0" = self.by-version."google-p12-pem"."0.1.0";
       "jws-3.1.3" = self.by-version."jws"."3.1.3";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -19581,13 +20378,13 @@
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
       "deprecated-0.0.1" = self.by-version."deprecated"."0.0.1";
       "gulp-util-3.0.7" = self.by-version."gulp-util"."3.0.7";
-      "interpret-1.0.0" = self.by-version."interpret"."1.0.0";
+      "interpret-1.0.1" = self.by-version."interpret"."1.0.1";
       "liftoff-2.2.1" = self.by-version."liftoff"."2.2.1";
       "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
       "orchestrator-0.3.7" = self.by-version."orchestrator"."0.3.7";
       "pretty-hrtime-1.0.2" = self.by-version."pretty-hrtime"."1.0.2";
       "semver-4.3.6" = self.by-version."semver"."4.3.6";
-      "tildify-1.1.2" = self.by-version."tildify"."1.1.2";
+      "tildify-1.2.0" = self.by-version."tildify"."1.2.0";
       "v8flags-2.0.11" = self.by-version."v8flags"."2.0.11";
       "vinyl-fs-0.3.14" = self.by-version."vinyl-fs"."0.3.14";
     };
@@ -19598,6 +20395,30 @@
     cpu = [ ];
   };
   "gulp" = self.by-version."gulp"."3.9.1";
+  by-spec."gulp-sourcemaps"."^1.5.2" =
+    self.by-version."gulp-sourcemaps"."1.6.0";
+  by-version."gulp-sourcemaps"."1.6.0" = self.buildNodePackage {
+    name = "gulp-sourcemaps-1.6.0";
+    version = "1.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz";
+      name = "gulp-sourcemaps-1.6.0.tgz";
+      sha1 = "b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c";
+    };
+    deps = {
+      "convert-source-map-1.2.0" = self.by-version."convert-source-map"."1.2.0";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
+      "strip-bom-2.0.0" = self.by-version."strip-bom"."2.0.0";
+      "through2-2.0.1" = self.by-version."through2"."2.0.1";
+      "vinyl-1.1.1" = self.by-version."vinyl"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."gulp-util"."^3.0.0" =
     self.by-version."gulp-util"."3.0.7";
   by-version."gulp-util"."3.0.7" = self.buildNodePackage {
@@ -19688,7 +20509,7 @@
       sha1 = "ffc594c482190c56531ed2d4a5864d0b0b7d2733";
     };
     deps = {
-      "send-0.13.2" = self.by-version."send"."0.13.2";
+      "send-0.14.1" = self.by-version."send"."0.14.1";
     };
     optionalDependencies = {
     };
@@ -19805,7 +20626,7 @@
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
       "commander-2.9.0" = self.by-version."commander"."2.9.0";
       "is-my-json-valid-2.13.1" = self.by-version."is-my-json-valid"."2.13.1";
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+      "pinkie-promise-2.0.1" = self.by-version."pinkie-promise"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -19816,15 +20637,15 @@
   by-spec."har-validator"."~2.0.6" =
     self.by-version."har-validator"."2.0.6";
   by-spec."harmony-reflect"."^1.4.2" =
-    self.by-version."harmony-reflect"."1.4.5";
-  by-version."harmony-reflect"."1.4.5" = self.buildNodePackage {
-    name = "harmony-reflect-1.4.5";
-    version = "1.4.5";
+    self.by-version."harmony-reflect"."1.4.6";
+  by-version."harmony-reflect"."1.4.6" = self.buildNodePackage {
+    name = "harmony-reflect-1.4.6";
+    version = "1.4.6";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.4.5.tgz";
-      name = "harmony-reflect-1.4.5.tgz";
-      sha1 = "a762be580997f2958e8dc61169a056b269e53bdc";
+      url = "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.4.6.tgz";
+      name = "harmony-reflect-1.4.6.tgz";
+      sha1 = "f67afe588486b138aef4184e5885af962a9b2531";
     };
     deps = {
     };
@@ -19975,6 +20796,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."has-color"."^0.1.7" =
+    self.by-version."has-color"."0.1.7";
+  by-version."has-color"."0.1.7" = self.buildNodePackage {
+    name = "has-color-0.1.7";
+    version = "0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz";
+      name = "has-color-0.1.7.tgz";
+      sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."has-cors"."1.0.3" =
     self.by-version."has-cors"."1.0.3";
   by-version."has-cors"."1.0.3" = self.buildNodePackage {
@@ -20106,8 +20946,8 @@
       sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
     };
     deps = {
-      "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1";
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+      "is-stream-1.1.0" = self.by-version."is-stream"."1.1.0";
+      "pinkie-promise-2.0.1" = self.by-version."pinkie-promise"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -20370,7 +21210,7 @@
     deps = {
       "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
       "pump-1.0.1" = self.by-version."pump"."1.0.1";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
@@ -20435,7 +21275,7 @@
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -20562,15 +21402,15 @@
     cpu = [ ];
   };
   by-spec."hosted-git-info"."^2.1.4" =
-    self.by-version."hosted-git-info"."2.1.4";
-  by-version."hosted-git-info"."2.1.4" = self.buildNodePackage {
-    name = "hosted-git-info-2.1.4";
-    version = "2.1.4";
+    self.by-version."hosted-git-info"."2.1.5";
+  by-version."hosted-git-info"."2.1.5" = self.buildNodePackage {
+    name = "hosted-git-info-2.1.5";
+    version = "2.1.5";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz";
-      name = "hosted-git-info-2.1.4.tgz";
-      sha1 = "d9e953b26988be88096c46e926494d9604c300f8";
+      url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz";
+      name = "hosted-git-info-2.1.5.tgz";
+      sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b";
     };
     deps = {
     };
@@ -20581,7 +21421,9 @@
     cpu = [ ];
   };
   by-spec."hosted-git-info"."~2.1.4" =
-    self.by-version."hosted-git-info"."2.1.4";
+    self.by-version."hosted-git-info"."2.1.5";
+  by-spec."hosted-git-info"."~2.1.5" =
+    self.by-version."hosted-git-info"."2.1.5";
   by-spec."html-md"."^3.0.2" =
     self.by-version."html-md"."3.0.2";
   by-version."html-md"."3.0.2" = self.buildNodePackage {
@@ -20698,7 +21540,7 @@
       "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0";
       "domutils-1.5.1" = self.by-version."domutils"."1.5.1";
       "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
       "entities-1.0.0" = self.by-version."entities"."1.0.0";
     };
     optionalDependencies = {
@@ -20723,7 +21565,7 @@
       "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0";
       "domutils-1.5.1" = self.by-version."domutils"."1.5.1";
       "entities-1.1.1" = self.by-version."entities"."1.1.1";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -20754,7 +21596,7 @@
       "domhandler-2.2.1" = self.by-version."domhandler"."2.2.1";
       "domutils-1.5.1" = self.by-version."domutils"."1.5.1";
       "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
       "entities-1.0.0" = self.by-version."entities"."1.0.0";
     };
     optionalDependencies = {
@@ -20810,19 +21652,20 @@
   by-spec."http-browserify"."^1.4.0" =
     self.by-version."http-browserify"."1.7.0";
   by-spec."http-errors".">=1.2.0" =
-    self.by-version."http-errors"."1.4.0";
-  by-version."http-errors"."1.4.0" = self.buildNodePackage {
-    name = "http-errors-1.4.0";
-    version = "1.4.0";
+    self.by-version."http-errors"."1.5.0";
+  by-version."http-errors"."1.5.0" = self.buildNodePackage {
+    name = "http-errors-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/http-errors/-/http-errors-1.4.0.tgz";
-      name = "http-errors-1.4.0.tgz";
-      sha1 = "6c0242dea6b3df7afda153c71089b31c6e82aabf";
+      url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz";
+      name = "http-errors-1.5.0.tgz";
+      sha1 = "b1cb3d8260fd8e2386cad3189045943372d48211";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
+      "setprototypeof-1.0.1" = self.by-version."setprototypeof"."1.0.1";
+      "statuses-1.3.0" = self.by-version."statuses"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -20843,7 +21686,7 @@
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
+      "statuses-1.3.0" = self.by-version."statuses"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -20853,6 +21696,47 @@
   };
   by-spec."http-errors"."~1.4.0" =
     self.by-version."http-errors"."1.4.0";
+  by-version."http-errors"."1.4.0" = self.buildNodePackage {
+    name = "http-errors-1.4.0";
+    version = "1.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/http-errors/-/http-errors-1.4.0.tgz";
+      name = "http-errors-1.4.0.tgz";
+      sha1 = "6c0242dea6b3df7afda153c71089b31c6e82aabf";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "statuses-1.3.0" = self.by-version."statuses"."1.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."http-errors"."~1.5.0" =
+    self.by-version."http-errors"."1.5.0";
+  by-spec."http-headers"."^3.0.1" =
+    self.by-version."http-headers"."3.0.1";
+  by-version."http-headers"."3.0.1" = self.buildNodePackage {
+    name = "http-headers-3.0.1";
+    version = "3.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/http-headers/-/http-headers-3.0.1.tgz";
+      name = "http-headers-3.0.1.tgz";
+      sha1 = "1cbc691c45cdf6d6c1dc63bf368b2505f56ef839";
+    };
+    deps = {
+      "next-line-1.1.0" = self.by-version."next-line"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."http-proxy"."1.0.2" =
     self.by-version."http-proxy"."1.0.2";
   by-version."http-proxy"."1.0.2" = self.buildNodePackage {
@@ -20874,15 +21758,15 @@
     cpu = [ ];
   };
   by-spec."http-proxy"."^1.13.0" =
-    self.by-version."http-proxy"."1.13.2";
-  by-version."http-proxy"."1.13.2" = self.buildNodePackage {
-    name = "http-proxy-1.13.2";
-    version = "1.13.2";
+    self.by-version."http-proxy"."1.13.3";
+  by-version."http-proxy"."1.13.3" = self.buildNodePackage {
+    name = "http-proxy-1.13.3";
+    version = "1.13.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.13.2.tgz";
-      name = "http-proxy-1.13.2.tgz";
-      sha1 = "636bcd09f3e7045377a5e919e92d16d29fdbff09";
+      url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.13.3.tgz";
+      name = "http-proxy-1.13.3.tgz";
+      sha1 = "d5ec0e25da0c4b2edaeaa9476672640deda59623";
     };
     deps = {
       "eventemitter3-1.2.0" = self.by-version."eventemitter3"."1.2.0";
@@ -20930,7 +21814,7 @@
     deps = {
       "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
       "jsprim-1.2.2" = self.by-version."jsprim"."1.2.2";
-      "sshpk-1.7.4" = self.by-version."sshpk"."1.7.4";
+      "sshpk-1.8.3" = self.by-version."sshpk"."1.8.3";
     };
     optionalDependencies = {
     };
@@ -20986,25 +21870,6 @@
     self.by-version."http-signature"."0.11.0";
   by-spec."http-signature"."~1.1.0" =
     self.by-version."http-signature"."1.1.1";
-  by-spec."https-browserify"."0.0.0" =
-    self.by-version."https-browserify"."0.0.0";
-  by-version."https-browserify"."0.0.0" = self.buildNodePackage {
-    name = "https-browserify-0.0.0";
-    version = "0.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
-      name = "https-browserify-0.0.0.tgz";
-      sha1 = "b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."https-browserify"."0.0.1" =
     self.by-version."https-browserify"."0.0.1";
   by-version."https-browserify"."0.0.1" = self.buildNodePackage {
@@ -21089,37 +21954,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."hyperquest"."^1.2.0" =
-    self.by-version."hyperquest"."1.3.0";
-  by-version."hyperquest"."1.3.0" = self.buildNodePackage {
-    name = "hyperquest-1.3.0";
-    version = "1.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/hyperquest/-/hyperquest-1.3.0.tgz";
-      name = "hyperquest-1.3.0.tgz";
-      sha1 = "e7d598030a3fc0229b61725783b641b2c6f1782a";
-    };
-    deps = {
-      "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
-      "through2-0.6.5" = self.by-version."through2"."0.6.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."i"."0.3.x" =
-    self.by-version."i"."0.3.4";
-  by-version."i"."0.3.4" = self.buildNodePackage {
-    name = "i-0.3.4";
-    version = "0.3.4";
+    self.by-version."i"."0.3.5";
+  by-version."i"."0.3.5" = self.buildNodePackage {
+    name = "i-0.3.5";
+    version = "0.3.5";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/i/-/i-0.3.4.tgz";
-      name = "i-0.3.4.tgz";
-      sha1 = "e1918d417b363a544e0e4a9b83c36dce1f85c91d";
+      url = "https://registry.npmjs.org/i/-/i-0.3.5.tgz";
+      name = "i-0.3.5.tgz";
+      sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5";
     };
     deps = {
     };
@@ -21130,15 +21974,15 @@
     cpu = [ ];
   };
   by-spec."i18next"."*" =
-    self.by-version."i18next"."2.4.1";
-  by-version."i18next"."2.4.1" = self.buildNodePackage {
-    name = "i18next-2.4.1";
-    version = "2.4.1";
+    self.by-version."i18next"."3.1.0";
+  by-version."i18next"."3.1.0" = self.buildNodePackage {
+    name = "i18next-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/i18next/-/i18next-2.4.1.tgz";
-      name = "i18next-2.4.1.tgz";
-      sha1 = "5981828838b8413070115c89b416696fee134f9f";
+      url = "https://registry.npmjs.org/i18next/-/i18next-3.1.0.tgz";
+      name = "i18next-3.1.0.tgz";
+      sha1 = "3481d8e4c760f1316738db7ba3fd35bc648c0a45";
     };
     deps = {
     };
@@ -21148,7 +21992,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "i18next" = self.by-version."i18next"."2.4.1";
+  "i18next" = self.by-version."i18next"."3.1.0";
   by-spec."i18next"."1.10.6" =
     self.by-version."i18next"."1.10.6";
   by-version."i18next"."1.10.6" = self.buildNodePackage {
@@ -21268,6 +22112,8 @@
   };
   by-spec."iconv-lite"."^0.4.13" =
     self.by-version."iconv-lite"."0.4.13";
+  by-spec."iconv-lite"."^0.4.4" =
+    self.by-version."iconv-lite"."0.4.13";
   by-spec."iconv-lite"."^0.4.5" =
     self.by-version."iconv-lite"."0.4.13";
   by-spec."iconv-lite"."~0.2.11" =
@@ -21331,16 +22177,16 @@
   };
   by-spec."iferr"."~0.1.5" =
     self.by-version."iferr"."0.1.5";
-  by-spec."ignore"."^3.0.10" =
-    self.by-version."ignore"."3.0.14";
-  by-version."ignore"."3.0.14" = self.buildNodePackage {
-    name = "ignore-3.0.14";
-    version = "3.0.14";
+  by-spec."ignore"."^3.1.2" =
+    self.by-version."ignore"."3.1.2";
+  by-version."ignore"."3.1.2" = self.buildNodePackage {
+    name = "ignore-3.1.2";
+    version = "3.1.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/ignore/-/ignore-3.0.14.tgz";
-      name = "ignore-3.0.14.tgz";
-      sha1 = "1b07d5d0810ac2571aab1a8b33485f2c48fb130e";
+      url = "https://registry.npmjs.org/ignore/-/ignore-3.1.2.tgz";
+      name = "ignore-3.1.2.tgz";
+      sha1 = "dd17765e9233b4019762ba82b892202b0980161b";
     };
     deps = {
     };
@@ -21388,6 +22234,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."image-size"."~0.5.0" =
+    self.by-version."image-size"."0.5.0";
+  by-version."image-size"."0.5.0" = self.buildNodePackage {
+    name = "image-size-0.5.0";
+    version = "0.5.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/image-size/-/image-size-0.5.0.tgz";
+      name = "image-size-0.5.0.tgz";
+      sha1 = "be7aed1c37b5ac3d9ba1d66a24b4c47ff8397651";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."imagemagick".">=0.1.3" =
     self.by-version."imagemagick"."0.1.3";
   by-version."imagemagick"."0.1.3" = self.buildNodePackage {
@@ -21407,20 +22272,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."imap"."0.8.16" =
-    self.by-version."imap"."0.8.16";
-  by-version."imap"."0.8.16" = self.buildNodePackage {
-    name = "imap-0.8.16";
-    version = "0.8.16";
+  by-spec."imap"."^0.8.17" =
+    self.by-version."imap"."0.8.17";
+  by-version."imap"."0.8.17" = self.buildNodePackage {
+    name = "imap-0.8.17";
+    version = "0.8.17";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/imap/-/imap-0.8.16.tgz";
-      name = "imap-0.8.16.tgz";
-      sha1 = "e6010866462f77301a119be28bf175f2dec055b0";
+      url = "https://registry.npmjs.org/imap/-/imap-0.8.17.tgz";
+      name = "imap-0.8.17.tgz";
+      sha1 = "e70ff1d1def0456af8bf1d96164d36176662172a";
     };
     deps = {
       "utf7-1.0.0" = self.by-version."utf7"."1.0.0";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
     };
     optionalDependencies = {
     };
@@ -21447,6 +22312,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."immutable"."^3.7.6" =
+    self.by-version."immutable"."3.8.1";
+  by-version."immutable"."3.8.1" = self.buildNodePackage {
+    name = "immutable-3.8.1";
+    version = "3.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/immutable/-/immutable-3.8.1.tgz";
+      name = "immutable-3.8.1.tgz";
+      sha1 = "200807f11ab0f72710ea485542de088075f68cd2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."imurmurhash"."*" =
     self.by-version."imurmurhash"."0.1.4";
   by-version."imurmurhash"."0.1.4" = self.buildNodePackage {
@@ -21502,7 +22386,7 @@
       sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80";
     };
     deps = {
-      "repeating-2.0.0" = self.by-version."repeating"."2.0.0";
+      "repeating-2.0.1" = self.by-version."repeating"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -21587,19 +22471,19 @@
     cpu = [ ];
   };
   by-spec."inflight"."^1.0.4" =
-    self.by-version."inflight"."1.0.4";
-  by-version."inflight"."1.0.4" = self.buildNodePackage {
-    name = "inflight-1.0.4";
-    version = "1.0.4";
+    self.by-version."inflight"."1.0.5";
+  by-version."inflight"."1.0.5" = self.buildNodePackage {
+    name = "inflight-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz";
-      name = "inflight-1.0.4.tgz";
-      sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a";
+      url = "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz";
+      name = "inflight-1.0.5.tgz";
+      sha1 = "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a";
     };
     deps = {
       "once-1.3.3" = self.by-version."once"."1.3.3";
-      "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
+      "wrappy-1.0.2" = self.by-version."wrappy"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -21608,7 +22492,9 @@
     cpu = [ ];
   };
   by-spec."inflight"."~1.0.4" =
-    self.by-version."inflight"."1.0.4";
+    self.by-version."inflight"."1.0.5";
+  by-spec."inflight"."~1.0.5" =
+    self.by-version."inflight"."1.0.5";
   by-spec."inherits"."1" =
     self.by-version."inherits"."1.0.2";
   by-version."inherits"."1.0.2" = self.buildNodePackage {
@@ -21708,22 +22594,22 @@
   by-spec."ini"."~1.3.4" =
     self.by-version."ini"."1.3.4";
   by-spec."init-package-json"."^1.2.0" =
-    self.by-version."init-package-json"."1.9.3";
-  by-version."init-package-json"."1.9.3" = self.buildNodePackage {
-    name = "init-package-json-1.9.3";
-    version = "1.9.3";
+    self.by-version."init-package-json"."1.9.4";
+  by-version."init-package-json"."1.9.4" = self.buildNodePackage {
+    name = "init-package-json-1.9.4";
+    version = "1.9.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.3.tgz";
-      name = "init-package-json-1.9.3.tgz";
-      sha1 = "ca2ff94709b6d9aaad66533c11a0aff645f15c7d";
+      url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.4.tgz";
+      name = "init-package-json-1.9.4.tgz";
+      sha1 = "b4053d0b40f0cf842a41966937cb3dc0f534e856";
     };
     deps = {
       "glob-6.0.4" = self.by-version."glob"."6.0.4";
-      "npm-package-arg-4.1.0" = self.by-version."npm-package-arg"."4.1.0";
+      "npm-package-arg-4.1.1" = self.by-version."npm-package-arg"."4.1.1";
       "promzard-0.3.0" = self.by-version."promzard"."0.3.0";
       "read-1.0.7" = self.by-version."read"."1.0.7";
-      "read-package-json-2.0.3" = self.by-version."read-package-json"."2.0.3";
+      "read-package-json-2.0.4" = self.by-version."read-package-json"."2.0.4";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "validate-npm-package-license-3.0.1" = self.by-version."validate-npm-package-license"."3.0.1";
       "validate-npm-package-name-2.2.2" = self.by-version."validate-npm-package-name"."2.2.2";
@@ -21735,7 +22621,9 @@
     cpu = [ ];
   };
   by-spec."init-package-json"."~1.9.3" =
-    self.by-version."init-package-json"."1.9.3";
+    self.by-version."init-package-json"."1.9.4";
+  by-spec."init-package-json"."~1.9.4" =
+    self.by-version."init-package-json"."1.9.4";
   by-spec."inline-source-map"."~0.3.0" =
     self.by-version."inline-source-map"."0.3.1";
   by-version."inline-source-map"."0.3.1" = self.buildNodePackage {
@@ -21777,18 +22665,18 @@
     cpu = [ ];
   };
   by-spec."inline-source-map"."~0.6.0" =
-    self.by-version."inline-source-map"."0.6.1";
-  by-version."inline-source-map"."0.6.1" = self.buildNodePackage {
-    name = "inline-source-map-0.6.1";
-    version = "0.6.1";
+    self.by-version."inline-source-map"."0.6.2";
+  by-version."inline-source-map"."0.6.2" = self.buildNodePackage {
+    name = "inline-source-map-0.6.2";
+    version = "0.6.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.1.tgz";
-      name = "inline-source-map-0.6.1.tgz";
-      sha1 = "f9d1f19690674d51539cdfd44efd713dac2cfe04";
+      url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz";
+      name = "inline-source-map-0.6.2.tgz";
+      sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5";
     };
     deps = {
-      "source-map-0.4.4" = self.by-version."source-map"."0.4.4";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
     };
     optionalDependencies = {
     };
@@ -21797,6 +22685,69 @@
     cpu = [ ];
   };
   by-spec."inquirer".">=0.2.4" =
+    self.by-version."inquirer"."1.0.3";
+  by-version."inquirer"."1.0.3" = self.buildNodePackage {
+    name = "inquirer-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz";
+      name = "inquirer-1.0.3.tgz";
+      sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0";
+    };
+    deps = {
+      "ansi-escapes-1.4.0" = self.by-version."ansi-escapes"."1.4.0";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "cli-cursor-1.0.2" = self.by-version."cli-cursor"."1.0.2";
+      "cli-width-2.1.0" = self.by-version."cli-width"."2.1.0";
+      "figures-1.7.0" = self.by-version."figures"."1.7.0";
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
+      "mute-stream-0.0.6" = self.by-version."mute-stream"."0.0.6";
+      "pinkie-promise-2.0.1" = self.by-version."pinkie-promise"."2.0.1";
+      "run-async-2.2.0" = self.by-version."run-async"."2.2.0";
+      "rx-4.1.0" = self.by-version."rx"."4.1.0";
+      "string-width-1.0.1" = self.by-version."string-width"."1.0.1";
+      "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."inquirer"."^0.10.0" =
+    self.by-version."inquirer"."0.10.1";
+  by-version."inquirer"."0.10.1" = self.buildNodePackage {
+    name = "inquirer-0.10.1";
+    version = "0.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz";
+      name = "inquirer-0.10.1.tgz";
+      sha1 = "ea25e4ce69ca145e05c99e46dcfec05e4012594a";
+    };
+    deps = {
+      "ansi-escapes-1.4.0" = self.by-version."ansi-escapes"."1.4.0";
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "cli-cursor-1.0.2" = self.by-version."cli-cursor"."1.0.2";
+      "cli-width-1.1.1" = self.by-version."cli-width"."1.1.1";
+      "figures-1.7.0" = self.by-version."figures"."1.7.0";
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
+      "readline2-1.0.1" = self.by-version."readline2"."1.0.1";
+      "run-async-0.1.0" = self.by-version."run-async"."0.1.0";
+      "rx-lite-3.1.2" = self.by-version."rx-lite"."3.1.2";
+      "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."inquirer"."^0.12.0" =
     self.by-version."inquirer"."0.12.0";
   by-version."inquirer"."0.12.0" = self.buildNodePackage {
     name = "inquirer-0.12.0";
@@ -21808,13 +22759,13 @@
       sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e";
     };
     deps = {
-      "ansi-escapes-1.3.0" = self.by-version."ansi-escapes"."1.3.0";
+      "ansi-escapes-1.4.0" = self.by-version."ansi-escapes"."1.4.0";
       "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
       "cli-cursor-1.0.2" = self.by-version."cli-cursor"."1.0.2";
       "cli-width-2.1.0" = self.by-version."cli-width"."2.1.0";
-      "figures-1.5.0" = self.by-version."figures"."1.5.0";
-      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "figures-1.7.0" = self.by-version."figures"."1.7.0";
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
       "readline2-1.0.1" = self.by-version."readline2"."1.0.1";
       "run-async-0.1.0" = self.by-version."run-async"."0.1.0";
       "rx-lite-3.1.2" = self.by-version."rx-lite"."3.1.2";
@@ -21828,8 +22779,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."inquirer"."^0.12.0" =
-    self.by-version."inquirer"."0.12.0";
   by-spec."inquirer"."^0.8.0" =
     self.by-version."inquirer"."0.8.5";
   by-version."inquirer"."0.8.5" = self.buildNodePackage {
@@ -21845,7 +22794,7 @@
       "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
       "cli-width-1.1.1" = self.by-version."cli-width"."1.1.1";
-      "figures-1.5.0" = self.by-version."figures"."1.5.0";
+      "figures-1.7.0" = self.by-version."figures"."1.7.0";
       "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
       "readline2-0.1.1" = self.by-version."readline2"."0.1.1";
       "rx-2.5.3" = self.by-version."rx"."2.5.3";
@@ -21869,12 +22818,12 @@
       sha1 = "20638e29a30f9ed1ca2e3a825fbc2cba5246ddfc";
     };
     deps = {
-      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "JSONStream-1.1.2" = self.by-version."JSONStream"."1.1.2";
       "combine-source-map-0.6.1" = self.by-version."combine-source-map"."0.6.1";
       "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10";
       "is-buffer-1.1.3" = self.by-version."is-buffer"."1.1.3";
       "lexical-scope-1.2.0" = self.by-version."lexical-scope"."1.2.0";
-      "process-0.11.2" = self.by-version."process"."0.11.2";
+      "process-0.11.4" = self.by-version."process"."0.11.4";
       "through2-1.1.1" = self.by-version."through2"."1.1.1";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
@@ -21896,12 +22845,12 @@
       sha1 = "c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3";
     };
     deps = {
-      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
-      "combine-source-map-0.7.1" = self.by-version."combine-source-map"."0.7.1";
+      "JSONStream-1.1.2" = self.by-version."JSONStream"."1.1.2";
+      "combine-source-map-0.7.2" = self.by-version."combine-source-map"."0.7.2";
       "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
       "is-buffer-1.1.3" = self.by-version."is-buffer"."1.1.3";
       "lexical-scope-1.2.0" = self.by-version."lexical-scope"."1.2.0";
-      "process-0.11.2" = self.by-version."process"."0.11.2";
+      "process-0.11.4" = self.by-version."process"."0.11.4";
       "through2-2.0.1" = self.by-version."through2"."2.0.1";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
@@ -21911,6 +22860,35 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."insight"."~0.8.2" =
+    self.by-version."insight"."0.8.2";
+  by-version."insight"."0.8.2" = self.buildNodePackage {
+    name = "insight-0.8.2";
+    version = "0.8.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/insight/-/insight-0.8.2.tgz";
+      name = "insight-0.8.2.tgz";
+      sha1 = "18c2acf1b6055491278fc7529f1f21d32e1f0eda";
+    };
+    deps = {
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "configstore-1.4.0" = self.by-version."configstore"."1.4.0";
+      "inquirer-0.10.1" = self.by-version."inquirer"."0.10.1";
+      "lodash.debounce-3.1.1" = self.by-version."lodash.debounce"."3.1.1";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
+      "os-name-1.0.3" = self.by-version."os-name"."1.0.3";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."internal-ip"."^1.0.0" =
     self.by-version."internal-ip"."1.2.0";
   by-version."internal-ip"."1.2.0" = self.buildNodePackage {
@@ -21931,35 +22909,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."interpret"."^0.6.4" =
-    self.by-version."interpret"."0.6.6";
-  by-version."interpret"."0.6.6" = self.buildNodePackage {
-    name = "interpret-0.6.6";
-    version = "0.6.6";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz";
-      name = "interpret-0.6.6.tgz";
-      sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."internal-ip"."^1.2.0" =
+    self.by-version."internal-ip"."1.2.0";
   by-spec."interpret"."^1.0.0" =
-    self.by-version."interpret"."1.0.0";
-  by-version."interpret"."1.0.0" = self.buildNodePackage {
-    name = "interpret-1.0.0";
-    version = "1.0.0";
+    self.by-version."interpret"."1.0.1";
+  by-version."interpret"."1.0.1" = self.buildNodePackage {
+    name = "interpret-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/interpret/-/interpret-1.0.0.tgz";
-      name = "interpret-1.0.0.tgz";
-      sha1 = "2a3338fa1c2bdbe58cdbfffabcbd0eb52b05241f";
+      url = "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz";
+      name = "interpret-1.0.1.tgz";
+      sha1 = "d579fb7f693b858004947af39fa0db49f795602c";
     };
     deps = {
     };
@@ -22029,15 +22990,15 @@
   by-spec."ip"."^0.3.0" =
     self.by-version."ip"."0.3.3";
   by-spec."ip"."^1.0.1" =
-    self.by-version."ip"."1.1.2";
-  by-version."ip"."1.1.2" = self.buildNodePackage {
-    name = "ip-1.1.2";
-    version = "1.1.2";
+    self.by-version."ip"."1.1.3";
+  by-version."ip"."1.1.3" = self.buildNodePackage {
+    name = "ip-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/ip/-/ip-1.1.2.tgz";
-      name = "ip-1.1.2.tgz";
-      sha1 = "a05ba664479611d0229fd21d2572fec4505f778e";
+      url = "https://registry.npmjs.org/ip/-/ip-1.1.3.tgz";
+      name = "ip-1.1.3.tgz";
+      sha1 = "12b16294a38925486d618a1103506e4eb4f8b296";
     };
     deps = {
     };
@@ -22047,8 +23008,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ip"."^1.1.0" =
+    self.by-version."ip"."1.1.3";
   by-spec."ip"."^1.1.2" =
-    self.by-version."ip"."1.1.2";
+    self.by-version."ip"."1.1.3";
   by-spec."ip-regex"."^1.0.0" =
     self.by-version."ip-regex"."1.0.3";
   by-version."ip-regex"."1.0.3" = self.buildNodePackage {
@@ -22127,15 +23090,15 @@
     cpu = [ ];
   };
   by-spec."ipaddr.js".">= 0.1.1" =
-    self.by-version."ipaddr.js"."1.1.0";
-  by-version."ipaddr.js"."1.1.0" = self.buildNodePackage {
-    name = "ipaddr.js-1.1.0";
-    version = "1.1.0";
+    self.by-version."ipaddr.js"."1.1.1";
+  by-version."ipaddr.js"."1.1.1" = self.buildNodePackage {
+    name = "ipaddr.js-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.0.tgz";
-      name = "ipaddr.js-1.1.0.tgz";
-      sha1 = "5fd380584eb3e2d55904dbe3047a2627d4199a14";
+      url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz";
+      name = "ipaddr.js-1.1.1.tgz";
+      sha1 = "c791d95f52b29c1247d5df80ada39b8a73647230";
     };
     deps = {
     };
@@ -22146,9 +23109,9 @@
     cpu = [ ];
   };
   by-spec."ipaddr.js".">= 0.1.5" =
-    self.by-version."ipaddr.js"."1.1.0";
+    self.by-version."ipaddr.js"."1.1.1";
   by-spec."ipaddr.js".">=0.1.2" =
-    self.by-version."ipaddr.js"."1.1.0";
+    self.by-version."ipaddr.js"."1.1.1";
   by-spec."ipaddr.js"."^0.1.5" =
     self.by-version."ipaddr.js"."0.1.9";
   by-version."ipaddr.js"."0.1.9" = self.buildNodePackage {
@@ -22169,7 +23132,7 @@
     cpu = [ ];
   };
   by-spec."ipaddr.js"."^1.0.1" =
-    self.by-version."ipaddr.js"."1.1.0";
+    self.by-version."ipaddr.js"."1.1.1";
   by-spec."ironhorse"."*" =
     self.by-version."ironhorse"."0.0.11";
   by-version."ironhorse"."0.0.11" = self.buildNodePackage {
@@ -22186,17 +23149,17 @@
       "winston-2.2.0" = self.by-version."winston"."2.2.0";
       "nconf-0.8.4" = self.by-version."nconf"."0.8.4";
       "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1";
-      "async-2.0.0-rc.3" = self.by-version."async"."2.0.0-rc.3";
+      "async-2.0.0-rc.6" = self.by-version."async"."2.0.0-rc.6";
       "express-5.0.0-alpha.2" = self.by-version."express"."5.0.0-alpha.2";
       "jade-1.11.0" = self.by-version."jade"."1.11.0";
       "passport-0.3.2" = self.by-version."passport"."0.3.2";
       "passport-http-0.3.0" = self.by-version."passport-http"."0.3.0";
-      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
-      "mongoose-4.4.11" = self.by-version."mongoose"."4.4.11";
+      "js-yaml-3.6.1" = self.by-version."js-yaml"."3.6.1";
+      "mongoose-4.4.20" = self.by-version."mongoose"."4.4.20";
       "gridfs-stream-1.1.1" = self.by-version."gridfs-stream"."1.1.1";
       "temp-0.8.3" = self.by-version."temp"."0.8.3";
-      "kue-0.10.5" = self.by-version."kue"."0.10.5";
-      "redis-2.6.0-1" = self.by-version."redis"."2.6.0-1";
+      "kue-0.11.0" = self.by-version."kue"."0.11.0";
+      "redis-2.6.1" = self.by-version."redis"."2.6.1";
       "hiredis-0.4.1" = self.by-version."hiredis"."0.4.1";
     };
     optionalDependencies = {
@@ -22206,26 +23169,6 @@
     cpu = [ ];
   };
   "ironhorse" = self.by-version."ironhorse"."0.0.11";
-  by-spec."is-absolute"."^0.1.7" =
-    self.by-version."is-absolute"."0.1.7";
-  by-version."is-absolute"."0.1.7" = self.buildNodePackage {
-    name = "is-absolute-0.1.7";
-    version = "0.1.7";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz";
-      name = "is-absolute-0.1.7.tgz";
-      sha1 = "847491119fccb5fb436217cc737f7faad50f603f";
-    };
-    deps = {
-      "is-relative-0.1.3" = self.by-version."is-relative"."0.1.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."is-arrayish"."^0.2.1" =
     self.by-version."is-arrayish"."0.2.1";
   by-version."is-arrayish"."0.2.1" = self.buildNodePackage {
@@ -22257,7 +23200,7 @@
       sha1 = "75f16642b480f187a711c814161fd3a4a7655898";
     };
     deps = {
-      "binary-extensions-1.4.0" = self.by-version."binary-extensions"."1.4.0";
+      "binary-extensions-1.4.1" = self.by-version."binary-extensions"."1.4.1";
     };
     optionalDependencies = {
     };
@@ -22345,7 +23288,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-extendable"."^0.1.1" =
+  by-spec."is-extendable"."^0.1.0" =
     self.by-version."is-extendable"."0.1.1";
   by-version."is-extendable"."0.1.1" = self.buildNodePackage {
     name = "is-extendable-0.1.1";
@@ -22364,6 +23307,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."is-extendable"."^0.1.1" =
+    self.by-version."is-extendable"."0.1.1";
   by-spec."is-extglob"."^1.0.0" =
     self.by-version."is-extglob"."1.0.0";
   by-version."is-extglob"."1.0.0" = self.buildNodePackage {
@@ -22542,7 +23487,7 @@
       sha1 = "01fcbbb393463a548f2f466cce16dece49db908f";
     };
     deps = {
-      "kind-of-3.0.2" = self.by-version."kind-of"."3.0.2";
+      "kind-of-3.0.3" = self.by-version."kind-of"."3.0.3";
     };
     optionalDependencies = {
     };
@@ -22687,6 +23632,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."is-promise"."^2.1.0" =
+    self.by-version."is-promise"."2.1.0";
   by-spec."is-promise"."~1" =
     self.by-version."is-promise"."1.0.1";
   by-version."is-promise"."1.0.1" = self.buildNodePackage {
@@ -22744,25 +23691,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-relative"."^0.1.0" =
-    self.by-version."is-relative"."0.1.3";
-  by-version."is-relative"."0.1.3" = self.buildNodePackage {
-    name = "is-relative-0.1.3";
-    version = "0.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz";
-      name = "is-relative-0.1.3.tgz";
-      sha1 = "905fee8ae86f45b3ec614bc3c15c869df0876e82";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."is-resolvable"."^1.0.0" =
     self.by-version."is-resolvable"."1.0.0";
   by-version."is-resolvable"."1.0.0" = self.buildNodePackage {
@@ -22784,15 +23712,15 @@
     cpu = [ ];
   };
   by-spec."is-stream"."^1.0.0" =
-    self.by-version."is-stream"."1.0.1";
-  by-version."is-stream"."1.0.1" = self.buildNodePackage {
-    name = "is-stream-1.0.1";
-    version = "1.0.1";
+    self.by-version."is-stream"."1.1.0";
+  by-version."is-stream"."1.1.0" = self.buildNodePackage {
+    name = "is-stream-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/is-stream/-/is-stream-1.0.1.tgz";
-      name = "is-stream-1.0.1.tgz";
-      sha1 = "b44ce45b1f0c3df583f6b5debf84dcf9743ac8b5";
+      url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+      name = "is-stream-1.1.0.tgz";
+      sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
     };
     deps = {
     };
@@ -22803,7 +23731,7 @@
     cpu = [ ];
   };
   by-spec."is-stream"."^1.0.1" =
-    self.by-version."is-stream"."1.0.1";
+    self.by-version."is-stream"."1.1.0";
   by-spec."is-typedarray"."~1.0.0" =
     self.by-version."is-typedarray"."1.0.0";
   by-version."is-typedarray"."1.0.0" = self.buildNodePackage {
@@ -22823,6 +23751,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."is-url"."^1.2.1" =
+    self.by-version."is-url"."1.2.1";
+  by-version."is-url"."1.2.1" = self.buildNodePackage {
+    name = "is-url-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-url/-/is-url-1.2.1.tgz";
+      name = "is-url-1.2.1.tgz";
+      sha1 = "bc92ffd29b23d5f2180e253b916bce6fda711873";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."is-utf8"."0.2.1" =
     self.by-version."is-utf8"."0.2.1";
   by-version."is-utf8"."0.2.1" = self.buildNodePackage {
@@ -22844,6 +23791,25 @@
   };
   by-spec."is-utf8"."^0.2.0" =
     self.by-version."is-utf8"."0.2.1";
+  by-spec."is-valid-glob"."^0.3.0" =
+    self.by-version."is-valid-glob"."0.3.0";
+  by-version."is-valid-glob"."0.3.0" = self.buildNodePackage {
+    name = "is-valid-glob-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz";
+      name = "is-valid-glob-0.3.0.tgz";
+      sha1 = "d4b55c69f51886f9b65c70d6c2622d37e29f48fe";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."isarray"."0.0.1" =
     self.by-version."isarray"."0.0.1";
   by-version."isarray"."0.0.1" = self.buildNodePackage {
@@ -22863,7 +23829,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."isarray"."^1.0.0" =
+  by-spec."isarray"."1.0.0" =
     self.by-version."isarray"."1.0.0";
   by-version."isarray"."1.0.0" = self.buildNodePackage {
     name = "isarray-1.0.0";
@@ -22882,6 +23848,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."isarray"."^1.0.0" =
+    self.by-version."isarray"."1.0.0";
   by-spec."isarray"."~0.0.1" =
     self.by-version."isarray"."0.0.1";
   by-spec."isarray"."~1.0.0" =
@@ -22944,18 +23912,18 @@
     cpu = [ ];
   };
   by-spec."isobject"."^2.0.0" =
-    self.by-version."isobject"."2.0.0";
-  by-version."isobject"."2.0.0" = self.buildNodePackage {
-    name = "isobject-2.0.0";
-    version = "2.0.0";
+    self.by-version."isobject"."2.1.0";
+  by-version."isobject"."2.1.0" = self.buildNodePackage {
+    name = "isobject-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/isobject/-/isobject-2.0.0.tgz";
-      name = "isobject-2.0.0.tgz";
-      sha1 = "208de872bd7378c2a92af9428a3f56eb91a122c4";
+      url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz";
+      name = "isobject-2.1.0.tgz";
+      sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
     };
     deps = {
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "isarray-1.0.0" = self.by-version."isarray"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -22975,8 +23943,8 @@
       sha1 = "611ae1acf14f5e81f729507472819fe9733558a9";
     };
     deps = {
-      "node-fetch-1.5.0" = self.by-version."node-fetch"."1.5.0";
-      "whatwg-fetch-0.11.0" = self.by-version."whatwg-fetch"."0.11.0";
+      "node-fetch-1.5.3" = self.by-version."node-fetch"."1.5.3";
+      "whatwg-fetch-1.0.0" = self.by-version."whatwg-fetch"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -23022,10 +23990,10 @@
       "istanbul-api-1.0.0-aplha.1" = self.by-version."istanbul-api"."1.0.0-aplha.1";
       "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
       "async-1.5.2" = self.by-version."async"."1.5.2";
-      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "js-yaml-3.6.1" = self.by-version."js-yaml"."3.6.1";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
-      "which-1.2.4" = self.by-version."which"."1.2.4";
+      "which-1.2.10" = self.by-version."which"."1.2.10";
       "wordwrap-1.0.0" = self.by-version."wordwrap"."1.0.0";
     };
     optionalDependencies = {
@@ -23053,13 +24021,13 @@
       "esprima-2.7.2" = self.by-version."esprima"."2.7.2";
       "fileset-0.2.1" = self.by-version."fileset"."0.2.1";
       "handlebars-4.0.5" = self.by-version."handlebars"."4.0.5";
-      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "js-yaml-3.6.1" = self.by-version."js-yaml"."3.6.1";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
       "once-1.3.3" = self.by-version."once"."1.3.3";
       "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
       "supports-color-3.1.2" = self.by-version."supports-color"."3.1.2";
-      "which-1.2.4" = self.by-version."which"."1.2.4";
+      "which-1.2.10" = self.by-version."which"."1.2.10";
       "wordwrap-1.0.0" = self.by-version."wordwrap"."1.0.0";
     };
     optionalDependencies = {
@@ -23068,6 +24036,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."istanbul"."^0.4.1" =
+    self.by-version."istanbul"."0.4.3";
   by-spec."istanbul-api"."^1.0.0-alpha" =
     self.by-version."istanbul-api"."1.0.0-aplha.1";
   by-version."istanbul-api"."1.0.0-aplha.1" = self.buildNodePackage {
@@ -23087,7 +24057,7 @@
       "istanbul-reports-1.0.0-alpha.4" = self.by-version."istanbul-reports"."1.0.0-alpha.4";
       "async-1.5.2" = self.by-version."async"."1.5.2";
       "fileset-0.2.1" = self.by-version."fileset"."0.2.1";
-      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "js-yaml-3.6.1" = self.by-version."js-yaml"."3.6.1";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "once-1.3.3" = self.by-version."once"."1.3.3";
     };
@@ -23216,7 +24186,7 @@
     };
     deps = {
       "character-parser-1.2.1" = self.by-version."character-parser"."1.2.1";
-      "clean-css-3.4.11" = self.by-version."clean-css"."3.4.11";
+      "clean-css-3.4.17" = self.by-version."clean-css"."3.4.17";
       "commander-2.6.0" = self.by-version."commander"."2.6.0";
       "constantinople-3.0.2" = self.by-version."constantinople"."3.0.2";
       "jstransformer-0.0.2" = self.by-version."jstransformer"."0.0.2";
@@ -23384,6 +24354,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."jodid25519"."^1.0.0" =
+    self.by-version."jodid25519"."1.0.2";
   by-spec."joi"."^6.4.3" =
     self.by-version."joi"."6.10.1";
   by-version."joi"."6.10.1" = self.buildNodePackage {
@@ -23399,7 +24371,7 @@
       "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
       "topo-1.1.0" = self.by-version."topo"."1.1.0";
       "isemail-1.2.0" = self.by-version."isemail"."1.2.0";
-      "moment-2.12.0" = self.by-version."moment"."2.12.0";
+      "moment-2.13.0" = self.by-version."moment"."2.13.0";
     };
     optionalDependencies = {
     };
@@ -23407,6 +24379,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."joi"."~6.10.1" =
+    self.by-version."joi"."6.10.1";
   by-spec."js-tokens"."^1.0.1" =
     self.by-version."js-tokens"."1.0.3";
   by-version."js-tokens"."1.0.3" = self.buildNodePackage {
@@ -23427,15 +24401,15 @@
     cpu = [ ];
   };
   by-spec."js-yaml"."*" =
-    self.by-version."js-yaml"."3.5.5";
-  by-version."js-yaml"."3.5.5" = self.buildNodePackage {
-    name = "js-yaml-3.5.5";
-    version = "3.5.5";
+    self.by-version."js-yaml"."3.6.1";
+  by-version."js-yaml"."3.6.1" = self.buildNodePackage {
+    name = "js-yaml-3.6.1";
+    version = "3.6.1";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz";
-      name = "js-yaml-3.5.5.tgz";
-      sha1 = "0377c38017cabc7322b0d1fbcd25a491641f2fbe";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz";
+      name = "js-yaml-3.6.1.tgz";
+      sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30";
     };
     deps = {
       "argparse-1.0.7" = self.by-version."argparse"."1.0.7";
@@ -23447,7 +24421,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "js-yaml" = self.by-version."js-yaml"."3.5.5";
+  "js-yaml" = self.by-version."js-yaml"."3.6.1";
   by-spec."js-yaml"."0.3.x" =
     self.by-version."js-yaml"."0.3.7";
   by-version."js-yaml"."0.3.7" = self.buildNodePackage {
@@ -23510,13 +24484,13 @@
     cpu = [ ];
   };
   by-spec."js-yaml"."3.x" =
-    self.by-version."js-yaml"."3.5.5";
+    self.by-version."js-yaml"."3.6.1";
   by-spec."js-yaml"."3.x >=3.2" =
-    self.by-version."js-yaml"."3.5.5";
+    self.by-version."js-yaml"."3.6.1";
   by-spec."js-yaml".">=3.0.1 <4.0.0-0" =
-    self.by-version."js-yaml"."3.5.5";
+    self.by-version."js-yaml"."3.6.1";
   by-spec."js-yaml"."^3.5.1" =
-    self.by-version."js-yaml"."3.5.5";
+    self.by-version."js-yaml"."3.6.1";
   by-spec."js-yaml"."~2.0.5" =
     self.by-version."js-yaml"."2.0.5";
   by-version."js-yaml"."2.0.5" = self.buildNodePackage {
@@ -23540,6 +24514,27 @@
   };
   by-spec."js-yaml"."~3.5.2" =
     self.by-version."js-yaml"."3.5.5";
+  by-version."js-yaml"."3.5.5" = self.buildNodePackage {
+    name = "js-yaml-3.5.5";
+    version = "3.5.5";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz";
+      name = "js-yaml-3.5.5.tgz";
+      sha1 = "0377c38017cabc7322b0d1fbcd25a491641f2fbe";
+    };
+    deps = {
+      "argparse-1.0.7" = self.by-version."argparse"."1.0.7";
+      "esprima-2.7.2" = self.by-version."esprima"."2.7.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."js-yaml"."~3.6.0" =
+    self.by-version."js-yaml"."3.6.1";
   by-spec."jsbn".">=0.1.0 <0.2.0" =
     self.by-version."jsbn"."0.1.0";
   by-version."jsbn"."0.1.0" = self.buildNodePackage {
@@ -23576,11 +24571,11 @@
       "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
       "contextify-0.1.15" = self.by-version."contextify"."0.1.15";
       "cssom-0.3.1" = self.by-version."cssom"."0.3.1";
-      "cssstyle-0.2.34" = self.by-version."cssstyle"."0.2.34";
+      "cssstyle-0.2.36" = self.by-version."cssstyle"."0.2.36";
       "htmlparser2-3.9.0" = self.by-version."htmlparser2"."3.9.0";
       "nwmatcher-1.3.7" = self.by-version."nwmatcher"."1.3.7";
       "parse5-1.5.1" = self.by-version."parse5"."1.5.1";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "xml-name-validator-1.0.0" = self.by-version."xml-name-validator"."1.0.0";
       "xmlhttprequest-1.8.0" = self.by-version."xmlhttprequest"."1.8.0";
       "acorn-globals-1.0.9" = self.by-version."acorn-globals"."1.0.9";
@@ -23607,10 +24602,10 @@
     deps = {
       "htmlparser2-3.9.0" = self.by-version."htmlparser2"."3.9.0";
       "nwmatcher-1.3.7" = self.by-version."nwmatcher"."1.3.7";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "xmlhttprequest-1.8.0" = self.by-version."xmlhttprequest"."1.8.0";
       "cssom-0.3.1" = self.by-version."cssom"."0.3.1";
-      "cssstyle-0.2.34" = self.by-version."cssstyle"."0.2.34";
+      "cssstyle-0.2.36" = self.by-version."cssstyle"."0.2.36";
       "contextify-0.1.15" = self.by-version."contextify"."0.1.15";
     };
     optionalDependencies = {
@@ -23633,10 +24628,10 @@
     deps = {
       "htmlparser2-3.9.0" = self.by-version."htmlparser2"."3.9.0";
       "nwmatcher-1.3.7" = self.by-version."nwmatcher"."1.3.7";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "xmlhttprequest-1.8.0" = self.by-version."xmlhttprequest"."1.8.0";
       "cssom-0.3.1" = self.by-version."cssom"."0.3.1";
-      "cssstyle-0.2.34" = self.by-version."cssstyle"."0.2.34";
+      "cssstyle-0.2.36" = self.by-version."cssstyle"."0.2.36";
       "contextify-0.1.15" = self.by-version."contextify"."0.1.15";
     };
     optionalDependencies = {
@@ -23667,15 +24662,15 @@
   by-spec."jsesc"."~0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-spec."jshint"."*" =
-    self.by-version."jshint"."2.9.1";
-  by-version."jshint"."2.9.1" = self.buildNodePackage {
-    name = "jshint-2.9.1";
-    version = "2.9.1";
+    self.by-version."jshint"."2.9.2";
+  by-version."jshint"."2.9.2" = self.buildNodePackage {
+    name = "jshint-2.9.2";
+    version = "2.9.2";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.1.tgz";
-      name = "jshint-2.9.1.tgz";
-      sha1 = "3136b68f8b6fa37423aacb8ec5e18a1ada7a2638";
+      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.2.tgz";
+      name = "jshint-2.9.2.tgz";
+      sha1 = "0b12d75f8eafb0823b7bf8efbb265b3262401619";
     };
     deps = {
       "cli-0.6.6" = self.by-version."cli"."0.6.6";
@@ -23693,19 +24688,19 @@
     os = [ ];
     cpu = [ ];
   };
-  "jshint" = self.by-version."jshint"."2.9.1";
+  "jshint" = self.by-version."jshint"."2.9.2";
   by-spec."jshint"."~2.9.1" =
-    self.by-version."jshint"."2.9.1";
+    self.by-version."jshint"."2.9.2";
   by-spec."json"."*" =
-    self.by-version."json"."9.0.3";
-  by-version."json"."9.0.3" = self.buildNodePackage {
-    name = "json-9.0.3";
-    version = "9.0.3";
+    self.by-version."json"."9.0.4";
+  by-version."json"."9.0.4" = self.buildNodePackage {
+    name = "json-9.0.4";
+    version = "9.0.4";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/json/-/json-9.0.3.tgz";
-      name = "json-9.0.3.tgz";
-      sha1 = "08dd0eda9dda30a40d978cc8823c2ce72df5d4f1";
+      url = "https://registry.npmjs.org/json/-/json-9.0.4.tgz";
+      name = "json-9.0.4.tgz";
+      sha1 = "d0dbf2404c128572a935ecafadfc782ec81112ce";
     };
     deps = {
     };
@@ -23715,7 +24710,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "json" = self.by-version."json"."9.0.3";
+  "json" = self.by-version."json"."9.0.4";
   by-spec."json-middleware"."^1.0.2" =
     self.by-version."json-middleware"."1.0.2";
   by-version."json-middleware"."1.0.2" = self.buildNodePackage {
@@ -23915,16 +24910,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."json5"."^0.4.0" =
-    self.by-version."json5"."0.4.0";
-  by-version."json5"."0.4.0" = self.buildNodePackage {
-    name = "json5-0.4.0";
-    version = "0.4.0";
+  by-spec."json5"."^0.5.0" =
+    self.by-version."json5"."0.5.0";
+  by-version."json5"."0.5.0" = self.buildNodePackage {
+    name = "json5-0.5.0";
+    version = "0.5.0";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz";
-      name = "json5-0.4.0.tgz";
-      sha1 = "054352e4c4c80c86c0923877d449de176a732c8d";
+      url = "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz";
+      name = "json5-0.5.0.tgz";
+      sha1 = "9b20715b026cbe3778fd769edccd822d8332a5b2";
     };
     deps = {
     };
@@ -23935,15 +24930,15 @@
     cpu = [ ];
   };
   by-spec."jsonfile"."^2.1.0" =
-    self.by-version."jsonfile"."2.2.3";
-  by-version."jsonfile"."2.2.3" = self.buildNodePackage {
-    name = "jsonfile-2.2.3";
-    version = "2.2.3";
+    self.by-version."jsonfile"."2.3.1";
+  by-version."jsonfile"."2.3.1" = self.buildNodePackage {
+    name = "jsonfile-2.3.1";
+    version = "2.3.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.2.3.tgz";
-      name = "jsonfile-2.2.3.tgz";
-      sha1 = "e252b99a6af901d3ec41f332589c90509a7bc605";
+      url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.3.1.tgz";
+      name = "jsonfile-2.3.1.tgz";
+      sha1 = "28bcb29c596b5b7aafd34e662a329ba62cd842fc";
     };
     deps = {
     };
@@ -24109,17 +25104,18 @@
     cpu = [ ];
   };
   by-spec."jsonwebtoken".">=1.0.0" =
-    self.by-version."jsonwebtoken"."5.7.0";
-  by-version."jsonwebtoken"."5.7.0" = self.buildNodePackage {
-    name = "jsonwebtoken-5.7.0";
-    version = "5.7.0";
+    self.by-version."jsonwebtoken"."7.0.0";
+  by-version."jsonwebtoken"."7.0.0" = self.buildNodePackage {
+    name = "jsonwebtoken-7.0.0";
+    version = "7.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-5.7.0.tgz";
-      name = "jsonwebtoken-5.7.0.tgz";
-      sha1 = "1c90f9a86ce5b748f5f979c12b70402b4afcddb4";
+      url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.0.0.tgz";
+      name = "jsonwebtoken-7.0.0.tgz";
+      sha1 = "0e1eb109cffe631db7dc0ec8c3face3b57f8f5c3";
     };
     deps = {
+      "joi-6.10.1" = self.by-version."joi"."6.10.1";
       "jws-3.1.3" = self.by-version."jws"."3.1.3";
       "ms-0.7.1" = self.by-version."ms"."0.7.1";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
@@ -24186,7 +25182,7 @@
       sha1 = "09a78993e0ae4d4ef4487f6155a91f6190cb4223";
     };
     deps = {
-      "base62-1.1.0" = self.by-version."base62"."1.1.0";
+      "base62-1.1.1" = self.by-version."base62"."1.1.1";
       "commoner-0.10.4" = self.by-version."commoner"."0.10.4";
       "esprima-fb-15001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."15001.1.0-dev-harmony-fb";
       "object-assign-2.1.1" = self.by-version."object-assign"."2.1.1";
@@ -24365,21 +25361,42 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."k-rpc"."^3.6.0" =
-    self.by-version."k-rpc"."3.6.1";
-  by-version."k-rpc"."3.6.1" = self.buildNodePackage {
-    name = "k-rpc-3.6.1";
-    version = "3.6.1";
+  by-spec."k-bucket"."^2.0.0" =
+    self.by-version."k-bucket"."2.0.1";
+  by-version."k-bucket"."2.0.1" = self.buildNodePackage {
+    name = "k-bucket-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/k-rpc/-/k-rpc-3.6.1.tgz";
-      name = "k-rpc-3.6.1.tgz";
-      sha1 = "b26ff19be82abc4d3c0cc34de4cd5282f4ed5450";
+      url = "https://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz";
+      name = "k-bucket-2.0.1.tgz";
+      sha1 = "58cccb244f563326ba893bf5c06a35f644846daa";
+    };
+    deps = {
+      "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
+      "randombytes-2.0.3" = self.by-version."randombytes"."2.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."k-rpc"."^3.6.0" =
+    self.by-version."k-rpc"."3.7.0";
+  by-version."k-rpc"."3.7.0" = self.buildNodePackage {
+    name = "k-rpc-3.7.0";
+    version = "3.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/k-rpc/-/k-rpc-3.7.0.tgz";
+      name = "k-rpc-3.7.0.tgz";
+      sha1 = "641f99b2825be34b6e7984f22b7962dc1a906c23";
     };
     deps = {
       "buffer-equals-1.0.3" = self.by-version."buffer-equals"."1.0.3";
-      "k-bucket-0.6.0" = self.by-version."k-bucket"."0.6.0";
-      "k-rpc-socket-1.5.1" = self.by-version."k-rpc-socket"."1.5.1";
+      "k-bucket-2.0.1" = self.by-version."k-bucket"."2.0.1";
+      "k-rpc-socket-1.5.2" = self.by-version."k-rpc-socket"."1.5.2";
     };
     optionalDependencies = {
     };
@@ -24388,18 +25405,18 @@
     cpu = [ ];
   };
   by-spec."k-rpc-socket"."^1.5.0" =
-    self.by-version."k-rpc-socket"."1.5.1";
-  by-version."k-rpc-socket"."1.5.1" = self.buildNodePackage {
-    name = "k-rpc-socket-1.5.1";
-    version = "1.5.1";
+    self.by-version."k-rpc-socket"."1.5.2";
+  by-version."k-rpc-socket"."1.5.2" = self.buildNodePackage {
+    name = "k-rpc-socket-1.5.2";
+    version = "1.5.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.5.1.tgz";
-      name = "k-rpc-socket-1.5.1.tgz";
-      sha1 = "0349823046a395bbb3d4d03c74f6a024fcb14ce4";
+      url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.5.2.tgz";
+      name = "k-rpc-socket-1.5.2.tgz";
+      sha1 = "16fe671041f270241fbaf3b007debb7312a95d40";
     };
     deps = {
-      "bencode-0.9.0" = self.by-version."bencode"."0.9.0";
+      "bencode-0.10.0" = self.by-version."bencode"."0.10.0";
     };
     optionalDependencies = {
     };
@@ -24440,26 +25457,26 @@
     deps = {
       "batch-0.5.3" = self.by-version."batch"."0.5.3";
       "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2";
-      "body-parser-1.15.0" = self.by-version."body-parser"."1.15.0";
-      "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
+      "body-parser-1.15.1" = self.by-version."body-parser"."1.15.1";
+      "chokidar-1.5.2" = self.by-version."chokidar"."1.5.2";
       "colors-1.1.2" = self.by-version."colors"."1.1.2";
       "connect-3.4.1" = self.by-version."connect"."3.4.1";
-      "core-js-2.2.2" = self.by-version."core-js"."2.2.2";
+      "core-js-2.4.0" = self.by-version."core-js"."2.4.0";
       "di-0.0.1" = self.by-version."di"."0.0.1";
       "dom-serialize-2.2.1" = self.by-version."dom-serialize"."2.2.1";
       "expand-braces-0.1.2" = self.by-version."expand-braces"."0.1.2";
       "glob-7.0.3" = self.by-version."glob"."7.0.3";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
-      "http-proxy-1.13.2" = self.by-version."http-proxy"."1.13.2";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
+      "http-proxy-1.13.3" = self.by-version."http-proxy"."1.13.3";
       "isbinaryfile-3.0.0" = self.by-version."isbinaryfile"."3.0.0";
       "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
-      "log4js-0.6.33" = self.by-version."log4js"."0.6.33";
+      "log4js-0.6.36" = self.by-version."log4js"."0.6.36";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
-      "socket.io-1.4.5" = self.by-version."socket.io"."1.4.5";
-      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
+      "socket.io-1.4.6" = self.by-version."socket.io"."1.4.6";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
       "useragent-2.1.9" = self.by-version."useragent"."2.1.9";
     };
     optionalDependencies = {
@@ -24474,19 +25491,19 @@
   by-spec."karma"."^0.13.0 || >= 0.14.0-rc.0" =
     self.by-version."karma"."0.13.22";
   by-spec."karma-chrome-launcher"."*" =
-    self.by-version."karma-chrome-launcher"."0.2.3";
-  by-version."karma-chrome-launcher"."0.2.3" = self.buildNodePackage {
-    name = "karma-chrome-launcher-0.2.3";
-    version = "0.2.3";
+    self.by-version."karma-chrome-launcher"."1.0.1";
+  by-version."karma-chrome-launcher"."1.0.1" = self.buildNodePackage {
+    name = "karma-chrome-launcher-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.2.3.tgz";
-      name = "karma-chrome-launcher-0.2.3.tgz";
-      sha1 = "4c6d700d163a9d34c618efd87918be49e7a4a8c9";
+      url = "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-1.0.1.tgz";
+      name = "karma-chrome-launcher-1.0.1.tgz";
+      sha1 = "be5ae7c4264f9a0a2e22e3d984beb325ad92c8cb";
     };
     deps = {
       "fs-access-1.0.0" = self.by-version."fs-access"."1.0.0";
-      "which-1.2.4" = self.by-version."which"."1.2.4";
+      "which-1.2.10" = self.by-version."which"."1.2.10";
     };
     optionalDependencies = {
     };
@@ -24494,23 +25511,23 @@
     os = [ ];
     cpu = [ ];
   };
-  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.2.3";
+  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."1.0.1";
   by-spec."karma-coverage"."*" =
-    self.by-version."karma-coverage"."0.5.5";
-  by-version."karma-coverage"."0.5.5" = self.buildNodePackage {
-    name = "karma-coverage-0.5.5";
-    version = "0.5.5";
+    self.by-version."karma-coverage"."1.0.0";
+  by-version."karma-coverage"."1.0.0" = self.buildNodePackage {
+    name = "karma-coverage-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma-coverage/-/karma-coverage-0.5.5.tgz";
-      name = "karma-coverage-0.5.5.tgz";
-      sha1 = "b0d58b1025d59d5c6620263186f1d58f5d5348c5";
+      url = "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.0.0.tgz";
+      name = "karma-coverage-1.0.0.tgz";
+      sha1 = "679a1152310f96ef91c32f5fe357d6c5b78f1f1d";
     };
     deps = {
       "istanbul-0.4.3" = self.by-version."istanbul"."0.4.3";
       "dateformat-1.0.12" = self.by-version."dateformat"."1.0.12";
       "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
-      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
     };
     optionalDependencies = {
     };
@@ -24518,17 +25535,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "karma-coverage" = self.by-version."karma-coverage"."0.5.5";
+  "karma-coverage" = self.by-version."karma-coverage"."1.0.0";
   by-spec."karma-junit-reporter"."*" =
-    self.by-version."karma-junit-reporter"."0.4.1";
-  by-version."karma-junit-reporter"."0.4.1" = self.buildNodePackage {
-    name = "karma-junit-reporter-0.4.1";
-    version = "0.4.1";
+    self.by-version."karma-junit-reporter"."2.0.0";
+  by-version."karma-junit-reporter"."2.0.0" = self.buildNodePackage {
+    name = "karma-junit-reporter-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.4.1.tgz";
-      name = "karma-junit-reporter-0.4.1.tgz";
-      sha1 = "d69477bc044e04f093fb1d61b2e4e694fb03c2d9";
+      url = "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-2.0.0.tgz";
+      name = "karma-junit-reporter-2.0.0.tgz";
+      sha1 = "f84629e0e1ef28dd2977c96f346c33d5bf93e159";
     };
     deps = {
       "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
@@ -24541,38 +25558,38 @@
     os = [ ];
     cpu = [ ];
   };
-  "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.4.1";
+  "karma-junit-reporter" = self.by-version."karma-junit-reporter"."2.0.0";
   by-spec."karma-mocha"."*" =
-    self.by-version."karma-mocha"."0.2.2";
-  by-version."karma-mocha"."0.2.2" = self.buildNodePackage {
-    name = "karma-mocha-0.2.2";
-    version = "0.2.2";
+    self.by-version."karma-mocha"."1.0.1";
+  by-version."karma-mocha"."1.0.1" = self.buildNodePackage {
+    name = "karma-mocha-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma-mocha/-/karma-mocha-0.2.2.tgz";
-      name = "karma-mocha-0.2.2.tgz";
-      sha1 = "388ed917da15dcb196d1b915c1934ef803193f8e";
+      url = "https://registry.npmjs.org/karma-mocha/-/karma-mocha-1.0.1.tgz";
+      name = "karma-mocha-1.0.1.tgz";
+      sha1 = "98519f19115cd1a3455d8a95e14049a878fd0670";
     };
     deps = {
     };
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."mocha"."2.4.5"];
+      self.by-version."mocha"."2.5.3"];
     os = [ ];
     cpu = [ ];
   };
-  "karma-mocha" = self.by-version."karma-mocha"."0.2.2";
+  "karma-mocha" = self.by-version."karma-mocha"."1.0.1";
   by-spec."karma-requirejs"."*" =
-    self.by-version."karma-requirejs"."0.2.6";
-  by-version."karma-requirejs"."0.2.6" = self.buildNodePackage {
-    name = "karma-requirejs-0.2.6";
-    version = "0.2.6";
+    self.by-version."karma-requirejs"."1.0.0";
+  by-version."karma-requirejs"."1.0.0" = self.buildNodePackage {
+    name = "karma-requirejs-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.6.tgz";
-      name = "karma-requirejs-0.2.6.tgz";
-      sha1 = "1a770c64f901320a389c65b4944746326372def8";
+      url = "https://registry.npmjs.org/karma-requirejs/-/karma-requirejs-1.0.0.tgz";
+      name = "karma-requirejs-1.0.0.tgz";
+      sha1 = "183b9ac456a9e958564b75b458baedfdba78cd6d";
     };
     deps = {
     };
@@ -24584,17 +25601,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "karma-requirejs" = self.by-version."karma-requirejs"."0.2.6";
+  "karma-requirejs" = self.by-version."karma-requirejs"."1.0.0";
   by-spec."karma-sauce-launcher"."*" =
-    self.by-version."karma-sauce-launcher"."0.3.1";
-  by-version."karma-sauce-launcher"."0.3.1" = self.buildNodePackage {
-    name = "karma-sauce-launcher-0.3.1";
-    version = "0.3.1";
+    self.by-version."karma-sauce-launcher"."1.0.0";
+  by-version."karma-sauce-launcher"."1.0.0" = self.buildNodePackage {
+    name = "karma-sauce-launcher-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.3.1.tgz";
-      name = "karma-sauce-launcher-0.3.1.tgz";
-      sha1 = "fa41f6afd1ad6cb7610885da83cbc9921a4d334c";
+      url = "https://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-1.0.0.tgz";
+      name = "karma-sauce-launcher-1.0.0.tgz";
+      sha1 = "569bf356f7c143a337bba5dcbf5787de0d9a640c";
     };
     deps = {
       "q-1.4.1" = self.by-version."q"."1.4.1";
@@ -24608,26 +25625,26 @@
     os = [ ];
     cpu = [ ];
   };
-  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.3.1";
+  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."1.0.0";
   by-spec."keen-js"."^3.2.4" =
-    self.by-version."keen-js"."3.4.0";
-  by-version."keen-js"."3.4.0" = self.buildNodePackage {
-    name = "keen-js-3.4.0";
-    version = "3.4.0";
+    self.by-version."keen-js"."3.4.1";
+  by-version."keen-js"."3.4.1" = self.buildNodePackage {
+    name = "keen-js-3.4.1";
+    version = "3.4.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/keen-js/-/keen-js-3.4.0.tgz";
-      name = "keen-js-3.4.0.tgz";
-      sha1 = "e3a8b10d4c98858793b78d77898cc5bccc8a014b";
+      url = "https://registry.npmjs.org/keen-js/-/keen-js-3.4.1.tgz";
+      name = "keen-js-3.4.1.tgz";
+      sha1 = "822a5b1e211d1f47caae576a42926efec0cad05b";
     };
     deps = {
       "JSON2-0.1.0" = self.by-version."JSON2"."0.1.0";
       "browserify-versionify-1.0.3" = self.by-version."browserify-versionify"."1.0.3";
-      "component-emitter-1.2.0" = self.by-version."component-emitter"."1.2.0";
+      "component-emitter-1.2.1" = self.by-version."component-emitter"."1.2.1";
       "domready-0.3.0" = self.by-version."domready"."0.3.0";
       "json3-3.3.2" = self.by-version."json3"."3.3.2";
       "spin.js-2.3.2" = self.by-version."spin.js"."2.3.2";
-      "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
+      "superagent-1.8.3" = self.by-version."superagent"."1.8.3";
     };
     optionalDependencies = {
     };
@@ -24695,18 +25712,18 @@
     cpu = [ ];
   };
   by-spec."kerberos"."~0.0" =
-    self.by-version."kerberos"."0.0.19";
-  by-version."kerberos"."0.0.19" = self.buildNodePackage {
-    name = "kerberos-0.0.19";
-    version = "0.0.19";
+    self.by-version."kerberos"."0.0.21";
+  by-version."kerberos"."0.0.21" = self.buildNodePackage {
+    name = "kerberos-0.0.21";
+    version = "0.0.21";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/kerberos/-/kerberos-0.0.19.tgz";
-      name = "kerberos-0.0.19.tgz";
-      sha1 = "49cf60bf49f60bdbf23f0e54b359ce45293a1302";
+      url = "https://registry.npmjs.org/kerberos/-/kerberos-0.0.21.tgz";
+      name = "kerberos-0.0.21.tgz";
+      sha1 = "414f7f947d45afff10406018f233bf471a1d1195";
     };
     deps = {
-      "nan-2.0.9" = self.by-version."nan"."2.0.9";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -24831,15 +25848,15 @@
   by-spec."keypress"."~0.2.1" =
     self.by-version."keypress"."0.2.1";
   by-spec."kind-of"."^3.0.2" =
-    self.by-version."kind-of"."3.0.2";
-  by-version."kind-of"."3.0.2" = self.buildNodePackage {
-    name = "kind-of-3.0.2";
-    version = "3.0.2";
+    self.by-version."kind-of"."3.0.3";
+  by-version."kind-of"."3.0.3" = self.buildNodePackage {
+    name = "kind-of-3.0.3";
+    version = "3.0.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz";
-      name = "kind-of-3.0.2.tgz";
-      sha1 = "187db427046e7e90945692e6768668bd6900dea0";
+      url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.3.tgz";
+      name = "kind-of-3.0.3.tgz";
+      sha1 = "c61608747d815b0362556db3276362a7a38aded3";
     };
     deps = {
       "is-buffer-1.1.3" = self.by-version."is-buffer"."1.1.3";
@@ -24851,15 +25868,15 @@
     cpu = [ ];
   };
   by-spec."klaw"."^1.0.0" =
-    self.by-version."klaw"."1.1.3";
-  by-version."klaw"."1.1.3" = self.buildNodePackage {
-    name = "klaw-1.1.3";
-    version = "1.1.3";
+    self.by-version."klaw"."1.3.0";
+  by-version."klaw"."1.3.0" = self.buildNodePackage {
+    name = "klaw-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/klaw/-/klaw-1.1.3.tgz";
-      name = "klaw-1.1.3.tgz";
-      sha1 = "7da33c6b42f9b3dc9cec00d17f13af017fcc2721";
+      url = "https://registry.npmjs.org/klaw/-/klaw-1.3.0.tgz";
+      name = "klaw-1.3.0.tgz";
+      sha1 = "8857bfbc1d824badf13d3d0241d8bbe46fb12f73";
     };
     deps = {
     };
@@ -24914,27 +25931,28 @@
   };
   "knox" = self.by-version."knox"."0.9.2";
   by-spec."kue"."*" =
-    self.by-version."kue"."0.10.5";
-  by-version."kue"."0.10.5" = self.buildNodePackage {
-    name = "kue-0.10.5";
-    version = "0.10.5";
-    bin = false;
+    self.by-version."kue"."0.11.0";
+  by-version."kue"."0.11.0" = self.buildNodePackage {
+    name = "kue-0.11.0";
+    version = "0.11.0";
+    bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/kue/-/kue-0.10.5.tgz";
-      name = "kue-0.10.5.tgz";
-      sha1 = "5473efb83c55a08d5149cd24ba11d6135fe7468e";
+      url = "https://registry.npmjs.org/kue/-/kue-0.11.0.tgz";
+      name = "kue-0.11.0.tgz";
+      sha1 = "54f2769b09a09ebeff0906db3896a92ed8a73332";
     };
     deps = {
-      "body-parser-1.15.0" = self.by-version."body-parser"."1.15.0";
+      "body-parser-1.15.1" = self.by-version."body-parser"."1.15.1";
       "express-4.13.4" = self.by-version."express"."4.13.4";
       "jade-1.11.0" = self.by-version."jade"."1.11.0";
       "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
       "lodash-deep-1.6.0" = self.by-version."lodash-deep"."1.6.0";
       "nib-1.1.0" = self.by-version."nib"."1.1.0";
       "node-redis-warlock-0.1.4" = self.by-version."node-redis-warlock"."0.1.4";
-      "redis-2.5.3" = self.by-version."redis"."2.5.3";
+      "redis-2.4.2" = self.by-version."redis"."2.4.2";
       "reds-0.2.5" = self.by-version."reds"."0.2.5";
       "stylus-0.52.4" = self.by-version."stylus"."0.52.4";
+      "yargs-3.32.0" = self.by-version."yargs"."3.32.0";
     };
     optionalDependencies = {
     };
@@ -24942,7 +25960,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "kue" = self.by-version."kue"."0.10.5";
+  "kue" = self.by-version."kue"."0.11.0";
   by-spec."labeled-stream-splicer"."^1.0.0" =
     self.by-version."labeled-stream-splicer"."1.0.2";
   by-version."labeled-stream-splicer"."1.0.2" = self.buildNodePackage {
@@ -25027,15 +26045,15 @@
     cpu = [ ];
   };
   by-spec."lazy-cache"."^1.0.3" =
-    self.by-version."lazy-cache"."1.0.3";
-  by-version."lazy-cache"."1.0.3" = self.buildNodePackage {
-    name = "lazy-cache-1.0.3";
-    version = "1.0.3";
+    self.by-version."lazy-cache"."1.0.4";
+  by-version."lazy-cache"."1.0.4" = self.buildNodePackage {
+    name = "lazy-cache-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.3.tgz";
-      name = "lazy-cache-1.0.3.tgz";
-      sha1 = "e97754618f9c886bb999b2ff69c78b82453d6674";
+      url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+      name = "lazy-cache-1.0.4.tgz";
+      sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
     };
     deps = {
     };
@@ -25045,6 +26063,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lazystream"."^1.0.0" =
+    self.by-version."lazystream"."1.0.0";
+  by-version."lazystream"."1.0.0" = self.buildNodePackage {
+    name = "lazystream-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz";
+      name = "lazystream-1.0.0.tgz";
+      sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
+    };
+    deps = {
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."lazystream"."~0.1.0" =
     self.by-version."lazystream"."0.1.0";
   by-version."lazystream"."0.1.0" = self.buildNodePackage {
@@ -25057,7 +26095,7 @@
       sha1 = "1b25d63c772a4c20f0a5ed0a9d77f484b6e16920";
     };
     deps = {
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
     };
     optionalDependencies = {
     };
@@ -25105,20 +26143,20 @@
     cpu = [ ];
   };
   by-spec."lcov-result-merger"."*" =
-    self.by-version."lcov-result-merger"."1.0.2";
-  by-version."lcov-result-merger"."1.0.2" = self.buildNodePackage {
-    name = "lcov-result-merger-1.0.2";
-    version = "1.0.2";
+    self.by-version."lcov-result-merger"."1.2.0";
+  by-version."lcov-result-merger"."1.2.0" = self.buildNodePackage {
+    name = "lcov-result-merger-1.2.0";
+    version = "1.2.0";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.0.2.tgz";
-      name = "lcov-result-merger-1.0.2.tgz";
-      sha1 = "a7a1cf861daf32deb39949c2eee8c9a9ed475c18";
+      url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.2.0.tgz";
+      name = "lcov-result-merger-1.2.0.tgz";
+      sha1 = "5de1e6426f885929b77357f014de5fee1dad0553";
     };
     deps = {
-      "through2-0.6.5" = self.by-version."through2"."0.6.5";
-      "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6";
-      "vinyl-fs-0.3.14" = self.by-version."vinyl-fs"."0.3.14";
+      "through2-2.0.1" = self.by-version."through2"."2.0.1";
+      "vinyl-1.1.1" = self.by-version."vinyl"."1.1.1";
+      "vinyl-fs-2.4.3" = self.by-version."vinyl-fs"."2.4.3";
     };
     optionalDependencies = {
     };
@@ -25126,7 +26164,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "lcov-result-merger" = self.by-version."lcov-result-merger"."1.0.2";
+  "lcov-result-merger" = self.by-version."lcov-result-merger"."1.2.0";
   by-spec."ldapjs"."^0.7.1" =
     self.by-version."ldapjs"."0.7.1";
   by-version."ldapjs"."0.7.1" = self.buildNodePackage {
@@ -25153,6 +26191,33 @@
     cpu = [ ];
   };
   by-spec."less"."*" =
+    self.by-version."less"."2.7.1";
+  by-version."less"."2.7.1" = self.buildNodePackage {
+    name = "less-2.7.1";
+    version = "2.7.1";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/less/-/less-2.7.1.tgz";
+      name = "less-2.7.1.tgz";
+      sha1 = "6cbfea22b3b830304e9a5fb371d54fa480c9d7cf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+      "errno-0.1.4" = self.by-version."errno"."0.1.4";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
+      "image-size-0.5.0" = self.by-version."image-size"."0.5.0";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "promise-7.1.1" = self.by-version."promise"."7.1.1";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "less" = self.by-version."less"."2.7.1";
+  by-spec."less"."~2.6.0" =
     self.by-version."less"."2.6.1";
   by-version."less"."2.6.1" = self.buildNodePackage {
     name = "less-2.6.1";
@@ -25167,21 +26232,18 @@
     };
     optionalDependencies = {
       "errno-0.1.4" = self.by-version."errno"."0.1.4";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "image-size-0.4.0" = self.by-version."image-size"."0.4.0";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "promise-7.1.1" = self.by-version."promise"."7.1.1";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
-      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "less" = self.by-version."less"."2.6.1";
-  by-spec."less"."~2.6.0" =
-    self.by-version."less"."2.6.1";
   by-spec."level"."^0.18.0" =
     self.by-version."level"."0.18.0";
   by-version."level"."0.18.0" = self.buildNodePackage {
@@ -25287,7 +26349,7 @@
       "deferred-leveldown-0.2.0" = self.by-version."deferred-leveldown"."0.2.0";
       "errno-0.1.4" = self.by-version."errno"."0.1.4";
       "prr-0.0.0" = self.by-version."prr"."0.0.0";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
@@ -25315,7 +26377,7 @@
       "deferred-leveldown-0.2.0" = self.by-version."deferred-leveldown"."0.2.0";
       "errno-0.1.4" = self.by-version."errno"."0.1.4";
       "prr-0.0.0" = self.by-version."prr"."0.0.0";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
@@ -25344,7 +26406,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."levn"."~0.3.0" =
+  by-spec."levn"."^0.3.0" =
     self.by-version."levn"."0.3.0";
   by-version."levn"."0.3.0" = self.buildNodePackage {
     name = "levn-0.3.0";
@@ -25365,6 +26427,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."levn"."~0.3.0" =
+    self.by-version."levn"."0.3.0";
   by-spec."lexical-scope"."^1.2.0" =
     self.by-version."lexical-scope"."1.2.0";
   by-version."lexical-scope"."1.2.0" = self.buildNodePackage {
@@ -25447,7 +26511,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."libmime"."^1.0.0" =
+  by-spec."libmime"."^1.2.0" =
     self.by-version."libmime"."1.2.0";
   by-version."libmime"."1.2.0" = self.buildNodePackage {
     name = "libmime-1.2.0";
@@ -25469,8 +26533,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."libmime"."^1.2.0" =
-    self.by-version."libmime"."1.2.0";
   by-spec."libqp"."1.1.0" =
     self.by-version."libqp"."1.1.0";
   by-version."libqp"."1.1.0" = self.buildNodePackage {
@@ -25538,18 +26600,18 @@
     cpu = [ ];
   };
   by-spec."linkify-it"."~1.2.0" =
-    self.by-version."linkify-it"."1.2.0";
-  by-version."linkify-it"."1.2.0" = self.buildNodePackage {
-    name = "linkify-it-1.2.0";
-    version = "1.2.0";
+    self.by-version."linkify-it"."1.2.4";
+  by-version."linkify-it"."1.2.4" = self.buildNodePackage {
+    name = "linkify-it-1.2.4";
+    version = "1.2.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.0.tgz";
-      name = "linkify-it-1.2.0.tgz";
-      sha1 = "fd71021cfb3dca1c28fe09385ef5c10bbead8206";
+      url = "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz";
+      name = "linkify-it-1.2.4.tgz";
+      sha1 = "0773526c317c8fd13bd534ee1d180ff88abf881a";
     };
     deps = {
-      "uc.micro-1.0.0" = self.by-version."uc.micro"."1.0.0";
+      "uc.micro-1.0.1" = self.by-version."uc.micro"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -25569,10 +26631,10 @@
       sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0";
     };
     deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "parse-json-2.2.0" = self.by-version."parse-json"."2.2.0";
       "pify-2.3.0" = self.by-version."pify"."2.3.0";
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+      "pinkie-promise-2.0.1" = self.by-version."pinkie-promise"."2.0.1";
       "strip-bom-2.0.0" = self.by-version."strip-bom"."2.0.0";
     };
     optionalDependencies = {
@@ -25581,6 +26643,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."load-json-file"."^1.1.0" =
+    self.by-version."load-json-file"."1.1.0";
   by-spec."loader-runner"."^2.1.0" =
     self.by-version."loader-runner"."2.1.1";
   by-version."loader-runner"."2.1.1" = self.buildNodePackage {
@@ -25601,19 +26665,21 @@
     cpu = [ ];
   };
   by-spec."loader-utils"."^0.2.11" =
-    self.by-version."loader-utils"."0.2.13";
-  by-version."loader-utils"."0.2.13" = self.buildNodePackage {
-    name = "loader-utils-0.2.13";
-    version = "0.2.13";
+    self.by-version."loader-utils"."0.2.15";
+  by-version."loader-utils"."0.2.15" = self.buildNodePackage {
+    name = "loader-utils-0.2.15";
+    version = "0.2.15";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.13.tgz";
-      name = "loader-utils-0.2.13.tgz";
-      sha1 = "ea0de320be919056362c9972d5072b4596ae9eec";
+      url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.15.tgz";
+      name = "loader-utils-0.2.15.tgz";
+      sha1 = "c7df3342a9d4e2103dddc97d4060daccc246d6ac";
     };
     deps = {
       "big.js-3.1.3" = self.by-version."big.js"."3.1.3";
-      "json5-0.4.0" = self.by-version."json5"."0.4.0";
+      "emojis-list-2.0.1" = self.by-version."emojis-list"."2.0.1";
+      "json5-0.5.0" = self.by-version."json5"."0.5.0";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
     };
     optionalDependencies = {
     };
@@ -25641,15 +26707,15 @@
     cpu = [ ];
   };
   by-spec."lodash"."*" =
-    self.by-version."lodash"."4.8.2";
-  by-version."lodash"."4.8.2" = self.buildNodePackage {
-    name = "lodash-4.8.2";
-    version = "4.8.2";
+    self.by-version."lodash"."4.13.1";
+  by-version."lodash"."4.13.1" = self.buildNodePackage {
+    name = "lodash-4.13.1";
+    version = "4.13.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash/-/lodash-4.8.2.tgz";
-      name = "lodash-4.8.2.tgz";
-      sha1 = "478ad7ff648c3c71a2f6108e032c5c0cc40747df";
+      url = "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz";
+      name = "lodash-4.13.1.tgz";
+      sha1 = "83e4b10913f48496d4d16fec4a560af2ee744b68";
     };
     deps = {
     };
@@ -25698,9 +26764,9 @@
     cpu = [ ];
   };
   by-spec."lodash".">= 4.0.0 < 5.0.0" =
-    self.by-version."lodash"."4.8.2";
+    self.by-version."lodash"."4.13.1";
   by-spec."lodash".">=2.4.1" =
-    self.by-version."lodash"."4.8.2";
+    self.by-version."lodash"."4.13.1";
   by-spec."lodash"."^2.4.1" =
     self.by-version."lodash"."2.4.2";
   by-version."lodash"."2.4.2" = self.buildNodePackage {
@@ -25731,13 +26797,17 @@
   by-spec."lodash"."^3.8.0" =
     self.by-version."lodash"."3.10.1";
   by-spec."lodash"."^4.0.0" =
-    self.by-version."lodash"."4.8.2";
+    self.by-version."lodash"."4.13.1";
   by-spec."lodash"."^4.0.1" =
-    self.by-version."lodash"."4.8.2";
+    self.by-version."lodash"."4.13.1";
   by-spec."lodash"."^4.2.0" =
-    self.by-version."lodash"."4.8.2";
+    self.by-version."lodash"."4.13.1";
   by-spec."lodash"."^4.3.0" =
-    self.by-version."lodash"."4.8.2";
+    self.by-version."lodash"."4.13.1";
+  by-spec."lodash"."^4.8.0" =
+    self.by-version."lodash"."4.13.1";
+  by-spec."lodash"."^4.8.2" =
+    self.by-version."lodash"."4.13.1";
   by-spec."lodash"."~0.9.2" =
     self.by-version."lodash"."0.9.2";
   by-version."lodash"."0.9.2" = self.buildNodePackage {
@@ -25776,25 +26846,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash"."~1.3.1" =
-    self.by-version."lodash"."1.3.1";
-  by-version."lodash"."1.3.1" = self.buildNodePackage {
-    name = "lodash-1.3.1";
-    version = "1.3.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz";
-      name = "lodash-1.3.1.tgz";
-      sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."lodash"."~2.4.1" =
     self.by-version."lodash"."2.4.2";
   by-spec."lodash"."~3.10.1" =
@@ -25906,7 +26957,7 @@
       sha1 = "a7ce672759472b91d12b193c69d8a24a02d8428d";
     };
     deps = {
-      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
     };
     optionalDependencies = {
     };
@@ -25936,15 +26987,15 @@
     cpu = [ ];
   };
   by-spec."lodash._baseclone"."~4.5.0" =
-    self.by-version."lodash._baseclone"."4.5.4";
-  by-version."lodash._baseclone"."4.5.4" = self.buildNodePackage {
-    name = "lodash._baseclone-4.5.4";
-    version = "4.5.4";
+    self.by-version."lodash._baseclone"."4.5.7";
+  by-version."lodash._baseclone"."4.5.7" = self.buildNodePackage {
+    name = "lodash._baseclone-4.5.7";
+    version = "4.5.7";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.4.tgz";
-      name = "lodash._baseclone-4.5.4.tgz";
-      sha1 = "71ebdc3f5483eb5fd21b11738e583f9017a3882e";
+      url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz";
+      name = "lodash._baseclone-4.5.7.tgz";
+      sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
     };
     deps = {
     };
@@ -25973,19 +27024,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash._basedifference"."~4.4.0" =
-    self.by-version."lodash._basedifference"."4.4.1";
-  by-version."lodash._basedifference"."4.4.1" = self.buildNodePackage {
-    name = "lodash._basedifference-4.4.1";
-    version = "4.4.1";
+  by-spec."lodash._basedifference"."~4.5.0" =
+    self.by-version."lodash._basedifference"."4.5.0";
+  by-version."lodash._basedifference"."4.5.0" = self.buildNodePackage {
+    name = "lodash._basedifference-4.5.0";
+    version = "4.5.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.4.1.tgz";
-      name = "lodash._basedifference-4.4.1.tgz";
-      sha1 = "537bde6fd0f3eeec28e37288dd51459765181b4d";
+      url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz";
+      name = "lodash._basedifference-4.5.0.tgz";
+      sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938";
     };
     deps = {
-      "lodash._setcache-4.1.2" = self.by-version."lodash._setcache"."4.1.2";
+      "lodash._root-3.0.1" = self.by-version."lodash._root"."3.0.1";
     };
     optionalDependencies = {
     };
@@ -25993,16 +27044,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash._baseflatten"."~4.1.0" =
-    self.by-version."lodash._baseflatten"."4.1.1";
-  by-version."lodash._baseflatten"."4.1.1" = self.buildNodePackage {
-    name = "lodash._baseflatten-4.1.1";
-    version = "4.1.1";
+  by-spec."lodash._baseflatten"."~4.2.0" =
+    self.by-version."lodash._baseflatten"."4.2.1";
+  by-version."lodash._baseflatten"."4.2.1" = self.buildNodePackage {
+    name = "lodash._baseflatten-4.2.1";
+    version = "4.2.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.1.1.tgz";
-      name = "lodash._baseflatten-4.1.1.tgz";
-      sha1 = "5c87403b88f3687a88d26424faadf3aa054aab0d";
+      url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz";
+      name = "lodash._baseflatten-4.2.1.tgz";
+      sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208";
     };
     deps = {
     };
@@ -26031,6 +27082,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lodash._baseslice"."~4.0.0" =
+    self.by-version."lodash._baseslice"."4.0.0";
+  by-version."lodash._baseslice"."4.0.0" = self.buildNodePackage {
+    name = "lodash._baseslice-4.0.0";
+    version = "4.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._baseslice/-/lodash._baseslice-4.0.0.tgz";
+      name = "lodash._baseslice-4.0.0.tgz";
+      sha1 = "f5ce1df982948ecaff63f223853415b7b9763704";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."lodash._basetostring"."^3.0.0" =
     self.by-version."lodash._basetostring"."3.0.1";
   by-version."lodash._basetostring"."3.0.1" = self.buildNodePackage {
@@ -26050,20 +27120,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash._baseuniq"."~4.5.0" =
-    self.by-version."lodash._baseuniq"."4.5.1";
-  by-version."lodash._baseuniq"."4.5.1" = self.buildNodePackage {
-    name = "lodash._baseuniq-4.5.1";
-    version = "4.5.1";
+  by-spec."lodash._basetostring"."~4.12.0" =
+    self.by-version."lodash._basetostring"."4.12.0";
+  by-version."lodash._basetostring"."4.12.0" = self.buildNodePackage {
+    name = "lodash._basetostring-4.12.0";
+    version = "4.12.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.5.1.tgz";
-      name = "lodash._baseuniq-4.5.1.tgz";
-      sha1 = "1980430c2e64ee86df6dd35794e1a301b2ab74de";
+      url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz";
+      name = "lodash._basetostring-4.12.0.tgz";
+      sha1 = "9327c9dc5158866b7fa4b9d42f4638e5766dd9df";
     };
     deps = {
-      "lodash._createset-4.0.1" = self.by-version."lodash._createset"."4.0.1";
-      "lodash._setcache-4.1.2" = self.by-version."lodash._setcache"."4.1.2";
     };
     optionalDependencies = {
     };
@@ -26071,8 +27139,27 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash._baseuniq"."~4.5.1" =
-    self.by-version."lodash._baseuniq"."4.5.1";
+  by-spec."lodash._baseuniq"."~4.6.0" =
+    self.by-version."lodash._baseuniq"."4.6.0";
+  by-version."lodash._baseuniq"."4.6.0" = self.buildNodePackage {
+    name = "lodash._baseuniq-4.6.0";
+    version = "4.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz";
+      name = "lodash._baseuniq-4.6.0.tgz";
+      sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8";
+    };
+    deps = {
+      "lodash._createset-4.0.3" = self.by-version."lodash._createset"."4.0.3";
+      "lodash._root-3.0.1" = self.by-version."lodash._root"."3.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."lodash._basevalues"."^3.0.0" =
     self.by-version."lodash._basevalues"."3.0.0";
   by-version."lodash._basevalues"."3.0.0" = self.buildNodePackage {
@@ -26175,15 +27262,15 @@
     cpu = [ ];
   };
   by-spec."lodash._createset"."~4.0.0" =
-    self.by-version."lodash._createset"."4.0.1";
-  by-version."lodash._createset"."4.0.1" = self.buildNodePackage {
-    name = "lodash._createset-4.0.1";
-    version = "4.0.1";
+    self.by-version."lodash._createset"."4.0.3";
+  by-version."lodash._createset"."4.0.3" = self.buildNodePackage {
+    name = "lodash._createset-4.0.3";
+    version = "4.0.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.1.tgz";
-      name = "lodash._createset-4.0.1.tgz";
-      sha1 = "00e891e3dd386c4512fcb1f49060dfa4d02a9819";
+      url = "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz";
+      name = "lodash._createset-4.0.3.tgz";
+      sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26";
     };
     deps = {
     };
@@ -26309,25 +27396,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash._setcache"."~4.1.0" =
-    self.by-version."lodash._setcache"."4.1.2";
-  by-version."lodash._setcache"."4.1.2" = self.buildNodePackage {
-    name = "lodash._setcache-4.1.2";
-    version = "4.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/lodash._setcache/-/lodash._setcache-4.1.2.tgz";
-      name = "lodash._setcache-4.1.2.tgz";
-      sha1 = "90941f81b2ef907e3f8c63bfd22ba3b7b70d88aa";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."lodash._root"."~3.0.0" =
+    self.by-version."lodash._root"."3.0.1";
   by-spec."lodash.assign"."4.0.1" =
     self.by-version."lodash.assign"."4.0.1";
   by-version."lodash.assign"."4.0.1" = self.buildNodePackage {
@@ -26340,8 +27410,8 @@
       sha1 = "8e7ff0206897a99dca32fc8123309f5c4c2c731e";
     };
     deps = {
-      "lodash.keys-4.0.6" = self.by-version."lodash.keys"."4.0.6";
-      "lodash.rest-4.0.2" = self.by-version."lodash.rest"."4.0.2";
+      "lodash.keys-4.0.7" = self.by-version."lodash.keys"."4.0.7";
+      "lodash.rest-4.0.3" = self.by-version."lodash.rest"."4.0.3";
     };
     optionalDependencies = {
     };
@@ -26371,8 +27441,31 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.assign"."^3.2.0" =
-    self.by-version."lodash.assign"."3.2.0";
+  by-spec."lodash.assign"."^4.0.0" =
+    self.by-version."lodash.assign"."4.0.9";
+  by-version."lodash.assign"."4.0.9" = self.buildNodePackage {
+    name = "lodash.assign-4.0.9";
+    version = "4.0.9";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.0.9.tgz";
+      name = "lodash.assign-4.0.9.tgz";
+      sha1 = "0a0731d93590ddd9ba4589fad65aaf6ee09217e3";
+    };
+    deps = {
+      "lodash.keys-4.0.7" = self.by-version."lodash.keys"."4.0.7";
+      "lodash.rest-4.0.3" = self.by-version."lodash.rest"."4.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.assign"."^4.0.3" =
+    self.by-version."lodash.assign"."4.0.9";
+  by-spec."lodash.assign"."^4.0.6" =
+    self.by-version."lodash.assign"."4.0.9";
   by-spec."lodash.clonedeep"."~4.3.2" =
     self.by-version."lodash.clonedeep"."4.3.2";
   by-version."lodash.clonedeep"."4.3.2" = self.buildNodePackage {
@@ -26385,7 +27478,27 @@
       sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de";
     };
     deps = {
-      "lodash._baseclone-4.5.4" = self.by-version."lodash._baseclone"."4.5.4";
+      "lodash._baseclone-4.5.7" = self.by-version."lodash._baseclone"."4.5.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.debounce"."^3.0.1" =
+    self.by-version."lodash.debounce"."3.1.1";
+  by-version."lodash.debounce"."3.1.1" = self.buildNodePackage {
+    name = "lodash.debounce-3.1.1";
+    version = "3.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-3.1.1.tgz";
+      name = "lodash.debounce-3.1.1.tgz";
+      sha1 = "812211c378a94cc29d5aa4e3346cf0bfce3a7df5";
+    };
+    deps = {
+      "lodash._getnative-3.9.1" = self.by-version."lodash._getnative"."3.9.1";
     };
     optionalDependencies = {
     };
@@ -26472,18 +27585,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.isarray"."~4.0.0" =
-    self.by-version."lodash.isarray"."4.0.0";
-  by-version."lodash.isarray"."4.0.0" = self.buildNodePackage {
-    name = "lodash.isarray-4.0.0";
-    version = "4.0.0";
+  by-spec."lodash.isequal"."^4.0.0" =
+    self.by-version."lodash.isequal"."4.2.0";
+  by-version."lodash.isequal"."4.2.0" = self.buildNodePackage {
+    name = "lodash.isequal-4.2.0";
+    version = "4.2.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz";
-      name = "lodash.isarray-4.0.0.tgz";
-      sha1 = "2aca496b28c4ca6d726715313590c02e6ea34403";
+      url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.2.0.tgz";
+      name = "lodash.isequal-4.2.0.tgz";
+      sha1 = "43f5518f59e37463d3944e846b3a413180b0f46a";
     };
     deps = {
+      "lodash._root-3.0.1" = self.by-version."lodash._root"."3.0.1";
+      "lodash.keys-4.0.7" = self.by-version."lodash.keys"."4.0.7";
     };
     optionalDependencies = {
     };
@@ -26514,15 +27629,15 @@
     cpu = [ ];
   };
   by-spec."lodash.keys"."^4.0.0" =
-    self.by-version."lodash.keys"."4.0.6";
-  by-version."lodash.keys"."4.0.6" = self.buildNodePackage {
-    name = "lodash.keys-4.0.6";
-    version = "4.0.6";
+    self.by-version."lodash.keys"."4.0.7";
+  by-version."lodash.keys"."4.0.7" = self.buildNodePackage {
+    name = "lodash.keys-4.0.7";
+    version = "4.0.7";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.0.6.tgz";
-      name = "lodash.keys-4.0.6.tgz";
-      sha1 = "2087692c58b0e44e88658108da8ad66f417867ac";
+      url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.0.7.tgz";
+      name = "lodash.keys-4.0.7.tgz";
+      sha1 = "30e1b3bd98e54d6a0611991812685b6bc47cb63b";
     };
     deps = {
     };
@@ -26532,8 +27647,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.keys"."~4.0.6" =
-    self.by-version."lodash.keys"."4.0.6";
   by-spec."lodash.memoize"."~3.0.3" =
     self.by-version."lodash.memoize"."3.0.4";
   by-version."lodash.memoize"."3.0.4" = self.buildNodePackage {
@@ -26573,18 +27686,20 @@
     cpu = [ ];
   };
   by-spec."lodash.pad"."^4.1.0" =
-    self.by-version."lodash.pad"."4.2.0";
-  by-version."lodash.pad"."4.2.0" = self.buildNodePackage {
-    name = "lodash.pad-4.2.0";
-    version = "4.2.0";
+    self.by-version."lodash.pad"."4.4.0";
+  by-version."lodash.pad"."4.4.0" = self.buildNodePackage {
+    name = "lodash.pad-4.4.0";
+    version = "4.4.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.2.0.tgz";
-      name = "lodash.pad-4.2.0.tgz";
-      sha1 = "743e1adf26534d3e8cf3fba52a68aa4f48c38cd6";
+      url = "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.4.0.tgz";
+      name = "lodash.pad-4.4.0.tgz";
+      sha1 = "faa38df26c0a69ec5086a82246c958e150dcb1ab";
     };
     deps = {
-      "lodash.tostring-4.1.2" = self.by-version."lodash.tostring"."4.1.2";
+      "lodash._baseslice-4.0.0" = self.by-version."lodash._baseslice"."4.0.0";
+      "lodash._basetostring-4.12.0" = self.by-version."lodash._basetostring"."4.12.0";
+      "lodash.tostring-4.1.3" = self.by-version."lodash.tostring"."4.1.3";
     };
     optionalDependencies = {
     };
@@ -26593,18 +27708,20 @@
     cpu = [ ];
   };
   by-spec."lodash.padend"."^4.1.0" =
-    self.by-version."lodash.padend"."4.3.0";
-  by-version."lodash.padend"."4.3.0" = self.buildNodePackage {
-    name = "lodash.padend-4.3.0";
-    version = "4.3.0";
+    self.by-version."lodash.padend"."4.5.0";
+  by-version."lodash.padend"."4.5.0" = self.buildNodePackage {
+    name = "lodash.padend-4.5.0";
+    version = "4.5.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.3.0.tgz";
-      name = "lodash.padend-4.3.0.tgz";
-      sha1 = "5333dccbcd88cdd651a05ba6e05f483ae287119f";
+      url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.5.0.tgz";
+      name = "lodash.padend-4.5.0.tgz";
+      sha1 = "a289e9377ee2e6de8ba7f11f3a8eb326070b7619";
     };
     deps = {
-      "lodash.tostring-4.1.2" = self.by-version."lodash.tostring"."4.1.2";
+      "lodash._baseslice-4.0.0" = self.by-version."lodash._baseslice"."4.0.0";
+      "lodash._basetostring-4.12.0" = self.by-version."lodash._basetostring"."4.12.0";
+      "lodash.tostring-4.1.3" = self.by-version."lodash.tostring"."4.1.3";
     };
     optionalDependencies = {
     };
@@ -26613,18 +27730,20 @@
     cpu = [ ];
   };
   by-spec."lodash.padstart"."^4.1.0" =
-    self.by-version."lodash.padstart"."4.3.0";
-  by-version."lodash.padstart"."4.3.0" = self.buildNodePackage {
-    name = "lodash.padstart-4.3.0";
-    version = "4.3.0";
+    self.by-version."lodash.padstart"."4.5.0";
+  by-version."lodash.padstart"."4.5.0" = self.buildNodePackage {
+    name = "lodash.padstart-4.5.0";
+    version = "4.5.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.3.0.tgz";
-      name = "lodash.padstart-4.3.0.tgz";
-      sha1 = "7044f6c4a3544165d2b5b3c2203834809fac692e";
+      url = "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.5.0.tgz";
+      name = "lodash.padstart-4.5.0.tgz";
+      sha1 = "3ea190f6734841c3364d279d11e056726b60a79a";
     };
     deps = {
-      "lodash.tostring-4.1.2" = self.by-version."lodash.tostring"."4.1.2";
+      "lodash._baseslice-4.0.0" = self.by-version."lodash._baseslice"."4.0.0";
+      "lodash._basetostring-4.12.0" = self.by-version."lodash._basetostring"."4.12.0";
+      "lodash.tostring-4.1.3" = self.by-version."lodash.tostring"."4.1.3";
     };
     optionalDependencies = {
     };
@@ -26633,15 +27752,15 @@
     cpu = [ ];
   };
   by-spec."lodash.rest"."^4.0.0" =
-    self.by-version."lodash.rest"."4.0.2";
-  by-version."lodash.rest"."4.0.2" = self.buildNodePackage {
-    name = "lodash.rest-4.0.2";
-    version = "4.0.2";
+    self.by-version."lodash.rest"."4.0.3";
+  by-version."lodash.rest"."4.0.3" = self.buildNodePackage {
+    name = "lodash.rest-4.0.3";
+    version = "4.0.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.2.tgz";
-      name = "lodash.rest-4.0.2.tgz";
-      sha1 = "a15a7daa9cbd45e223ef5ba5d38e87dd02eac6bd";
+      url = "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.3.tgz";
+      name = "lodash.rest-4.0.3.tgz";
+      sha1 = "4c1c32c40028087250fabf70d42e0151548f48c5";
     };
     deps = {
     };
@@ -26722,15 +27841,15 @@
     cpu = [ ];
   };
   by-spec."lodash.tostring"."^4.0.0" =
-    self.by-version."lodash.tostring"."4.1.2";
-  by-version."lodash.tostring"."4.1.2" = self.buildNodePackage {
-    name = "lodash.tostring-4.1.2";
-    version = "4.1.2";
+    self.by-version."lodash.tostring"."4.1.3";
+  by-version."lodash.tostring"."4.1.3" = self.buildNodePackage {
+    name = "lodash.tostring-4.1.3";
+    version = "4.1.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.2.tgz";
-      name = "lodash.tostring-4.1.2.tgz";
-      sha1 = "7d326a5cf64da4298f2fd35b688d848267535288";
+      url = "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.3.tgz";
+      name = "lodash.tostring-4.1.3.tgz";
+      sha1 = "5697f62973f30105a76c2deb3e2d1669f04fd825";
     };
     deps = {
     };
@@ -26740,21 +27859,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.union"."~4.2.1" =
-    self.by-version."lodash.union"."4.2.1";
-  by-version."lodash.union"."4.2.1" = self.buildNodePackage {
-    name = "lodash.union-4.2.1";
-    version = "4.2.1";
+  by-spec."lodash.union"."~4.4.0" =
+    self.by-version."lodash.union"."4.4.0";
+  by-version."lodash.union"."4.4.0" = self.buildNodePackage {
+    name = "lodash.union-4.4.0";
+    version = "4.4.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.2.1.tgz";
-      name = "lodash.union-4.2.1.tgz";
-      sha1 = "6871017b9b1ff71952c1e2bb2e25b1046a7e2842";
+      url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz";
+      name = "lodash.union-4.4.0.tgz";
+      sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38";
     };
     deps = {
-      "lodash._baseflatten-4.1.1" = self.by-version."lodash._baseflatten"."4.1.1";
-      "lodash._baseuniq-4.5.1" = self.by-version."lodash._baseuniq"."4.5.1";
-      "lodash.rest-4.0.2" = self.by-version."lodash.rest"."4.0.2";
+      "lodash._baseflatten-4.2.1" = self.by-version."lodash._baseflatten"."4.2.1";
+      "lodash._baseuniq-4.6.0" = self.by-version."lodash._baseuniq"."4.6.0";
+      "lodash.rest-4.0.3" = self.by-version."lodash.rest"."4.0.3";
     };
     optionalDependencies = {
     };
@@ -26762,19 +27881,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.uniq"."~4.2.1" =
-    self.by-version."lodash.uniq"."4.2.1";
-  by-version."lodash.uniq"."4.2.1" = self.buildNodePackage {
-    name = "lodash.uniq-4.2.1";
-    version = "4.2.1";
+  by-spec."lodash.uniq"."~4.3.0" =
+    self.by-version."lodash.uniq"."4.3.0";
+  by-version."lodash.uniq"."4.3.0" = self.buildNodePackage {
+    name = "lodash.uniq-4.3.0";
+    version = "4.3.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.2.1.tgz";
-      name = "lodash.uniq-4.2.1.tgz";
-      sha1 = "4210d4b90647ee24211b469aed0ef84902069743";
+      url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz";
+      name = "lodash.uniq-4.3.0.tgz";
+      sha1 = "dcad810876841447d8f3ec662323c86a6d938227";
     };
     deps = {
-      "lodash._baseuniq-4.5.1" = self.by-version."lodash._baseuniq"."4.5.1";
+      "lodash._baseuniq-4.6.0" = self.by-version."lodash._baseuniq"."4.6.0";
     };
     optionalDependencies = {
     };
@@ -26782,20 +27901,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.without"."~4.1.2" =
-    self.by-version."lodash.without"."4.1.2";
-  by-version."lodash.without"."4.1.2" = self.buildNodePackage {
-    name = "lodash.without-4.1.2";
-    version = "4.1.2";
+  by-spec."lodash.without"."~4.2.0" =
+    self.by-version."lodash.without"."4.2.0";
+  by-version."lodash.without"."4.2.0" = self.buildNodePackage {
+    name = "lodash.without-4.2.0";
+    version = "4.2.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.1.2.tgz";
-      name = "lodash.without-4.1.2.tgz";
-      sha1 = "c68b1981e1b001bd87eef7487dba0af267846229";
+      url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz";
+      name = "lodash.without-4.2.0.tgz";
+      sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6";
     };
     deps = {
-      "lodash._basedifference-4.4.1" = self.by-version."lodash._basedifference"."4.4.1";
-      "lodash.rest-4.0.2" = self.by-version."lodash.rest"."4.0.2";
+      "lodash._basedifference-4.5.0" = self.by-version."lodash._basedifference"."4.5.0";
+      "lodash.rest-4.0.3" = self.by-version."lodash.rest"."4.0.3";
     };
     optionalDependencies = {
     };
@@ -26823,18 +27942,18 @@
     cpu = [ ];
   };
   by-spec."log4js"."^0.6.31" =
-    self.by-version."log4js"."0.6.33";
-  by-version."log4js"."0.6.33" = self.buildNodePackage {
-    name = "log4js-0.6.33";
-    version = "0.6.33";
+    self.by-version."log4js"."0.6.36";
+  by-version."log4js"."0.6.36" = self.buildNodePackage {
+    name = "log4js-0.6.36";
+    version = "0.6.36";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/log4js/-/log4js-0.6.33.tgz";
-      name = "log4js-0.6.33.tgz";
-      sha1 = "53f1bf825dac7cdfeadca6787624fa824ccf5b7e";
+      url = "https://registry.npmjs.org/log4js/-/log4js-0.6.36.tgz";
+      name = "log4js-0.6.36.tgz";
+      sha1 = "4ba7497a209a6d775676ab5efbc4237433858012";
     };
     deps = {
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
       "semver-4.3.6" = self.by-version."semver"."4.3.6";
     };
     optionalDependencies = {
@@ -26921,15 +28040,15 @@
     cpu = [ ];
   };
   by-spec."loose-envify"."^1.0.0" =
-    self.by-version."loose-envify"."1.1.0";
-  by-version."loose-envify"."1.1.0" = self.buildNodePackage {
-    name = "loose-envify-1.1.0";
-    version = "1.1.0";
-    bin = false;
+    self.by-version."loose-envify"."1.2.0";
+  by-version."loose-envify"."1.2.0" = self.buildNodePackage {
+    name = "loose-envify-1.2.0";
+    version = "1.2.0";
+    bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.1.0.tgz";
-      name = "loose-envify-1.1.0.tgz";
-      sha1 = "527582d62cff4e04da3f9976c7110d3392ec7e0c";
+      url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.2.0.tgz";
+      name = "loose-envify-1.2.0.tgz";
+      sha1 = "69a65aad3de542cf4ee0f4fe74e8e33c709ccb0f";
     };
     deps = {
       "js-tokens-1.0.3" = self.by-version."js-tokens"."1.0.3";
@@ -26941,20 +28060,20 @@
     cpu = [ ];
   };
   by-spec."loose-envify"."^1.1.0" =
-    self.by-version."loose-envify"."1.1.0";
+    self.by-version."loose-envify"."1.2.0";
   by-spec."loud-rejection"."^1.0.0" =
-    self.by-version."loud-rejection"."1.3.0";
-  by-version."loud-rejection"."1.3.0" = self.buildNodePackage {
-    name = "loud-rejection-1.3.0";
-    version = "1.3.0";
+    self.by-version."loud-rejection"."1.4.1";
+  by-version."loud-rejection"."1.4.1" = self.buildNodePackage {
+    name = "loud-rejection-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.3.0.tgz";
-      name = "loud-rejection-1.3.0.tgz";
-      sha1 = "f289a392f17d2baacf194d0a673004394433b115";
+      url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.4.1.tgz";
+      name = "loud-rejection-1.4.1.tgz";
+      sha1 = "13f58c75b1430e65141cd075ace9a2ee575b236c";
     };
     deps = {
-      "array-find-index-1.0.1" = self.by-version."array-find-index"."1.0.1";
+      "currently-unhandled-0.4.1" = self.by-version."currently-unhandled"."0.4.1";
       "signal-exit-2.1.2" = self.by-version."signal-exit"."2.1.2";
     };
     optionalDependencies = {
@@ -27080,27 +28199,6 @@
   };
   by-spec."lru-cache"."^2.5.0" =
     self.by-version."lru-cache"."2.7.3";
-  by-spec."lru-cache"."^4.0.0" =
-    self.by-version."lru-cache"."4.0.1";
-  by-version."lru-cache"."4.0.1" = self.buildNodePackage {
-    name = "lru-cache-4.0.1";
-    version = "4.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz";
-      name = "lru-cache-4.0.1.tgz";
-      sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be";
-    };
-    deps = {
-      "pseudomap-1.0.2" = self.by-version."pseudomap"."1.0.2";
-      "yallist-2.0.0" = self.by-version."yallist"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."lru-cache"."~1.0.2" =
     self.by-version."lru-cache"."1.0.6";
   by-version."lru-cache"."1.0.6" = self.buildNodePackage {
@@ -27122,19 +28220,20 @@
   };
   by-spec."lru-cache"."~2.5.0" =
     self.by-version."lru-cache"."2.5.2";
-  by-spec."lru-cache"."~3.2.0" =
-    self.by-version."lru-cache"."3.2.0";
-  by-version."lru-cache"."3.2.0" = self.buildNodePackage {
-    name = "lru-cache-3.2.0";
-    version = "3.2.0";
+  by-spec."lru-cache"."~4.0.1" =
+    self.by-version."lru-cache"."4.0.1";
+  by-version."lru-cache"."4.0.1" = self.buildNodePackage {
+    name = "lru-cache-4.0.1";
+    version = "4.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz";
-      name = "lru-cache-3.2.0.tgz";
-      sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee";
+      url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz";
+      name = "lru-cache-4.0.1.tgz";
+      sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be";
     };
     deps = {
       "pseudomap-1.0.2" = self.by-version."pseudomap"."1.0.2";
+      "yallist-2.0.0" = self.by-version."yallist"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -27200,15 +28299,15 @@
     cpu = [ ];
   };
   by-spec."ltx"."*" =
-    self.by-version."ltx"."2.3.0";
-  by-version."ltx"."2.3.0" = self.buildNodePackage {
-    name = "ltx-2.3.0";
-    version = "2.3.0";
+    self.by-version."ltx"."2.4.1";
+  by-version."ltx"."2.4.1" = self.buildNodePackage {
+    name = "ltx-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/ltx/-/ltx-2.3.0.tgz";
-      name = "ltx-2.3.0.tgz";
-      sha1 = "0d86d7366b866ad718b1c545f71c137884db2186";
+      url = "https://registry.npmjs.org/ltx/-/ltx-2.4.1.tgz";
+      name = "ltx-2.4.1.tgz";
+      sha1 = "6a5cb23fd508b5e4833acdc910d4ea037e9dbefe";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -27219,7 +28318,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "ltx" = self.by-version."ltx"."2.3.0";
+  "ltx" = self.by-version."ltx"."2.4.1";
   by-spec."ltx"."^0.9.0" =
     self.by-version."ltx"."0.9.1";
   by-version."ltx"."0.9.1" = self.buildNodePackage {
@@ -27241,22 +28340,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ltx"."^2.0.1" =
-    self.by-version."ltx"."2.3.0";
   by-spec."ltx"."^2.2.0" =
-    self.by-version."ltx"."2.3.0";
+    self.by-version."ltx"."2.4.1";
   by-spec."ltx"."~0.9.0" =
     self.by-version."ltx"."0.9.1";
   by-spec."lunr".">=0.5.2 <1.0.0-0" =
-    self.by-version."lunr"."0.7.0";
-  by-version."lunr"."0.7.0" = self.buildNodePackage {
-    name = "lunr-0.7.0";
-    version = "0.7.0";
+    self.by-version."lunr"."0.7.1";
+  by-version."lunr"."0.7.1" = self.buildNodePackage {
+    name = "lunr-0.7.1";
+    version = "0.7.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/lunr/-/lunr-0.7.0.tgz";
-      name = "lunr-0.7.0.tgz";
-      sha1 = "e7d279a273c4ab42ff584b61ce32a3513a2d3859";
+      url = "https://registry.npmjs.org/lunr/-/lunr-0.7.1.tgz";
+      name = "lunr-0.7.1.tgz";
+      sha1 = "b5a2cff99555b7893f5f1a4a17af3f638373c4bb";
     };
     deps = {
     };
@@ -27333,19 +28430,19 @@
   by-spec."magnet-uri"."~2.0.0" =
     self.by-version."magnet-uri"."2.0.1";
   by-spec."mailchimp".">=1.1.0" =
-    self.by-version."mailchimp"."1.1.6";
-  by-version."mailchimp"."1.1.6" = self.buildNodePackage {
-    name = "mailchimp-1.1.6";
-    version = "1.1.6";
+    self.by-version."mailchimp"."1.2.0";
+  by-version."mailchimp"."1.2.0" = self.buildNodePackage {
+    name = "mailchimp-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mailchimp/-/mailchimp-1.1.6.tgz";
-      name = "mailchimp-1.1.6.tgz";
-      sha1 = "5aa72867e3043f173de6d1ff6965e6ed3ea55b61";
+      url = "https://registry.npmjs.org/mailchimp/-/mailchimp-1.2.0.tgz";
+      name = "mailchimp-1.2.0.tgz";
+      sha1 = "cbabf992120e5f7225ca9484a4393844a58272b4";
     };
     deps = {
-      "request-2.70.0" = self.by-version."request"."2.70.0";
-      "qs-1.2.2" = self.by-version."qs"."1.2.2";
+      "qs-6.2.0" = self.by-version."qs"."6.2.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -27354,18 +28451,18 @@
     cpu = [ ];
   };
   by-spec."mailcomposer".">= 0.1.27" =
-    self.by-version."mailcomposer"."3.7.0";
-  by-version."mailcomposer"."3.7.0" = self.buildNodePackage {
-    name = "mailcomposer-3.7.0";
-    version = "3.7.0";
+    self.by-version."mailcomposer"."3.9.0";
+  by-version."mailcomposer"."3.9.0" = self.buildNodePackage {
+    name = "mailcomposer-3.9.0";
+    version = "3.9.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.7.0.tgz";
-      name = "mailcomposer-3.7.0.tgz";
-      sha1 = "6f328613e972df8b5035c0834c65ea992d81433c";
+      url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.9.0.tgz";
+      name = "mailcomposer-3.9.0.tgz";
+      sha1 = "1b2781d349732f3f2ae419e1e187dcd5d9702712";
     };
     deps = {
-      "buildmail-3.6.0" = self.by-version."buildmail"."3.6.0";
+      "buildmail-3.7.0" = self.by-version."buildmail"."3.7.0";
       "libmime-2.0.3" = self.by-version."libmime"."2.0.3";
     };
     optionalDependencies = {
@@ -27374,6 +28471,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."mailcomposer"."^2.1.0" =
+    self.by-version."mailcomposer"."2.1.0";
+  by-version."mailcomposer"."2.1.0" = self.buildNodePackage {
+    name = "mailcomposer-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-2.1.0.tgz";
+      name = "mailcomposer-2.1.0.tgz";
+      sha1 = "a6531822899614fee899c92226d81e2b9cbb183d";
+    };
+    deps = {
+      "buildmail-2.0.0" = self.by-version."buildmail"."2.0.0";
+      "libmime-1.2.0" = self.by-version."libmime"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."mailcomposer"."~0.2.10" =
     self.by-version."mailcomposer"."0.2.12";
   by-version."mailcomposer"."0.2.12" = self.buildNodePackage {
@@ -27424,6 +28542,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."mailparser"."^0.6.0" =
+    self.by-version."mailparser"."0.6.0";
+  by-version."mailparser"."0.6.0" = self.buildNodePackage {
+    name = "mailparser-0.6.0";
+    version = "0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.0.tgz";
+      name = "mailparser-0.6.0.tgz";
+      sha1 = "6fb84c3012d34acccf97a27e778d0288ebb20248";
+    };
+    deps = {
+      "mimelib-0.2.19" = self.by-version."mimelib"."0.2.19";
+      "encoding-0.1.12" = self.by-version."encoding"."0.1.12";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "uue-3.0.0" = self.by-version."uue"."3.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."map-obj"."^1.0.0" =
     self.by-version."map-obj"."1.0.1";
   by-version."map-obj"."1.0.1" = self.buildNodePackage {
@@ -27478,9 +28619,9 @@
     deps = {
       "argparse-1.0.7" = self.by-version."argparse"."1.0.7";
       "entities-1.1.1" = self.by-version."entities"."1.1.1";
-      "linkify-it-1.2.0" = self.by-version."linkify-it"."1.2.0";
+      "linkify-it-1.2.4" = self.by-version."linkify-it"."1.2.4";
       "mdurl-1.0.1" = self.by-version."mdurl"."1.0.1";
-      "uc.micro-1.0.0" = self.by-version."uc.micro"."1.0.0";
+      "uc.micro-1.0.1" = self.by-version."uc.micro"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -27545,7 +28686,7 @@
     };
     deps = {
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
-      "figures-1.5.0" = self.by-version."figures"."1.5.0";
+      "figures-1.7.0" = self.by-version."figures"."1.7.0";
       "gzip-size-1.0.0" = self.by-version."gzip-size"."1.0.0";
       "pretty-bytes-1.0.4" = self.by-version."pretty-bytes"."1.0.4";
     };
@@ -27735,7 +28876,7 @@
     };
     deps = {
       "errno-0.1.4" = self.by-version."errno"."0.1.4";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -27759,11 +28900,11 @@
     deps = {
       "camelcase-keys-2.1.0" = self.by-version."camelcase-keys"."2.1.0";
       "decamelize-1.2.0" = self.by-version."decamelize"."1.2.0";
-      "loud-rejection-1.3.0" = self.by-version."loud-rejection"."1.3.0";
+      "loud-rejection-1.4.1" = self.by-version."loud-rejection"."1.4.1";
       "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1";
       "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
       "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
-      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
       "read-pkg-up-1.0.1" = self.by-version."read-pkg-up"."1.0.1";
       "redent-1.0.0" = self.by-version."redent"."1.0.0";
       "trim-newlines-1.0.0" = self.by-version."trim-newlines"."1.0.0";
@@ -27856,6 +28997,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."merge-stream"."^1.0.0" =
+    self.by-version."merge-stream"."1.0.0";
+  by-version."merge-stream"."1.0.0" = self.buildNodePackage {
+    name = "merge-stream-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz";
+      name = "merge-stream-1.0.0.tgz";
+      sha1 = "9cfd156fef35421e2b5403ce11dc6eb1962b026e";
+    };
+    deps = {
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."method-override"."1.0.0" =
     self.by-version."method-override"."1.0.0";
   by-version."method-override"."1.0.0" = self.buildNodePackage {
@@ -27897,21 +29058,21 @@
     cpu = [ ];
   };
   by-spec."method-override"."~2.3.5" =
-    self.by-version."method-override"."2.3.5";
-  by-version."method-override"."2.3.5" = self.buildNodePackage {
-    name = "method-override-2.3.5";
-    version = "2.3.5";
+    self.by-version."method-override"."2.3.6";
+  by-version."method-override"."2.3.6" = self.buildNodePackage {
+    name = "method-override-2.3.6";
+    version = "2.3.6";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/method-override/-/method-override-2.3.5.tgz";
-      name = "method-override-2.3.5.tgz";
-      sha1 = "2cd5cdbff00c3673d7ae345119a812a5d95b8c8e";
+      url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz";
+      name = "method-override-2.3.6.tgz";
+      sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e";
     };
     deps = {
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "methods-1.1.2" = self.by-version."methods"."1.1.2";
       "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
-      "vary-1.0.1" = self.by-version."vary"."1.0.1";
+      "vary-1.1.0" = self.by-version."vary"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -28057,26 +29218,26 @@
     cpu = [ ];
   };
   by-spec."micromatch"."^2.1.5" =
-    self.by-version."micromatch"."2.3.7";
-  by-version."micromatch"."2.3.7" = self.buildNodePackage {
-    name = "micromatch-2.3.7";
-    version = "2.3.7";
+    self.by-version."micromatch"."2.3.8";
+  by-version."micromatch"."2.3.8" = self.buildNodePackage {
+    name = "micromatch-2.3.8";
+    version = "2.3.8";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.7.tgz";
-      name = "micromatch-2.3.7.tgz";
-      sha1 = "2f2e85ef46140dbea6cb55e739b6b11b30eaa509";
+      url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.8.tgz";
+      name = "micromatch-2.3.8.tgz";
+      sha1 = "94fbf8f37ed9edeca06bf1c8f7b743fb5f6f5854";
     };
     deps = {
       "arr-diff-2.0.0" = self.by-version."arr-diff"."2.0.0";
       "array-unique-0.2.1" = self.by-version."array-unique"."0.2.1";
-      "braces-1.8.3" = self.by-version."braces"."1.8.3";
+      "braces-1.8.5" = self.by-version."braces"."1.8.5";
       "expand-brackets-0.1.5" = self.by-version."expand-brackets"."0.1.5";
       "extglob-0.3.2" = self.by-version."extglob"."0.3.2";
       "filename-regex-2.0.0" = self.by-version."filename-regex"."2.0.0";
       "is-extglob-1.0.0" = self.by-version."is-extglob"."1.0.0";
       "is-glob-2.0.1" = self.by-version."is-glob"."2.0.1";
-      "kind-of-3.0.2" = self.by-version."kind-of"."3.0.2";
+      "kind-of-3.0.3" = self.by-version."kind-of"."3.0.3";
       "normalize-path-2.0.1" = self.by-version."normalize-path"."2.0.1";
       "object.omit-2.0.0" = self.by-version."object.omit"."2.0.0";
       "parse-glob-3.0.4" = self.by-version."parse-glob"."3.0.4";
@@ -28088,6 +29249,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."micromatch"."^2.3.7" =
+    self.by-version."micromatch"."2.3.8";
   by-spec."miller-rabin"."^4.0.0" =
     self.by-version."miller-rabin"."4.0.0";
   by-version."miller-rabin"."4.0.0" = self.buildNodePackage {
@@ -28100,7 +29263,7 @@
       sha1 = "4a62fb1d42933c05583982f4c716f6fb9e6c6d3d";
     };
     deps = {
-      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "bn.js-4.11.4" = self.by-version."bn.js"."4.11.4";
       "brorand-1.0.5" = self.by-version."brorand"."1.0.5";
     };
     optionalDependencies = {
@@ -28207,16 +29370,16 @@
     self.by-version."mime"."1.2.11";
   by-spec."mime"."~1.2.9" =
     self.by-version."mime"."1.2.11";
-  by-spec."mime-db".">= 1.21.0 < 2" =
-    self.by-version."mime-db"."1.22.0";
-  by-version."mime-db"."1.22.0" = self.buildNodePackage {
-    name = "mime-db-1.22.0";
-    version = "1.22.0";
+  by-spec."mime-db".">= 1.23.0 < 2" =
+    self.by-version."mime-db"."1.23.0";
+  by-version."mime-db"."1.23.0" = self.buildNodePackage {
+    name = "mime-db-1.23.0";
+    version = "1.23.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz";
-      name = "mime-db-1.22.0.tgz";
-      sha1 = "ab23a6372dc9d86d3dc9121bd0ebd38105a1904a";
+      url = "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz";
+      name = "mime-db-1.23.0.tgz";
+      sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659";
     };
     deps = {
     };
@@ -28245,21 +29408,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime-db"."~1.22.0" =
-    self.by-version."mime-db"."1.22.0";
+  by-spec."mime-db"."~1.23.0" =
+    self.by-version."mime-db"."1.23.0";
   by-spec."mime-types"."^2.1.10" =
-    self.by-version."mime-types"."2.1.10";
-  by-version."mime-types"."2.1.10" = self.buildNodePackage {
-    name = "mime-types-2.1.10";
-    version = "2.1.10";
+    self.by-version."mime-types"."2.1.11";
+  by-version."mime-types"."2.1.11" = self.buildNodePackage {
+    name = "mime-types-2.1.11";
+    version = "2.1.11";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz";
-      name = "mime-types-2.1.10.tgz";
-      sha1 = "b93c7cb4362e16d41072a7e54538fb4d43070837";
+      url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz";
+      name = "mime-types-2.1.11.tgz";
+      sha1 = "c259c471bda808a85d6cd193b430a5fae4473b3c";
     };
     deps = {
-      "mime-db-1.22.0" = self.by-version."mime-db"."1.22.0";
+      "mime-db-1.23.0" = self.by-version."mime-db"."1.23.0";
     };
     optionalDependencies = {
     };
@@ -28267,8 +29430,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."mime-types"."^2.1.3" =
+    self.by-version."mime-types"."2.1.11";
   by-spec."mime-types"."^2.1.7" =
-    self.by-version."mime-types"."2.1.10";
+    self.by-version."mime-types"."2.1.11";
   by-spec."mime-types"."~1.0.0" =
     self.by-version."mime-types"."1.0.2";
   by-version."mime-types"."1.0.2" = self.buildNodePackage {
@@ -28316,17 +29481,17 @@
     self.by-version."mime-types"."2.0.14";
   by-spec."mime-types"."~2.0.9" =
     self.by-version."mime-types"."2.0.14";
-  by-spec."mime-types"."~2.1.10" =
-    self.by-version."mime-types"."2.1.10";
+  by-spec."mime-types"."~2.1.11" =
+    self.by-version."mime-types"."2.1.11";
   by-spec."mime-types"."~2.1.2" =
-    self.by-version."mime-types"."2.1.10";
+    self.by-version."mime-types"."2.1.11";
   by-spec."mime-types"."~2.1.6" =
-    self.by-version."mime-types"."2.1.10";
+    self.by-version."mime-types"."2.1.11";
   by-spec."mime-types"."~2.1.7" =
-    self.by-version."mime-types"."2.1.10";
+    self.by-version."mime-types"."2.1.11";
   by-spec."mime-types"."~2.1.9" =
-    self.by-version."mime-types"."2.1.10";
-  by-spec."mimelib"."~0.2.15" =
+    self.by-version."mime-types"."2.1.11";
+  by-spec."mimelib"."^0.2.19" =
     self.by-version."mimelib"."0.2.19";
   by-version."mimelib"."0.2.19" = self.buildNodePackage {
     name = "mimelib-0.2.19";
@@ -28347,6 +29512,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."mimelib"."~0.2.15" =
+    self.by-version."mimelib"."0.2.19";
   by-spec."minilog"."~2.0.2" =
     self.by-version."minilog"."2.0.8";
   by-version."minilog"."2.0.8" = self.buildNodePackage {
@@ -28481,7 +29648,7 @@
       sha1 = "5236157a51e4f004c177fb3c527ff7dd78f0ef83";
     };
     deps = {
-      "brace-expansion-1.1.3" = self.by-version."brace-expansion"."1.1.3";
+      "brace-expansion-1.1.4" = self.by-version."brace-expansion"."1.1.4";
     };
     optionalDependencies = {
     };
@@ -28501,7 +29668,7 @@
       sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
     };
     deps = {
-      "brace-expansion-1.1.3" = self.by-version."brace-expansion"."1.1.3";
+      "brace-expansion-1.1.4" = self.by-version."brace-expansion"."1.1.4";
     };
     optionalDependencies = {
     };
@@ -28806,26 +29973,27 @@
   by-spec."mkdirp"."~0.5.1" =
     self.by-version."mkdirp"."0.5.1";
   by-spec."mocha"."*" =
-    self.by-version."mocha"."2.4.5";
-  by-version."mocha"."2.4.5" = self.buildNodePackage {
-    name = "mocha-2.4.5";
-    version = "2.4.5";
+    self.by-version."mocha"."2.5.3";
+  by-version."mocha"."2.5.3" = self.buildNodePackage {
+    name = "mocha-2.5.3";
+    version = "2.5.3";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-2.4.5.tgz";
-      name = "mocha-2.4.5.tgz";
-      sha1 = "151768dd2875eb51bc8295e9800026e9f2bb398f";
+      url = "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz";
+      name = "mocha-2.5.3.tgz";
+      sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58";
     };
     deps = {
       "commander-2.3.0" = self.by-version."commander"."2.3.0";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "diff-1.4.0" = self.by-version."diff"."1.4.0";
       "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2";
-      "glob-3.2.3" = self.by-version."glob"."3.2.3";
-      "growl-1.8.1" = self.by-version."growl"."1.8.1";
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "growl-1.9.2" = self.by-version."growl"."1.9.2";
       "jade-0.26.3" = self.by-version."jade"."0.26.3";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "supports-color-1.2.0" = self.by-version."supports-color"."1.2.0";
+      "to-iso-string-0.0.2" = self.by-version."to-iso-string"."0.0.2";
     };
     optionalDependencies = {
     };
@@ -28833,7 +30001,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "mocha" = self.by-version."mocha"."2.4.5";
+  "mocha" = self.by-version."mocha"."2.5.3";
   by-spec."mocha-phantomjs"."*" =
     self.by-version."mocha-phantomjs"."4.0.2";
   by-version."mocha-phantomjs"."4.0.2" = self.buildNodePackage {
@@ -28847,7 +30015,7 @@
     };
     deps = {
       "phantomjs-1.9.7-15" = self.by-version."phantomjs"."1.9.7-15";
-      "mocha-phantomjs-core-1.3.0" = self.by-version."mocha-phantomjs-core"."1.3.0";
+      "mocha-phantomjs-core-1.3.1" = self.by-version."mocha-phantomjs-core"."1.3.1";
       "commander-2.9.0" = self.by-version."commander"."2.9.0";
     };
     optionalDependencies = {
@@ -28858,15 +30026,15 @@
   };
   "mocha-phantomjs" = self.by-version."mocha-phantomjs"."4.0.2";
   by-spec."mocha-phantomjs-core"."^1.1.0" =
-    self.by-version."mocha-phantomjs-core"."1.3.0";
-  by-version."mocha-phantomjs-core"."1.3.0" = self.buildNodePackage {
-    name = "mocha-phantomjs-core-1.3.0";
-    version = "1.3.0";
+    self.by-version."mocha-phantomjs-core"."1.3.1";
+  by-version."mocha-phantomjs-core"."1.3.1" = self.buildNodePackage {
+    name = "mocha-phantomjs-core-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha-phantomjs-core/-/mocha-phantomjs-core-1.3.0.tgz";
-      name = "mocha-phantomjs-core-1.3.0.tgz";
-      sha1 = "fa991c9b13e3ba34fa0a0fe4c3f567da84882eb0";
+      url = "https://registry.npmjs.org/mocha-phantomjs-core/-/mocha-phantomjs-core-1.3.1.tgz";
+      name = "mocha-phantomjs-core-1.3.1.tgz";
+      sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18";
     };
     deps = {
     };
@@ -28912,15 +30080,15 @@
       sha1 = "ea75caf9199090d25b0d5512b5acacb96e7f87f3";
     };
     deps = {
-      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
-      "browser-resolve-1.11.1" = self.by-version."browser-resolve"."1.11.1";
+      "JSONStream-1.1.2" = self.by-version."JSONStream"."1.1.2";
+      "browser-resolve-1.11.2" = self.by-version."browser-resolve"."1.11.2";
       "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10";
       "defined-1.0.0" = self.by-version."defined"."1.0.0";
       "detective-4.3.1" = self.by-version."detective"."4.3.1";
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "parents-1.0.1" = self.by-version."parents"."1.0.1";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
       "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
       "stream-combiner2-1.0.2" = self.by-version."stream-combiner2"."1.0.2";
       "subarg-1.0.0" = self.by-version."subarg"."1.0.0";
@@ -28934,26 +30102,26 @@
     cpu = [ ];
   };
   by-spec."module-deps"."^4.0.2" =
-    self.by-version."module-deps"."4.0.5";
-  by-version."module-deps"."4.0.5" = self.buildNodePackage {
-    name = "module-deps-4.0.5";
-    version = "4.0.5";
+    self.by-version."module-deps"."4.0.7";
+  by-version."module-deps"."4.0.7" = self.buildNodePackage {
+    name = "module-deps-4.0.7";
+    version = "4.0.7";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.5.tgz";
-      name = "module-deps-4.0.5.tgz";
-      sha1 = "67c5fad02e1c8720a56ec3182d624bf97d18bd9c";
+      url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.7.tgz";
+      name = "module-deps-4.0.7.tgz";
+      sha1 = "edfeb3937be7359bc14a6672c22ef124887f6ed2";
     };
     deps = {
-      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
-      "browser-resolve-1.11.1" = self.by-version."browser-resolve"."1.11.1";
+      "JSONStream-1.1.2" = self.by-version."JSONStream"."1.1.2";
+      "browser-resolve-1.11.2" = self.by-version."browser-resolve"."1.11.2";
       "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
       "defined-1.0.0" = self.by-version."defined"."1.0.0";
       "detective-4.3.1" = self.by-version."detective"."4.3.1";
       "duplexer2-0.1.4" = self.by-version."duplexer2"."0.1.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "parents-1.0.1" = self.by-version."parents"."1.0.1";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
       "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
       "stream-combiner2-1.1.1" = self.by-version."stream-combiner2"."1.1.1";
       "subarg-1.0.0" = self.by-version."subarg"."1.0.0";
@@ -29005,15 +30173,15 @@
     cpu = [ ];
   };
   by-spec."moment"."2.x.x" =
-    self.by-version."moment"."2.12.0";
-  by-version."moment"."2.12.0" = self.buildNodePackage {
-    name = "moment-2.12.0";
-    version = "2.12.0";
+    self.by-version."moment"."2.13.0";
+  by-version."moment"."2.13.0" = self.buildNodePackage {
+    name = "moment-2.13.0";
+    version = "2.13.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/moment/-/moment-2.12.0.tgz";
-      name = "moment-2.12.0.tgz";
-      sha1 = "dc2560d19838d6c0731b1a6afa04675264d360d6";
+      url = "https://registry.npmjs.org/moment/-/moment-2.13.0.tgz";
+      name = "moment-2.13.0.tgz";
+      sha1 = "24162d99521e6d40f99ae6939e806d2139eaac52";
     };
     deps = {
     };
@@ -29024,15 +30192,15 @@
     cpu = [ ];
   };
   by-spec."moment".">= 2.6.0" =
-    self.by-version."moment"."2.12.0";
+    self.by-version."moment"."2.13.0";
   by-spec."moment".">=2.4.0" =
-    self.by-version."moment"."2.12.0";
+    self.by-version."moment"."2.13.0";
   by-spec."moment".">=2.5.0" =
-    self.by-version."moment"."2.12.0";
+    self.by-version."moment"."2.13.0";
   by-spec."moment"."^2.10.6" =
-    self.by-version."moment"."2.12.0";
+    self.by-version."moment"."2.13.0";
   by-spec."moment"."^2.8.4" =
-    self.by-version."moment"."2.12.0";
+    self.by-version."moment"."2.13.0";
   by-spec."moment"."~2.11.2" =
     self.by-version."moment"."2.11.2";
   by-version."moment"."2.11.2" = self.buildNodePackage {
@@ -29074,18 +30242,18 @@
   by-spec."moment"."~2.5.1" =
     self.by-version."moment"."2.5.1";
   by-spec."moment-timezone".">=0.0.3" =
-    self.by-version."moment-timezone"."0.5.3";
-  by-version."moment-timezone"."0.5.3" = self.buildNodePackage {
-    name = "moment-timezone-0.5.3";
-    version = "0.5.3";
+    self.by-version."moment-timezone"."0.5.4";
+  by-version."moment-timezone"."0.5.4" = self.buildNodePackage {
+    name = "moment-timezone-0.5.4";
+    version = "0.5.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.3.tgz";
-      name = "moment-timezone-0.5.3.tgz";
-      sha1 = "34ba53bd719677975bee9d0e8ba799ad9373f082";
+      url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.4.tgz";
+      name = "moment-timezone-0.5.4.tgz";
+      sha1 = "b6188b8f08557ea9ffb0d42899f5b171e1858e93";
     };
     deps = {
-      "moment-2.12.0" = self.by-version."moment"."2.12.0";
+      "moment-2.13.0" = self.by-version."moment"."2.13.0";
     };
     optionalDependencies = {
     };
@@ -29094,7 +30262,7 @@
     cpu = [ ];
   };
   by-spec."moment-timezone".">=0.3.0" =
-    self.by-version."moment-timezone"."0.5.3";
+    self.by-version."moment-timezone"."0.5.4";
   by-spec."moment-timezone"."~0.3.0" =
     self.by-version."moment-timezone"."0.3.1";
   by-version."moment-timezone"."0.3.1" = self.buildNodePackage {
@@ -29107,7 +30275,7 @@
       sha1 = "3ef47856b02d53b718a10a5ec2023aa299e07bf5";
     };
     deps = {
-      "moment-2.12.0" = self.by-version."moment"."2.12.0";
+      "moment-2.13.0" = self.by-version."moment"."2.13.0";
     };
     optionalDependencies = {
     };
@@ -29178,20 +30346,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mongodb"."2.1.14" =
-    self.by-version."mongodb"."2.1.14";
-  by-version."mongodb"."2.1.14" = self.buildNodePackage {
-    name = "mongodb-2.1.14";
-    version = "2.1.14";
+  by-spec."mongodb"."2.1.18" =
+    self.by-version."mongodb"."2.1.18";
+  by-version."mongodb"."2.1.18" = self.buildNodePackage {
+    name = "mongodb-2.1.18";
+    version = "2.1.18";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mongodb/-/mongodb-2.1.14.tgz";
-      name = "mongodb-2.1.14.tgz";
-      sha1 = "d78e9d70e0966ed56aba87abd15a1f1ab9478c85";
+      url = "https://registry.npmjs.org/mongodb/-/mongodb-2.1.18.tgz";
+      name = "mongodb-2.1.18.tgz";
+      sha1 = "28d40b515b2be4d5a69ffdd4c535f0df432e4097";
     };
     deps = {
       "es6-promise-3.0.2" = self.by-version."es6-promise"."3.0.2";
-      "mongodb-core-1.3.13" = self.by-version."mongodb-core"."1.3.13";
+      "mongodb-core-1.3.18" = self.by-version."mongodb-core"."1.3.18";
       "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31";
     };
     optionalDependencies = {
@@ -29215,7 +30383,7 @@
       "mongodb-core-1.2.31" = self.by-version."mongodb-core"."1.2.31";
       "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31";
       "es6-promise-2.1.1" = self.by-version."es6-promise"."2.1.1";
-      "kerberos-0.0.19" = self.by-version."kerberos"."0.0.19";
+      "kerberos-0.0.21" = self.by-version."kerberos"."0.0.21";
     };
     optionalDependencies = {
     };
@@ -29224,19 +30392,19 @@
     cpu = [ ];
   };
   by-spec."mongodb".">= 1.2.0 <2.2.0" =
-    self.by-version."mongodb"."2.1.16";
-  by-version."mongodb"."2.1.16" = self.buildNodePackage {
-    name = "mongodb-2.1.16";
-    version = "2.1.16";
+    self.by-version."mongodb"."2.1.21";
+  by-version."mongodb"."2.1.21" = self.buildNodePackage {
+    name = "mongodb-2.1.21";
+    version = "2.1.21";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mongodb/-/mongodb-2.1.16.tgz";
-      name = "mongodb-2.1.16.tgz";
-      sha1 = "8501a7465574ef4b605c46c98cd6bd57fc4968fa";
+      url = "https://registry.npmjs.org/mongodb/-/mongodb-2.1.21.tgz";
+      name = "mongodb-2.1.21.tgz";
+      sha1 = "764709dbcceb5825b4eb31f95395f965fd442272";
     };
     deps = {
       "es6-promise-3.0.2" = self.by-version."es6-promise"."3.0.2";
-      "mongodb-core-1.3.16" = self.by-version."mongodb-core"."1.3.16";
+      "mongodb-core-1.3.21" = self.by-version."mongodb-core"."1.3.21";
       "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31";
     };
     optionalDependencies = {
@@ -29262,7 +30430,7 @@
       "bson-0.4.23" = self.by-version."bson"."0.4.23";
     };
     optionalDependencies = {
-      "kerberos-0.0.19" = self.by-version."kerberos"."0.0.19";
+      "kerberos-0.0.21" = self.by-version."kerberos"."0.0.21";
     };
     peerDependencies = [];
     os = [ ];
@@ -29285,20 +30453,20 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."kerberos"."0.0.19"];
+      self.by-version."kerberos"."0.0.21"];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mongodb-core"."1.3.13" =
-    self.by-version."mongodb-core"."1.3.13";
-  by-version."mongodb-core"."1.3.13" = self.buildNodePackage {
-    name = "mongodb-core-1.3.13";
-    version = "1.3.13";
+  by-spec."mongodb-core"."1.3.18" =
+    self.by-version."mongodb-core"."1.3.18";
+  by-version."mongodb-core"."1.3.18" = self.buildNodePackage {
+    name = "mongodb-core-1.3.18";
+    version = "1.3.18";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.13.tgz";
-      name = "mongodb-core-1.3.13.tgz";
-      sha1 = "0a8e8719461ed98f36ed981ae00fa65d8b97781d";
+      url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.18.tgz";
+      name = "mongodb-core-1.3.18.tgz";
+      sha1 = "90684b3b7c7356d65ae356391d30b0f248804c7a";
     };
     deps = {
       "bson-0.4.23" = self.by-version."bson"."0.4.23";
@@ -29310,16 +30478,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mongodb-core"."1.3.16" =
-    self.by-version."mongodb-core"."1.3.16";
-  by-version."mongodb-core"."1.3.16" = self.buildNodePackage {
-    name = "mongodb-core-1.3.16";
-    version = "1.3.16";
+  by-spec."mongodb-core"."1.3.21" =
+    self.by-version."mongodb-core"."1.3.21";
+  by-version."mongodb-core"."1.3.21" = self.buildNodePackage {
+    name = "mongodb-core-1.3.21";
+    version = "1.3.21";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.16.tgz";
-      name = "mongodb-core-1.3.16.tgz";
-      sha1 = "6f9905bc7be0c890333a011d0313e5f0e2769a3b";
+      url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.21.tgz";
+      name = "mongodb-core-1.3.21.tgz";
+      sha1 = "fe129e7bee2b3b26c1409de02ab60d03f6291cca";
     };
     deps = {
       "bson-0.4.23" = self.by-version."bson"."0.4.23";
@@ -29332,25 +30500,25 @@
     cpu = [ ];
   };
   by-spec."mongoose"."*" =
-    self.by-version."mongoose"."4.4.11";
-  by-version."mongoose"."4.4.11" = self.buildNodePackage {
-    name = "mongoose-4.4.11";
-    version = "4.4.11";
+    self.by-version."mongoose"."4.4.20";
+  by-version."mongoose"."4.4.20" = self.buildNodePackage {
+    name = "mongoose-4.4.20";
+    version = "4.4.20";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mongoose/-/mongoose-4.4.11.tgz";
-      name = "mongoose-4.4.11.tgz";
-      sha1 = "ea67e1cf819d180f96dbd4e205675596d55b9d68";
+      url = "https://registry.npmjs.org/mongoose/-/mongoose-4.4.20.tgz";
+      name = "mongoose-4.4.20.tgz";
+      sha1 = "e974ffb6ae8c50f409801a8497a98e9f3b51f2dd";
     };
     deps = {
       "async-1.5.2" = self.by-version."async"."1.5.2";
       "bson-0.4.23" = self.by-version."bson"."0.4.23";
       "hooks-fixed-1.1.0" = self.by-version."hooks-fixed"."1.1.0";
       "kareem-1.0.1" = self.by-version."kareem"."1.0.1";
-      "mongodb-2.1.14" = self.by-version."mongodb"."2.1.14";
+      "mongodb-2.1.18" = self.by-version."mongodb"."2.1.18";
       "mpath-0.2.1" = self.by-version."mpath"."0.2.1";
       "mpromise-0.5.5" = self.by-version."mpromise"."0.5.5";
-      "mquery-1.10.0" = self.by-version."mquery"."1.10.0";
+      "mquery-1.11.0" = self.by-version."mquery"."1.11.0";
       "ms-0.7.1" = self.by-version."ms"."0.7.1";
       "muri-1.1.0" = self.by-version."muri"."1.1.0";
       "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
@@ -29478,7 +30646,7 @@
       sha1 = "f63dd313c422a3871f5569e36b0d28ca1a224631";
     };
     deps = {
-      "harmony-reflect-1.4.5" = self.by-version."harmony-reflect"."1.4.5";
+      "harmony-reflect-1.4.6" = self.by-version."harmony-reflect"."1.4.6";
       "owl-deepcopy-0.0.4" = self.by-version."owl-deepcopy"."0.0.4";
     };
     optionalDependencies = {
@@ -29543,7 +30711,7 @@
       sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2";
     };
     deps = {
-      "basic-auth-1.0.3" = self.by-version."basic-auth"."1.0.3";
+      "basic-auth-1.0.4" = self.by-version."basic-auth"."1.0.4";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
@@ -29670,10 +30838,10 @@
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
       "mqtt-connection-2.1.1" = self.by-version."mqtt-connection"."2.1.1";
-      "mqtt-packet-3.4.6" = self.by-version."mqtt-packet"."3.4.6";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "mqtt-packet-3.4.7" = self.by-version."mqtt-packet"."3.4.7";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
       "reinterval-1.0.2" = self.by-version."reinterval"."1.0.2";
-      "websocket-stream-3.1.0" = self.by-version."websocket-stream"."3.1.0";
+      "websocket-stream-3.2.1" = self.by-version."websocket-stream"."3.2.1";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
@@ -29695,7 +30863,7 @@
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "mqtt-packet-3.4.6" = self.by-version."mqtt-packet"."3.4.6";
+      "mqtt-packet-3.4.7" = self.by-version."mqtt-packet"."3.4.7";
       "reduplexer-1.1.0" = self.by-version."reduplexer"."1.1.0";
       "through2-0.6.5" = self.by-version."through2"."0.6.5";
     };
@@ -29706,15 +30874,15 @@
     cpu = [ ];
   };
   by-spec."mqtt-packet"."^3.0.0" =
-    self.by-version."mqtt-packet"."3.4.6";
-  by-version."mqtt-packet"."3.4.6" = self.buildNodePackage {
-    name = "mqtt-packet-3.4.6";
-    version = "3.4.6";
+    self.by-version."mqtt-packet"."3.4.7";
+  by-version."mqtt-packet"."3.4.7" = self.buildNodePackage {
+    name = "mqtt-packet-3.4.7";
+    version = "3.4.7";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-3.4.6.tgz";
-      name = "mqtt-packet-3.4.6.tgz";
-      sha1 = "644ae77638fd3814151112bc67b9fc7f36d650e3";
+      url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-3.4.7.tgz";
+      name = "mqtt-packet-3.4.7.tgz";
+      sha1 = "be8c267be7f0bf6a2a2d4f6de28307b6e0940e5f";
     };
     deps = {
       "bl-0.9.5" = self.by-version."bl"."0.9.5";
@@ -29727,17 +30895,17 @@
     cpu = [ ];
   };
   by-spec."mqtt-packet"."^3.2.0" =
-    self.by-version."mqtt-packet"."3.4.6";
-  by-spec."mquery"."1.10.0" =
-    self.by-version."mquery"."1.10.0";
-  by-version."mquery"."1.10.0" = self.buildNodePackage {
-    name = "mquery-1.10.0";
-    version = "1.10.0";
+    self.by-version."mqtt-packet"."3.4.7";
+  by-spec."mquery"."1.11.0" =
+    self.by-version."mquery"."1.11.0";
+  by-version."mquery"."1.11.0" = self.buildNodePackage {
+    name = "mquery-1.11.0";
+    version = "1.11.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mquery/-/mquery-1.10.0.tgz";
-      name = "mquery-1.10.0.tgz";
-      sha1 = "8603f02b0b524d17ac0539a85996124ee17b7cb3";
+      url = "https://registry.npmjs.org/mquery/-/mquery-1.11.0.tgz";
+      name = "mquery-1.11.0.tgz";
+      sha1 = "e0c65dedb1037edbf6cfb88262e777fee23551d9";
     };
     deps = {
       "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2";
@@ -29864,7 +31032,7 @@
       sha1 = "923e2c5cffa65c8418e9b228d1124793969c429c";
     };
     deps = {
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -29915,6 +31083,46 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."multicast-dns"."^6.0.1" =
+    self.by-version."multicast-dns"."6.0.1";
+  by-version."multicast-dns"."6.0.1" = self.buildNodePackage {
+    name = "multicast-dns-6.0.1";
+    version = "6.0.1";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.0.1.tgz";
+      name = "multicast-dns-6.0.1.tgz";
+      sha1 = "069da64a0b695e156ef47c86a94e69e1a17ff2c2";
+    };
+    deps = {
+      "dns-packet-1.1.0" = self.by-version."dns-packet"."1.1.0";
+      "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."multicast-dns-service-types"."^1.1.0" =
+    self.by-version."multicast-dns-service-types"."1.1.0";
+  by-version."multicast-dns-service-types"."1.1.0" = self.buildNodePackage {
+    name = "multicast-dns-service-types-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz";
+      name = "multicast-dns-service-types-1.1.0.tgz";
+      sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."multiparty"."2.2.0" =
     self.by-version."multiparty"."2.2.0";
   by-version."multiparty"."2.2.0" = self.buildNodePackage {
@@ -29927,7 +31135,7 @@
       sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4";
     };
     deps = {
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
       "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0";
     };
     optionalDependencies = {
@@ -29948,7 +31156,7 @@
       sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f";
     };
     deps = {
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
       "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0";
     };
     optionalDependencies = {
@@ -30131,7 +31339,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mute-stream"."~0.0.4" =
+  by-spec."mute-stream"."0.0.6" =
     self.by-version."mute-stream"."0.0.6";
   by-version."mute-stream"."0.0.6" = self.buildNodePackage {
     name = "mute-stream-0.0.6";
@@ -30150,6 +31358,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."mute-stream"."~0.0.4" =
+    self.by-version."mute-stream"."0.0.6";
   by-spec."mv"."0.0.5" =
     self.by-version."mv"."0.0.5";
   by-version."mv"."0.0.5" = self.buildNodePackage {
@@ -30192,34 +31402,15 @@
     cpu = [ ];
   };
   by-spec."nan"."2" =
-    self.by-version."nan"."2.2.1";
-  by-version."nan"."2.2.1" = self.buildNodePackage {
-    name = "nan-2.2.1";
-    version = "2.2.1";
+    self.by-version."nan"."2.3.5";
+  by-version."nan"."2.3.5" = self.buildNodePackage {
+    name = "nan-2.3.5";
+    version = "2.3.5";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/nan/-/nan-2.2.1.tgz";
-      name = "nan-2.2.1.tgz";
-      sha1 = "d68693f6b34bb41d66bc68b3a4f9defc79d7149b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."nan"."2.0.*" =
-    self.by-version."nan"."2.0.9";
-  by-version."nan"."2.0.9" = self.buildNodePackage {
-    name = "nan-2.0.9";
-    version = "2.0.9";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz";
-      name = "nan-2.0.9.tgz";
-      sha1 = "d02a770f46778842cceb94e17cab31ffc7234a05";
+      url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
+      name = "nan-2.3.5.tgz";
+      sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
     };
     deps = {
     };
@@ -30267,26 +31458,49 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."2.0.9" =
-    self.by-version."nan"."2.0.9";
-  by-spec."nan"."2.0.x" =
-    self.by-version."nan"."2.0.9";
+  by-spec."nan"."2.2.0" =
+    self.by-version."nan"."2.2.0";
+  by-version."nan"."2.2.0" = self.buildNodePackage {
+    name = "nan-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/nan/-/nan-2.2.0.tgz";
+      name = "nan-2.2.0.tgz";
+      sha1 = "779c07135629503cf6a7b7e6aab33049b3c3853c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nan"."2.3.*" =
+    self.by-version."nan"."2.3.5";
+  by-spec."nan"."2.3.5" =
+    self.by-version."nan"."2.3.5";
+  by-spec."nan"."2.3.x" =
+    self.by-version."nan"."2.3.5";
   by-spec."nan".">=2.0.0" =
-    self.by-version."nan"."2.2.1";
+    self.by-version."nan"."2.3.5";
   by-spec."nan"."^2.0" =
-    self.by-version."nan"."2.2.1";
-  by-spec."nan"."^2.0.4" =
-    self.by-version."nan"."2.2.1";
+    self.by-version."nan"."2.3.5";
   by-spec."nan"."^2.0.5" =
-    self.by-version."nan"."2.2.1";
+    self.by-version."nan"."2.3.5";
   by-spec."nan"."^2.0.8" =
-    self.by-version."nan"."2.2.1";
+    self.by-version."nan"."2.3.5";
   by-spec."nan"."^2.0.9" =
-    self.by-version."nan"."2.2.1";
+    self.by-version."nan"."2.3.5";
   by-spec."nan"."^2.1.0" =
-    self.by-version."nan"."2.2.1";
+    self.by-version."nan"."2.3.5";
   by-spec."nan"."^2.2.0" =
-    self.by-version."nan"."2.2.1";
+    self.by-version."nan"."2.3.5";
+  by-spec."nan"."^2.3.0" =
+    self.by-version."nan"."2.3.5";
+  by-spec."nan"."^2.3.2" =
+    self.by-version."nan"."2.3.5";
   by-spec."nan"."~0.3.0" =
     self.by-version."nan"."0.3.2";
   by-version."nan"."0.3.2" = self.buildNodePackage {
@@ -30344,12 +31558,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."~2.0" =
-    self.by-version."nan"."2.0.9";
   by-spec."nan"."~2.0.0" =
     self.by-version."nan"."2.0.9";
-  by-spec."nan"."~2.0.5" =
-    self.by-version."nan"."2.0.9";
+  by-version."nan"."2.0.9" = self.buildNodePackage {
+    name = "nan-2.0.9";
+    version = "2.0.9";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz";
+      name = "nan-2.0.9.tgz";
+      sha1 = "d02a770f46778842cceb94e17cab31ffc7234a05";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."nan"."~2.1.0" =
     self.by-version."nan"."2.1.0";
   by-version."nan"."2.1.0" = self.buildNodePackage {
@@ -30369,6 +31596,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."nan"."~2.3" =
+    self.by-version."nan"."2.3.5";
+  by-spec."nan"."~2.3.3" =
+    self.by-version."nan"."2.3.5";
   by-spec."native-dns"."0.6.1" =
     self.by-version."native-dns"."0.6.1";
   by-version."native-dns"."0.6.1" = self.buildNodePackage {
@@ -30381,7 +31612,7 @@
       sha1 = "f7d2a3c5464bb6f09d9167e35a7350bd7ffe9b82";
     };
     deps = {
-      "ipaddr.js-1.1.0" = self.by-version."ipaddr.js"."1.1.0";
+      "ipaddr.js-1.1.1" = self.by-version."ipaddr.js"."1.1.1";
       "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2";
       "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1";
     };
@@ -30425,7 +31656,7 @@
     };
     deps = {
       "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
-      "ipaddr.js-1.1.0" = self.by-version."ipaddr.js"."1.1.0";
+      "ipaddr.js-1.1.1" = self.by-version."ipaddr.js"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -30588,6 +31819,48 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."needle"."^0.10.0" =
+    self.by-version."needle"."0.10.0";
+  by-version."needle"."0.10.0" = self.buildNodePackage {
+    name = "needle-0.10.0";
+    version = "0.10.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/needle/-/needle-0.10.0.tgz";
+      name = "needle-0.10.0.tgz";
+      sha1 = "16a24d63f2a61152eb74cce1d12af85c507577d4";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."needle"."^0.11.0" =
+    self.by-version."needle"."0.11.0";
+  by-version."needle"."0.11.0" = self.buildNodePackage {
+    name = "needle-0.11.0";
+    version = "0.11.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/needle/-/needle-0.11.0.tgz";
+      name = "needle-0.11.0.tgz";
+      sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."negotiator"."0.3.0" =
     self.by-version."negotiator"."0.3.0";
   by-version."negotiator"."0.3.0" = self.buildNodePackage {
@@ -30683,16 +31956,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."negotiator"."0.6.0" =
-    self.by-version."negotiator"."0.6.0";
-  by-version."negotiator"."0.6.0" = self.buildNodePackage {
-    name = "negotiator-0.6.0";
-    version = "0.6.0";
+  by-spec."negotiator"."0.6.1" =
+    self.by-version."negotiator"."0.6.1";
+  by-version."negotiator"."0.6.1" = self.buildNodePackage {
+    name = "negotiator-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.0.tgz";
-      name = "negotiator-0.6.0.tgz";
-      sha1 = "33593a5a2b0ce30c985840c6f56b6fb1ea9e3a55";
+      url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz";
+      name = "negotiator-0.6.1.tgz";
+      sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
     };
     deps = {
     };
@@ -30736,7 +32009,7 @@
       sha1 = "49f5bca55a30a3726d69253557f231135a637075";
     };
     deps = {
-      "raw-socket-1.4.0" = self.by-version."raw-socket"."1.4.0";
+      "raw-socket-1.5.0" = self.by-version."raw-socket"."1.5.0";
     };
     optionalDependencies = {
     };
@@ -30745,15 +32018,15 @@
     cpu = [ ];
   };
   by-spec."netmask"."~1.0.4" =
-    self.by-version."netmask"."1.0.5";
-  by-version."netmask"."1.0.5" = self.buildNodePackage {
-    name = "netmask-1.0.5";
-    version = "1.0.5";
+    self.by-version."netmask"."1.0.6";
+  by-version."netmask"."1.0.6" = self.buildNodePackage {
+    name = "netmask-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/netmask/-/netmask-1.0.5.tgz";
-      name = "netmask-1.0.5.tgz";
-      sha1 = "84851218294b88e0ac5a008ec46401e2a5c767d2";
+      url = "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz";
+      name = "netmask-1.0.6.tgz";
+      sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35";
     };
     deps = {
     };
@@ -30803,6 +32076,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."next-line"."^1.0.0" =
+    self.by-version."next-line"."1.1.0";
+  by-version."next-line"."1.1.0" = self.buildNodePackage {
+    name = "next-line-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz";
+      name = "next-line-1.1.0.tgz";
+      sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."nib"."*" =
     self.by-version."nib"."1.1.0";
   by-version."nib"."1.1.0" = self.buildNodePackage {
@@ -30861,7 +32153,7 @@
     };
     deps = {
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
-      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
     };
     optionalDependencies = {
     };
@@ -30934,7 +32226,7 @@
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -30954,19 +32246,19 @@
   by-spec."node-expat"."~2.3.8" =
     self.by-version."node-expat"."2.3.13";
   by-spec."node-fetch"."^1.0.1" =
-    self.by-version."node-fetch"."1.5.0";
-  by-version."node-fetch"."1.5.0" = self.buildNodePackage {
-    name = "node-fetch-1.5.0";
-    version = "1.5.0";
+    self.by-version."node-fetch"."1.5.3";
+  by-version."node-fetch"."1.5.3" = self.buildNodePackage {
+    name = "node-fetch-1.5.3";
+    version = "1.5.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.5.0.tgz";
-      name = "node-fetch-1.5.0.tgz";
-      sha1 = "c1b82cda9579aa57ee05b838278183c6e997f642";
+      url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.5.3.tgz";
+      name = "node-fetch-1.5.3.tgz";
+      sha1 = "f28d8b95ca8d45b433745dd319361e36402baef0";
     };
     deps = {
       "encoding-0.1.12" = self.by-version."encoding"."0.1.12";
-      "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1";
+      "is-stream-1.1.0" = self.by-version."is-stream"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -31024,20 +32316,20 @@
       sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0";
     };
     deps = {
-      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
+      "fstream-1.0.9" = self.by-version."fstream"."1.0.9";
       "glob-4.5.3" = self.by-version."glob"."4.5.3";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
-      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "npmlog-2.0.4" = self.by-version."npmlog"."2.0.4";
       "osenv-0.1.3" = self.by-version."osenv"."0.1.3";
       "path-array-1.0.1" = self.by-version."path-array"."1.0.1";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "tar-2.2.1" = self.by-version."tar"."2.2.1";
-      "which-1.2.4" = self.by-version."which"."1.2.4";
+      "which-1.2.10" = self.by-version."which"."1.2.10";
     };
     optionalDependencies = {
     };
@@ -31049,15 +32341,15 @@
   by-spec."node-gyp"."~3.3.1" =
     self.by-version."node-gyp"."3.3.1";
   by-spec."node-inspector"."*" =
-    self.by-version."node-inspector"."0.12.7";
-  by-version."node-inspector"."0.12.7" = self.buildNodePackage {
-    name = "node-inspector-0.12.7";
-    version = "0.12.7";
+    self.by-version."node-inspector"."0.12.8";
+  by-version."node-inspector"."0.12.8" = self.buildNodePackage {
+    name = "node-inspector-0.12.8";
+    version = "0.12.8";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-inspector/-/node-inspector-0.12.7.tgz";
-      name = "node-inspector-0.12.7.tgz";
-      sha1 = "99289f6a15826c01d7cd15d8f54b2fc9cef2d3c5";
+      url = "https://registry.npmjs.org/node-inspector/-/node-inspector-0.12.8.tgz";
+      name = "node-inspector-0.12.8.tgz";
+      sha1 = "a59c3dc47cb08d15a2e526be3a1da7d64e5c227f";
     };
     deps = {
       "async-0.9.2" = self.by-version."async"."0.9.2";
@@ -31069,11 +32361,11 @@
       "rc-1.1.6" = self.by-version."rc"."1.1.6";
       "semver-4.3.6" = self.by-version."semver"."4.3.6";
       "serve-favicon-2.3.0" = self.by-version."serve-favicon"."2.3.0";
-      "strong-data-uri-1.0.3" = self.by-version."strong-data-uri"."1.0.3";
-      "v8-debug-0.7.1" = self.by-version."v8-debug"."0.7.1";
-      "v8-profiler-5.6.0" = self.by-version."v8-profiler"."5.6.0";
-      "which-1.2.4" = self.by-version."which"."1.2.4";
-      "ws-0.8.1" = self.by-version."ws"."0.8.1";
+      "strong-data-uri-1.0.4" = self.by-version."strong-data-uri"."1.0.4";
+      "v8-debug-0.7.7" = self.by-version."v8-debug"."0.7.7";
+      "v8-profiler-5.6.5" = self.by-version."v8-profiler"."5.6.5";
+      "which-1.2.10" = self.by-version."which"."1.2.10";
+      "ws-1.1.0" = self.by-version."ws"."1.1.0";
       "yargs-3.32.0" = self.by-version."yargs"."3.32.0";
     };
     optionalDependencies = {
@@ -31082,7 +32374,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-inspector" = self.by-version."node-inspector"."0.12.7";
+  "node-inspector" = self.by-version."node-inspector"."0.12.8";
   by-spec."node-int64"."~0.3.0" =
     self.by-version."node-int64"."0.3.3";
   by-version."node-int64"."0.3.3" = self.buildNodePackage {
@@ -31102,48 +32394,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-libs-browser".">= 0.4.0 <=0.6.0" =
-    self.by-version."node-libs-browser"."0.5.3";
-  by-version."node-libs-browser"."0.5.3" = self.buildNodePackage {
-    name = "node-libs-browser-0.5.3";
-    version = "0.5.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.5.3.tgz";
-      name = "node-libs-browser-0.5.3.tgz";
-      sha1 = "55efa888ec907acdb8cffc4e7a51712780e13b6a";
-    };
-    deps = {
-      "assert-1.3.0" = self.by-version."assert"."1.3.0";
-      "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
-      "buffer-3.6.0" = self.by-version."buffer"."3.6.0";
-      "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
-      "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
-      "crypto-browserify-3.2.8" = self.by-version."crypto-browserify"."3.2.8";
-      "domain-browser-1.1.7" = self.by-version."domain-browser"."1.1.7";
-      "events-1.1.0" = self.by-version."events"."1.1.0";
-      "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0";
-      "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
-      "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
-      "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
-      "process-0.11.2" = self.by-version."process"."0.11.2";
-      "punycode-1.4.1" = self.by-version."punycode"."1.4.1";
-      "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "stream-browserify-1.0.0" = self.by-version."stream-browserify"."1.0.0";
-      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
-      "timers-browserify-1.4.2" = self.by-version."timers-browserify"."1.4.2";
-      "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
-      "url-0.10.3" = self.by-version."url"."0.10.3";
-      "util-0.10.3" = self.by-version."util"."0.10.3";
-      "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."node-libs-browser"."^1.0.0" =
     self.by-version."node-libs-browser"."1.0.0";
   by-version."node-libs-browser"."1.0.0" = self.buildNodePackage {
@@ -31156,9 +32406,9 @@
       sha1 = "ff8ad6c2cfa78043bdd0091ec07f0aaa581620fc";
     };
     deps = {
-      "assert-1.3.0" = self.by-version."assert"."1.3.0";
+      "assert-1.4.1" = self.by-version."assert"."1.4.1";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
-      "buffer-4.5.1" = self.by-version."buffer"."4.5.1";
+      "buffer-4.6.0" = self.by-version."buffer"."4.6.0";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
       "constants-browserify-1.0.0" = self.by-version."constants-browserify"."1.0.0";
       "crypto-browserify-3.11.0" = self.by-version."crypto-browserify"."3.11.0";
@@ -31168,10 +32418,10 @@
       "https-browserify-0.0.1" = self.by-version."https-browserify"."0.0.1";
       "os-browserify-0.2.1" = self.by-version."os-browserify"."0.2.1";
       "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
-      "process-0.11.2" = self.by-version."process"."0.11.2";
+      "process-0.11.4" = self.by-version."process"."0.11.4";
       "punycode-1.4.1" = self.by-version."punycode"."1.4.1";
       "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
       "stream-browserify-2.0.1" = self.by-version."stream-browserify"."2.0.1";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "timers-browserify-1.4.2" = self.by-version."timers-browserify"."1.4.2";
@@ -31206,22 +32456,22 @@
     cpu = [ ];
   };
   by-spec."node-pre-gyp"."0.6.x" =
-    self.by-version."node-pre-gyp"."0.6.26";
-  by-version."node-pre-gyp"."0.6.26" = self.buildNodePackage {
-    name = "node-pre-gyp-0.6.26";
-    version = "0.6.26";
+    self.by-version."node-pre-gyp"."0.6.28";
+  by-version."node-pre-gyp"."0.6.28" = self.buildNodePackage {
+    name = "node-pre-gyp-0.6.28";
+    version = "0.6.28";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.26.tgz";
-      name = "node-pre-gyp-0.6.26.tgz";
-      sha1 = "d4fae0d69030d60e394169cdae5a4fbcad788630";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.28.tgz";
+      name = "node-pre-gyp-0.6.28.tgz";
+      sha1 = "e440f5faff5480735b4fd0509ff33f9da93d7c20";
     };
     deps = {
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
-      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "npmlog-2.0.4" = self.by-version."npmlog"."2.0.4";
       "rc-1.1.6" = self.by-version."rc"."1.1.6";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "tar-2.2.1" = self.by-version."tar"."2.2.1";
@@ -31234,25 +32484,23 @@
     cpu = [ ];
   };
   by-spec."node-pre-gyp"."^0.6.25" =
-    self.by-version."node-pre-gyp"."0.6.26";
+    self.by-version."node-pre-gyp"."0.6.28";
   by-spec."node-pre-gyp"."^0.6.5" =
-    self.by-version."node-pre-gyp"."0.6.26";
+    self.by-version."node-pre-gyp"."0.6.28";
   by-spec."node-pre-gyp-github"."^1.1.0" =
-    self.by-version."node-pre-gyp-github"."1.1.2";
-  by-version."node-pre-gyp-github"."1.1.2" = self.buildNodePackage {
-    name = "node-pre-gyp-github-1.1.2";
-    version = "1.1.2";
+    self.by-version."node-pre-gyp-github"."1.3.1";
+  by-version."node-pre-gyp-github"."1.3.1" = self.buildNodePackage {
+    name = "node-pre-gyp-github-1.3.1";
+    version = "1.3.1";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp-github/-/node-pre-gyp-github-1.1.2.tgz";
-      name = "node-pre-gyp-github-1.1.2.tgz";
-      sha1 = "01454ef4079a44907596920c6051228124ff9042";
+      url = "https://registry.npmjs.org/node-pre-gyp-github/-/node-pre-gyp-github-1.3.1.tgz";
+      name = "node-pre-gyp-github-1.3.1.tgz";
+      sha1 = "c6965303995b5b083eca64a1aa35fd2b511dcbb3";
     };
     deps = {
       "github-0.2.4" = self.by-version."github"."0.2.4";
       "commander-2.9.0" = self.by-version."commander"."2.9.0";
-      "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -31273,7 +32521,7 @@
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -31324,7 +32572,7 @@
       "ws-0.8.1" = self.by-version."ws"."0.8.1";
       "xml2js-0.4.16" = self.by-version."xml2js"."0.4.16";
       "node-red-node-feedparser-0.1.5" = self.by-version."node-red-node-feedparser"."0.1.5";
-      "node-red-node-email-0.1.3" = self.by-version."node-red-node-email"."0.1.3";
+      "node-red-node-email-0.1.8" = self.by-version."node-red-node-email"."0.1.8";
       "node-red-node-twitter-0.1.6" = self.by-version."node-red-node-twitter"."0.1.6";
       "node-red-node-rbe-0.1.5" = self.by-version."node-red-node-rbe"."0.1.5";
     };
@@ -31338,19 +32586,21 @@
   };
   "node-red" = self.by-version."node-red"."0.13.4";
   by-spec."node-red-node-email"."0.1.*" =
-    self.by-version."node-red-node-email"."0.1.3";
-  by-version."node-red-node-email"."0.1.3" = self.buildNodePackage {
-    name = "node-red-node-email-0.1.3";
-    version = "0.1.3";
+    self.by-version."node-red-node-email"."0.1.8";
+  by-version."node-red-node-email"."0.1.8" = self.buildNodePackage {
+    name = "node-red-node-email-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.3.tgz";
-      name = "node-red-node-email-0.1.3.tgz";
-      sha1 = "4beade1fa54903e34be18766cceb525d76b27fe7";
+      url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.8.tgz";
+      name = "node-red-node-email-0.1.8.tgz";
+      sha1 = "685313d1edda41e97cfcb2c3149f426bef19f935";
     };
     deps = {
-      "nodemailer-1.3.4" = self.by-version."nodemailer"."1.3.4";
-      "imap-0.8.16" = self.by-version."imap"."0.8.16";
+      "nodemailer-1.11.0" = self.by-version."nodemailer"."1.11.0";
+      "poplib-0.1.7" = self.by-version."poplib"."0.1.7";
+      "mailparser-0.6.0" = self.by-version."mailparser"."0.6.0";
+      "imap-0.8.17" = self.by-version."imap"."0.8.17";
     };
     optionalDependencies = {
     };
@@ -31461,7 +32711,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-redis-warlock"."^0.1.2" =
+  by-spec."node-redis-warlock"."~0.1.2" =
     self.by-version."node-redis-warlock"."0.1.4";
   by-version."node-redis-warlock"."0.1.4" = self.buildNodePackage {
     name = "node-redis-warlock-0.1.4";
@@ -31474,7 +32724,7 @@
     };
     deps = {
       "node-redis-scripty-0.0.5" = self.by-version."node-redis-scripty"."0.0.5";
-      "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
+      "uuid-2.0.2" = self.by-version."uuid"."2.0.2";
     };
     optionalDependencies = {
     };
@@ -31483,6 +32733,29 @@
     cpu = [ ];
   };
   by-spec."node-stringprep"."*" =
+    self.by-version."node-stringprep"."0.8.0";
+  by-version."node-stringprep"."0.8.0" = self.buildNodePackage {
+    name = "node-stringprep-0.8.0";
+    version = "0.8.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-stringprep/-/node-stringprep-0.8.0.tgz";
+      name = "node-stringprep-0.8.0.tgz";
+      sha1 = "e4a39e48ea4486ec454bc08dca51dd1aa4686417";
+    };
+    deps = {
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "node-stringprep" = self.by-version."node-stringprep"."0.8.0";
+  by-spec."node-stringprep"."^0.7.0" =
     self.by-version."node-stringprep"."0.7.3";
   by-version."node-stringprep"."0.7.3" = self.buildNodePackage {
     name = "node-stringprep-0.7.3";
@@ -31504,9 +32777,6 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-stringprep" = self.by-version."node-stringprep"."0.7.3";
-  by-spec."node-stringprep"."^0.7.0" =
-    self.by-version."node-stringprep"."0.7.3";
   by-spec."node-stringprep"."~0.7.0" =
     self.by-version."node-stringprep"."0.7.3";
   by-spec."node-swt".">=0.1.1" =
@@ -31658,10 +32928,14 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."node-uuid"."1.4.7" =
+    self.by-version."node-uuid"."1.4.7";
   by-spec."node-uuid"."^1.3.3" =
     self.by-version."node-uuid"."1.4.7";
   by-spec."node-uuid"."^1.4.1" =
     self.by-version."node-uuid"."1.4.7";
+  by-spec."node-uuid"."^1.4.7" =
+    self.by-version."node-uuid"."1.4.7";
   by-spec."node-uuid"."~1.4.0" =
     self.by-version."node-uuid"."1.4.7";
   by-spec."node-uuid"."~1.4.1" =
@@ -31691,15 +32965,15 @@
     cpu = [ ];
   };
   by-spec."node-xmpp-client"."*" =
-    self.by-version."node-xmpp-client"."3.0.0";
-  by-version."node-xmpp-client"."3.0.0" = self.buildNodePackage {
-    name = "node-xmpp-client-3.0.0";
-    version = "3.0.0";
+    self.by-version."node-xmpp-client"."3.0.1";
+  by-version."node-xmpp-client"."3.0.1" = self.buildNodePackage {
+    name = "node-xmpp-client-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-3.0.0.tgz";
-      name = "node-xmpp-client-3.0.0.tgz";
-      sha1 = "52cc5d3bf7d1fc86d2776a582f7c7bcae802613a";
+      url = "https://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-3.0.1.tgz";
+      name = "node-xmpp-client-3.0.1.tgz";
+      sha1 = "75c8f097d658d8ecc7b846cea531030c817616cc";
     };
     deps = {
       "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
@@ -31707,8 +32981,8 @@
       "faye-websocket-0.10.0" = self.by-version."faye-websocket"."0.10.0";
       "istanbul-0.4.3" = self.by-version."istanbul"."0.4.3";
       "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
-      "node-xmpp-core-4.2.0" = self.by-version."node-xmpp-core"."4.2.0";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "node-xmpp-core-5.0.2" = self.by-version."node-xmpp-core"."5.0.2";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -31716,20 +32990,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-xmpp-client" = self.by-version."node-xmpp-client"."3.0.0";
+  "node-xmpp-client" = self.by-version."node-xmpp-client"."3.0.1";
   by-spec."node-xmpp-component"."*" =
-    self.by-version."node-xmpp-component"."2.0.1";
-  by-version."node-xmpp-component"."2.0.1" = self.buildNodePackage {
-    name = "node-xmpp-component-2.0.1";
-    version = "2.0.1";
+    self.by-version."node-xmpp-component"."2.0.2";
+  by-version."node-xmpp-component"."2.0.2" = self.buildNodePackage {
+    name = "node-xmpp-component-2.0.2";
+    version = "2.0.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-2.0.1.tgz";
-      name = "node-xmpp-component-2.0.1.tgz";
-      sha1 = "987f4928cbadb4542a0fbdd3c7c529778a89ef1c";
+      url = "https://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-2.0.2.tgz";
+      name = "node-xmpp-component-2.0.2.tgz";
+      sha1 = "74588fd2b7cecff9f7b8df691ea664d4f1ae522b";
     };
     deps = {
-      "node-xmpp-core-5.0.1" = self.by-version."node-xmpp-core"."5.0.1";
+      "node-xmpp-core-5.0.2" = self.by-version."node-xmpp-core"."5.0.2";
     };
     optionalDependencies = {
     };
@@ -31737,23 +33011,23 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-xmpp-component" = self.by-version."node-xmpp-component"."2.0.1";
+  "node-xmpp-component" = self.by-version."node-xmpp-component"."2.0.2";
   by-spec."node-xmpp-core"."*" =
-    self.by-version."node-xmpp-core"."5.0.1";
-  by-version."node-xmpp-core"."5.0.1" = self.buildNodePackage {
-    name = "node-xmpp-core-5.0.1";
-    version = "5.0.1";
+    self.by-version."node-xmpp-core"."5.0.2";
+  by-version."node-xmpp-core"."5.0.2" = self.buildNodePackage {
+    name = "node-xmpp-core-5.0.2";
+    version = "5.0.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-5.0.1.tgz";
-      name = "node-xmpp-core-5.0.1.tgz";
-      sha1 = "74098106652e17e2a2847ba82225e6504c595135";
+      url = "https://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-5.0.2.tgz";
+      name = "node-xmpp-core-5.0.2.tgz";
+      sha1 = "17603b38753e7d97a9bc866ceabc637fcd5a7b8b";
     };
     deps = {
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "lodash.assign-3.2.0" = self.by-version."lodash.assign"."3.2.0";
-      "ltx-2.3.0" = self.by-version."ltx"."2.3.0";
+      "lodash.assign-4.0.9" = self.by-version."lodash.assign"."4.0.9";
+      "ltx-2.4.1" = self.by-version."ltx"."2.4.1";
       "node-xmpp-jid-2.3.0" = self.by-version."node-xmpp-jid"."2.3.0";
       "node-xmpp-stanza-1.1.0" = self.by-version."node-xmpp-stanza"."1.1.0";
       "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1";
@@ -31765,37 +33039,11 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-xmpp-core" = self.by-version."node-xmpp-core"."5.0.1";
-  by-spec."node-xmpp-core"."^4.1.0" =
-    self.by-version."node-xmpp-core"."4.2.0";
-  by-version."node-xmpp-core"."4.2.0" = self.buildNodePackage {
-    name = "node-xmpp-core-4.2.0";
-    version = "4.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-4.2.0.tgz";
-      name = "node-xmpp-core-4.2.0.tgz";
-      sha1 = "7e2e040c1e5aa64be35013bdc34132ec376995ae";
-    };
-    deps = {
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "lodash.assign-3.2.0" = self.by-version."lodash.assign"."3.2.0";
-      "ltx-2.3.0" = self.by-version."ltx"."2.3.0";
-      "node-xmpp-jid-2.3.0" = self.by-version."node-xmpp-jid"."2.3.0";
-      "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1";
-      "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."node-xmpp-core"."^4.2.0" =
-    self.by-version."node-xmpp-core"."4.2.0";
+  "node-xmpp-core" = self.by-version."node-xmpp-core"."5.0.2";
+  by-spec."node-xmpp-core"."^5.0.0" =
+    self.by-version."node-xmpp-core"."5.0.2";
   by-spec."node-xmpp-core"."^5.0.1" =
-    self.by-version."node-xmpp-core"."5.0.1";
+    self.by-version."node-xmpp-core"."5.0.2";
   by-spec."node-xmpp-core"."~1.0.0-alpha14" =
     self.by-version."node-xmpp-core"."1.0.0";
   by-version."node-xmpp-core"."1.0.0" = self.buildNodePackage {
@@ -31820,7 +33068,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-xmpp-jid"."^2.0.0" =
+  by-spec."node-xmpp-jid"."^2.3.0" =
     self.by-version."node-xmpp-jid"."2.3.0";
   by-version."node-xmpp-jid"."2.3.0" = self.buildNodePackage {
     name = "node-xmpp-jid-2.3.0";
@@ -31867,22 +33115,22 @@
   };
   "node-xmpp-joap" = self.by-version."node-xmpp-joap"."0.0.19";
   by-spec."node-xmpp-server"."*" =
-    self.by-version."node-xmpp-server"."2.1.2";
-  by-version."node-xmpp-server"."2.1.2" = self.buildNodePackage {
-    name = "node-xmpp-server-2.1.2";
-    version = "2.1.2";
+    self.by-version."node-xmpp-server"."2.1.3";
+  by-version."node-xmpp-server"."2.1.3" = self.buildNodePackage {
+    name = "node-xmpp-server-2.1.3";
+    version = "2.1.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-2.1.2.tgz";
-      name = "node-xmpp-server-2.1.2.tgz";
-      sha1 = "57ebff142811540070be50048db17d5179a243e5";
+      url = "https://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-2.1.3.tgz";
+      name = "node-xmpp-server-2.1.3.tgz";
+      sha1 = "2759cc2ac50e66f0a94618756e92e32da12b3df5";
     };
     deps = {
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "es6-collections-0.5.6" = self.by-version."es6-collections"."0.5.6";
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
-      "node-xmpp-core-4.2.0" = self.by-version."node-xmpp-core"."4.2.0";
-      "ws-0.8.1" = self.by-version."ws"."0.8.1";
+      "node-xmpp-core-5.0.2" = self.by-version."node-xmpp-core"."5.0.2";
+      "ws-1.1.0" = self.by-version."ws"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -31890,7 +33138,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-xmpp-server" = self.by-version."node-xmpp-server"."2.1.2";
+  "node-xmpp-server" = self.by-version."node-xmpp-server"."2.1.3";
   by-spec."node-xmpp-serviceadmin"."*" =
     self.by-version."node-xmpp-serviceadmin"."0.2.0";
   by-version."node-xmpp-serviceadmin"."0.2.0" = self.buildNodePackage {
@@ -31929,7 +33177,7 @@
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "ltx-2.3.0" = self.by-version."ltx"."2.3.0";
+      "ltx-2.4.1" = self.by-version."ltx"."2.4.1";
     };
     optionalDependencies = {
     };
@@ -31987,7 +33235,7 @@
       sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19";
     };
     deps = {
-      "mailcomposer-3.7.0" = self.by-version."mailcomposer"."3.7.0";
+      "mailcomposer-3.9.0" = self.by-version."mailcomposer"."3.9.0";
       "simplesmtp-0.3.35" = self.by-version."simplesmtp"."0.3.35";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
     };
@@ -32017,27 +33265,27 @@
       "aws-sdk-2.0.5" = self.by-version."aws-sdk"."2.0.5";
     };
     optionalDependencies = {
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nodemailer"."1.3.4" =
-    self.by-version."nodemailer"."1.3.4";
-  by-version."nodemailer"."1.3.4" = self.buildNodePackage {
-    name = "nodemailer-1.3.4";
-    version = "1.3.4";
+  by-spec."nodemailer"."^1.11.0" =
+    self.by-version."nodemailer"."1.11.0";
+  by-version."nodemailer"."1.11.0" = self.buildNodePackage {
+    name = "nodemailer-1.11.0";
+    version = "1.11.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemailer/-/nodemailer-1.3.4.tgz";
-      name = "nodemailer-1.3.4.tgz";
-      sha1 = "9e5ca29ddc9fd78584e5ed46ddc486385be43ae3";
+      url = "https://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz";
+      name = "nodemailer-1.11.0.tgz";
+      sha1 = "4e69cb39b03015b1d1ef0c78a815412b9e976f79";
     };
     deps = {
-      "buildmail-1.3.0" = self.by-version."buildmail"."1.3.0";
-      "hyperquest-1.3.0" = self.by-version."hyperquest"."1.3.0";
       "libmime-1.2.0" = self.by-version."libmime"."1.2.0";
+      "mailcomposer-2.1.0" = self.by-version."mailcomposer"."2.1.0";
+      "needle-0.11.0" = self.by-version."needle"."0.11.0";
       "nodemailer-direct-transport-1.1.0" = self.by-version."nodemailer-direct-transport"."1.1.0";
       "nodemailer-smtp-transport-1.1.0" = self.by-version."nodemailer-smtp-transport"."1.1.0";
     };
@@ -32047,7 +33295,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nodemailer-direct-transport"."^1.0.2" =
+  by-spec."nodemailer-direct-transport"."^1.1.0" =
     self.by-version."nodemailer-direct-transport"."1.1.0";
   by-version."nodemailer-direct-transport"."1.1.0" = self.buildNodePackage {
     name = "nodemailer-direct-transport-1.1.0";
@@ -32067,16 +33315,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nodemailer-fetch"."1.3.0" =
-    self.by-version."nodemailer-fetch"."1.3.0";
-  by-version."nodemailer-fetch"."1.3.0" = self.buildNodePackage {
-    name = "nodemailer-fetch-1.3.0";
-    version = "1.3.0";
+  by-spec."nodemailer-fetch"."1.4.0" =
+    self.by-version."nodemailer-fetch"."1.4.0";
+  by-version."nodemailer-fetch"."1.4.0" = self.buildNodePackage {
+    name = "nodemailer-fetch-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.3.0.tgz";
-      name = "nodemailer-fetch-1.3.0.tgz";
-      sha1 = "9f37f6a5b80c1cb5d697ca2bfbde41a6582a50b0";
+      url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.4.0.tgz";
+      name = "nodemailer-fetch-1.4.0.tgz";
+      sha1 = "08a6174f755aba6ad9d88133355a70c1dee4e698";
     };
     deps = {
     };
@@ -32086,19 +33334,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nodemailer-shared"."1.0.4" =
-    self.by-version."nodemailer-shared"."1.0.4";
-  by-version."nodemailer-shared"."1.0.4" = self.buildNodePackage {
-    name = "nodemailer-shared-1.0.4";
-    version = "1.0.4";
+  by-spec."nodemailer-shared"."1.0.5" =
+    self.by-version."nodemailer-shared"."1.0.5";
+  by-version."nodemailer-shared"."1.0.5" = self.buildNodePackage {
+    name = "nodemailer-shared-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.0.4.tgz";
-      name = "nodemailer-shared-1.0.4.tgz";
-      sha1 = "8b5c5c35bfb29a47dda7d38303f3a4fb47ba38ae";
+      url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.0.5.tgz";
+      name = "nodemailer-shared-1.0.5.tgz";
+      sha1 = "6de64484d47944422bb5f0886fffd908ada4ce5e";
     };
     deps = {
-      "nodemailer-fetch-1.3.0" = self.by-version."nodemailer-fetch"."1.3.0";
+      "nodemailer-fetch-1.4.0" = self.by-version."nodemailer-fetch"."1.4.0";
     };
     optionalDependencies = {
     };
@@ -32106,7 +33354,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nodemailer-smtp-transport"."^1.0.2" =
+  by-spec."nodemailer-smtp-transport"."^1.1.0" =
     self.by-version."nodemailer-smtp-transport"."1.1.0";
   by-version."nodemailer-smtp-transport"."1.1.0" = self.buildNodePackage {
     name = "nodemailer-smtp-transport-1.1.0";
@@ -32119,7 +33367,7 @@
     };
     deps = {
       "clone-1.0.2" = self.by-version."clone"."1.0.2";
-      "nodemailer-wellknown-0.1.8" = self.by-version."nodemailer-wellknown"."0.1.8";
+      "nodemailer-wellknown-0.1.10" = self.by-version."nodemailer-wellknown"."0.1.10";
       "smtp-connection-1.3.8" = self.by-version."smtp-connection"."1.3.8";
     };
     optionalDependencies = {
@@ -32129,15 +33377,15 @@
     cpu = [ ];
   };
   by-spec."nodemailer-wellknown"."^0.1.7" =
-    self.by-version."nodemailer-wellknown"."0.1.8";
-  by-version."nodemailer-wellknown"."0.1.8" = self.buildNodePackage {
-    name = "nodemailer-wellknown-0.1.8";
-    version = "0.1.8";
+    self.by-version."nodemailer-wellknown"."0.1.10";
+  by-version."nodemailer-wellknown"."0.1.10" = self.buildNodePackage {
+    name = "nodemailer-wellknown-0.1.10";
+    version = "0.1.10";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.8.tgz";
-      name = "nodemailer-wellknown-0.1.8.tgz";
-      sha1 = "d44f1ced0aedf1ac1d9a99e8444d0db6c01428dc";
+      url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz";
+      name = "nodemailer-wellknown-0.1.10.tgz";
+      sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5";
     };
     deps = {
     };
@@ -32148,24 +33396,24 @@
     cpu = [ ];
   };
   by-spec."nodemon"."*" =
-    self.by-version."nodemon"."1.9.1";
-  by-version."nodemon"."1.9.1" = self.buildNodePackage {
-    name = "nodemon-1.9.1";
-    version = "1.9.1";
+    self.by-version."nodemon"."1.9.2";
+  by-version."nodemon"."1.9.2" = self.buildNodePackage {
+    name = "nodemon-1.9.2";
+    version = "1.9.2";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.9.1.tgz";
-      name = "nodemon-1.9.1.tgz";
-      sha1 = "442071f88c39d801fb0bdfd209413da5dce6dad3";
+      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.9.2.tgz";
+      name = "nodemon-1.9.2.tgz";
+      sha1 = "21b3cd157d5483833b473372c98e1795a4d55970";
     };
     deps = {
-      "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
+      "chokidar-1.5.2" = self.by-version."chokidar"."1.5.2";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "es6-promise-3.1.2" = self.by-version."es6-promise"."3.1.2";
+      "es6-promise-3.2.1" = self.by-version."es6-promise"."3.2.1";
       "ignore-by-default-1.0.1" = self.by-version."ignore-by-default"."1.0.1";
       "lodash.defaults-3.1.2" = self.by-version."lodash.defaults"."3.1.2";
       "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
-      "ps-tree-1.0.1" = self.by-version."ps-tree"."1.0.1";
+      "ps-tree-1.1.0" = self.by-version."ps-tree"."1.1.0";
       "touch-1.0.0" = self.by-version."touch"."1.0.0";
       "undefsafe-0.0.3" = self.by-version."undefsafe"."0.0.3";
       "update-notifier-0.5.0" = self.by-version."update-notifier"."0.5.0";
@@ -32176,7 +33424,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "nodemon" = self.by-version."nodemon"."1.9.1";
+  "nodemon" = self.by-version."nodemon"."1.9.2";
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
   by-version."nomnom"."1.6.2" = self.buildNodePackage {
@@ -32328,16 +33576,16 @@
     self.by-version."nopt"."3.0.6";
   by-spec."nopt"."~3.0.6" =
     self.by-version."nopt"."3.0.6";
-  by-spec."normalize-git-url"."~3.0.1" =
-    self.by-version."normalize-git-url"."3.0.1";
-  by-version."normalize-git-url"."3.0.1" = self.buildNodePackage {
-    name = "normalize-git-url-3.0.1";
-    version = "3.0.1";
+  by-spec."normalize-git-url"."~3.0.2" =
+    self.by-version."normalize-git-url"."3.0.2";
+  by-version."normalize-git-url"."3.0.2" = self.buildNodePackage {
+    name = "normalize-git-url-3.0.2";
+    version = "3.0.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.1.tgz";
-      name = "normalize-git-url-3.0.1.tgz";
-      sha1 = "d40d419d05a15870271e50534dbb7b8ccd9b0a5c";
+      url = "https://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.2.tgz";
+      name = "normalize-git-url-3.0.2.tgz";
+      sha1 = "8e5f14be0bdaedb73e07200310aa416c27350fc4";
     };
     deps = {
     };
@@ -32359,7 +33607,7 @@
       sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df";
     };
     deps = {
-      "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4";
+      "hosted-git-info-2.1.5" = self.by-version."hosted-git-info"."2.1.5";
       "is-builtin-module-1.0.0" = self.by-version."is-builtin-module"."1.0.0";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "validate-npm-package-license-3.0.1" = self.by-version."validate-npm-package-license"."3.0.1";
@@ -32398,21 +33646,21 @@
     cpu = [ ];
   };
   by-spec."npm"."*" =
-    self.by-version."npm"."3.8.7";
-  by-version."npm"."3.8.7" = self.buildNodePackage {
-    name = "npm-3.8.7";
-    version = "3.8.7";
+    self.by-version."npm"."3.9.6";
+  by-version."npm"."3.9.6" = self.buildNodePackage {
+    name = "npm-3.9.6";
+    version = "3.9.6";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-3.8.7.tgz";
-      name = "npm-3.8.7.tgz";
-      sha1 = "dabc1c63f6eef1cb30e3e560966fdd9affe5a1ee";
+      url = "https://registry.npmjs.org/npm/-/npm-3.9.6.tgz";
+      name = "npm-3.9.6.tgz";
+      sha1 = "0ef1d272a069ad95bdca8b2dfe6fcd82f4b461d7";
     };
     deps = {
       "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
       "ansicolors-0.3.2" = self.by-version."ansicolors"."0.3.2";
       "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3";
-      "aproba-1.0.1" = self.by-version."aproba"."1.0.1";
+      "aproba-1.0.3" = self.by-version."aproba"."1.0.3";
       "archy-1.0.0" = self.by-version."archy"."1.0.0";
       "chownr-1.0.1" = self.by-version."chownr"."1.0.1";
       "cmd-shim-2.0.2" = self.by-version."cmd-shim"."2.0.2";
@@ -32420,38 +33668,36 @@
       "config-chain-1.1.10" = self.by-version."config-chain"."1.1.10";
       "dezalgo-1.0.3" = self.by-version."dezalgo"."1.0.3";
       "editor-1.0.0" = self.by-version."editor"."1.0.0";
-      "fs-vacuum-1.2.7" = self.by-version."fs-vacuum"."1.2.7";
+      "fs-vacuum-1.2.9" = self.by-version."fs-vacuum"."1.2.9";
       "fs-write-stream-atomic-1.0.8" = self.by-version."fs-write-stream-atomic"."1.0.8";
-      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
-      "fstream-npm-1.0.7" = self.by-version."fstream-npm"."1.0.7";
+      "fstream-1.0.9" = self.by-version."fstream"."1.0.9";
+      "fstream-npm-1.1.0" = self.by-version."fstream-npm"."1.1.0";
       "glob-7.0.3" = self.by-version."glob"."7.0.3";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "has-unicode-2.0.0" = self.by-version."has-unicode"."2.0.0";
-      "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4";
+      "hosted-git-info-2.1.5" = self.by-version."hosted-git-info"."2.1.5";
       "iferr-0.1.5" = self.by-version."iferr"."0.1.5";
-      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+      "inflight-1.0.5" = self.by-version."inflight"."1.0.5";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "ini-1.3.4" = self.by-version."ini"."1.3.4";
-      "init-package-json-1.9.3" = self.by-version."init-package-json"."1.9.3";
+      "init-package-json-1.9.4" = self.by-version."init-package-json"."1.9.4";
       "lockfile-1.0.1" = self.by-version."lockfile"."1.0.1";
-      "lodash._baseuniq-4.5.1" = self.by-version."lodash._baseuniq"."4.5.1";
+      "lodash._baseuniq-4.6.0" = self.by-version."lodash._baseuniq"."4.6.0";
       "lodash.clonedeep-4.3.2" = self.by-version."lodash.clonedeep"."4.3.2";
-      "lodash.isarray-4.0.0" = self.by-version."lodash.isarray"."4.0.0";
-      "lodash.keys-4.0.6" = self.by-version."lodash.keys"."4.0.6";
-      "lodash.union-4.2.1" = self.by-version."lodash.union"."4.2.1";
-      "lodash.uniq-4.2.1" = self.by-version."lodash.uniq"."4.2.1";
-      "lodash.without-4.1.2" = self.by-version."lodash.without"."4.1.2";
+      "lodash.union-4.4.0" = self.by-version."lodash.union"."4.4.0";
+      "lodash.uniq-4.3.0" = self.by-version."lodash.uniq"."4.3.0";
+      "lodash.without-4.2.0" = self.by-version."lodash.without"."4.2.0";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "node-gyp-3.3.1" = self.by-version."node-gyp"."3.3.1";
       "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
-      "normalize-git-url-3.0.1" = self.by-version."normalize-git-url"."3.0.1";
+      "normalize-git-url-3.0.2" = self.by-version."normalize-git-url"."3.0.2";
       "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
       "npm-cache-filename-1.0.2" = self.by-version."npm-cache-filename"."1.0.2";
       "npm-install-checks-3.0.0" = self.by-version."npm-install-checks"."3.0.0";
-      "npm-package-arg-4.1.0" = self.by-version."npm-package-arg"."4.1.0";
-      "npm-registry-client-7.1.0" = self.by-version."npm-registry-client"."7.1.0";
-      "npm-user-validate-0.1.2" = self.by-version."npm-user-validate"."0.1.2";
-      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "npm-package-arg-4.1.1" = self.by-version."npm-package-arg"."4.1.1";
+      "npm-registry-client-7.1.1" = self.by-version."npm-registry-client"."7.1.1";
+      "npm-user-validate-0.1.3" = self.by-version."npm-user-validate"."0.1.3";
+      "npmlog-2.0.4" = self.by-version."npmlog"."2.0.4";
       "once-1.3.3" = self.by-version."once"."1.3.3";
       "opener-1.4.1" = self.by-version."opener"."1.4.1";
       "osenv-0.1.3" = self.by-version."osenv"."0.1.3";
@@ -32459,11 +33705,11 @@
       "read-1.0.7" = self.by-version."read"."1.0.7";
       "read-cmd-shim-1.0.1" = self.by-version."read-cmd-shim"."1.0.1";
       "read-installed-4.0.3" = self.by-version."read-installed"."4.0.3";
-      "read-package-json-2.0.3" = self.by-version."read-package-json"."2.0.3";
-      "read-package-tree-5.1.2" = self.by-version."read-package-tree"."5.1.2";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
-      "realize-package-specifier-3.0.1" = self.by-version."realize-package-specifier"."3.0.1";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "read-package-json-2.0.4" = self.by-version."read-package-json"."2.0.4";
+      "read-package-tree-5.1.4" = self.by-version."read-package-tree"."5.1.4";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
+      "realize-package-specifier-3.0.3" = self.by-version."realize-package-specifier"."3.0.3";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "retry-0.9.0" = self.by-version."retry"."0.9.0";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
@@ -32478,8 +33724,8 @@
       "unique-filename-1.1.0" = self.by-version."unique-filename"."1.1.0";
       "unpipe-1.0.0" = self.by-version."unpipe"."1.0.0";
       "validate-npm-package-name-2.2.2" = self.by-version."validate-npm-package-name"."2.2.2";
-      "which-1.2.4" = self.by-version."which"."1.2.4";
-      "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
+      "which-1.2.10" = self.by-version."which"."1.2.10";
+      "wrappy-1.0.2" = self.by-version."wrappy"."1.0.2";
       "write-file-atomic-1.1.4" = self.by-version."write-file-atomic"."1.1.4";
       "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
       "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
@@ -32499,17 +33745,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "npm" = self.by-version."npm"."3.8.7";
-  by-spec."npm"."^2.1.12" =
-    self.by-version."npm"."2.15.3";
-  by-version."npm"."2.15.3" = self.buildNodePackage {
-    name = "npm-2.15.3";
-    version = "2.15.3";
+  "npm" = self.by-version."npm"."3.9.6";
+  by-spec."npm"."^2.10.x" =
+    self.by-version."npm"."2.15.6";
+  by-version."npm"."2.15.6" = self.buildNodePackage {
+    name = "npm-2.15.6";
+    version = "2.15.6";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-2.15.3.tgz";
-      name = "npm-2.15.3.tgz";
-      sha1 = "9ee96a12f7dad6e8dc3e90b5635b65aedffb6cd3";
+      url = "https://registry.npmjs.org/npm/-/npm-2.15.6.tgz";
+      name = "npm-2.15.6.tgz";
+      sha1 = "d6216caf7a275fbe66bbc9505b8d288f9da1051e";
     };
     deps = {
       "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
@@ -32518,7 +33764,7 @@
       "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3";
       "archy-1.0.0" = self.by-version."archy"."1.0.0";
       "async-some-1.0.2" = self.by-version."async-some"."1.0.2";
-      "block-stream-0.0.8" = self.by-version."block-stream"."0.0.8";
+      "block-stream-0.0.9" = self.by-version."block-stream"."0.0.9";
       "char-spinner-1.0.1" = self.by-version."char-spinner"."1.0.1";
       "chmodr-1.0.2" = self.by-version."chmodr"."1.0.2";
       "chownr-1.0.1" = self.by-version."chownr"."1.0.1";
@@ -32527,49 +33773,49 @@
       "config-chain-1.1.10" = self.by-version."config-chain"."1.1.10";
       "dezalgo-1.0.3" = self.by-version."dezalgo"."1.0.3";
       "editor-1.0.0" = self.by-version."editor"."1.0.0";
-      "fs-vacuum-1.2.7" = self.by-version."fs-vacuum"."1.2.7";
+      "fs-vacuum-1.2.9" = self.by-version."fs-vacuum"."1.2.9";
       "fs-write-stream-atomic-1.0.8" = self.by-version."fs-write-stream-atomic"."1.0.8";
-      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
+      "fstream-1.0.9" = self.by-version."fstream"."1.0.9";
       "fstream-npm-1.0.7" = self.by-version."fstream-npm"."1.0.7";
       "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
       "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
       "glob-7.0.3" = self.by-version."glob"."7.0.3";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
-      "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4";
-      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
+      "hosted-git-info-2.1.5" = self.by-version."hosted-git-info"."2.1.5";
+      "inflight-1.0.5" = self.by-version."inflight"."1.0.5";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "ini-1.3.4" = self.by-version."ini"."1.3.4";
-      "init-package-json-1.9.3" = self.by-version."init-package-json"."1.9.3";
+      "init-package-json-1.9.4" = self.by-version."init-package-json"."1.9.4";
       "lockfile-1.0.1" = self.by-version."lockfile"."1.0.1";
-      "lru-cache-3.2.0" = self.by-version."lru-cache"."3.2.0";
+      "lru-cache-4.0.1" = self.by-version."lru-cache"."4.0.1";
       "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "node-gyp-3.3.1" = self.by-version."node-gyp"."3.3.1";
       "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
-      "normalize-git-url-3.0.1" = self.by-version."normalize-git-url"."3.0.1";
+      "normalize-git-url-3.0.2" = self.by-version."normalize-git-url"."3.0.2";
       "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
       "npm-cache-filename-1.0.2" = self.by-version."npm-cache-filename"."1.0.2";
       "npm-install-checks-1.0.7" = self.by-version."npm-install-checks"."1.0.7";
-      "npm-package-arg-4.1.0" = self.by-version."npm-package-arg"."4.1.0";
-      "npm-registry-client-7.1.0" = self.by-version."npm-registry-client"."7.1.0";
-      "npm-user-validate-0.1.2" = self.by-version."npm-user-validate"."0.1.2";
-      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "npm-package-arg-4.1.1" = self.by-version."npm-package-arg"."4.1.1";
+      "npm-registry-client-7.1.1" = self.by-version."npm-registry-client"."7.1.1";
+      "npm-user-validate-0.1.3" = self.by-version."npm-user-validate"."0.1.3";
+      "npmlog-2.0.4" = self.by-version."npmlog"."2.0.4";
       "once-1.3.3" = self.by-version."once"."1.3.3";
       "opener-1.4.1" = self.by-version."opener"."1.4.1";
       "osenv-0.1.3" = self.by-version."osenv"."0.1.3";
       "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1";
       "read-1.0.7" = self.by-version."read"."1.0.7";
       "read-installed-4.0.3" = self.by-version."read-installed"."4.0.3";
-      "read-package-json-2.0.3" = self.by-version."read-package-json"."2.0.3";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "realize-package-specifier-3.0.1" = self.by-version."realize-package-specifier"."3.0.1";
-      "request-2.69.0" = self.by-version."request"."2.69.0";
+      "read-package-json-2.0.4" = self.by-version."read-package-json"."2.0.4";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
+      "realize-package-specifier-3.0.3" = self.by-version."realize-package-specifier"."3.0.3";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "retry-0.9.0" = self.by-version."retry"."0.9.0";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "sha-2.0.1" = self.by-version."sha"."2.0.1";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
-      "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0";
+      "sorted-object-2.0.0" = self.by-version."sorted-object"."2.0.0";
       "spdx-license-ids-1.2.1" = self.by-version."spdx-license-ids"."1.2.1";
       "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
       "tar-2.2.1" = self.by-version."tar"."2.2.1";
@@ -32578,8 +33824,8 @@
       "umask-1.1.0" = self.by-version."umask"."1.1.0";
       "validate-npm-package-license-3.0.1" = self.by-version."validate-npm-package-license"."3.0.1";
       "validate-npm-package-name-2.2.2" = self.by-version."validate-npm-package-name"."2.2.2";
-      "which-1.2.4" = self.by-version."which"."1.2.4";
-      "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
+      "which-1.2.10" = self.by-version."which"."1.2.10";
+      "wrappy-1.0.2" = self.by-version."wrappy"."1.0.2";
       "write-file-atomic-1.1.4" = self.by-version."write-file-atomic"."1.1.4";
       "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
       "imurmurhash-0.1.4" = self.by-version."imurmurhash"."0.1.4";
@@ -32590,10 +33836,10 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm"."^2.10.x" =
-    self.by-version."npm"."2.15.3";
+  by-spec."npm"."^3" =
+    self.by-version."npm"."3.9.6";
   by-spec."npm"."^3.5.1" =
-    self.by-version."npm"."3.8.7";
+    self.by-version."npm"."3.9.6";
   by-spec."npm-cache-filename"."~1.0.2" =
     self.by-version."npm-cache-filename"."1.0.2";
   by-version."npm-cache-filename"."1.0.2" = self.buildNodePackage {
@@ -32614,18 +33860,18 @@
     cpu = [ ];
   };
   by-spec."npm-check-updates"."*" =
-    self.by-version."npm-check-updates"."2.6.1";
-  by-version."npm-check-updates"."2.6.1" = self.buildNodePackage {
-    name = "npm-check-updates-2.6.1";
-    version = "2.6.1";
+    self.by-version."npm-check-updates"."2.6.7";
+  by-version."npm-check-updates"."2.6.7" = self.buildNodePackage {
+    name = "npm-check-updates-2.6.7";
+    version = "2.6.7";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.6.1.tgz";
-      name = "npm-check-updates-2.6.1.tgz";
-      sha1 = "50fe729bcb30178d806339851c02068b15c5d2c9";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.6.7.tgz";
+      name = "npm-check-updates-2.6.7.tgz";
+      sha1 = "fe1aac606ce71e69ce060c16854dd6cff2cd7c22";
     };
     deps = {
-      "bluebird-3.3.4" = self.by-version."bluebird"."3.3.4";
+      "bluebird-3.4.0" = self.by-version."bluebird"."3.4.0";
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
       "cint-8.2.1" = self.by-version."cint"."8.2.1";
       "cli-table-0.3.1" = self.by-version."cli-table"."0.3.1";
@@ -32636,8 +33882,8 @@
       "json-parse-helpfulerror-1.0.3" = self.by-version."json-parse-helpfulerror"."1.0.3";
       "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
       "node-alias-1.0.4" = self.by-version."node-alias"."1.0.4";
-      "npm-3.8.7" = self.by-version."npm"."3.8.7";
-      "npmi-1.0.1" = self.by-version."npmi"."1.0.1";
+      "npm-3.9.6" = self.by-version."npm"."3.9.6";
+      "npmi-2.0.1" = self.by-version."npmi"."2.0.1";
       "require-dir-0.3.0" = self.by-version."require-dir"."0.3.0";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "semver-utils-1.1.1" = self.by-version."semver-utils"."1.1.1";
@@ -32650,7 +33896,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "npm-check-updates" = self.by-version."npm-check-updates"."2.6.1";
+  "npm-check-updates" = self.by-version."npm-check-updates"."2.6.7";
   by-spec."npm-install-checks"."~1.0.7" =
     self.by-version."npm-install-checks"."1.0.7";
   by-version."npm-install-checks"."1.0.7" = self.buildNodePackage {
@@ -32663,7 +33909,7 @@
       sha1 = "6d91aeda0ac96801f1ed7aadee116a6c0a086a57";
     };
     deps = {
-      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "npmlog-2.0.4" = self.by-version."npmlog"."2.0.4";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
     };
     optionalDependencies = {
@@ -32693,18 +33939,18 @@
     cpu = [ ];
   };
   by-spec."npm-package-arg"."^3.0.0 || ^4.0.0" =
-    self.by-version."npm-package-arg"."4.1.0";
-  by-version."npm-package-arg"."4.1.0" = self.buildNodePackage {
-    name = "npm-package-arg-4.1.0";
-    version = "4.1.0";
+    self.by-version."npm-package-arg"."4.1.1";
+  by-version."npm-package-arg"."4.1.1" = self.buildNodePackage {
+    name = "npm-package-arg-4.1.1";
+    version = "4.1.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz";
-      name = "npm-package-arg-4.1.0.tgz";
-      sha1 = "2e015f8ac00737cb97f997c9cbf059f42a74527d";
+      url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.1.tgz";
+      name = "npm-package-arg-4.1.1.tgz";
+      sha1 = "86d9dca985b4c5e5d59772dfd5de6919998a495a";
     };
     deps = {
-      "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4";
+      "hosted-git-info-2.1.5" = self.by-version."hosted-git-info"."2.1.5";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
     };
     optionalDependencies = {
@@ -32714,9 +33960,13 @@
     cpu = [ ];
   };
   by-spec."npm-package-arg"."^4.0.0" =
-    self.by-version."npm-package-arg"."4.1.0";
+    self.by-version."npm-package-arg"."4.1.1";
+  by-spec."npm-package-arg"."^4.1.1" =
+    self.by-version."npm-package-arg"."4.1.1";
   by-spec."npm-package-arg"."~4.1.0" =
-    self.by-version."npm-package-arg"."4.1.0";
+    self.by-version."npm-package-arg"."4.1.1";
+  by-spec."npm-package-arg"."~4.1.1" =
+    self.by-version."npm-package-arg"."4.1.1";
   by-spec."npm-registry-client"."0.2.27" =
     self.by-version."npm-registry-client"."0.2.27";
   by-version."npm-registry-client"."0.2.27" = self.buildNodePackage {
@@ -32729,7 +33979,7 @@
       sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
     };
     deps = {
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "semver-2.0.11" = self.by-version."semver"."2.0.11";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
@@ -32740,7 +33990,7 @@
       "couch-login-0.1.20" = self.by-version."couch-login"."0.1.20";
     };
     optionalDependencies = {
-      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "npmlog-3.0.0" = self.by-version."npmlog"."3.0.0";
     };
     peerDependencies = [];
     os = [ ];
@@ -32760,66 +34010,66 @@
     deps = {
       "chownr-1.0.1" = self.by-version."chownr"."1.0.1";
       "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
-      "npm-package-arg-4.1.0" = self.by-version."npm-package-arg"."4.1.0";
+      "npm-package-arg-4.1.1" = self.by-version."npm-package-arg"."4.1.1";
       "once-1.3.3" = self.by-version."once"."1.3.3";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "retry-0.8.0" = self.by-version."retry"."0.8.0";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
     };
     optionalDependencies = {
-      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "npmlog-2.0.4" = self.by-version."npmlog"."2.0.4";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
   by-spec."npm-registry-client"."~7.1.0" =
-    self.by-version."npm-registry-client"."7.1.0";
-  by-version."npm-registry-client"."7.1.0" = self.buildNodePackage {
-    name = "npm-registry-client-7.1.0";
-    version = "7.1.0";
+    self.by-version."npm-registry-client"."7.1.1";
+  by-version."npm-registry-client"."7.1.1" = self.buildNodePackage {
+    name = "npm-registry-client-7.1.1";
+    version = "7.1.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.0.tgz";
-      name = "npm-registry-client-7.1.0.tgz";
-      sha1 = "e3be14ab279fe5123e15ab5c8a650445415664a5";
+      url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.1.tgz";
+      name = "npm-registry-client-7.1.1.tgz";
+      sha1 = "d402c000996904132258bc48c9b81362025091df";
     };
     deps = {
       "chownr-1.0.1" = self.by-version."chownr"."1.0.1";
       "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
-      "npm-package-arg-4.1.0" = self.by-version."npm-package-arg"."4.1.0";
+      "npm-package-arg-4.1.1" = self.by-version."npm-package-arg"."4.1.1";
       "once-1.3.3" = self.by-version."once"."1.3.3";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "retry-0.8.0" = self.by-version."retry"."0.8.0";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
     };
     optionalDependencies = {
-      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "npmlog-3.0.0" = self.by-version."npmlog"."3.0.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
   by-spec."npm-user-validate"."~0.1.2" =
-    self.by-version."npm-user-validate"."0.1.2";
-  by-version."npm-user-validate"."0.1.2" = self.buildNodePackage {
-    name = "npm-user-validate-0.1.2";
-    version = "0.1.2";
+    self.by-version."npm-user-validate"."0.1.3";
+  by-version."npm-user-validate"."0.1.3" = self.buildNodePackage {
+    name = "npm-user-validate-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz";
-      name = "npm-user-validate-0.1.2.tgz";
-      sha1 = "d585da0b47c9f41a9e6ca684b6fd84ba41ebe87d";
+      url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.3.tgz";
+      name = "npm-user-validate-0.1.3.tgz";
+      sha1 = "68a90b5a097374891a7b35f491d4285b8ac3b9f7";
     };
     deps = {
     };
@@ -32838,7 +34088,7 @@
     src = fetchgit {
       url = "git://github.com/NixOS/npm2nix.git";
       rev = "0c06be7d278a7f64fc853a5fd42d2031d14496d5";
-      sha256 = "1x8bsmli0s1l3vshw5ylmak9z1pvnc1ps5cbc72cbn1zi36m5cp1";
+      sha256 = "e1b252cd883fd8c5c4618b157d03b3fb869fa6aad4170ef51e34681069d50bf5";
     };
     deps = {
       "semver-4.3.6" = self.by-version."semver"."4.3.6";
@@ -32967,19 +34217,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npmi"."^1.0.1" =
-    self.by-version."npmi"."1.0.1";
-  by-version."npmi"."1.0.1" = self.buildNodePackage {
-    name = "npmi-1.0.1";
-    version = "1.0.1";
+  by-spec."npmi"."^2.0.1-alpha" =
+    self.by-version."npmi"."2.0.1";
+  by-version."npmi"."2.0.1" = self.buildNodePackage {
+    name = "npmi-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/npmi/-/npmi-1.0.1.tgz";
-      name = "npmi-1.0.1.tgz";
-      sha1 = "15d769273547545e6809dcf0ce18aed48b0290e2";
+      url = "https://registry.npmjs.org/npmi/-/npmi-2.0.1.tgz";
+      name = "npmi-2.0.1.tgz";
+      sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea";
     };
     deps = {
-      "npm-2.15.3" = self.by-version."npm"."2.15.3";
+      "npm-3.9.6" = self.by-version."npm"."3.9.6";
       "semver-4.3.6" = self.by-version."semver"."4.3.6";
     };
     optionalDependencies = {
@@ -32989,15 +34239,38 @@
     cpu = [ ];
   };
   by-spec."npmlog"."*" =
-    self.by-version."npmlog"."2.0.3";
-  by-version."npmlog"."2.0.3" = self.buildNodePackage {
-    name = "npmlog-2.0.3";
-    version = "2.0.3";
+    self.by-version."npmlog"."3.0.0";
+  by-version."npmlog"."3.0.0" = self.buildNodePackage {
+    name = "npmlog-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/npmlog/-/npmlog-2.0.3.tgz";
-      name = "npmlog-2.0.3.tgz";
-      sha1 = "020f99351f0c02e399c674ba256e7c4d3b3dd298";
+      url = "https://registry.npmjs.org/npmlog/-/npmlog-3.0.0.tgz";
+      name = "npmlog-3.0.0.tgz";
+      sha1 = "5b75a32bffcfd6ebf046487a302182224cd17c9b";
+    };
+    deps = {
+      "ansi-0.3.1" = self.by-version."ansi"."0.3.1";
+      "are-we-there-yet-1.1.2" = self.by-version."are-we-there-yet"."1.1.2";
+      "gauge-2.5.0" = self.by-version."gauge"."2.5.0";
+      "set-blocking-2.0.0" = self.by-version."set-blocking"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."npmlog"."0 || 1 || 2" =
+    self.by-version."npmlog"."2.0.4";
+  by-version."npmlog"."2.0.4" = self.buildNodePackage {
+    name = "npmlog-2.0.4";
+    version = "2.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz";
+      name = "npmlog-2.0.4.tgz";
+      sha1 = "98b52530f2514ca90d09ec5b22c8846722375692";
     };
     deps = {
       "ansi-0.3.1" = self.by-version."ansi"."0.3.1";
@@ -33010,14 +34283,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npmlog"."0 || 1 || 2" =
-    self.by-version."npmlog"."2.0.3";
   by-spec."npmlog"."0.1 || 1 || 2" =
-    self.by-version."npmlog"."2.0.3";
+    self.by-version."npmlog"."2.0.4";
   by-spec."npmlog"."~2.0.0" =
-    self.by-version."npmlog"."2.0.3";
+    self.by-version."npmlog"."2.0.4";
+  by-spec."npmlog"."~2.0.0 || ~3.0.0" =
+    self.by-version."npmlog"."3.0.0";
   by-spec."npmlog"."~2.0.3" =
-    self.by-version."npmlog"."2.0.3";
+    self.by-version."npmlog"."2.0.4";
   by-spec."nssocket"."~0.5.1" =
     self.by-version."nssocket"."0.5.3";
   by-version."nssocket"."0.5.3" = self.buildNodePackage {
@@ -33168,9 +34441,9 @@
     version = "0.9.14";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
+      url = "https://github.com/ciaranj/node-oauth/tarball/master";
       name = "oauth-0.9.14.tgz";
-      sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
+      sha256 = "abd0d7be4fb10804e5a38ee66a4db5fc36d2ed045be52e7c8b7e19e4c9e16bd8";
     };
     deps = {
     };
@@ -33286,15 +34559,15 @@
     cpu = [ ];
   };
   by-spec."oauth-sign"."~0.8.0" =
-    self.by-version."oauth-sign"."0.8.1";
-  by-version."oauth-sign"."0.8.1" = self.buildNodePackage {
-    name = "oauth-sign-0.8.1";
-    version = "0.8.1";
+    self.by-version."oauth-sign"."0.8.2";
+  by-version."oauth-sign"."0.8.2" = self.buildNodePackage {
+    name = "oauth-sign-0.8.2";
+    version = "0.8.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz";
-      name = "oauth-sign-0.8.1.tgz";
-      sha1 = "182439bdb91378bf7460e75c64ea43e6448def06";
+      url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
+      name = "oauth-sign-0.8.2.tgz";
+      sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
     };
     deps = {
     };
@@ -33305,7 +34578,7 @@
     cpu = [ ];
   };
   by-spec."oauth-sign"."~0.8.1" =
-    self.by-version."oauth-sign"."0.8.1";
+    self.by-version."oauth-sign"."0.8.2";
   by-spec."oauth2orize"."1.2.2" =
     self.by-version."oauth2orize"."1.2.2";
   by-version."oauth2orize"."1.2.2" = self.buildNodePackage {
@@ -33404,16 +34677,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."object-assign"."^4.0.1" =
-    self.by-version."object-assign"."4.0.1";
-  by-version."object-assign"."4.0.1" = self.buildNodePackage {
-    name = "object-assign-4.0.1";
-    version = "4.0.1";
+  by-spec."object-assign"."^4.0.0" =
+    self.by-version."object-assign"."4.1.0";
+  by-version."object-assign"."4.1.0" = self.buildNodePackage {
+    name = "object-assign-4.1.0";
+    version = "4.1.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz";
-      name = "object-assign-4.0.1.tgz";
-      sha1 = "99504456c3598b5cad4fc59c26e8a9bb107fe0bd";
+      url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz";
+      name = "object-assign-4.1.0.tgz";
+      sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0";
     };
     deps = {
     };
@@ -33423,6 +34696,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."object-assign"."^4.0.1" =
+    self.by-version."object-assign"."4.1.0";
+  by-spec."object-assign"."^4.1.0" =
+    self.by-version."object-assign"."4.1.0";
   by-spec."object-component"."0.0.3" =
     self.by-version."object-component"."0.0.3";
   by-version."object-component"."0.0.3" = self.buildNodePackage {
@@ -33637,7 +34914,7 @@
       sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
     };
     deps = {
-      "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
+      "wrappy-1.0.2" = self.by-version."wrappy"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -33651,6 +34928,8 @@
     self.by-version."once"."1.3.3";
   by-spec."once"."^1.3.1" =
     self.by-version."once"."1.3.3";
+  by-spec."once"."^1.3.3" =
+    self.by-version."once"."1.3.3";
   by-spec."once"."~1.1.1" =
     self.by-version."once"."1.1.1";
   by-version."once"."1.1.1" = self.buildNodePackage {
@@ -33778,18 +35057,18 @@
   by-spec."opener"."~1.4.1" =
     self.by-version."opener"."1.4.1";
   by-spec."openid".">=0.2.0" =
-    self.by-version."openid"."2.0.0";
-  by-version."openid"."2.0.0" = self.buildNodePackage {
-    name = "openid-2.0.0";
-    version = "2.0.0";
+    self.by-version."openid"."2.0.1";
+  by-version."openid"."2.0.1" = self.buildNodePackage {
+    name = "openid-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/openid/-/openid-2.0.0.tgz";
-      name = "openid-2.0.0.tgz";
-      sha1 = "cf738439d321d248790cc49f5cadded3e4b5910a";
+      url = "https://registry.npmjs.org/openid/-/openid-2.0.1.tgz";
+      name = "openid-2.0.1.tgz";
+      sha1 = "6e17c07e806f5e645733d50798ee54aa2b3a9df4";
     };
     deps = {
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -34037,6 +35316,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ordered-read-streams"."^0.3.0" =
+    self.by-version."ordered-read-streams"."0.3.0";
+  by-version."ordered-read-streams"."0.3.0" = self.buildNodePackage {
+    name = "ordered-read-streams-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz";
+      name = "ordered-read-streams-0.3.0.tgz";
+      sha1 = "7137e69b3298bb342247a1bbee3881c80e2fd78b";
+    };
+    deps = {
+      "is-stream-1.1.0" = self.by-version."is-stream"."1.1.0";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."os-browserify"."~0.1.1" =
     self.by-version."os-browserify"."0.1.2";
   by-version."os-browserify"."0.1.2" = self.buildNodePackage {
@@ -34056,8 +35356,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."os-browserify"."~0.1.2" =
-    self.by-version."os-browserify"."0.1.2";
   by-spec."os-browserify"."~0.2.0" =
     self.by-version."os-browserify"."0.2.1";
   by-version."os-browserify"."0.2.1" = self.buildNodePackage {
@@ -34118,6 +35416,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."os-name"."^1.0.0" =
+    self.by-version."os-name"."1.0.3";
+  by-version."os-name"."1.0.3" = self.buildNodePackage {
+    name = "os-name-1.0.3";
+    version = "1.0.3";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz";
+      name = "os-name-1.0.3.tgz";
+      sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf";
+    };
+    deps = {
+      "osx-release-1.1.0" = self.by-version."osx-release"."1.1.0";
+      "win-release-1.1.1" = self.by-version."win-release"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."os-tmpdir"."^1.0.0" =
     self.by-version."os-tmpdir"."1.0.1";
   by-version."os-tmpdir"."1.0.1" = self.buildNodePackage {
@@ -34185,6 +35504,26 @@
     self.by-version."osenv"."0.1.3";
   by-spec."osenv"."~0.1.3" =
     self.by-version."osenv"."0.1.3";
+  by-spec."osx-release"."^1.0.0" =
+    self.by-version."osx-release"."1.1.0";
+  by-version."osx-release"."1.1.0" = self.buildNodePackage {
+    name = "osx-release-1.1.0";
+    version = "1.1.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz";
+      name = "osx-release-1.1.0.tgz";
+      sha1 = "f217911a28136949af1bf9308b241e2737d3cd6c";
+    };
+    deps = {
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."owl-deepcopy"."*" =
     self.by-version."owl-deepcopy"."0.0.4";
   by-version."owl-deepcopy"."0.0.4" = self.buildNodePackage {
@@ -34246,9 +35585,9 @@
     };
     deps = {
       "co-3.0.6" = self.by-version."co"."3.0.6";
-      "netmask-1.0.5" = self.by-version."netmask"."1.0.5";
+      "netmask-1.0.6" = self.by-version."netmask"."1.0.6";
       "degenerator-1.0.2" = self.by-version."degenerator"."1.0.2";
-      "regenerator-0.8.42" = self.by-version."regenerator"."0.8.42";
+      "regenerator-0.8.46" = self.by-version."regenerator"."0.8.46";
       "thunkify-2.1.2" = self.by-version."thunkify"."2.1.2";
     };
     optionalDependencies = {
@@ -34350,7 +35689,7 @@
       sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23";
     };
     deps = {
-      "asn1.js-4.5.2" = self.by-version."asn1.js"."4.5.2";
+      "asn1.js-4.6.2" = self.by-version."asn1.js"."4.6.2";
       "browserify-aes-1.0.6" = self.by-version."browserify-aes"."1.0.6";
       "create-hash-1.1.2" = self.by-version."create-hash"."1.1.2";
       "evp_bytestokey-1.0.0" = self.by-version."evp_bytestokey"."1.0.0";
@@ -34441,8 +35780,8 @@
       "blob-to-buffer-1.2.6" = self.by-version."blob-to-buffer"."1.2.6";
       "get-stdin-5.0.1" = self.by-version."get-stdin"."5.0.1";
       "magnet-uri-5.1.3" = self.by-version."magnet-uri"."5.1.3";
-      "parse-torrent-file-3.3.7" = self.by-version."parse-torrent-file"."3.3.7";
-      "simple-get-2.0.0" = self.by-version."simple-get"."2.0.0";
+      "parse-torrent-file-3.3.8" = self.by-version."parse-torrent-file"."3.3.8";
+      "simple-get-2.2.0" = self.by-version."simple-get"."2.2.0";
     };
     optionalDependencies = {
     };
@@ -34472,15 +35811,15 @@
     cpu = [ ];
   };
   by-spec."parse-torrent-file"."^3.0.0" =
-    self.by-version."parse-torrent-file"."3.3.7";
-  by-version."parse-torrent-file"."3.3.7" = self.buildNodePackage {
-    name = "parse-torrent-file-3.3.7";
-    version = "3.3.7";
+    self.by-version."parse-torrent-file"."3.3.8";
+  by-version."parse-torrent-file"."3.3.8" = self.buildNodePackage {
+    name = "parse-torrent-file-3.3.8";
+    version = "3.3.8";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-3.3.7.tgz";
-      name = "parse-torrent-file-3.3.7.tgz";
-      sha1 = "4b39e456b5ce16761ccf26ef3275b4ac848e9394";
+      url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-3.3.8.tgz";
+      name = "parse-torrent-file-3.3.8.tgz";
+      sha1 = "917fbceb794edadca66056130637fd38b9ffac13";
     };
     deps = {
       "bencode-0.9.0" = self.by-version."bencode"."0.9.0";
@@ -34651,27 +35990,26 @@
   };
   by-spec."parseurl"."~1.3.1" =
     self.by-version."parseurl"."1.3.1";
-  by-spec."parsoid"."*" =
-    self.by-version."parsoid"."0.4.0";
-  by-version."parsoid"."0.4.0" = self.buildNodePackage {
-    name = "parsoid-0.4.0";
-    version = "0.4.0";
+  by-spec."parsoid"."0.4.1" =
+    self.by-version."parsoid"."0.4.1";
+  by-version."parsoid"."0.4.1" = self.buildNodePackage {
+    name = "parsoid-0.4.1";
+    version = "0.4.1";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.4.0.tgz";
-      name = "parsoid-0.4.0.tgz";
-      sha1 = "3bfc61b6d217a6f7903650140f880fa2550865a7";
+      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.4.1.tgz";
+      name = "parsoid-0.4.1.tgz";
+      sha1 = "141f2fe215b06d74fd0bad4d5a46b105cd0eb3e7";
     };
     deps = {
-      "alea-0.0.9" = self.by-version."alea"."0.0.9";
       "async-0.9.2" = self.by-version."async"."0.9.2";
-      "body-parser-1.15.0" = self.by-version."body-parser"."1.15.0";
+      "body-parser-1.13.3" = self.by-version."body-parser"."1.13.3";
       "bunyan-1.0.1" = self.by-version."bunyan"."1.0.1";
-      "compression-1.6.1" = self.by-version."compression"."1.6.1";
+      "compression-1.5.2" = self.by-version."compression"."1.5.2";
       "connect-busboy-0.0.2" = self.by-version."connect-busboy"."0.0.2";
       "core-js-0.8.4" = self.by-version."core-js"."0.8.4";
       "diff-1.0.8" = self.by-version."diff"."1.0.8";
-      "domino-1.0.24" = self.by-version."domino"."1.0.24";
+      "domino-1.0.25" = self.by-version."domino"."1.0.25";
       "entities-1.1.1" = self.by-version."entities"."1.1.1";
       "express-4.13.4" = self.by-version."express"."4.13.4";
       "express-handlebars-2.0.1" = self.by-version."express-handlebars"."2.0.1";
@@ -34692,7 +36030,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "parsoid" = self.by-version."parsoid"."0.4.0";
+  "parsoid" = self.by-version."parsoid"."0.4.1";
   by-spec."passport"."*" =
     self.by-version."passport"."0.3.2";
   by-version."passport"."0.3.2" = self.buildNodePackage {
@@ -34784,15 +36122,15 @@
     cpu = [ ];
   };
   by-spec."passport-facebook".">=0.1.5" =
-    self.by-version."passport-facebook"."2.1.0";
-  by-version."passport-facebook"."2.1.0" = self.buildNodePackage {
-    name = "passport-facebook-2.1.0";
-    version = "2.1.0";
+    self.by-version."passport-facebook"."2.1.1";
+  by-version."passport-facebook"."2.1.1" = self.buildNodePackage {
+    name = "passport-facebook-2.1.1";
+    version = "2.1.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/passport-facebook/-/passport-facebook-2.1.0.tgz";
-      name = "passport-facebook-2.1.0.tgz";
-      sha1 = "41f591557fc209b621be79a3b37be395ca5de4d0";
+      url = "https://registry.npmjs.org/passport-facebook/-/passport-facebook-2.1.1.tgz";
+      name = "passport-facebook-2.1.1.tgz";
+      sha1 = "c39d0b52ae4d59163245a4e21a7b9b6321303311";
     };
     deps = {
       "passport-oauth2-1.3.0" = self.by-version."passport-oauth2"."1.3.0";
@@ -35044,7 +36382,7 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
       "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -35074,7 +36412,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."passport-oauth".">= 0.1.0" =
+  by-spec."passport-oauth"."1.x.x" =
     self.by-version."passport-oauth"."1.0.0";
   by-version."passport-oauth"."1.0.0" = self.buildNodePackage {
     name = "passport-oauth-1.0.0";
@@ -35095,6 +36433,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."passport-oauth".">= 0.1.0" =
+    self.by-version."passport-oauth"."1.0.0";
   by-spec."passport-oauth"."~0.1.1" =
     self.by-version."passport-oauth"."0.1.15";
   by-spec."passport-oauth1"."1.x.x" =
@@ -35166,19 +36506,19 @@
     cpu = [ ];
   };
   by-spec."passport-soundcloud".">=0.1.2" =
-    self.by-version."passport-soundcloud"."0.1.2";
-  by-version."passport-soundcloud"."0.1.2" = self.buildNodePackage {
-    name = "passport-soundcloud-0.1.2";
-    version = "0.1.2";
+    self.by-version."passport-soundcloud"."0.2.0";
+  by-version."passport-soundcloud"."0.2.0" = self.buildNodePackage {
+    name = "passport-soundcloud-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/passport-soundcloud/-/passport-soundcloud-0.1.2.tgz";
-      name = "passport-soundcloud-0.1.2.tgz";
-      sha1 = "4ecf4b42b3e7d9641b78b9181aae6b75127beb21";
+      url = "https://registry.npmjs.org/passport-soundcloud/-/passport-soundcloud-0.2.0.tgz";
+      name = "passport-soundcloud-0.2.0.tgz";
+      sha1 = "80a025c7d3d70bf258f2b7da65950613bdb28258";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+      "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -35247,19 +36587,19 @@
     cpu = [ ];
   };
   by-spec."passport-wordpress".">=0.0.1" =
-    self.by-version."passport-wordpress"."0.0.3";
-  by-version."passport-wordpress"."0.0.3" = self.buildNodePackage {
-    name = "passport-wordpress-0.0.3";
-    version = "0.0.3";
+    self.by-version."passport-wordpress"."0.0.4";
+  by-version."passport-wordpress"."0.0.4" = self.buildNodePackage {
+    name = "passport-wordpress-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/passport-wordpress/-/passport-wordpress-0.0.3.tgz";
-      name = "passport-wordpress-0.0.3.tgz";
-      sha1 = "fa3b144c7c5a4c967a5f5f383139d515a95a7988";
+      url = "https://registry.npmjs.org/passport-wordpress/-/passport-wordpress-0.0.4.tgz";
+      name = "passport-wordpress-0.0.4.tgz";
+      sha1 = "553b54812f9711171951f34d15ce4e001a98f1b0";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+      "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -35320,7 +36660,7 @@
       sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b";
     };
     deps = {
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+      "pinkie-promise-2.0.1" = self.by-version."pinkie-promise"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -35328,8 +36668,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."path-exists"."^2.1.0" =
-    self.by-version."path-exists"."2.1.0";
   by-spec."path-is-absolute"."1.0.0" =
     self.by-version."path-is-absolute"."1.0.0";
   by-version."path-is-absolute"."1.0.0" = self.buildNodePackage {
@@ -35503,9 +36841,9 @@
       sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
     };
     deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "pify-2.3.0" = self.by-version."pify"."2.3.0";
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+      "pinkie-promise-2.0.1" = self.by-version."pinkie-promise"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -35591,25 +36929,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."pbkdf2-compat"."2.0.1" =
-    self.by-version."pbkdf2-compat"."2.0.1";
-  by-version."pbkdf2-compat"."2.0.1" = self.buildNodePackage {
-    name = "pbkdf2-compat-2.0.1";
-    version = "2.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz";
-      name = "pbkdf2-compat-2.0.1.tgz";
-      sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."peer-wire-protocol"."^0.7.0" =
     self.by-version."peer-wire-protocol"."0.7.0";
   by-version."peer-wire-protocol"."0.7.0" = self.buildNodePackage {
@@ -35623,7 +36942,7 @@
     };
     deps = {
       "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
       "bncode-0.2.3" = self.by-version."bncode"."0.2.3";
       "speedometer-0.1.4" = self.by-version."speedometer"."0.1.4";
     };
@@ -35681,15 +37000,15 @@
     cpu = [ ];
   };
   by-spec."peerflix"."*" =
-    self.by-version."peerflix"."0.32.4";
-  by-version."peerflix"."0.32.4" = self.buildNodePackage {
-    name = "peerflix-0.32.4";
-    version = "0.32.4";
+    self.by-version."peerflix"."0.35.0";
+  by-version."peerflix"."0.35.0" = self.buildNodePackage {
+    name = "peerflix-0.35.0";
+    version = "0.35.0";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.32.4.tgz";
-      name = "peerflix-0.32.4.tgz";
-      sha1 = "f971df69db962ecaee1b7a7ba67fff7c57fd12dc";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.35.0.tgz";
+      name = "peerflix-0.35.0.tgz";
+      sha1 = "022246d6bfe4175aa10340d253e3d8c92df7b926";
     };
     deps = {
       "clivas-0.1.4" = self.by-version."clivas"."0.1.4";
@@ -35702,30 +37021,30 @@
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
       "parse-torrent-5.7.3" = self.by-version."parse-torrent"."5.7.3";
       "pump-0.3.5" = self.by-version."pump"."0.3.5";
-      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
+      "range-parser-1.2.0" = self.by-version."range-parser"."1.2.0";
       "rc-0.4.0" = self.by-version."rc"."0.4.0";
-      "torrent-stream-1.0.2" = self.by-version."torrent-stream"."1.0.2";
+      "torrent-stream-1.0.3" = self.by-version."torrent-stream"."1.0.3";
       "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
-      "airplay-js-0.2.16" = self.by-version."airplay-js"."0.2.16";
+      "airplayer-2.0.0" = self.by-version."airplayer"."2.0.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "peerflix" = self.by-version."peerflix"."0.32.4";
-  by-spec."peerflix"."^0.29.1" =
-    self.by-version."peerflix"."0.29.2";
-  by-version."peerflix"."0.29.2" = self.buildNodePackage {
-    name = "peerflix-0.29.2";
-    version = "0.29.2";
+  "peerflix" = self.by-version."peerflix"."0.35.0";
+  by-spec."peerflix"."^0.34.0" =
+    self.by-version."peerflix"."0.34.0";
+  by-version."peerflix"."0.34.0" = self.buildNodePackage {
+    name = "peerflix-0.34.0";
+    version = "0.34.0";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.29.2.tgz";
-      name = "peerflix-0.29.2.tgz";
-      sha1 = "6a32587260546d42d4d2c0ccc37063d977af105c";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.34.0.tgz";
+      name = "peerflix-0.34.0.tgz";
+      sha1 = "748f7e401284bf8f2c620264d229223304199dbe";
     };
     deps = {
       "clivas-0.1.4" = self.by-version."clivas"."0.1.4";
@@ -35736,11 +37055,11 @@
       "numeral-1.5.3" = self.by-version."numeral"."1.5.3";
       "open-0.0.5" = self.by-version."open"."0.0.5";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+      "parse-torrent-5.7.3" = self.by-version."parse-torrent"."5.7.3";
       "pump-0.3.5" = self.by-version."pump"."0.3.5";
-      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
+      "range-parser-1.2.0" = self.by-version."range-parser"."1.2.0";
       "rc-0.4.0" = self.by-version."rc"."0.4.0";
-      "read-torrent-1.3.0" = self.by-version."read-torrent"."1.3.0";
-      "torrent-stream-0.18.1" = self.by-version."torrent-stream"."0.18.1";
+      "torrent-stream-1.0.3" = self.by-version."torrent-stream"."1.0.3";
       "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
@@ -35768,29 +37087,29 @@
       "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "pump-1.0.1" = self.by-version."pump"."1.0.1";
-      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
+      "range-parser-1.2.0" = self.by-version."range-parser"."1.2.0";
       "read-torrent-1.3.0" = self.by-version."read-torrent"."1.3.0";
       "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17";
       "torrent-stream-0.18.1" = self.by-version."torrent-stream"."0.18.1";
     };
     optionalDependencies = {
-      "fluent-ffmpeg-2.0.1" = self.by-version."fluent-ffmpeg"."2.0.1";
+      "fluent-ffmpeg-2.1.0" = self.by-version."fluent-ffmpeg"."2.1.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
   "peerflix-server" = self.by-version."peerflix-server"."0.0.29";
-  by-spec."pegjs"."0.6.2" =
-    self.by-version."pegjs"."0.6.2";
-  by-version."pegjs"."0.6.2" = self.buildNodePackage {
-    name = "pegjs-0.6.2";
-    version = "0.6.2";
+  by-spec."pegjs"."0.9.0" =
+    self.by-version."pegjs"."0.9.0";
+  by-version."pegjs"."0.9.0" = self.buildNodePackage {
+    name = "pegjs-0.9.0";
+    version = "0.9.0";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz";
-      name = "pegjs-0.6.2.tgz";
-      sha1 = "74651f8a800e444db688e4eeae8edb65637a17a5";
+      url = "https://registry.npmjs.org/pegjs/-/pegjs-0.9.0.tgz";
+      name = "pegjs-0.9.0.tgz";
+      sha1 = "f6aefa2e3ce56169208e52179dfe41f89141a369";
     };
     deps = {
     };
@@ -35800,16 +37119,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."pegjs"."git+https://github.com/tstarling/pegjs#fork" =
+  by-spec."pegjs"."git+https://github.com/tstarling/pegjs.git#fork" =
     self.by-version."pegjs"."0.8.0";
   by-version."pegjs"."0.8.0" = self.buildNodePackage {
     name = "pegjs-0.8.0";
     version = "0.8.0";
     bin = true;
     src = fetchgit {
-      url = "https://github.com/tstarling/pegjs";
+      url = "https://github.com/tstarling/pegjs.git";
       rev = "9162b1e114e41992dd0fdafa24d2574a0b8a836a";
-      sha256 = "1aj0vgdwyir7z4aals6njrd92as27bflhlm5bp0fgi0lvvlwinnh";
+      sha256 = "d0dac8e9de14c4e7c05da55248dd3a422b915a96d668aa14f92747cfdbdb40aa";
     };
     deps = {
     };
@@ -35857,7 +37176,7 @@
       "progress-1.1.8" = self.by-version."progress"."1.1.8";
       "request-2.67.0" = self.by-version."request"."2.67.0";
       "request-progress-2.0.1" = self.by-version."request-progress"."2.0.1";
-      "which-1.2.4" = self.by-version."which"."1.2.4";
+      "which-1.2.10" = self.by-version."which"."1.2.10";
     };
     optionalDependencies = {
     };
@@ -35914,7 +37233,7 @@
       "progress-1.1.8" = self.by-version."progress"."1.1.8";
       "request-2.67.0" = self.by-version."request"."2.67.0";
       "request-progress-2.0.1" = self.by-version."request-progress"."2.0.1";
-      "which-1.2.4" = self.by-version."which"."1.2.4";
+      "which-1.2.10" = self.by-version."which"."1.2.10";
     };
     optionalDependencies = {
     };
@@ -35961,15 +37280,15 @@
     cpu = [ ];
   };
   by-spec."pinkie-promise"."^2.0.0" =
-    self.by-version."pinkie-promise"."2.0.0";
-  by-version."pinkie-promise"."2.0.0" = self.buildNodePackage {
-    name = "pinkie-promise-2.0.0";
-    version = "2.0.0";
+    self.by-version."pinkie-promise"."2.0.1";
+  by-version."pinkie-promise"."2.0.1" = self.buildNodePackage {
+    name = "pinkie-promise-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz";
-      name = "pinkie-promise-2.0.0.tgz";
-      sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259";
+      url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+      name = "pinkie-promise-2.0.1.tgz";
+      sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
     };
     deps = {
       "pinkie-2.0.4" = self.by-version."pinkie"."2.0.4";
@@ -35980,6 +37299,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."pkg-conf"."^1.1.2" =
+    self.by-version."pkg-conf"."1.1.3";
+  by-version."pkg-conf"."1.1.3" = self.buildNodePackage {
+    name = "pkg-conf-1.1.3";
+    version = "1.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-1.1.3.tgz";
+      name = "pkg-conf-1.1.3.tgz";
+      sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b";
+    };
+    deps = {
+      "find-up-1.1.2" = self.by-version."find-up"."1.1.2";
+      "load-json-file-1.1.0" = self.by-version."load-json-file"."1.1.0";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
+      "symbol-0.2.3" = self.by-version."symbol"."0.2.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."pkgcloud".">=1.1.0" =
     self.by-version."pkgcloud"."1.3.0";
   by-version."pkgcloud"."1.3.0" = self.buildNodePackage {
@@ -35993,10 +37335,10 @@
     };
     deps = {
       "async-0.9.2" = self.by-version."async"."0.9.2";
-      "aws-sdk-2.3.2" = self.by-version."aws-sdk"."2.3.2";
+      "aws-sdk-2.3.19" = self.by-version."aws-sdk"."2.3.19";
       "errs-0.3.2" = self.by-version."errs"."0.3.2";
       "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
-      "fast-json-patch-0.5.6" = self.by-version."fast-json-patch"."0.5.6";
+      "fast-json-patch-0.5.7" = self.by-version."fast-json-patch"."0.5.7";
       "filed-0.1.0" = self.by-version."filed"."0.1.0";
       "gcloud-0.10.0" = self.by-version."gcloud"."0.10.0";
       "ip-0.3.3" = self.by-version."ip"."0.3.3";
@@ -36120,6 +37462,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."plist"."1.2.0" =
+    self.by-version."plist"."1.2.0";
   by-spec."plist"."^1.0.1" =
     self.by-version."plist"."1.2.0";
   by-spec."plist"."^1.2.0" =
@@ -36226,6 +37570,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."poplib"."^0.1.7" =
+    self.by-version."poplib"."0.1.7";
+  by-version."poplib"."0.1.7" = self.buildNodePackage {
+    name = "poplib-0.1.7";
+    version = "0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz";
+      name = "poplib-0.1.7.tgz";
+      sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc";
+    };
+    deps = {
+      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."portfinder"."^0.3.0" =
     self.by-version."portfinder"."0.3.0";
   by-version."portfinder"."0.3.0" = self.buildNodePackage {
@@ -36247,18 +37611,18 @@
     cpu = [ ];
   };
   by-spec."posix"."*" =
-    self.by-version."posix"."4.0.1";
-  by-version."posix"."4.0.1" = self.buildNodePackage {
-    name = "posix-4.0.1";
-    version = "4.0.1";
+    self.by-version."posix"."4.0.2";
+  by-version."posix"."4.0.2" = self.buildNodePackage {
+    name = "posix-4.0.2";
+    version = "4.0.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/posix/-/posix-4.0.1.tgz";
-      name = "posix-4.0.1.tgz";
-      sha1 = "22d195ef7915705b69430eb997780dc74e159be4";
+      url = "https://registry.npmjs.org/posix/-/posix-4.0.2.tgz";
+      name = "posix-4.0.2.tgz";
+      sha1 = "8ea7533a54ae5dee4866532094ca5d68248bbe7f";
     };
     deps = {
-      "nan-2.0.9" = self.by-version."nan"."2.0.9";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -36266,7 +37630,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "posix" = self.by-version."posix"."4.0.1";
+  "posix" = self.by-version."posix"."4.0.2";
   by-spec."posix-getopt"."1.1.0" =
     self.by-version."posix-getopt"."1.1.0";
   by-version."posix-getopt"."1.1.0" = self.buildNodePackage {
@@ -36325,15 +37689,15 @@
     cpu = [ ];
   };
   by-spec."prepend-http"."^1.0.0" =
-    self.by-version."prepend-http"."1.0.3";
-  by-version."prepend-http"."1.0.3" = self.buildNodePackage {
-    name = "prepend-http-1.0.3";
-    version = "1.0.3";
+    self.by-version."prepend-http"."1.0.4";
+  by-version."prepend-http"."1.0.4" = self.buildNodePackage {
+    name = "prepend-http-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.3.tgz";
-      name = "prepend-http-1.0.3.tgz";
-      sha1 = "4d0d2b6f9efcf1190c23931325b4f3a9dba84869";
+      url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz";
+      name = "prepend-http-1.0.4.tgz";
+      sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
     };
     deps = {
     };
@@ -36437,7 +37801,7 @@
     deps = {
     };
     optionalDependencies = {
-      "es6-shim-0.35.0" = self.by-version."es6-shim"."0.35.0";
+      "es6-shim-0.35.1" = self.by-version."es6-shim"."0.35.1";
     };
     peerDependencies = [];
     os = [ ];
@@ -36466,16 +37830,16 @@
     self.by-version."private"."0.1.6";
   by-spec."private"."~0.1.5" =
     self.by-version."private"."0.1.6";
-  by-spec."process"."^0.11.0" =
-    self.by-version."process"."0.11.2";
-  by-version."process"."0.11.2" = self.buildNodePackage {
-    name = "process-0.11.2";
-    version = "0.11.2";
+  by-spec."process"."~0.11.0" =
+    self.by-version."process"."0.11.4";
+  by-version."process"."0.11.4" = self.buildNodePackage {
+    name = "process-0.11.4";
+    version = "0.11.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/process/-/process-0.11.2.tgz";
-      name = "process-0.11.2.tgz";
-      sha1 = "8a58d1d12c573f3f890da9848a4fe8e16ca977b2";
+      url = "https://registry.npmjs.org/process/-/process-0.11.4.tgz";
+      name = "process-0.11.4.tgz";
+      sha1 = "a6e6d49f0833d36571c0b9492c0f4b90bac96cd3";
     };
     deps = {
     };
@@ -36485,18 +37849,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."process"."~0.11.0" =
-    self.by-version."process"."0.11.2";
   by-spec."process-nextick-args"."~1.0.6" =
-    self.by-version."process-nextick-args"."1.0.6";
-  by-version."process-nextick-args"."1.0.6" = self.buildNodePackage {
-    name = "process-nextick-args-1.0.6";
-    version = "1.0.6";
+    self.by-version."process-nextick-args"."1.0.7";
+  by-version."process-nextick-args"."1.0.7" = self.buildNodePackage {
+    name = "process-nextick-args-1.0.7";
+    version = "1.0.7";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz";
-      name = "process-nextick-args-1.0.6.tgz";
-      sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05";
+      url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
+      name = "process-nextick-args-1.0.7.tgz";
+      sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
     };
     deps = {
     };
@@ -36601,7 +37963,7 @@
       sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf";
     };
     deps = {
-      "asap-2.0.3" = self.by-version."asap"."2.0.3";
+      "asap-2.0.4" = self.by-version."asap"."2.0.4";
     };
     optionalDependencies = {
     };
@@ -36887,15 +38249,15 @@
     cpu = [ ];
   };
   by-spec."ps-tree"."^1.0.1" =
-    self.by-version."ps-tree"."1.0.1";
-  by-version."ps-tree"."1.0.1" = self.buildNodePackage {
-    name = "ps-tree-1.0.1";
-    version = "1.0.1";
+    self.by-version."ps-tree"."1.1.0";
+  by-version."ps-tree"."1.1.0" = self.buildNodePackage {
+    name = "ps-tree-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.0.1.tgz";
-      name = "ps-tree-1.0.1.tgz";
-      sha1 = "c64063b4ce8d72f7f874975f3ecc5f3597ac8e4b";
+      url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz";
+      name = "ps-tree-1.1.0.tgz";
+      sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014";
     };
     deps = {
       "event-stream-3.3.2" = self.by-version."event-stream"."3.3.2";
@@ -36956,7 +38318,7 @@
       sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6";
     };
     deps = {
-      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "bn.js-4.11.4" = self.by-version."bn.js"."4.11.4";
       "browserify-rsa-4.0.1" = self.by-version."browserify-rsa"."4.0.1";
       "create-hash-1.1.2" = self.by-version."create-hash"."1.1.2";
       "parse-asn1-5.0.0" = self.by-version."parse-asn1"."5.0.0";
@@ -37151,21 +38513,20 @@
   };
   "pure" = self.by-version."pure"."2.67.0";
   by-spec."pusher"."^1.0.0" =
-    self.by-version."pusher"."1.2.1";
-  by-version."pusher"."1.2.1" = self.buildNodePackage {
-    name = "pusher-1.2.1";
-    version = "1.2.1";
+    self.by-version."pusher"."1.3.0";
+  by-version."pusher"."1.3.0" = self.buildNodePackage {
+    name = "pusher-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/pusher/-/pusher-1.2.1.tgz";
-      name = "pusher-1.2.1.tgz";
-      sha1 = "58b8c406e34373b7f46579854c445d09e2eacd6b";
+      url = "https://registry.npmjs.org/pusher/-/pusher-1.3.0.tgz";
+      name = "pusher-1.3.0.tgz";
+      sha1 = "f5e949571ed0d59aebdd41286cd1e1433bd96f11";
     };
     deps = {
       "request-2.67.0" = self.by-version."request"."2.67.0";
     };
     optionalDependencies = {
-      "webpack-1.12.14" = self.by-version."webpack"."1.12.14";
     };
     peerDependencies = [];
     os = [ ];
@@ -37209,29 +38570,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."q".">= 0.0.1" =
-    self.by-version."q"."2.0.3";
-  by-version."q"."2.0.3" = self.buildNodePackage {
-    name = "q-2.0.3";
-    version = "2.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/q/-/q-2.0.3.tgz";
-      name = "q-2.0.3.tgz";
-      sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134";
-    };
-    deps = {
-      "asap-2.0.3" = self.by-version."asap"."2.0.3";
-      "pop-iterate-1.0.1" = self.by-version."pop-iterate"."1.0.1";
-      "weak-map-1.0.5" = self.by-version."weak-map"."1.0.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."q"."^1.0.1" =
+  by-spec."q"."1.4.1" =
     self.by-version."q"."1.4.1";
   by-version."q"."1.4.1" = self.buildNodePackage {
     name = "q-1.4.1";
@@ -37250,6 +38589,30 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."q".">= 0.0.1" =
+    self.by-version."q"."2.0.3";
+  by-version."q"."2.0.3" = self.buildNodePackage {
+    name = "q-2.0.3";
+    version = "2.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/q/-/q-2.0.3.tgz";
+      name = "q-2.0.3.tgz";
+      sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134";
+    };
+    deps = {
+      "asap-2.0.4" = self.by-version."asap"."2.0.4";
+      "pop-iterate-1.0.1" = self.by-version."pop-iterate"."1.0.1";
+      "weak-map-1.0.5" = self.by-version."weak-map"."1.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."q"."^1.0.1" =
+    self.by-version."q"."1.4.1";
   by-spec."q"."^1.1.2" =
     self.by-version."q"."1.4.1";
   by-spec."q"."^1.4.1" =
@@ -37412,8 +38775,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs"."1.x.x" =
-    self.by-version."qs"."1.2.2";
+  by-spec."qs"."2.3.3" =
+    self.by-version."qs"."2.3.3";
+  by-version."qs"."2.3.3" = self.buildNodePackage {
+    name = "qs-2.3.3";
+    version = "2.3.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
+      name = "qs-2.3.3.tgz";
+      sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."qs"."4.0.0" =
     self.by-version."qs"."4.0.0";
   by-version."qs"."4.0.0" = self.buildNodePackage {
@@ -37472,7 +38852,24 @@
     cpu = [ ];
   };
   by-spec."qs".">= 0.4.0" =
-    self.by-version."qs"."6.1.0";
+    self.by-version."qs"."6.2.0";
+  by-version."qs"."6.2.0" = self.buildNodePackage {
+    name = "qs-6.2.0";
+    version = "6.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz";
+      name = "qs-6.2.0.tgz";
+      sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."qs"."^3.1.0" =
     self.by-version."qs"."3.1.0";
   by-version."qs"."3.1.0" = self.buildNodePackage {
@@ -37492,6 +38889,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."qs"."^6.2.0" =
+    self.by-version."qs"."6.2.0";
   by-spec."qs"."~0.5.4" =
     self.by-version."qs"."0.5.6";
   by-version."qs"."0.5.6" = self.buildNodePackage {
@@ -37555,23 +38954,6 @@
   };
   by-spec."qs"."~2.3.1" =
     self.by-version."qs"."2.3.3";
-  by-version."qs"."2.3.3" = self.buildNodePackage {
-    name = "qs-2.3.3";
-    version = "2.3.3";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
-      name = "qs-2.3.3.tgz";
-      sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."qs"."~2.4.0" =
     self.by-version."qs"."2.4.2";
   by-version."qs"."2.4.2" = self.buildNodePackage {
@@ -37614,25 +38996,6 @@
   };
   by-spec."qs"."~5.2.0" =
     self.by-version."qs"."5.2.0";
-  by-spec."qs"."~6.0.2" =
-    self.by-version."qs"."6.0.2";
-  by-version."qs"."6.0.2" = self.buildNodePackage {
-    name = "qs-6.0.2";
-    version = "6.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz";
-      name = "qs-6.0.2.tgz";
-      sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."qs"."~6.1.0" =
     self.by-version."qs"."6.1.0";
   by-spec."query-string"."^1.0.0" =
@@ -37731,6 +39094,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."random-access-file"."^1.0.1" =
+    self.by-version."random-access-file"."1.2.0";
+  by-version."random-access-file"."1.2.0" = self.buildNodePackage {
+    name = "random-access-file-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.2.0.tgz";
+      name = "random-access-file-1.2.0.tgz";
+      sha1 = "c7aa8b20ae3e9e6db3ff316d791beee5a1514f29";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."random-bytes"."~1.0.0" =
     self.by-version."random-bytes"."1.0.0";
   by-version."random-bytes"."1.0.0" = self.buildNodePackage {
@@ -37782,7 +39167,7 @@
     };
     deps = {
       "is-number-2.1.0" = self.by-version."is-number"."2.1.0";
-      "kind-of-3.0.2" = self.by-version."kind-of"."3.0.2";
+      "kind-of-3.0.3" = self.by-version."kind-of"."3.0.3";
     };
     optionalDependencies = {
     };
@@ -37811,6 +39196,8 @@
   };
   by-spec."randombytes"."^2.0.1" =
     self.by-version."randombytes"."2.0.3";
+  by-spec."randombytes"."^2.0.3" =
+    self.by-version."randombytes"."2.0.3";
   by-spec."range-parser"."0.0.4" =
     self.by-version."range-parser"."0.0.4";
   by-version."range-parser"."0.0.4" = self.buildNodePackage {
@@ -37850,6 +39237,29 @@
     cpu = [ ];
   };
   by-spec."range-parser"."^1.0.0" =
+    self.by-version."range-parser"."1.2.0";
+  by-version."range-parser"."1.2.0" = self.buildNodePackage {
+    name = "range-parser-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz";
+      name = "range-parser-1.2.0.tgz";
+      sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."range-parser"."^1.0.2" =
+    self.by-version."range-parser"."1.2.0";
+  by-spec."range-parser"."^1.0.3" =
+    self.by-version."range-parser"."1.2.0";
+  by-spec."range-parser"."~1.0.0" =
     self.by-version."range-parser"."1.0.3";
   by-version."range-parser"."1.0.3" = self.buildNodePackage {
     name = "range-parser-1.0.3";
@@ -37868,14 +39278,12 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."range-parser"."^1.0.2" =
-    self.by-version."range-parser"."1.0.3";
-  by-spec."range-parser"."~1.0.0" =
-    self.by-version."range-parser"."1.0.3";
   by-spec."range-parser"."~1.0.2" =
     self.by-version."range-parser"."1.0.3";
   by-spec."range-parser"."~1.0.3" =
     self.by-version."range-parser"."1.0.3";
+  by-spec."range-parser"."~1.2.0" =
+    self.by-version."range-parser"."1.2.0";
   by-spec."raven"."~0.10.0" =
     self.by-version."raven"."0.10.0";
   by-version."raven"."0.10.0" = self.buildNodePackage {
@@ -38006,19 +39414,21 @@
     self.by-version."raw-body"."2.1.6";
   by-spec."raw-body"."~2.1.5" =
     self.by-version."raw-body"."2.1.6";
+  by-spec."raw-body"."~2.1.6" =
+    self.by-version."raw-body"."2.1.6";
   by-spec."raw-socket"."*" =
-    self.by-version."raw-socket"."1.4.0";
-  by-version."raw-socket"."1.4.0" = self.buildNodePackage {
-    name = "raw-socket-1.4.0";
-    version = "1.4.0";
+    self.by-version."raw-socket"."1.5.0";
+  by-version."raw-socket"."1.5.0" = self.buildNodePackage {
+    name = "raw-socket-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.4.0.tgz";
-      name = "raw-socket-1.4.0.tgz";
-      sha1 = "739c09259e5524d68024f0e13ea9e5e2702d2e8b";
+      url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.0.tgz";
+      name = "raw-socket-1.5.0.tgz";
+      sha1 = "7a0fba1aef118609011a1205e830e626ca522ae9";
     };
     deps = {
-      "nan-2.0.9" = self.by-version."nan"."2.0.9";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -38096,20 +39506,20 @@
     cpu = [ ];
   };
   by-spec."react"."*" =
-    self.by-version."react"."15.0.0";
-  by-version."react"."15.0.0" = self.buildNodePackage {
-    name = "react-15.0.0";
-    version = "15.0.0";
+    self.by-version."react"."15.1.0";
+  by-version."react"."15.1.0" = self.buildNodePackage {
+    name = "react-15.1.0";
+    version = "15.1.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/react/-/react-15.0.0.tgz";
-      name = "react-15.0.0.tgz";
-      sha1 = "3c7e16531d630e15c1a50a947f14ba61746af8a7";
+      url = "https://registry.npmjs.org/react/-/react-15.1.0.tgz";
+      name = "react-15.1.0.tgz";
+      sha1 = "5f7a9f085a00509898efd2b24cb12ea1dfaf8b40";
     };
     deps = {
-      "fbjs-0.8.0" = self.by-version."fbjs"."0.8.0";
-      "loose-envify-1.1.0" = self.by-version."loose-envify"."1.1.0";
-      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+      "fbjs-0.8.3" = self.by-version."fbjs"."0.8.3";
+      "loose-envify-1.2.0" = self.by-version."loose-envify"."1.2.0";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
     };
     optionalDependencies = {
     };
@@ -38117,7 +39527,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "react" = self.by-version."react"."15.0.0";
+  "react" = self.by-version."react"."15.1.0";
   by-spec."react-tools"."*" =
     self.by-version."react-tools"."0.14.0-alpha3";
   by-version."react-tools"."0.14.0-alpha3" = self.buildNodePackage {
@@ -38178,7 +39588,7 @@
       sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0";
     };
     deps = {
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -38198,8 +39608,8 @@
       sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
     };
     deps = {
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "pinkie-promise-2.0.1" = self.by-version."pinkie-promise"."2.0.1";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -38219,7 +39629,7 @@
       sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b";
     };
     deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
     };
     optionalDependencies = {
     };
@@ -38240,14 +39650,14 @@
     };
     deps = {
       "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
-      "read-package-json-2.0.3" = self.by-version."read-package-json"."2.0.3";
+      "read-package-json-2.0.4" = self.by-version."read-package-json"."2.0.4";
       "readdir-scoped-modules-1.0.2" = self.by-version."readdir-scoped-modules"."1.0.2";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
       "util-extend-1.0.3" = self.by-version."util-extend"."1.0.3";
     };
     optionalDependencies = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
     };
     peerDependencies = [];
     os = [ ];
@@ -38265,7 +39675,7 @@
       sha1 = "43c669ae864aae308dfbbb2721a67e295ec8fff6";
     };
     deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
     };
     optionalDependencies = {
     };
@@ -38285,7 +39695,7 @@
       sha1 = "5da77c799ed1388d3ef88a18471bb5924f8a0ba1";
     };
     deps = {
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
       "readable-wrap-1.0.0" = self.by-version."readable-wrap"."1.0.0";
     };
     optionalDependencies = {
@@ -38306,7 +39716,7 @@
       sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0";
     };
     deps = {
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -38315,15 +39725,15 @@
     cpu = [ ];
   };
   by-spec."read-package-json"."1 || 2" =
-    self.by-version."read-package-json"."2.0.3";
-  by-version."read-package-json"."2.0.3" = self.buildNodePackage {
-    name = "read-package-json-2.0.3";
-    version = "2.0.3";
+    self.by-version."read-package-json"."2.0.4";
+  by-version."read-package-json"."2.0.4" = self.buildNodePackage {
+    name = "read-package-json-2.0.4";
+    version = "2.0.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.3.tgz";
-      name = "read-package-json-2.0.3.tgz";
-      sha1 = "f8cec1627053b54f384b353224545e607554c5d2";
+      url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.4.tgz";
+      name = "read-package-json-2.0.4.tgz";
+      sha1 = "61ed1b2256ea438d8008895090be84b8e799c853";
     };
     deps = {
       "glob-6.0.4" = self.by-version."glob"."6.0.4";
@@ -38331,32 +39741,32 @@
       "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
     };
     optionalDependencies = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
   by-spec."read-package-json"."^2.0.0" =
-    self.by-version."read-package-json"."2.0.3";
-  by-spec."read-package-json"."~2.0.3" =
-    self.by-version."read-package-json"."2.0.3";
-  by-spec."read-package-tree"."~5.1.2" =
-    self.by-version."read-package-tree"."5.1.2";
-  by-version."read-package-tree"."5.1.2" = self.buildNodePackage {
-    name = "read-package-tree-5.1.2";
-    version = "5.1.2";
+    self.by-version."read-package-json"."2.0.4";
+  by-spec."read-package-json"."~2.0.4" =
+    self.by-version."read-package-json"."2.0.4";
+  by-spec."read-package-tree"."~5.1.4" =
+    self.by-version."read-package-tree"."5.1.4";
+  by-version."read-package-tree"."5.1.4" = self.buildNodePackage {
+    name = "read-package-tree-5.1.4";
+    version = "5.1.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.2.tgz";
-      name = "read-package-tree-5.1.2.tgz";
-      sha1 = "e3a488792f40cf470819f01a610e719d64f09094";
+      url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.4.tgz";
+      name = "read-package-tree-5.1.4.tgz";
+      sha1 = "bb6e465f913d4259a9534c87b1d5c508fe8eb078";
     };
     deps = {
       "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
       "dezalgo-1.0.3" = self.by-version."dezalgo"."1.0.3";
       "once-1.3.3" = self.by-version."once"."1.3.3";
-      "read-package-json-2.0.3" = self.by-version."read-package-json"."2.0.3";
+      "read-package-json-2.0.4" = self.by-version."read-package-json"."2.0.4";
       "readdir-scoped-modules-1.0.2" = self.by-version."readdir-scoped-modules"."1.0.2";
     };
     optionalDependencies = {
@@ -38431,26 +39841,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."read-torrent"."^1.1.0" =
-    self.by-version."read-torrent"."1.3.0";
   by-spec."read-torrent"."^1.3.0" =
     self.by-version."read-torrent"."1.3.0";
   by-spec."readable-stream"."1 || 2" =
-    self.by-version."readable-stream"."2.0.6";
-  by-version."readable-stream"."2.0.6" = self.buildNodePackage {
-    name = "readable-stream-2.0.6";
-    version = "2.0.6";
+    self.by-version."readable-stream"."2.1.4";
+  by-version."readable-stream"."2.1.4" = self.buildNodePackage {
+    name = "readable-stream-2.1.4";
+    version = "2.1.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
-      name = "readable-stream-2.0.6.tgz";
-      sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
+      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz";
+      name = "readable-stream-2.1.4.tgz";
+      sha1 = "70b9791c6fcb8480db44bd155a0f6bb58f172468";
     };
     deps = {
+      "buffer-shims-1.0.0" = self.by-version."buffer-shims"."1.0.0";
       "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "isarray-1.0.0" = self.by-version."isarray"."1.0.0";
-      "process-nextick-args-1.0.6" = self.by-version."process-nextick-args"."1.0.6";
+      "process-nextick-args-1.0.7" = self.by-version."process-nextick-args"."1.0.7";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "util-deprecate-1.0.2" = self.by-version."util-deprecate"."1.0.2";
     };
@@ -38507,15 +39916,15 @@
     cpu = [ ];
   };
   by-spec."readable-stream"."1.1" =
-    self.by-version."readable-stream"."1.1.13";
-  by-version."readable-stream"."1.1.13" = self.buildNodePackage {
-    name = "readable-stream-1.1.13";
-    version = "1.1.13";
+    self.by-version."readable-stream"."1.1.14";
+  by-version."readable-stream"."1.1.14" = self.buildNodePackage {
+    name = "readable-stream-1.1.14";
+    version = "1.1.14";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz";
-      name = "readable-stream-1.1.13.tgz";
-      sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e";
+      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
+      name = "readable-stream-1.1.14.tgz";
+      sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
     };
     deps = {
       "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
@@ -38530,19 +39939,19 @@
     cpu = [ ];
   };
   by-spec."readable-stream"."1.1.x" =
-    self.by-version."readable-stream"."1.1.13";
+    self.by-version."readable-stream"."1.1.14";
   by-spec."readable-stream"."2" =
-    self.by-version."readable-stream"."2.0.6";
+    self.by-version."readable-stream"."2.1.4";
   by-spec."readable-stream".">=1.0.33-1 <1.1.0-0" =
-    self.by-version."readable-stream"."1.0.33";
-  by-version."readable-stream"."1.0.33" = self.buildNodePackage {
-    name = "readable-stream-1.0.33";
-    version = "1.0.33";
+    self.by-version."readable-stream"."1.0.34";
+  by-version."readable-stream"."1.0.34" = self.buildNodePackage {
+    name = "readable-stream-1.0.34";
+    version = "1.0.34";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
-      name = "readable-stream-1.0.33.tgz";
-      sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
+      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz";
+      name = "readable-stream-1.0.34.tgz";
+      sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
     };
     deps = {
       "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
@@ -38557,61 +39966,88 @@
     cpu = [ ];
   };
   by-spec."readable-stream".">=1.1.13-1 <1.2.0-0" =
-    self.by-version."readable-stream"."1.1.13";
+    self.by-version."readable-stream"."1.1.14";
   by-spec."readable-stream".">=2.0.0 <3.0.0" =
-    self.by-version."readable-stream"."2.0.6";
+    self.by-version."readable-stream"."2.1.4";
   by-spec."readable-stream"."^1.0.2" =
-    self.by-version."readable-stream"."1.1.13";
+    self.by-version."readable-stream"."1.1.14";
   by-spec."readable-stream"."^1.0.27-1" =
-    self.by-version."readable-stream"."1.1.13";
+    self.by-version."readable-stream"."1.1.14";
   by-spec."readable-stream"."^1.0.31" =
-    self.by-version."readable-stream"."1.1.13";
+    self.by-version."readable-stream"."1.1.14";
   by-spec."readable-stream"."^1.0.33" =
-    self.by-version."readable-stream"."1.1.13";
+    self.by-version."readable-stream"."1.1.14";
   by-spec."readable-stream"."^1.1.13" =
-    self.by-version."readable-stream"."1.1.13";
+    self.by-version."readable-stream"."1.1.14";
   by-spec."readable-stream"."^1.1.13-1" =
-    self.by-version."readable-stream"."1.1.13";
+    self.by-version."readable-stream"."1.1.14";
   by-spec."readable-stream"."^2.0.0" =
-    self.by-version."readable-stream"."2.0.6";
+    self.by-version."readable-stream"."2.1.4";
   by-spec."readable-stream"."^2.0.0 || ^1.1.13" =
-    self.by-version."readable-stream"."2.0.6";
+    self.by-version."readable-stream"."2.1.4";
   by-spec."readable-stream"."^2.0.1" =
-    self.by-version."readable-stream"."2.0.6";
+    self.by-version."readable-stream"."2.1.4";
   by-spec."readable-stream"."^2.0.2" =
-    self.by-version."readable-stream"."2.0.6";
+    self.by-version."readable-stream"."2.1.4";
+  by-spec."readable-stream"."^2.0.4" =
+    self.by-version."readable-stream"."2.1.4";
   by-spec."readable-stream"."^2.0.5" =
-    self.by-version."readable-stream"."2.0.6";
+    self.by-version."readable-stream"."2.1.4";
+  by-spec."readable-stream"."^2.1.0" =
+    self.by-version."readable-stream"."2.1.4";
   by-spec."readable-stream"."~1.0.17" =
-    self.by-version."readable-stream"."1.0.33";
+    self.by-version."readable-stream"."1.0.34";
   by-spec."readable-stream"."~1.0.2" =
-    self.by-version."readable-stream"."1.0.33";
+    self.by-version."readable-stream"."1.0.34";
   by-spec."readable-stream"."~1.0.24" =
-    self.by-version."readable-stream"."1.0.33";
+    self.by-version."readable-stream"."1.0.34";
   by-spec."readable-stream"."~1.0.26" =
-    self.by-version."readable-stream"."1.0.33";
+    self.by-version."readable-stream"."1.0.34";
   by-spec."readable-stream"."~1.0.26-2" =
-    self.by-version."readable-stream"."1.0.33";
+    self.by-version."readable-stream"."1.0.34";
   by-spec."readable-stream"."~1.0.33" =
-    self.by-version."readable-stream"."1.0.33";
+    self.by-version."readable-stream"."1.0.34";
   by-spec."readable-stream"."~1.1.0" =
-    self.by-version."readable-stream"."1.1.13";
+    self.by-version."readable-stream"."1.1.14";
   by-spec."readable-stream"."~1.1.10" =
-    self.by-version."readable-stream"."1.1.13";
-  by-spec."readable-stream"."~1.1.13" =
-    self.by-version."readable-stream"."1.1.13";
+    self.by-version."readable-stream"."1.1.14";
   by-spec."readable-stream"."~1.1.8" =
-    self.by-version."readable-stream"."1.1.13";
+    self.by-version."readable-stream"."1.1.14";
   by-spec."readable-stream"."~1.1.9" =
-    self.by-version."readable-stream"."1.1.13";
+    self.by-version."readable-stream"."1.1.14";
   by-spec."readable-stream"."~2.0.0" =
     self.by-version."readable-stream"."2.0.6";
+  by-version."readable-stream"."2.0.6" = self.buildNodePackage {
+    name = "readable-stream-2.0.6";
+    version = "2.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
+      name = "readable-stream-2.0.6.tgz";
+      sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
+    };
+    deps = {
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "isarray-1.0.0" = self.by-version."isarray"."1.0.0";
+      "process-nextick-args-1.0.7" = self.by-version."process-nextick-args"."1.0.7";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "util-deprecate-1.0.2" = self.by-version."util-deprecate"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."readable-stream"."~2.0.4" =
     self.by-version."readable-stream"."2.0.6";
   by-spec."readable-stream"."~2.0.5" =
     self.by-version."readable-stream"."2.0.6";
-  by-spec."readable-stream"."~2.0.6" =
-    self.by-version."readable-stream"."2.0.6";
+  by-spec."readable-stream"."~2.1.2" =
+    self.by-version."readable-stream"."2.1.4";
+  by-spec."readable-stream"."~2.1.3" =
+    self.by-version."readable-stream"."2.1.4";
   by-spec."readable-wrap"."^1.0.0" =
     self.by-version."readable-wrap"."1.0.0";
   by-version."readable-wrap"."1.0.0" = self.buildNodePackage {
@@ -38624,7 +40060,7 @@
       sha1 = "3b5a211c631e12303a54991c806c17e7ae206bff";
     };
     deps = {
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
     };
     optionalDependencies = {
     };
@@ -38646,7 +40082,7 @@
     deps = {
       "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
       "dezalgo-1.0.3" = self.by-version."dezalgo"."1.0.3";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "once-1.3.3" = self.by-version."once"."1.3.3";
     };
     optionalDependencies = {
@@ -38669,9 +40105,9 @@
       sha1 = "cc09ba5d12d8feb864bc75f6e2ebc137060cbd82";
     };
     deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "minimatch-2.0.10" = self.by-version."minimatch"."2.0.10";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -38723,19 +40159,19 @@
     cpu = [ ];
   };
   by-spec."realize-package-specifier"."~3.0.1" =
-    self.by-version."realize-package-specifier"."3.0.1";
-  by-version."realize-package-specifier"."3.0.1" = self.buildNodePackage {
-    name = "realize-package-specifier-3.0.1";
-    version = "3.0.1";
+    self.by-version."realize-package-specifier"."3.0.3";
+  by-version."realize-package-specifier"."3.0.3" = self.buildNodePackage {
+    name = "realize-package-specifier-3.0.3";
+    version = "3.0.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz";
-      name = "realize-package-specifier-3.0.1.tgz";
-      sha1 = "fde32e926448e38f99334d95b7b08d51e3a98d9f";
+      url = "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.3.tgz";
+      name = "realize-package-specifier-3.0.3.tgz";
+      sha1 = "d0def882952b8de3f67eba5e91199661271f41f4";
     };
     deps = {
       "dezalgo-1.0.3" = self.by-version."dezalgo"."1.0.3";
-      "npm-package-arg-4.1.0" = self.by-version."npm-package-arg"."4.1.0";
+      "npm-package-arg-4.1.1" = self.by-version."npm-package-arg"."4.1.1";
     };
     optionalDependencies = {
     };
@@ -38743,6 +40179,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."realize-package-specifier"."~3.0.3" =
+    self.by-version."realize-package-specifier"."3.0.3";
   by-spec."recast"."0.10.33" =
     self.by-version."recast"."0.10.33";
   by-version."recast"."0.10.33" = self.buildNodePackage {
@@ -38756,7 +40194,7 @@
     };
     deps = {
       "esprima-fb-15001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."15001.1001.0-dev-harmony-fb";
-      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
       "private-0.1.6" = self.by-version."private"."0.1.6";
       "ast-types-0.8.12" = self.by-version."ast-types"."0.8.12";
     };
@@ -38779,7 +40217,7 @@
     };
     deps = {
       "esprima-fb-15001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."15001.1001.0-dev-harmony-fb";
-      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
       "private-0.1.6" = self.by-version."private"."0.1.6";
       "ast-types-0.8.15" = self.by-version."ast-types"."0.8.15";
     };
@@ -38809,6 +40247,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."rechoir"."^0.6.2" =
+    self.by-version."rechoir"."0.6.2";
   by-spec."reconnect-core"."https://github.com/dodo/reconnect-core/tarball/merged" =
     self.by-version."reconnect-core"."0.0.1";
   by-version."reconnect-core"."0.0.1" = self.buildNodePackage {
@@ -38851,20 +40291,20 @@
     cpu = [ ];
   };
   by-spec."redis"."*" =
-    self.by-version."redis"."2.6.0-1";
-  by-version."redis"."2.6.0-1" = self.buildNodePackage {
-    name = "redis-2.6.0-1";
-    version = "2.6.0-1";
+    self.by-version."redis"."2.6.1";
+  by-version."redis"."2.6.1" = self.buildNodePackage {
+    name = "redis-2.6.1";
+    version = "2.6.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/redis/-/redis-2.6.0-1.tgz";
-      name = "redis-2.6.0-1.tgz";
-      sha1 = "d6feb32cf08a734ba7f7f776699363ef69e3b9b4";
+      url = "https://registry.npmjs.org/redis/-/redis-2.6.1.tgz";
+      name = "redis-2.6.1.tgz";
+      sha1 = "0c174e15b34ac6974195ad956d5a7177d6115d46";
     };
     deps = {
       "double-ended-queue-2.1.0-0" = self.by-version."double-ended-queue"."2.1.0-0";
-      "redis-commands-1.1.0" = self.by-version."redis-commands"."1.1.0";
-      "redis-parser-1.3.0" = self.by-version."redis-parser"."1.3.0";
+      "redis-commands-1.2.0" = self.by-version."redis-commands"."1.2.0";
+      "redis-parser-2.0.2" = self.by-version."redis-parser"."2.0.2";
     };
     optionalDependencies = {
     };
@@ -38872,7 +40312,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "redis" = self.by-version."redis"."2.6.0-1";
+  "redis" = self.by-version."redis"."2.6.1";
   by-spec."redis"."0.10.x" =
     self.by-version."redis"."0.10.3";
   by-version."redis"."0.10.3" = self.buildNodePackage {
@@ -38930,21 +40370,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."redis"."^2.4.2" =
-    self.by-version."redis"."2.5.3";
-  by-version."redis"."2.5.3" = self.buildNodePackage {
-    name = "redis-2.5.3";
-    version = "2.5.3";
+  by-spec."redis"."~2.4.2" =
+    self.by-version."redis"."2.4.2";
+  by-version."redis"."2.4.2" = self.buildNodePackage {
+    name = "redis-2.4.2";
+    version = "2.4.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/redis/-/redis-2.5.3.tgz";
-      name = "redis-2.5.3.tgz";
-      sha1 = "f61b036e118d21150a1085adef08bd97c8e13925";
+      url = "https://registry.npmjs.org/redis/-/redis-2.4.2.tgz";
+      name = "redis-2.4.2.tgz";
+      sha1 = "2f9160255a26a6cad2b79bf0847e067280a146ea";
     };
     deps = {
       "double-ended-queue-2.1.0-0" = self.by-version."double-ended-queue"."2.1.0-0";
-      "redis-commands-1.1.0" = self.by-version."redis-commands"."1.1.0";
-      "redis-parser-1.3.0" = self.by-version."redis-parser"."1.3.0";
+      "redis-commands-1.2.0" = self.by-version."redis-commands"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -38953,15 +40392,15 @@
     cpu = [ ];
   };
   by-spec."redis-commands"."^1.0.1" =
-    self.by-version."redis-commands"."1.1.0";
-  by-version."redis-commands"."1.1.0" = self.buildNodePackage {
-    name = "redis-commands-1.1.0";
-    version = "1.1.0";
+    self.by-version."redis-commands"."1.2.0";
+  by-version."redis-commands"."1.2.0" = self.buildNodePackage {
+    name = "redis-commands-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.1.0.tgz";
-      name = "redis-commands-1.1.0.tgz";
-      sha1 = "aa5609a52213596816b6050384332ef631011272";
+      url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.2.0.tgz";
+      name = "redis-commands-1.2.0.tgz";
+      sha1 = "4808e7a0fcb1d3609bec56eecc3532dacbab981c";
     };
     deps = {
     };
@@ -38971,18 +40410,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."redis-commands"."^1.1.0" =
-    self.by-version."redis-commands"."1.1.0";
-  by-spec."redis-parser"."^1.1.0" =
-    self.by-version."redis-parser"."1.3.0";
-  by-version."redis-parser"."1.3.0" = self.buildNodePackage {
-    name = "redis-parser-1.3.0";
-    version = "1.3.0";
+  by-spec."redis-commands"."^1.2.0" =
+    self.by-version."redis-commands"."1.2.0";
+  by-spec."redis-parser"."^2.0.0" =
+    self.by-version."redis-parser"."2.0.2";
+  by-version."redis-parser"."2.0.2" = self.buildNodePackage {
+    name = "redis-parser-2.0.2";
+    version = "2.0.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/redis-parser/-/redis-parser-1.3.0.tgz";
-      name = "redis-parser-1.3.0.tgz";
-      sha1 = "806ebe7bbfb7d34e4d7c1e9ef282efcfad04126a";
+      url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.0.2.tgz";
+      name = "redis-parser-2.0.2.tgz";
+      sha1 = "c3354d6afef91c90ab941533d8033eb7e7dc5b56";
     };
     deps = {
     };
@@ -38992,8 +40431,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."redis-parser"."^1.2.0" =
-    self.by-version."redis-parser"."1.3.0";
   by-spec."reds"."~0.2.5" =
     self.by-version."reds"."0.2.5";
   by-version."reds"."0.2.5" = self.buildNodePackage {
@@ -39047,7 +40484,7 @@
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
     };
     optionalDependencies = {
     };
@@ -39056,15 +40493,15 @@
     cpu = [ ];
   };
   by-spec."regenerator"."~0.8.13" =
-    self.by-version."regenerator"."0.8.42";
-  by-version."regenerator"."0.8.42" = self.buildNodePackage {
-    name = "regenerator-0.8.42";
-    version = "0.8.42";
+    self.by-version."regenerator"."0.8.46";
+  by-version."regenerator"."0.8.46" = self.buildNodePackage {
+    name = "regenerator-0.8.46";
+    version = "0.8.46";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/regenerator/-/regenerator-0.8.42.tgz";
-      name = "regenerator-0.8.42.tgz";
-      sha1 = "17957424df24db002208f1498f62b9a40231cfc9";
+      url = "https://registry.npmjs.org/regenerator/-/regenerator-0.8.46.tgz";
+      name = "regenerator-0.8.46.tgz";
+      sha1 = "154c327686361ed52cad69b2545efc53a3d07696";
     };
     deps = {
       "commoner-0.10.4" = self.by-version."commoner"."0.10.4";
@@ -39072,6 +40509,7 @@
       "esprima-fb-15001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."15001.1001.0-dev-harmony-fb";
       "private-0.1.6" = self.by-version."private"."0.1.6";
       "recast-0.10.33" = self.by-version."recast"."0.10.33";
+      "regenerator-runtime-0.9.5" = self.by-version."regenerator-runtime"."0.9.5";
       "through-2.3.8" = self.by-version."through"."2.3.8";
     };
     optionalDependencies = {
@@ -39080,6 +40518,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."regenerator-runtime"."^0.9.5" =
+    self.by-version."regenerator-runtime"."0.9.5";
+  by-version."regenerator-runtime"."0.9.5" = self.buildNodePackage {
+    name = "regenerator-runtime-0.9.5";
+    version = "0.9.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz";
+      name = "regenerator-runtime-0.9.5.tgz";
+      sha1 = "403d6d40a4bdff9c330dd9392dcbb2d9a8bba1fc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."regenerator-runtime"."~0.9.5" =
+    self.by-version."regenerator-runtime"."0.9.5";
   by-spec."regex-cache"."^0.4.2" =
     self.by-version."regex-cache"."0.4.3";
   by-version."regex-cache"."0.4.3" = self.buildNodePackage {
@@ -39211,7 +40670,7 @@
     deps = {
       "markdown-it-4.4.0" = self.by-version."markdown-it"."4.4.0";
       "sanitize-html-1.11.4" = self.by-version."sanitize-html"."1.11.4";
-      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "js-yaml-3.6.1" = self.by-version."js-yaml"."3.6.1";
       "highlight.js-8.9.1" = self.by-version."highlight.js"."8.9.1";
     };
     optionalDependencies = {
@@ -39300,15 +40759,15 @@
   by-spec."repeating"."^1.1.2" =
     self.by-version."repeating"."1.1.3";
   by-spec."repeating"."^2.0.0" =
-    self.by-version."repeating"."2.0.0";
-  by-version."repeating"."2.0.0" = self.buildNodePackage {
-    name = "repeating-2.0.0";
-    version = "2.0.0";
+    self.by-version."repeating"."2.0.1";
+  by-version."repeating"."2.0.1" = self.buildNodePackage {
+    name = "repeating-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz";
-      name = "repeating-2.0.0.tgz";
-      sha1 = "fd27d6d264d18fbebfaa56553dd7b82535a5034e";
+      url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz";
+      name = "repeating-2.0.1.tgz";
+      sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
     };
     deps = {
       "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1";
@@ -39361,19 +40820,19 @@
     cpu = [ ];
   };
   by-spec."request"."2" =
-    self.by-version."request"."2.70.0";
-  by-version."request"."2.70.0" = self.buildNodePackage {
-    name = "request-2.70.0";
-    version = "2.70.0";
+    self.by-version."request"."2.72.0";
+  by-version."request"."2.72.0" = self.buildNodePackage {
+    name = "request-2.72.0";
+    version = "2.72.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/request/-/request-2.70.0.tgz";
-      name = "request-2.70.0.tgz";
-      sha1 = "7ecf8437d6fb553e92e2981a411b9ee2aadd7cce";
+      url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz";
+      name = "request-2.72.0.tgz";
+      sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1";
     };
     deps = {
       "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
-      "aws4-1.3.2" = self.by-version."aws4"."1.3.2";
+      "aws4-1.4.1" = self.by-version."aws4"."1.4.1";
       "bl-1.1.2" = self.by-version."bl"."1.1.2";
       "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
       "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
@@ -39386,13 +40845,13 @@
       "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0";
       "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
       "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "mime-types-2.1.11" = self.by-version."mime-types"."2.1.11";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
-      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "oauth-sign-0.8.2" = self.by-version."oauth-sign"."0.8.2";
       "qs-6.1.0" = self.by-version."qs"."6.1.0";
       "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
       "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tunnel-agent-0.4.3" = self.by-version."tunnel-agent"."0.4.3";
     };
     optionalDependencies = {
     };
@@ -39401,9 +40860,9 @@
     cpu = [ ];
   };
   by-spec."request"."2 >=2.20.0" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request"."2 >=2.25.0" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request"."2.16.x" =
     self.by-version."request"."2.16.6";
   by-version."request"."2.16.6" = self.buildNodePackage {
@@ -39486,7 +40945,7 @@
     optionalDependencies = {
       "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tunnel-agent-0.4.3" = self.by-version."tunnel-agent"."0.4.3";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
       "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
       "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
@@ -39517,7 +40976,7 @@
     optionalDependencies = {
       "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tunnel-agent-0.4.3" = self.by-version."tunnel-agent"."0.4.3";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
       "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
       "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
@@ -39548,7 +41007,7 @@
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tunnel-agent-0.4.3" = self.by-version."tunnel-agent"."0.4.3";
       "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
       "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0";
@@ -39583,7 +41042,7 @@
       "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "qs-2.4.2" = self.by-version."qs"."2.4.2";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tunnel-agent-0.4.3" = self.by-version."tunnel-agent"."0.4.3";
       "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
       "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
@@ -39618,13 +41077,13 @@
       "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
       "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
       "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "mime-types-2.1.11" = self.by-version."mime-types"."2.1.11";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "qs-4.0.0" = self.by-version."qs"."4.0.0";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tunnel-agent-0.4.3" = self.by-version."tunnel-agent"."0.4.3";
       "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
-      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "oauth-sign-0.8.2" = self.by-version."oauth-sign"."0.8.2";
       "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
       "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
@@ -39656,13 +41115,13 @@
       "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
       "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
       "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "mime-types-2.1.11" = self.by-version."mime-types"."2.1.11";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "qs-5.1.0" = self.by-version."qs"."5.1.0";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tunnel-agent-0.4.3" = self.by-version."tunnel-agent"."0.4.3";
       "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
-      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "oauth-sign-0.8.2" = self.by-version."oauth-sign"."0.8.2";
       "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
       "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
@@ -39694,13 +41153,13 @@
       "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
       "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
       "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "mime-types-2.1.11" = self.by-version."mime-types"."2.1.11";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "qs-5.2.0" = self.by-version."qs"."5.2.0";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tunnel-agent-0.4.3" = self.by-version."tunnel-agent"."0.4.3";
       "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
-      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "oauth-sign-0.8.2" = self.by-version."oauth-sign"."0.8.2";
       "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
       "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
       "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
@@ -39732,13 +41191,13 @@
       "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
       "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
       "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "mime-types-2.1.11" = self.by-version."mime-types"."2.1.11";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "qs-5.2.0" = self.by-version."qs"."5.2.0";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tunnel-agent-0.4.3" = self.by-version."tunnel-agent"."0.4.3";
       "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "http-signature-1.1.1" = self.by-version."http-signature"."1.1.1";
-      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "oauth-sign-0.8.2" = self.by-version."oauth-sign"."0.8.2";
       "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
       "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
       "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
@@ -39773,49 +41232,47 @@
     cpu = [ ];
   };
   by-spec."request"."2.x" =
-    self.by-version."request"."2.70.0";
-  by-spec."request"."2.x.x" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request"."=2.67.0" =
     self.by-version."request"."2.67.0";
   by-spec."request".">= 2.2.9" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request".">= 2.44.0 < 3.0.0" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request".">=2.2.9" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request".">=2.27.0" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request".">=2.29.1" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request".">=2.30.1" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request".">=2.31.0 <3.0.0-0" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request".">=2.55" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request"."^2.34.0" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request"."^2.39.0" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
+  by-spec."request"."^2.40.0" =
+    self.by-version."request"."2.72.0";
   by-spec."request"."^2.47.0" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request"."^2.51.0" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request"."^2.54.0" =
-    self.by-version."request"."2.70.0";
-  by-spec."request"."^2.55.0" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request"."^2.61.0" =
-    self.by-version."request"."2.70.0";
-  by-spec."request"."^2.62.0" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request"."^2.65.0" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request"."^2.67.0" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
+  by-spec."request"."^2.72.0" =
+    self.by-version."request"."2.72.0";
   by-spec."request"."~2" =
-    self.by-version."request"."2.70.0";
+    self.by-version."request"."2.72.0";
   by-spec."request"."~2.16.2" =
     self.by-version."request"."2.16.6";
   by-spec."request"."~2.34.0" =
@@ -39871,7 +41328,7 @@
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tunnel-agent-0.4.3" = self.by-version."tunnel-agent"."0.4.3";
       "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
       "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0";
@@ -39906,13 +41363,13 @@
       "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
       "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
       "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "mime-types-2.1.11" = self.by-version."mime-types"."2.1.11";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "qs-4.0.0" = self.by-version."qs"."4.0.0";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tunnel-agent-0.4.3" = self.by-version."tunnel-agent"."0.4.3";
       "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
-      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "oauth-sign-0.8.2" = self.by-version."oauth-sign"."0.8.2";
       "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
       "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
@@ -39928,48 +41385,8 @@
   };
   by-spec."request"."~2.67.0" =
     self.by-version."request"."2.67.0";
-  by-spec."request"."~2.69.0" =
-    self.by-version."request"."2.69.0";
-  by-version."request"."2.69.0" = self.buildNodePackage {
-    name = "request-2.69.0";
-    version = "2.69.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz";
-      name = "request-2.69.0.tgz";
-      sha1 = "cf91d2e000752b1217155c005241911991a2346a";
-    };
-    deps = {
-      "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
-      "aws4-1.3.2" = self.by-version."aws4"."1.3.2";
-      "bl-1.0.3" = self.by-version."bl"."1.0.3";
-      "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
-      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
-      "extend-3.0.0" = self.by-version."extend"."3.0.0";
-      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
-      "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
-      "har-validator-2.0.6" = self.by-version."har-validator"."2.0.6";
-      "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
-      "http-signature-1.1.1" = self.by-version."http-signature"."1.1.1";
-      "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0";
-      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
-      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
-      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
-      "qs-6.0.2" = self.by-version."qs"."6.0.2";
-      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
-      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."request"."~2.70.0" =
-    self.by-version."request"."2.70.0";
+  by-spec."request"."~2.72.0" =
+    self.by-version."request"."2.72.0";
   by-spec."request-progress"."^0.3.1" =
     self.by-version."request-progress"."0.3.1";
   by-version."request-progress"."0.3.1" = self.buildNodePackage {
@@ -40029,6 +41446,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."require-main-filename"."^1.0.1" =
+    self.by-version."require-main-filename"."1.0.1";
+  by-version."require-main-filename"."1.0.1" = self.buildNodePackage {
+    name = "require-main-filename-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+      name = "require-main-filename-1.0.1.tgz";
+      sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."require-uncached"."^1.0.2" =
     self.by-version."require-uncached"."1.0.2";
   by-version."require-uncached"."1.0.2" = self.buildNodePackage {
@@ -40230,7 +41666,7 @@
     deps = {
       "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
       "backoff-2.5.0" = self.by-version."backoff"."2.5.0";
-      "bunyan-1.8.0" = self.by-version."bunyan"."1.8.0";
+      "bunyan-1.8.1" = self.by-version."bunyan"."1.8.1";
       "csv-0.4.6" = self.by-version."csv"."0.4.6";
       "escape-regexp-component-1.0.2" = self.by-version."escape-regexp-component"."1.0.2";
       "formidable-1.0.17" = self.by-version."formidable"."1.0.17";
@@ -40244,7 +41680,7 @@
       "qs-3.1.0" = self.by-version."qs"."3.1.0";
       "semver-4.3.6" = self.by-version."semver"."4.3.6";
       "spdy-1.32.5" = self.by-version."spdy"."1.32.5";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tunnel-agent-0.4.3" = self.by-version."tunnel-agent"."0.4.3";
       "vasync-1.6.3" = self.by-version."vasync"."1.6.3";
       "verror-1.6.1" = self.by-version."verror"."1.6.1";
     };
@@ -40316,15 +41752,15 @@
     cpu = [ ];
   };
   by-spec."rethinkdb"."*" =
-    self.by-version."rethinkdb"."2.3.0";
-  by-version."rethinkdb"."2.3.0" = self.buildNodePackage {
-    name = "rethinkdb-2.3.0";
-    version = "2.3.0";
+    self.by-version."rethinkdb"."2.3.2";
+  by-version."rethinkdb"."2.3.2" = self.buildNodePackage {
+    name = "rethinkdb-2.3.2";
+    version = "2.3.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/rethinkdb/-/rethinkdb-2.3.0.tgz";
-      name = "rethinkdb-2.3.0.tgz";
-      sha1 = "101942b27954af48e93c031d040dc76b5d3475cc";
+      url = "https://registry.npmjs.org/rethinkdb/-/rethinkdb-2.3.2.tgz";
+      name = "rethinkdb-2.3.2.tgz";
+      sha1 = "7486a35df430c193199928860d9f898d80d48892";
     };
     deps = {
       "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2";
@@ -40335,7 +41771,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "rethinkdb" = self.by-version."rethinkdb"."2.3.0";
+  "rethinkdb" = self.by-version."rethinkdb"."2.3.2";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = self.buildNodePackage {
@@ -40431,6 +41867,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."reverse-http"."^1.2.0" =
+    self.by-version."reverse-http"."1.2.0";
+  by-version."reverse-http"."1.2.0" = self.buildNodePackage {
+    name = "reverse-http-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/reverse-http/-/reverse-http-1.2.0.tgz";
+      name = "reverse-http-1.2.0.tgz";
+      sha1 = "d5bd826506425a3b3eacadf1e0e2c1ac3e289728";
+    };
+    deps = {
+      "consume-http-header-1.0.0" = self.by-version."consume-http-header"."1.0.0";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."right-align"."^0.1.1" =
     self.by-version."right-align"."0.1.3";
   by-version."right-align"."0.1.3" = self.buildNodePackage {
@@ -40524,6 +41981,8 @@
     self.by-version."rimraf"."2.5.2";
   by-spec."rimraf"."^2.4.3" =
     self.by-version."rimraf"."2.5.2";
+  by-spec."rimraf"."^2.5.2" =
+    self.by-version."rimraf"."2.5.2";
   by-spec."rimraf"."~2" =
     self.by-version."rimraf"."2.5.2";
   by-spec."rimraf"."~2.1.4" =
@@ -40597,25 +42056,6 @@
     self.by-version."rimraf"."2.5.2";
   by-spec."rimraf"."~2.5.2" =
     self.by-version."rimraf"."2.5.2";
-  by-spec."ripemd160"."0.2.0" =
-    self.by-version."ripemd160"."0.2.0";
-  by-version."ripemd160"."0.2.0" = self.buildNodePackage {
-    name = "ripemd160-0.2.0";
-    version = "0.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz";
-      name = "ripemd160-0.2.0.tgz";
-      sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."ripemd160"."^1.0.0" =
     self.by-version."ripemd160"."1.0.1";
   by-version."ripemd160"."1.0.1" = self.buildNodePackage {
@@ -40774,7 +42214,7 @@
       sha1 = "a52671ea35a73ef969b66026b8a2f0653261bc46";
     };
     deps = {
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "mime-types-2.1.11" = self.by-version."mime-types"."2.1.11";
       "xml-1.0.1" = self.by-version."xml"."1.0.1";
     };
     optionalDependencies = {
@@ -40803,6 +42243,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."run-async"."^2.2.0" =
+    self.by-version."run-async"."2.2.0";
+  by-version."run-async"."2.2.0" = self.buildNodePackage {
+    name = "run-async-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/run-async/-/run-async-2.2.0.tgz";
+      name = "run-async-2.2.0.tgz";
+      sha1 = "8783abd83c7bb86f41ee0602fc82404b3bd6e8b9";
+    };
+    deps = {
+      "is-promise-2.1.0" = self.by-version."is-promise"."2.1.0";
+      "pinkie-promise-2.0.1" = self.by-version."pinkie-promise"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."run-parallel"."^1.0.0" =
     self.by-version."run-parallel"."1.1.6";
   by-version."run-parallel"."1.1.6" = self.buildNodePackage {
@@ -40881,6 +42342,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."rx"."^4.1.0" =
+    self.by-version."rx"."4.1.0";
+  by-version."rx"."4.1.0" = self.buildNodePackage {
+    name = "rx-4.1.0";
+    version = "4.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz";
+      name = "rx-4.1.0.tgz";
+      sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."rx-lite"."^3.1.2" =
     self.by-version."rx-lite"."3.1.2";
   by-version."rx-lite"."3.1.2" = self.buildNodePackage {
@@ -40916,7 +42396,7 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."aws-sdk"."2.3.2"];
+      self.by-version."aws-sdk"."2.3.19"];
     os = [ ];
     cpu = [ ];
   };
@@ -41210,6 +42690,8 @@
     self.by-version."sax"."1.2.1";
   by-spec."sax"."~0.6.0" =
     self.by-version."sax"."0.6.1";
+  by-spec."sax"."~1.2.1" =
+    self.by-version."sax"."1.2.1";
   by-spec."scmp"."0.0.3" =
     self.by-version."scmp"."0.0.3";
   by-version."scmp"."0.0.3" = self.buildNodePackage {
@@ -41229,7 +42711,9 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."scmp"."1.0.0" =
+  by-spec."scmp"."~0.0.3" =
+    self.by-version."scmp"."0.0.3";
+  by-spec."scmp"."~1.0.0" =
     self.by-version."scmp"."1.0.0";
   by-version."scmp"."1.0.0" = self.buildNodePackage {
     name = "scmp-1.0.0";
@@ -41248,10 +42732,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."scmp"."~0.0.3" =
-    self.by-version."scmp"."0.0.3";
-  by-spec."scmp"."~1.0.0" =
-    self.by-version."scmp"."1.0.0";
   by-spec."secure-keys"."^1.0.0" =
     self.by-version."secure-keys"."1.0.0";
   by-version."secure-keys"."1.0.0" = self.buildNodePackage {
@@ -41272,21 +42752,21 @@
     cpu = [ ];
   };
   by-spec."selenium-webdriver"."*" =
-    self.by-version."selenium-webdriver"."2.53.1";
-  by-version."selenium-webdriver"."2.53.1" = self.buildNodePackage {
-    name = "selenium-webdriver-2.53.1";
-    version = "2.53.1";
+    self.by-version."selenium-webdriver"."2.53.2";
+  by-version."selenium-webdriver"."2.53.2" = self.buildNodePackage {
+    name = "selenium-webdriver-2.53.2";
+    version = "2.53.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.1.tgz";
-      name = "selenium-webdriver-2.53.1.tgz";
-      sha1 = "b50673955dc03b9164c07773a86b25ea7161dbd9";
+      url = "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.2.tgz";
+      name = "selenium-webdriver-2.53.2.tgz";
+      sha1 = "7d45f0b44c4d90d9c94b136e2dcaa0a70d54d67b";
     };
     deps = {
       "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "tmp-0.0.24" = self.by-version."tmp"."0.0.24";
-      "ws-1.0.1" = self.by-version."ws"."1.0.1";
+      "ws-1.1.0" = self.by-version."ws"."1.1.0";
       "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
     };
     optionalDependencies = {
@@ -41295,7 +42775,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.53.1";
+  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.53.2";
   by-spec."semver"."*" =
     self.by-version."semver"."5.1.0";
   by-version."semver"."5.1.0" = self.buildNodePackage {
@@ -41529,29 +43009,30 @@
     cpu = [ ];
   };
   by-spec."send"."*" =
-    self.by-version."send"."0.13.2";
-  by-version."send"."0.13.2" = self.buildNodePackage {
-    name = "send-0.13.2";
-    version = "0.13.2";
+    self.by-version."send"."0.14.1";
+  by-version."send"."0.14.1" = self.buildNodePackage {
+    name = "send-0.14.1";
+    version = "0.14.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz";
-      name = "send-0.13.2.tgz";
-      sha1 = "765e7607c8055452bba6f0b052595350986036de";
+      url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz";
+      name = "send-0.14.1.tgz";
+      sha1 = "a954984325392f51532a7760760e459598c89f7a";
     };
     deps = {
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "depd-1.1.0" = self.by-version."depd"."1.1.0";
       "destroy-1.0.4" = self.by-version."destroy"."1.0.4";
+      "encodeurl-1.0.1" = self.by-version."encodeurl"."1.0.1";
       "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
       "etag-1.7.0" = self.by-version."etag"."1.7.0";
       "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
-      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
+      "http-errors-1.5.0" = self.by-version."http-errors"."1.5.0";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "ms-0.7.1" = self.by-version."ms"."0.7.1";
       "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
-      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
-      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
+      "range-parser-1.2.0" = self.by-version."range-parser"."1.2.0";
+      "statuses-1.3.0" = self.by-version."statuses"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -41690,6 +43171,37 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."send"."0.13.2" =
+    self.by-version."send"."0.13.2";
+  by-version."send"."0.13.2" = self.buildNodePackage {
+    name = "send-0.13.2";
+    version = "0.13.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz";
+      name = "send-0.13.2.tgz";
+      sha1 = "765e7607c8055452bba6f0b052595350986036de";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.1.0" = self.by-version."depd"."1.1.0";
+      "destroy-1.0.4" = self.by-version."destroy"."1.0.4";
+      "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+      "etag-1.7.0" = self.by-version."etag"."1.7.0";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
+      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."send"."0.3.0" =
     self.by-version."send"."0.3.0";
   by-version."send"."0.3.0" = self.buildNodePackage {
@@ -41825,8 +43337,8 @@
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "nan-2.0.9" = self.by-version."nan"."2.0.9";
-      "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26";
-      "node-pre-gyp-github-1.1.2" = self.by-version."node-pre-gyp-github"."1.1.2";
+      "node-pre-gyp-0.6.28" = self.by-version."node-pre-gyp"."0.6.28";
+      "node-pre-gyp-github-1.3.1" = self.by-version."node-pre-gyp-github"."1.3.1";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
       "sf-0.1.7" = self.by-version."sf"."0.1.7";
     };
@@ -41859,8 +43371,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."serve-favicon"."^2.2.1" =
-    self.by-version."serve-favicon"."2.3.0";
   by-spec."serve-favicon"."~2.3.0" =
     self.by-version."serve-favicon"."2.3.0";
   by-spec."serve-index"."1.0.1" =
@@ -41901,7 +43411,7 @@
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
       "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "mime-types-2.1.11" = self.by-version."mime-types"."2.1.11";
       "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
     };
     optionalDependencies = {
@@ -41932,20 +43442,20 @@
     cpu = [ ];
   };
   by-spec."serve-static"."~1.10.0" =
-    self.by-version."serve-static"."1.10.2";
-  by-version."serve-static"."1.10.2" = self.buildNodePackage {
-    name = "serve-static-1.10.2";
-    version = "1.10.2";
+    self.by-version."serve-static"."1.10.3";
+  by-version."serve-static"."1.10.3" = self.buildNodePackage {
+    name = "serve-static-1.10.3";
+    version = "1.10.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.2.tgz";
-      name = "serve-static-1.10.2.tgz";
-      sha1 = "feb800d0e722124dd0b00333160c16e9caa8bcb3";
+      url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz";
+      name = "serve-static-1.10.3.tgz";
+      sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535";
     };
     deps = {
       "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
       "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
-      "send-0.13.1" = self.by-version."send"."0.13.1";
+      "send-0.13.2" = self.by-version."send"."0.13.2";
     };
     optionalDependencies = {
     };
@@ -41954,7 +43464,7 @@
     cpu = [ ];
   };
   by-spec."serve-static"."~1.10.2" =
-    self.by-version."serve-static"."1.10.2";
+    self.by-version."serve-static"."1.10.3";
   by-spec."serve-static"."~1.3.2" =
     self.by-version."serve-static"."1.3.2";
   by-version."serve-static"."1.3.2" = self.buildNodePackage {
@@ -41977,6 +43487,63 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."server-destroy"."^1.0.1" =
+    self.by-version."server-destroy"."1.0.1";
+  by-version."server-destroy"."1.0.1" = self.buildNodePackage {
+    name = "server-destroy-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz";
+      name = "server-destroy-1.0.1.tgz";
+      sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."set-blocking"."^1.0.0" =
+    self.by-version."set-blocking"."1.0.0";
+  by-version."set-blocking"."1.0.0" = self.buildNodePackage {
+    name = "set-blocking-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/set-blocking/-/set-blocking-1.0.0.tgz";
+      name = "set-blocking-1.0.0.tgz";
+      sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."set-blocking"."~2.0.0" =
+    self.by-version."set-blocking"."2.0.0";
+  by-version."set-blocking"."2.0.0" = self.buildNodePackage {
+    name = "set-blocking-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
+      name = "set-blocking-2.0.0.tgz";
+      sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."setimmediate"."1.0.1" =
     self.by-version."setimmediate"."1.0.1";
   by-version."setimmediate"."1.0.1" = self.buildNodePackage {
@@ -42015,6 +43582,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."setprototypeof"."1.0.1" =
+    self.by-version."setprototypeof"."1.0.1";
+  by-version."setprototypeof"."1.0.1" = self.buildNodePackage {
+    name = "setprototypeof-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz";
+      name = "setprototypeof-1.0.1.tgz";
+      sha1 = "52009b27888c4dc48f591949c0a8275834c1ca7e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sf"."0.1.7" =
     self.by-version."sf"."0.1.7";
   by-version."sf"."0.1.7" = self.buildNodePackage {
@@ -42046,27 +43632,8 @@
       sha1 = "6030822fbd2c9823949f8f72ed6411ee5cf25aae";
     };
     deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."sha.js"."2.2.6" =
-    self.by-version."sha.js"."2.2.6";
-  by-version."sha.js"."2.2.6" = self.buildNodePackage {
-    name = "sha.js-2.2.6";
-    version = "2.2.6";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz";
-      name = "sha.js-2.2.6.tgz";
-      sha1 = "17ddeddc5f722fb66501658895461977867315ba";
-    };
-    deps = {
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -42137,15 +43704,15 @@
     cpu = [ ];
   };
   by-spec."shell-quote"."^1.4.3" =
-    self.by-version."shell-quote"."1.5.0";
-  by-version."shell-quote"."1.5.0" = self.buildNodePackage {
-    name = "shell-quote-1.5.0";
-    version = "1.5.0";
+    self.by-version."shell-quote"."1.6.0";
+  by-version."shell-quote"."1.6.0" = self.buildNodePackage {
+    name = "shell-quote-1.6.0";
+    version = "1.6.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.5.0.tgz";
-      name = "shell-quote-1.5.0.tgz";
-      sha1 = "8c0a7e9f4713716c21e962a6ed5faf830dc77a88";
+      url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.0.tgz";
+      name = "shell-quote-1.6.0.tgz";
+      sha1 = "c8906761e1730d1ef771c82df5423d595c1bb31d";
     };
     deps = {
       "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0";
@@ -42179,17 +43746,20 @@
     cpu = [ ];
   };
   by-spec."shelljs"."*" =
-    self.by-version."shelljs"."0.6.0";
-  by-version."shelljs"."0.6.0" = self.buildNodePackage {
-    name = "shelljs-0.6.0";
-    version = "0.6.0";
+    self.by-version."shelljs"."0.7.0";
+  by-version."shelljs"."0.7.0" = self.buildNodePackage {
+    name = "shelljs-0.7.0";
+    version = "0.7.0";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.6.0.tgz";
-      name = "shelljs-0.6.0.tgz";
-      sha1 = "ce1ed837b4b0e55b5ec3dab84251ab9dbdc0c7ec";
+      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.0.tgz";
+      name = "shelljs-0.7.0.tgz";
+      sha1 = "3f6f2e4965cec565f65ff3861d644f879281a576";
     };
     deps = {
+      "glob-7.0.3" = self.by-version."glob"."7.0.3";
+      "interpret-1.0.1" = self.by-version."interpret"."1.0.1";
+      "rechoir-0.6.2" = self.by-version."rechoir"."0.6.2";
     };
     optionalDependencies = {
     };
@@ -42197,7 +43767,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "shelljs" = self.by-version."shelljs"."0.6.0";
+  "shelljs" = self.by-version."shelljs"."0.7.0";
   by-spec."shelljs"."0.3.0" =
     self.by-version."shelljs"."0.3.0";
   by-version."shelljs"."0.3.0" = self.buildNodePackage {
@@ -42219,7 +43789,7 @@
   };
   by-spec."shelljs"."0.3.x" =
     self.by-version."shelljs"."0.3.0";
-  by-spec."shelljs"."^0.5.1" =
+  by-spec."shelljs"."^0.5.3" =
     self.by-version."shelljs"."0.5.3";
   by-version."shelljs"."0.5.3" = self.buildNodePackage {
     name = "shelljs-0.5.3";
@@ -42240,21 +43810,40 @@
   };
   by-spec."shelljs"."^0.6.0" =
     self.by-version."shelljs"."0.6.0";
+  by-version."shelljs"."0.6.0" = self.buildNodePackage {
+    name = "shelljs-0.6.0";
+    version = "0.6.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.6.0.tgz";
+      name = "shelljs-0.6.0.tgz";
+      sha1 = "ce1ed837b4b0e55b5ec3dab84251ab9dbdc0c7ec";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."shelljs"."^0.7.0" =
+    self.by-version."shelljs"."0.7.0";
   by-spec."should"."*" =
-    self.by-version."should"."8.3.0";
-  by-version."should"."8.3.0" = self.buildNodePackage {
-    name = "should-8.3.0";
-    version = "8.3.0";
+    self.by-version."should"."9.0.2";
+  by-version."should"."9.0.2" = self.buildNodePackage {
+    name = "should-9.0.2";
+    version = "9.0.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/should/-/should-8.3.0.tgz";
-      name = "should-8.3.0.tgz";
-      sha1 = "e94f988fac575f1bbb03f3befdc61059ff0e2c4a";
+      url = "https://registry.npmjs.org/should/-/should-9.0.2.tgz";
+      name = "should-9.0.2.tgz";
+      sha1 = "b550f691e71c66788e0e96e9f721d58be6920e5a";
     };
     deps = {
-      "should-equal-0.7.2" = self.by-version."should-equal"."0.7.2";
-      "should-format-0.3.2" = self.by-version."should-format"."0.3.2";
-      "should-type-0.2.0" = self.by-version."should-type"."0.2.0";
+      "should-equal-1.0.0" = self.by-version."should-equal"."1.0.0";
+      "should-format-1.0.0" = self.by-version."should-format"."1.0.0";
+      "should-type-1.0.2" = self.by-version."should-type"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -42262,20 +43851,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "should" = self.by-version."should"."8.3.0";
-  by-spec."should-equal"."0.7.2" =
-    self.by-version."should-equal"."0.7.2";
-  by-version."should-equal"."0.7.2" = self.buildNodePackage {
-    name = "should-equal-0.7.2";
-    version = "0.7.2";
+  "should" = self.by-version."should"."9.0.2";
+  by-spec."should-equal"."^1.0.0" =
+    self.by-version."should-equal"."1.0.0";
+  by-version."should-equal"."1.0.0" = self.buildNodePackage {
+    name = "should-equal-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/should-equal/-/should-equal-0.7.2.tgz";
-      name = "should-equal-0.7.2.tgz";
-      sha1 = "a6a963dbf501b93ed34b7807ae7d7f042fc24ca8";
+      url = "https://registry.npmjs.org/should-equal/-/should-equal-1.0.0.tgz";
+      name = "should-equal-1.0.0.tgz";
+      sha1 = "5268aa4fa27514f5f9032d6ef8ab70cef8fcadaf";
     };
     deps = {
-      "should-type-0.2.0" = self.by-version."should-type"."0.2.0";
+      "should-type-1.0.2" = self.by-version."should-type"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -42283,19 +43872,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."should-format"."0.3.2" =
-    self.by-version."should-format"."0.3.2";
-  by-version."should-format"."0.3.2" = self.buildNodePackage {
-    name = "should-format-0.3.2";
-    version = "0.3.2";
+  by-spec."should-format"."^1.0.0" =
+    self.by-version."should-format"."1.0.0";
+  by-version."should-format"."1.0.0" = self.buildNodePackage {
+    name = "should-format-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/should-format/-/should-format-0.3.2.tgz";
-      name = "should-format-0.3.2.tgz";
-      sha1 = "a59831e01a2ddee149911bc7148be5c80319e1ff";
+      url = "https://registry.npmjs.org/should-format/-/should-format-1.0.0.tgz";
+      name = "should-format-1.0.0.tgz";
+      sha1 = "0a30cdab4a3bd1427bbccb8b738567bda7290d78";
     };
     deps = {
-      "should-type-0.2.0" = self.by-version."should-type"."0.2.0";
+      "should-type-1.0.2" = self.by-version."should-type"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -42303,16 +43892,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."should-type"."0.2.0" =
-    self.by-version."should-type"."0.2.0";
-  by-version."should-type"."0.2.0" = self.buildNodePackage {
-    name = "should-type-0.2.0";
-    version = "0.2.0";
+  by-spec."should-type"."^1.0.0" =
+    self.by-version."should-type"."1.0.2";
+  by-version."should-type"."1.0.2" = self.buildNodePackage {
+    name = "should-type-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/should-type/-/should-type-0.2.0.tgz";
-      name = "should-type-0.2.0.tgz";
-      sha1 = "6707ef95529d989dcc098fe0753ab1f9136bb7f6";
+      url = "https://registry.npmjs.org/should-type/-/should-type-1.0.2.tgz";
+      name = "should-type-1.0.2.tgz";
+      sha1 = "ba4519fbe621b780527ef3af791261d41022cb8e";
     };
     deps = {
     };
@@ -42448,15 +44037,15 @@
   by-spec."simple-get"."^1.3.1" =
     self.by-version."simple-get"."1.4.3";
   by-spec."simple-get"."^2.0.0" =
-    self.by-version."simple-get"."2.0.0";
-  by-version."simple-get"."2.0.0" = self.buildNodePackage {
-    name = "simple-get-2.0.0";
-    version = "2.0.0";
+    self.by-version."simple-get"."2.2.0";
+  by-version."simple-get"."2.2.0" = self.buildNodePackage {
+    name = "simple-get-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/simple-get/-/simple-get-2.0.0.tgz";
-      name = "simple-get-2.0.0.tgz";
-      sha1 = "3aadc50fd5ebeb64a41cd520e38e8226c3cd952f";
+      url = "https://registry.npmjs.org/simple-get/-/simple-get-2.2.0.tgz";
+      name = "simple-get-2.2.0.tgz";
+      sha1 = "b19f51209f00455fe7aa4d781fac3b07c51782d8";
     };
     deps = {
       "once-1.3.3" = self.by-version."once"."1.3.3";
@@ -42489,15 +44078,15 @@
     cpu = [ ];
   };
   by-spec."simple-peer"."^6.0.0" =
-    self.by-version."simple-peer"."6.0.3";
-  by-version."simple-peer"."6.0.3" = self.buildNodePackage {
-    name = "simple-peer-6.0.3";
-    version = "6.0.3";
+    self.by-version."simple-peer"."6.0.4";
+  by-version."simple-peer"."6.0.4" = self.buildNodePackage {
+    name = "simple-peer-6.0.4";
+    version = "6.0.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.0.3.tgz";
-      name = "simple-peer-6.0.3.tgz";
-      sha1 = "5055c2db9ff7b829afee01a330c7a8c8ae023310";
+      url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.0.4.tgz";
+      name = "simple-peer-6.0.4.tgz";
+      sha1 = "f0b72ae756cc3f87e3af964c23fe621e35785ac8";
     };
     deps = {
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
@@ -42505,7 +44094,29 @@
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "once-1.3.3" = self.by-version."once"."1.3.3";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."simple-plist"."0.1.4" =
+    self.by-version."simple-plist"."0.1.4";
+  by-version."simple-plist"."0.1.4" = self.buildNodePackage {
+    name = "simple-plist-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.1.4.tgz";
+      name = "simple-plist-0.1.4.tgz";
+      sha1 = "10eb51b47e33c556eb8ec46d5ee64d64e717db5d";
+    };
+    deps = {
+      "plist-1.2.0" = self.by-version."plist"."1.2.0";
+      "bplist-parser-0.0.6" = self.by-version."bplist-parser"."0.0.6";
+      "bplist-creator-0.0.4" = self.by-version."bplist-creator"."0.0.4";
     };
     optionalDependencies = {
     };
@@ -42534,21 +44145,21 @@
     cpu = [ ];
   };
   by-spec."simple-websocket"."^4.0.0" =
-    self.by-version."simple-websocket"."4.0.3";
-  by-version."simple-websocket"."4.0.3" = self.buildNodePackage {
-    name = "simple-websocket-4.0.3";
-    version = "4.0.3";
+    self.by-version."simple-websocket"."4.1.0";
+  by-version."simple-websocket"."4.1.0" = self.buildNodePackage {
+    name = "simple-websocket-4.1.0";
+    version = "4.1.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.0.3.tgz";
-      name = "simple-websocket-4.0.3.tgz";
-      sha1 = "fb296329cd05bd76fc64d2b929b0c92007f857b8";
+      url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.1.0.tgz";
+      name = "simple-websocket-4.1.0.tgz";
+      sha1 = "2b1e887e7737ae1452458ead0d0a79722901877f";
     };
     deps = {
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
-      "ws-1.0.1" = self.by-version."ws"."1.0.1";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
+      "ws-1.1.0" = self.by-version."ws"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -42619,6 +44230,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."single-line-log"."^1.0.1" =
+    self.by-version."single-line-log"."1.1.1";
+  by-version."single-line-log"."1.1.1" = self.buildNodePackage {
+    name = "single-line-log-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.1.tgz";
+      name = "single-line-log-1.1.1.tgz";
+      sha1 = "f87743dfdb5519b5fe1dda36edd68f35e3cb5de6";
+    };
+    deps = {
+      "string-width-1.0.1" = self.by-version."string-width"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sinon"."*" =
     self.by-version."sinon"."2.0.0-pre";
   by-version."sinon"."2.0.0-pre" = self.buildNodePackage {
@@ -42658,27 +44289,27 @@
     deps = {
       "express-5.0.0-alpha.2" = self.by-version."express"."5.0.0-alpha.2";
       "express-json5-0.1.0" = self.by-version."express-json5"."0.1.0";
-      "body-parser-1.15.0" = self.by-version."body-parser"."1.15.0";
-      "compression-1.6.1" = self.by-version."compression"."1.6.1";
+      "body-parser-1.15.1" = self.by-version."body-parser"."1.15.1";
+      "compression-1.6.2" = self.by-version."compression"."1.6.2";
       "commander-2.9.0" = self.by-version."commander"."2.9.0";
-      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "js-yaml-3.6.1" = self.by-version."js-yaml"."3.6.1";
       "cookies-0.6.1" = self.by-version."cookies"."0.6.1";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
       "async-0.9.2" = self.by-version."async"."0.9.2";
       "es6-shim-0.21.1" = self.by-version."es6-shim"."0.21.1";
       "semver-4.3.6" = self.by-version."semver"."4.3.6";
       "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
-      "bunyan-1.8.0" = self.by-version."bunyan"."1.8.0";
+      "bunyan-1.8.1" = self.by-version."bunyan"."1.8.1";
       "handlebars-2.0.0" = self.by-version."handlebars"."2.0.0";
       "highlight.js-8.9.1" = self.by-version."highlight.js"."8.9.1";
-      "lunr-0.7.0" = self.by-version."lunr"."0.7.0";
+      "lunr-0.7.1" = self.by-version."lunr"."0.7.1";
       "render-readme-1.3.1" = self.by-version."render-readme"."1.3.1";
       "jju-1.3.0" = self.by-version."jju"."1.3.0";
-      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "JSONStream-1.1.2" = self.by-version."JSONStream"."1.1.2";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "sinopia-htpasswd-0.4.5" = self.by-version."sinopia-htpasswd"."0.4.5";
-      "http-errors-1.4.0" = self.by-version."http-errors"."1.4.0";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "http-errors-1.5.0" = self.by-version."http-errors"."1.5.0";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
     };
     optionalDependencies = {
       "fs-ext-0.5.0" = self.by-version."fs-ext"."0.5.0";
@@ -42744,7 +44375,7 @@
       sha1 = "be4d17c579360e07e04ed8172ba2b10a69054df3";
     };
     deps = {
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -42900,15 +44531,15 @@
   };
   "sloc" = self.by-version."sloc"."0.1.10";
   by-spec."smart-buffer"."^1.0.4" =
-    self.by-version."smart-buffer"."1.0.4";
-  by-version."smart-buffer"."1.0.4" = self.buildNodePackage {
-    name = "smart-buffer-1.0.4";
-    version = "1.0.4";
+    self.by-version."smart-buffer"."1.0.11";
+  by-version."smart-buffer"."1.0.11" = self.buildNodePackage {
+    name = "smart-buffer-1.0.11";
+    version = "1.0.11";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.0.4.tgz";
-      name = "smart-buffer-1.0.4.tgz";
-      sha1 = "2cc20003c8be2f08082768a84cf2c684cca8a309";
+      url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.0.11.tgz";
+      name = "smart-buffer-1.0.11.tgz";
+      sha1 = "3050337098a8e4cdf0350fef63dd146049ff940a";
     };
     deps = {
     };
@@ -43126,20 +44757,20 @@
     cpu = [ ];
   };
   by-spec."socket.io"."^1.4.5" =
-    self.by-version."socket.io"."1.4.5";
-  by-version."socket.io"."1.4.5" = self.buildNodePackage {
-    name = "socket.io-1.4.5";
-    version = "1.4.5";
+    self.by-version."socket.io"."1.4.6";
+  by-version."socket.io"."1.4.6" = self.buildNodePackage {
+    name = "socket.io-1.4.6";
+    version = "1.4.6";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.5.tgz";
-      name = "socket.io-1.4.5.tgz";
-      sha1 = "f202f49eeb9cf7cf6c0971ad75d8d96d451ea4f7";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.6.tgz";
+      name = "socket.io-1.4.6.tgz";
+      sha1 = "0dddc2cb8fb9b66fc928604f13f6aa910254cc1c";
     };
     deps = {
-      "engine.io-1.6.8" = self.by-version."engine.io"."1.6.8";
+      "engine.io-1.6.9" = self.by-version."engine.io"."1.6.9";
       "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6";
-      "socket.io-client-1.4.5" = self.by-version."socket.io-client"."1.4.5";
+      "socket.io-client-1.4.6" = self.by-version."socket.io-client"."1.4.6";
       "socket.io-adapter-0.4.0" = self.by-version."socket.io-adapter"."0.4.0";
       "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
@@ -43174,7 +44805,7 @@
     cpu = [ ];
   };
   by-spec."socket.io"."~1.4.5" =
-    self.by-version."socket.io"."1.4.5";
+    self.by-version."socket.io"."1.4.6";
   by-spec."socket.io-adapter"."0.2.0" =
     self.by-version."socket.io-adapter"."0.2.0";
   by-version."socket.io-adapter"."0.2.0" = self.buildNodePackage {
@@ -43292,20 +44923,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."socket.io-client"."1.4.5" =
-    self.by-version."socket.io-client"."1.4.5";
-  by-version."socket.io-client"."1.4.5" = self.buildNodePackage {
-    name = "socket.io-client-1.4.5";
-    version = "1.4.5";
+  by-spec."socket.io-client"."1.4.6" =
+    self.by-version."socket.io-client"."1.4.6";
+  by-version."socket.io-client"."1.4.6" = self.buildNodePackage {
+    name = "socket.io-client-1.4.6";
+    version = "1.4.6";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.5.tgz";
-      name = "socket.io-client-1.4.5.tgz";
-      sha1 = "400d630c31e7c9579e45173f977e4f5bd8dc7d2e";
+      url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz";
+      name = "socket.io-client-1.4.6.tgz";
+      sha1 = "49b0ba537efd15b8297c84016e642e1c7c752c3d";
     };
     deps = {
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "engine.io-client-1.6.8" = self.by-version."engine.io-client"."1.6.8";
+      "engine.io-client-1.6.9" = self.by-version."engine.io-client"."1.6.9";
       "component-bind-1.0.0" = self.by-version."component-bind"."1.0.0";
       "component-emitter-1.2.0" = self.by-version."component-emitter"."1.2.0";
       "object-component-0.0.3" = self.by-version."object-component"."0.0.3";
@@ -43417,19 +45048,19 @@
     cpu = [ ];
   };
   by-spec."sockjs"."*" =
-    self.by-version."sockjs"."0.3.16";
-  by-version."sockjs"."0.3.16" = self.buildNodePackage {
-    name = "sockjs-0.3.16";
-    version = "0.3.16";
+    self.by-version."sockjs"."0.3.17";
+  by-version."sockjs"."0.3.17" = self.buildNodePackage {
+    name = "sockjs-0.3.17";
+    version = "0.3.17";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.16.tgz";
-      name = "sockjs-0.3.16.tgz";
-      sha1 = "2bf5b90eb681b5216dfb98b8cf3e01a33ca271bc";
+      url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.17.tgz";
+      name = "sockjs-0.3.17.tgz";
+      sha1 = "ef1b88f5d73e6278fad8e9476ac91064382f3b44";
     };
     deps = {
       "faye-websocket-0.10.0" = self.by-version."faye-websocket"."0.10.0";
-      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "uuid-2.0.2" = self.by-version."uuid"."2.0.2";
     };
     optionalDependencies = {
     };
@@ -43437,7 +45068,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "sockjs" = self.by-version."sockjs"."0.3.16";
+  "sockjs" = self.by-version."sockjs"."0.3.17";
   by-spec."socks"."~1.1.5" =
     self.by-version."socks"."1.1.9";
   by-version."socks"."1.1.9" = self.buildNodePackage {
@@ -43450,8 +45081,8 @@
       sha1 = "628d7e4d04912435445ac0b6e459376cb3e6d691";
     };
     deps = {
-      "ip-1.1.2" = self.by-version."ip"."1.1.2";
-      "smart-buffer-1.0.4" = self.by-version."smart-buffer"."1.0.4";
+      "ip-1.1.3" = self.by-version."ip"."1.1.3";
+      "smart-buffer-1.0.11" = self.by-version."smart-buffer"."1.0.11";
     };
     optionalDependencies = {
     };
@@ -43482,15 +45113,15 @@
     cpu = [ ];
   };
   by-spec."sort-keys"."^1.0.0" =
-    self.by-version."sort-keys"."1.1.1";
-  by-version."sort-keys"."1.1.1" = self.buildNodePackage {
-    name = "sort-keys-1.1.1";
-    version = "1.1.1";
+    self.by-version."sort-keys"."1.1.2";
+  by-version."sort-keys"."1.1.2" = self.buildNodePackage {
+    name = "sort-keys-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.1.tgz";
-      name = "sort-keys-1.1.1.tgz";
-      sha1 = "a791c26071df66c356bf5dcad9cfb57a7b2f826e";
+      url = "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz";
+      name = "sort-keys-1.1.2.tgz";
+      sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad";
     };
     deps = {
       "is-plain-obj-1.1.0" = self.by-version."is-plain-obj"."1.1.0";
@@ -43513,26 +45144,7 @@
       sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188";
     };
     deps = {
-      "sort-keys-1.1.1" = self.by-version."sort-keys"."1.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."sorted-object"."~1.0.0" =
-    self.by-version."sorted-object"."1.0.0";
-  by-version."sorted-object"."1.0.0" = self.buildNodePackage {
-    name = "sorted-object-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz";
-      name = "sorted-object-1.0.0.tgz";
-      sha1 = "5d1f4f9c1fb2cd48965967304e212eb44cfb6d05";
-    };
-    deps = {
+      "sort-keys-1.1.2" = self.by-version."sort-keys"."1.1.2";
     };
     optionalDependencies = {
     };
@@ -43571,7 +45183,7 @@
       sha1 = "558e7f57a5bf6baf6501baf2ae2c9076c4502006";
     };
     deps = {
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
     };
     optionalDependencies = {
     };
@@ -43599,15 +45211,15 @@
     cpu = [ ];
   };
   by-spec."source-map"."*" =
-    self.by-version."source-map"."0.5.3";
-  by-version."source-map"."0.5.3" = self.buildNodePackage {
-    name = "source-map-0.5.3";
-    version = "0.5.3";
+    self.by-version."source-map"."0.5.6";
+  by-version."source-map"."0.5.6" = self.buildNodePackage {
+    name = "source-map-0.5.6";
+    version = "0.5.6";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz";
-      name = "source-map-0.5.3.tgz";
-      sha1 = "82674b85a71b0be76c3e7416d15e9f5252eb3be0";
+      url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz";
+      name = "source-map-0.5.6.tgz";
+      sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
     };
     deps = {
     };
@@ -43617,7 +45229,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "source-map" = self.by-version."source-map"."0.5.3";
+  "source-map" = self.by-version."source-map"."0.5.6";
   by-spec."source-map"."0.1.32" =
     self.by-version."source-map"."0.1.32";
   by-version."source-map"."0.1.32" = self.buildNodePackage {
@@ -43678,26 +45290,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."source-map"."0.4.2" =
-    self.by-version."source-map"."0.4.2";
-  by-version."source-map"."0.4.2" = self.buildNodePackage {
-    name = "source-map-0.4.2";
-    version = "0.4.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz";
-      name = "source-map-0.4.2.tgz";
-      sha1 = "dc9f3114394ab7c1f9782972f3d11820fff06f1f";
-    };
-    deps = {
-      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."source-map"."0.4.x" =
     self.by-version."source-map"."0.4.4";
   by-version."source-map"."0.4.4" = self.buildNodePackage {
@@ -43725,9 +45317,9 @@
   by-spec."source-map"."^0.4.4" =
     self.by-version."source-map"."0.4.4";
   by-spec."source-map"."^0.5.1" =
-    self.by-version."source-map"."0.5.3";
+    self.by-version."source-map"."0.5.6";
   by-spec."source-map"."^0.5.3" =
-    self.by-version."source-map"."0.5.3";
+    self.by-version."source-map"."0.5.6";
   by-spec."source-map"."~0.1.31" =
     self.by-version."source-map"."0.1.43";
   by-spec."source-map"."~0.1.33" =
@@ -43776,16 +45368,14 @@
   };
   by-spec."source-map"."~0.4.0" =
     self.by-version."source-map"."0.4.4";
-  by-spec."source-map"."~0.4.1" =
-    self.by-version."source-map"."0.4.4";
   by-spec."source-map"."~0.4.2" =
     self.by-version."source-map"."0.4.4";
   by-spec."source-map"."~0.5.0" =
-    self.by-version."source-map"."0.5.3";
+    self.by-version."source-map"."0.5.6";
   by-spec."source-map"."~0.5.1" =
-    self.by-version."source-map"."0.5.3";
+    self.by-version."source-map"."0.5.6";
   by-spec."source-map"."~0.5.3" =
-    self.by-version."source-map"."0.5.3";
+    self.by-version."source-map"."0.5.6";
   by-spec."source-map-support"."0.3.2" =
     self.by-version."source-map-support"."0.3.2";
   by-version."source-map-support"."0.3.2" = self.buildNodePackage {
@@ -43925,7 +45515,7 @@
   };
   by-spec."spdx-license-ids"."^1.0.2" =
     self.by-version."spdx-license-ids"."1.2.1";
-  by-spec."spdx-license-ids"."~1.2.0" =
+  by-spec."spdx-license-ids"."~1.2.1" =
     self.by-version."spdx-license-ids"."1.2.1";
   by-spec."spdy"."^1.26.5" =
     self.by-version."spdy"."1.32.5";
@@ -44120,7 +45710,7 @@
     deps = {
       "asn1-0.2.3" = self.by-version."asn1"."0.2.3";
       "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
-      "dashdash-1.13.0" = self.by-version."dashdash"."1.13.0";
+      "dashdash-1.14.0" = self.by-version."dashdash"."1.14.0";
     };
     optionalDependencies = {
       "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
@@ -44146,7 +45736,7 @@
     deps = {
       "asn1-0.2.3" = self.by-version."asn1"."0.2.3";
       "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
-      "dashdash-1.13.0" = self.by-version."dashdash"."1.13.0";
+      "dashdash-1.14.0" = self.by-version."dashdash"."1.14.0";
     };
     optionalDependencies = {
       "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
@@ -44159,7 +45749,32 @@
     cpu = [ ];
   };
   by-spec."sshpk"."^1.7.0" =
-    self.by-version."sshpk"."1.7.4";
+    self.by-version."sshpk"."1.8.3";
+  by-version."sshpk"."1.8.3" = self.buildNodePackage {
+    name = "sshpk-1.8.3";
+    version = "1.8.3";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz";
+      name = "sshpk-1.8.3.tgz";
+      sha1 = "890cc9d614dc5292e5cb1a543b03c9abaa5c374e";
+    };
+    deps = {
+      "asn1-0.2.3" = self.by-version."asn1"."0.2.3";
+      "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0";
+      "dashdash-1.14.0" = self.by-version."dashdash"."1.14.0";
+      "getpass-0.1.6" = self.by-version."getpass"."0.1.6";
+    };
+    optionalDependencies = {
+      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
+      "tweetnacl-0.13.3" = self.by-version."tweetnacl"."0.13.3";
+      "jodid25519-1.0.2" = self.by-version."jodid25519"."1.0.2";
+      "ecc-jsbn-0.1.1" = self.by-version."ecc-jsbn"."0.1.1";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sshpk-agent"."1.2.1" =
     self.by-version."sshpk-agent"."1.2.1";
   by-version."sshpk-agent"."1.2.1" = self.buildNodePackage {
@@ -44174,7 +45789,7 @@
     deps = {
       "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
       "sshpk-1.7.4" = self.by-version."sshpk"."1.7.4";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -44195,7 +45810,7 @@
     };
     deps = {
       "es6-promise-2.3.0" = self.by-version."es6-promise"."2.3.0";
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -44280,6 +45895,31 @@
     cpu = [ ];
   };
   by-spec."statuses"."1" =
+    self.by-version."statuses"."1.3.0";
+  by-version."statuses"."1.3.0" = self.buildNodePackage {
+    name = "statuses-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz";
+      name = "statuses-1.3.0.tgz";
+      sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."statuses".">= 1.2.1 < 2" =
+    self.by-version."statuses"."1.3.0";
+  by-spec."statuses".">= 1.3.0 < 2" =
+    self.by-version."statuses"."1.3.0";
+  by-spec."statuses"."^1.2.1" =
+    self.by-version."statuses"."1.3.0";
+  by-spec."statuses"."~1.2.1" =
     self.by-version."statuses"."1.2.1";
   by-version."statuses"."1.2.1" = self.buildNodePackage {
     name = "statuses-1.2.1";
@@ -44298,12 +45938,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."statuses".">= 1.2.1 < 2" =
-    self.by-version."statuses"."1.2.1";
-  by-spec."statuses"."^1.2.1" =
-    self.by-version."statuses"."1.2.1";
-  by-spec."statuses"."~1.2.1" =
-    self.by-version."statuses"."1.2.1";
+  by-spec."statuses"."~1.3.0" =
+    self.by-version."statuses"."1.3.0";
   by-spec."stream-browserify"."^1.0.0" =
     self.by-version."stream-browserify"."1.0.0";
   by-version."stream-browserify"."1.0.0" = self.buildNodePackage {
@@ -44317,7 +45953,7 @@
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
     };
     optionalDependencies = {
     };
@@ -44338,7 +45974,7 @@
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -44348,6 +45984,44 @@
   };
   by-spec."stream-browserify"."^2.0.1" =
     self.by-version."stream-browserify"."2.0.1";
+  by-spec."stream-buffers"."~0.2.3" =
+    self.by-version."stream-buffers"."0.2.6";
+  by-version."stream-buffers"."0.2.6" = self.buildNodePackage {
+    name = "stream-buffers-0.2.6";
+    version = "0.2.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-0.2.6.tgz";
+      name = "stream-buffers-0.2.6.tgz";
+      sha1 = "181c08d5bb3690045f69401b9ae6a7a0cf3313fc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."stream-buffers"."~2.2.0" =
+    self.by-version."stream-buffers"."2.2.0";
+  by-version."stream-buffers"."2.2.0" = self.buildNodePackage {
+    name = "stream-buffers-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz";
+      name = "stream-buffers-2.2.0.tgz";
+      sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."stream-collector"."^1.0.1" =
     self.by-version."stream-collector"."1.0.1";
   by-version."stream-collector"."1.0.1" = self.buildNodePackage {
@@ -44401,7 +46075,7 @@
     };
     deps = {
       "duplexer2-0.1.4" = self.by-version."duplexer2"."0.1.4";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -44482,7 +46156,7 @@
       sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de";
     };
     deps = {
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
     };
     optionalDependencies = {
     };
@@ -44511,19 +46185,20 @@
     cpu = [ ];
   };
   by-spec."stream-http"."^2.0.0" =
-    self.by-version."stream-http"."2.2.1";
-  by-version."stream-http"."2.2.1" = self.buildNodePackage {
-    name = "stream-http-2.2.1";
-    version = "2.2.1";
+    self.by-version."stream-http"."2.3.0";
+  by-version."stream-http"."2.3.0" = self.buildNodePackage {
+    name = "stream-http-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/stream-http/-/stream-http-2.2.1.tgz";
-      name = "stream-http-2.2.1.tgz";
-      sha1 = "c0d29dd8546341c66a4880a78272cd4661a956a6";
+      url = "https://registry.npmjs.org/stream-http/-/stream-http-2.3.0.tgz";
+      name = "stream-http-2.3.0.tgz";
+      sha1 = "d77de76f6211072119f8d2a49a118717b8feeaa3";
     };
     deps = {
       "builtin-status-codes-2.0.0" = self.by-version."builtin-status-codes"."2.0.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
       "to-arraybuffer-1.0.1" = self.by-version."to-arraybuffer"."1.0.1";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
@@ -44547,7 +46222,7 @@
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
       "readable-wrap-1.0.0" = self.by-version."readable-wrap"."1.0.0";
       "through2-1.1.1" = self.by-version."through2"."1.1.1";
       "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
@@ -44571,7 +46246,7 @@
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -44767,7 +46442,7 @@
     };
     deps = {
       "addr-to-ip-port-1.4.2" = self.by-version."addr-to-ip-port"."1.4.2";
-      "ipaddr.js-1.1.0" = self.by-version."ipaddr.js"."1.1.0";
+      "ipaddr.js-1.1.1" = self.by-version."ipaddr.js"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -44960,6 +46635,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."strip-bom-stream"."^1.0.0" =
+    self.by-version."strip-bom-stream"."1.0.0";
+  by-version."strip-bom-stream"."1.0.0" = self.buildNodePackage {
+    name = "strip-bom-stream-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz";
+      name = "strip-bom-stream-1.0.0.tgz";
+      sha1 = "e7144398577d51a6bed0fa1994fa05f43fd988ee";
+    };
+    deps = {
+      "first-chunk-stream-1.0.0" = self.by-version."first-chunk-stream"."1.0.0";
+      "strip-bom-2.0.0" = self.by-version."strip-bom"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."strip-indent"."^1.0.1" =
     self.by-version."strip-indent"."1.0.1";
   by-version."strip-indent"."1.0.1" = self.buildNodePackage {
@@ -45025,15 +46721,15 @@
   by-spec."strip-json-comments"."~1.0.4" =
     self.by-version."strip-json-comments"."1.0.4";
   by-spec."strong-data-uri"."^1.0.0" =
-    self.by-version."strong-data-uri"."1.0.3";
-  by-version."strong-data-uri"."1.0.3" = self.buildNodePackage {
-    name = "strong-data-uri-1.0.3";
-    version = "1.0.3";
+    self.by-version."strong-data-uri"."1.0.4";
+  by-version."strong-data-uri"."1.0.4" = self.buildNodePackage {
+    name = "strong-data-uri-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.3.tgz";
-      name = "strong-data-uri-1.0.3.tgz";
-      sha1 = "0edbd175e7900ae28c939dea9d4d31c03afbd6b6";
+      url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.4.tgz";
+      name = "strong-data-uri-1.0.4.tgz";
+      sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0";
     };
     deps = {
       "truncate-1.0.5" = self.by-version."truncate"."1.0.5";
@@ -45064,22 +46760,22 @@
     cpu = [ ];
   };
   by-spec."stylus"."*" =
-    self.by-version."stylus"."0.54.2";
-  by-version."stylus"."0.54.2" = self.buildNodePackage {
-    name = "stylus-0.54.2";
-    version = "0.54.2";
+    self.by-version."stylus"."0.54.5";
+  by-version."stylus"."0.54.5" = self.buildNodePackage {
+    name = "stylus-0.54.5";
+    version = "0.54.5";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/stylus/-/stylus-0.54.2.tgz";
-      name = "stylus-0.54.2.tgz";
-      sha1 = "77f0da93cde5a55ab917496850b7ab5214474a0b";
+      url = "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz";
+      name = "stylus-0.54.5.tgz";
+      sha1 = "42b9560931ca7090ce8515a798ba9e6aa3d6dc79";
     };
     deps = {
       "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "sax-0.5.8" = self.by-version."sax"."0.5.8";
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "glob-7.0.3" = self.by-version."glob"."7.0.3";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
     optionalDependencies = {
@@ -45088,7 +46784,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "stylus" = self.by-version."stylus"."0.54.2";
+  "stylus" = self.by-version."stylus"."0.54.5";
   by-spec."stylus"."0.49.x" =
     self.by-version."stylus"."0.49.3";
   by-version."stylus"."0.49.3" = self.buildNodePackage {
@@ -45178,7 +46874,37 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."superagent"."0.21.0" =
+  by-spec."superagent"."1.8.3" =
+    self.by-version."superagent"."1.8.3";
+  by-version."superagent"."1.8.3" = self.buildNodePackage {
+    name = "superagent-1.8.3";
+    version = "1.8.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/superagent/-/superagent-1.8.3.tgz";
+      name = "superagent-1.8.3.tgz";
+      sha1 = "2b7d70fcc870eda4f2a61e619dd54009b86547c3";
+    };
+    deps = {
+      "qs-2.3.3" = self.by-version."qs"."2.3.3";
+      "formidable-1.0.17" = self.by-version."formidable"."1.0.17";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "component-emitter-1.2.1" = self.by-version."component-emitter"."1.2.1";
+      "methods-1.1.2" = self.by-version."methods"."1.1.2";
+      "cookiejar-2.0.6" = self.by-version."cookiejar"."2.0.6";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+      "form-data-1.0.0-rc3" = self.by-version."form-data"."1.0.0-rc3";
+      "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."superagent"."^0.21.0" =
     self.by-version."superagent"."0.21.0";
   by-version."superagent"."0.21.0" = self.buildNodePackage {
     name = "superagent-0.21.0";
@@ -45208,8 +46934,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."superagent"."^0.21.0" =
-    self.by-version."superagent"."0.21.0";
+  by-spec."superagent"."^1.8.3" =
+    self.by-version."superagent"."1.8.3";
   by-spec."superagent"."~0.21.0" =
     self.by-version."superagent"."0.21.0";
   by-spec."supports-color"."1.2.0" =
@@ -45310,6 +47036,33 @@
   };
   by-spec."supports-color"."^3.1.2" =
     self.by-version."supports-color"."3.1.2";
+  by-spec."svgo"."*" =
+    self.by-version."svgo"."0.6.6";
+  by-version."svgo"."0.6.6" = self.buildNodePackage {
+    name = "svgo-0.6.6";
+    version = "0.6.6";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/svgo/-/svgo-0.6.6.tgz";
+      name = "svgo-0.6.6.tgz";
+      sha1 = "b340889036f20f9b447543077d0f5573ed044c08";
+    };
+    deps = {
+      "sax-1.2.1" = self.by-version."sax"."1.2.1";
+      "coa-1.0.1" = self.by-version."coa"."1.0.1";
+      "js-yaml-3.6.1" = self.by-version."js-yaml"."3.6.1";
+      "colors-1.1.2" = self.by-version."colors"."1.1.2";
+      "whet.extend-0.9.9" = self.by-version."whet.extend"."0.9.9";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "csso-2.0.0" = self.by-version."csso"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "svgo" = self.by-version."svgo"."0.6.6";
   by-spec."swig"."0.14.x" =
     self.by-version."swig"."0.14.0";
   by-version."swig"."0.14.0" = self.buildNodePackage {
@@ -45352,6 +47105,25 @@
   };
   by-spec."sylvester".">= 0.0.8" =
     self.by-version."sylvester"."0.0.21";
+  by-spec."symbol"."^0.2.1" =
+    self.by-version."symbol"."0.2.3";
+  by-version."symbol"."0.2.3" = self.buildNodePackage {
+    name = "symbol-0.2.3";
+    version = "0.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/symbol/-/symbol-0.2.3.tgz";
+      name = "symbol-0.2.3.tgz";
+      sha1 = "3b9873b8a901e47c6efe21526a3ac372ef28bbc7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sync-exec"."0.6.2" =
     self.by-version."sync-exec"."0.6.2";
   by-version."sync-exec"."0.6.2" = self.buildNodePackage {
@@ -45403,14 +47175,14 @@
       sha1 = "b424433ef596851922b2fd77224a69a1951618eb";
     };
     deps = {
-      "bluebird-3.3.4" = self.by-version."bluebird"."3.3.4";
+      "bluebird-3.4.0" = self.by-version."bluebird"."3.4.0";
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
-      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
       "slice-ansi-0.0.4" = self.by-version."slice-ansi"."0.0.4";
       "string-width-1.0.1" = self.by-version."string-width"."1.0.1";
       "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
       "tv4-1.2.7" = self.by-version."tv4"."1.2.7";
-      "xregexp-3.1.0" = self.by-version."xregexp"."3.1.0";
+      "xregexp-3.1.1" = self.by-version."xregexp"."3.1.1";
     };
     optionalDependencies = {
     };
@@ -45427,7 +47199,7 @@
     src = fetchgit {
       url = "https://github.com/mixu/node-tabtab.git";
       rev = "94af2b878b174527b6636aec88acd46979247755";
-      sha256 = "7be2daa2fe7893478d38d90b213de359c9a662a7ef06ad9cbfaac11ad399a149";
+      sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272";
     };
     deps = {
     };
@@ -45475,8 +47247,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tapable"."~0.1.8" =
-    self.by-version."tapable"."0.1.10";
   by-spec."tapable"."~0.2.3" =
     self.by-version."tapable"."0.2.4";
   by-spec."tape"."~2.3.2" =
@@ -45516,8 +47286,8 @@
       sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1";
     };
     deps = {
-      "block-stream-0.0.8" = self.by-version."block-stream"."0.0.8";
-      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
+      "block-stream-0.0.9" = self.by-version."block-stream"."0.0.9";
+      "fstream-1.0.9" = self.by-version."fstream"."1.0.9";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
@@ -45540,7 +47310,7 @@
     };
     deps = {
       "inherits-1.0.2" = self.by-version."inherits"."1.0.2";
-      "block-stream-0.0.8" = self.by-version."block-stream"."0.0.8";
+      "block-stream-0.0.9" = self.by-version."block-stream"."0.0.9";
       "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
     };
     optionalDependencies = {
@@ -45561,8 +47331,8 @@
       sha1 = "8b0f6740f9946259de26a3ed9c9a22890dff023f";
     };
     deps = {
-      "block-stream-0.0.8" = self.by-version."block-stream"."0.0.8";
-      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
+      "block-stream-0.0.9" = self.by-version."block-stream"."0.0.9";
+      "fstream-1.0.9" = self.by-version."fstream"."1.0.9";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
@@ -45590,8 +47360,8 @@
     };
     deps = {
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
-      "fstream-ignore-1.0.3" = self.by-version."fstream-ignore"."1.0.3";
+      "fstream-1.0.9" = self.by-version."fstream"."1.0.9";
+      "fstream-ignore-1.0.5" = self.by-version."fstream-ignore"."1.0.5";
       "once-1.3.3" = self.by-version."once"."1.3.3";
       "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
@@ -45605,20 +47375,20 @@
     cpu = [ ];
   };
   by-spec."tar-stream"."^1.0.0" =
-    self.by-version."tar-stream"."1.5.1";
-  by-version."tar-stream"."1.5.1" = self.buildNodePackage {
-    name = "tar-stream-1.5.1";
-    version = "1.5.1";
+    self.by-version."tar-stream"."1.5.2";
+  by-version."tar-stream"."1.5.2" = self.buildNodePackage {
+    name = "tar-stream-1.5.2";
+    version = "1.5.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.1.tgz";
-      name = "tar-stream-1.5.1.tgz";
-      sha1 = "516c74d1bea3e131cc0b9348929c9a83f0a2ad11";
+      url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz";
+      name = "tar-stream-1.5.2.tgz";
+      sha1 = "fbc6c6e83c1a19d4cb48c7d96171fc248effc7bf";
     };
     deps = {
       "bl-1.1.2" = self.by-version."bl"."1.1.2";
       "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
@@ -45641,7 +47411,7 @@
     deps = {
       "bl-0.9.5" = self.by-version."bl"."0.9.5";
       "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
@@ -45887,7 +47657,7 @@
       sha1 = "795292fde9f254c2a368b38f9cc5d1bd4663afb6";
     };
     deps = {
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
@@ -45908,7 +47678,7 @@
       sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48";
     };
     deps = {
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
@@ -45917,6 +47687,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."through2"."^0.6.0" =
+    self.by-version."through2"."0.6.5";
   by-spec."through2"."^0.6.1" =
     self.by-version."through2"."0.6.5";
   by-spec."through2"."^0.6.2" =
@@ -45935,7 +47707,7 @@
       sha1 = "0847cbc4449f3405574dbdccd9bb841b83ac3545";
     };
     deps = {
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.1.14" = self.by-version."readable-stream"."1.1.14";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
@@ -45965,6 +47737,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."through2"."^2.0.1" =
+    self.by-version."through2"."2.0.1";
   by-spec."through2"."~0.5.1" =
     self.by-version."through2"."0.5.1";
   by-version."through2"."0.5.1" = self.buildNodePackage {
@@ -45977,7 +47751,7 @@
       sha1 = "dfdd012eb9c700e2323fd334f38ac622ab372da7";
     };
     deps = {
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
     optionalDependencies = {
@@ -45988,8 +47762,29 @@
   };
   by-spec."through2"."~0.6.1" =
     self.by-version."through2"."0.6.5";
-  by-spec."through2"."~0.6.3" =
-    self.by-version."through2"."0.6.5";
+  by-spec."through2"."~2.0.0" =
+    self.by-version."through2"."2.0.1";
+  by-spec."through2-filter"."^2.0.0" =
+    self.by-version."through2-filter"."2.0.0";
+  by-version."through2-filter"."2.0.0" = self.buildNodePackage {
+    name = "through2-filter-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz";
+      name = "through2-filter-2.0.0.tgz";
+      sha1 = "60bc55a0dacb76085db1f9dae99ab43f83d622ec";
+    };
+    deps = {
+      "through2-2.0.1" = self.by-version."through2"."2.0.1";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."thunkify"."~2.1.1" =
     self.by-version."thunkify"."2.1.2";
   by-version."thunkify"."2.1.2" = self.buildNodePackage {
@@ -46031,15 +47826,15 @@
   by-spec."thunky"."~0.1.0" =
     self.by-version."thunky"."0.1.0";
   by-spec."tildify"."^1.0.0" =
-    self.by-version."tildify"."1.1.2";
-  by-version."tildify"."1.1.2" = self.buildNodePackage {
-    name = "tildify-1.1.2";
-    version = "1.1.2";
+    self.by-version."tildify"."1.2.0";
+  by-version."tildify"."1.2.0" = self.buildNodePackage {
+    name = "tildify-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz";
-      name = "tildify-1.1.2.tgz";
-      sha1 = "9f611d8a2e93a5e50756db040f1cd2b7fd80859d";
+      url = "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz";
+      name = "tildify-1.2.0.tgz";
+      sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a";
     };
     deps = {
       "os-homedir-1.0.1" = self.by-version."os-homedir"."1.0.1";
@@ -46064,7 +47859,7 @@
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -46141,7 +47936,7 @@
       sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d";
     };
     deps = {
-      "process-0.11.2" = self.by-version."process"."0.11.2";
+      "process-0.11.4" = self.by-version."process"."0.11.4";
     };
     optionalDependencies = {
     };
@@ -46169,15 +47964,15 @@
     cpu = [ ];
   };
   by-spec."timezone"."*" =
-    self.by-version."timezone"."1.0.1";
-  by-version."timezone"."1.0.1" = self.buildNodePackage {
-    name = "timezone-1.0.1";
-    version = "1.0.1";
+    self.by-version."timezone"."1.0.4";
+  by-version."timezone"."1.0.4" = self.buildNodePackage {
+    name = "timezone-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/timezone/-/timezone-1.0.1.tgz";
-      name = "timezone-1.0.1.tgz";
-      sha1 = "3521e855fb33f90ef14cd2090ee1e1021ad902f4";
+      url = "https://registry.npmjs.org/timezone/-/timezone-1.0.4.tgz";
+      name = "timezone-1.0.4.tgz";
+      sha1 = "c38edbad45c636228c1f33996ebc57e155f8b074";
     };
     deps = {
     };
@@ -46187,7 +47982,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "timezone" = self.by-version."timezone"."1.0.1";
+  "timezone" = self.by-version."timezone"."1.0.4";
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
   by-version."tinycolor"."0.0.1" = self.buildNodePackage {
@@ -46208,15 +48003,15 @@
     cpu = [ ];
   };
   by-spec."titanium"."*" =
-    self.by-version."titanium"."5.0.7";
-  by-version."titanium"."5.0.7" = self.buildNodePackage {
-    name = "titanium-5.0.7";
-    version = "5.0.7";
+    self.by-version."titanium"."5.0.8";
+  by-version."titanium"."5.0.8" = self.buildNodePackage {
+    name = "titanium-5.0.8";
+    version = "5.0.8";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.7.tgz";
-      name = "titanium-5.0.7.tgz";
-      sha1 = "84270842a582aa0b2738cf827566af570f6f711e";
+      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.8.tgz";
+      name = "titanium-5.0.8.tgz";
+      sha1 = "2c8e4db80880515feb1e3195645096057706d71b";
     };
     deps = {
       "async-1.4.2" = self.by-version."async"."1.4.2";
@@ -46239,7 +48034,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "titanium" = self.by-version."titanium"."5.0.7";
+  "titanium" = self.by-version."titanium"."5.0.8";
   by-spec."tldtools"."0.0.19" =
     self.by-version."tldtools"."0.0.19";
   by-version."tldtools"."0.0.19" = self.buildNodePackage {
@@ -46252,7 +48047,7 @@
       sha1 = "1df2277a43e291fd0a929c0e096a0a0917d75b1b";
     };
     deps = {
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -46272,7 +48067,7 @@
       sha1 = "c9c793d04d7fbdccb90b1c02c019f7259375d612";
     };
     deps = {
-      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "request-2.72.0" = self.by-version."request"."2.72.0";
     };
     optionalDependencies = {
     };
@@ -46340,6 +48135,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."to-absolute-glob"."^0.1.1" =
+    self.by-version."to-absolute-glob"."0.1.1";
+  by-version."to-absolute-glob"."0.1.1" = self.buildNodePackage {
+    name = "to-absolute-glob-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz";
+      name = "to-absolute-glob-0.1.1.tgz";
+      sha1 = "1cdfa472a9ef50c239ee66999b662ca0eb39937f";
+    };
+    deps = {
+      "extend-shallow-2.0.1" = self.by-version."extend-shallow"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."to-array"."0.1.3" =
     self.by-version."to-array"."0.1.3";
   by-version."to-array"."0.1.3" = self.buildNodePackage {
@@ -46397,6 +48212,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."to-iso-string"."0.0.2" =
+    self.by-version."to-iso-string"."0.0.2";
+  by-version."to-iso-string"."0.0.2" = self.buildNodePackage {
+    name = "to-iso-string-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz";
+      name = "to-iso-string-0.0.2.tgz";
+      sha1 = "4dc19e664dfccbe25bd8db508b00c6da158255d1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."tomahawk"."0.1.6" =
     self.by-version."tomahawk"."0.1.6";
   by-version."tomahawk"."0.1.6" = self.buildNodePackage {
@@ -46563,21 +48397,21 @@
     cpu = [ ];
   };
   by-spec."torrent-stream"."^1.0.1" =
-    self.by-version."torrent-stream"."1.0.2";
-  by-version."torrent-stream"."1.0.2" = self.buildNodePackage {
-    name = "torrent-stream-1.0.2";
-    version = "1.0.2";
+    self.by-version."torrent-stream"."1.0.3";
+  by-version."torrent-stream"."1.0.3" = self.buildNodePackage {
+    name = "torrent-stream-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.2.tgz";
-      name = "torrent-stream-1.0.2.tgz";
-      sha1 = "99642b93c4eca1ad182fc807b5bcaa6ec40bb93e";
+      url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.3.tgz";
+      name = "torrent-stream-1.0.3.tgz";
+      sha1 = "d8c043b44c3c448c9397a3aec42d2df55887037b";
     };
     deps = {
       "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0";
       "bncode-0.5.3" = self.by-version."bncode"."0.5.3";
       "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5";
-      "fs-chunk-store-1.4.0" = self.by-version."fs-chunk-store"."1.4.0";
+      "fs-chunk-store-1.6.2" = self.by-version."fs-chunk-store"."1.6.2";
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
       "immediate-chunk-store-1.0.8" = self.by-version."immediate-chunk-store"."1.0.8";
       "ip-set-1.0.0" = self.by-version."ip-set"."1.0.0";
@@ -46633,6 +48467,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."tough-cookie"."^2.0.0" =
+    self.by-version."tough-cookie"."2.2.2";
   by-spec."tough-cookie"."~2.2.0" =
     self.by-version."tough-cookie"."2.2.2";
   by-spec."transformers"."2.1.0" =
@@ -46752,6 +48588,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."tsscmp"."1.0.5" =
+    self.by-version."tsscmp"."1.0.5";
+  by-version."tsscmp"."1.0.5" = self.buildNodePackage {
+    name = "tsscmp-1.0.5";
+    version = "1.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz";
+      name = "tsscmp-1.0.5.tgz";
+      sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."tty-browserify"."0.0.0" =
     self.by-version."tty-browserify"."0.0.0";
   by-version."tty-browserify"."0.0.0" = self.buildNodePackage {
@@ -46774,15 +48629,15 @@
   by-spec."tty-browserify"."~0.0.0" =
     self.by-version."tty-browserify"."0.0.0";
   by-spec."tunnel-agent"."^0.4.0" =
-    self.by-version."tunnel-agent"."0.4.2";
-  by-version."tunnel-agent"."0.4.2" = self.buildNodePackage {
-    name = "tunnel-agent-0.4.2";
-    version = "0.4.2";
+    self.by-version."tunnel-agent"."0.4.3";
+  by-version."tunnel-agent"."0.4.3" = self.buildNodePackage {
+    name = "tunnel-agent-0.4.3";
+    version = "0.4.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz";
-      name = "tunnel-agent-0.4.2.tgz";
-      sha1 = "1104e3f36ac87125c287270067d582d18133bfee";
+      url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz";
+      name = "tunnel-agent-0.4.3.tgz";
+      sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
     };
     deps = {
     };
@@ -46831,9 +48686,9 @@
     cpu = [ ];
   };
   by-spec."tunnel-agent"."~0.4.0" =
-    self.by-version."tunnel-agent"."0.4.2";
+    self.by-version."tunnel-agent"."0.4.3";
   by-spec."tunnel-agent"."~0.4.1" =
-    self.by-version."tunnel-agent"."0.4.2";
+    self.by-version."tunnel-agent"."0.4.3";
   by-spec."tv4"."^1.2.7" =
     self.by-version."tv4"."1.2.7";
   by-version."tv4"."1.2.7" = self.buildNodePackage {
@@ -46872,6 +48727,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."tweetnacl"."~0.13.0" =
+    self.by-version."tweetnacl"."0.13.3";
+  by-version."tweetnacl"."0.13.3" = self.buildNodePackage {
+    name = "tweetnacl-0.13.3";
+    version = "0.13.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz";
+      name = "tweetnacl-0.13.3.tgz";
+      sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."twilio".">=1.1.4" =
     self.by-version."twilio"."2.9.1";
   by-version."twilio"."2.9.1" = self.buildNodePackage {
@@ -47020,19 +48894,19 @@
     cpu = [ ];
   };
   by-spec."type-is"."~1.6.10" =
-    self.by-version."type-is"."1.6.12";
-  by-version."type-is"."1.6.12" = self.buildNodePackage {
-    name = "type-is-1.6.12";
-    version = "1.6.12";
+    self.by-version."type-is"."1.6.13";
+  by-version."type-is"."1.6.13" = self.buildNodePackage {
+    name = "type-is-1.6.13";
+    version = "1.6.13";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/type-is/-/type-is-1.6.12.tgz";
-      name = "type-is-1.6.12.tgz";
-      sha1 = "0352a9dfbfff040fe668cc153cc95829c354173e";
+      url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz";
+      name = "type-is-1.6.13.tgz";
+      sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08";
     };
     deps = {
       "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "mime-types-2.1.11" = self.by-version."mime-types"."2.1.11";
     };
     optionalDependencies = {
     };
@@ -47041,11 +48915,13 @@
     cpu = [ ];
   };
   by-spec."type-is"."~1.6.11" =
-    self.by-version."type-is"."1.6.12";
+    self.by-version."type-is"."1.6.13";
+  by-spec."type-is"."~1.6.12" =
+    self.by-version."type-is"."1.6.13";
   by-spec."type-is"."~1.6.4" =
-    self.by-version."type-is"."1.6.12";
+    self.by-version."type-is"."1.6.13";
   by-spec."type-is"."~1.6.6" =
-    self.by-version."type-is"."1.6.12";
+    self.by-version."type-is"."1.6.13";
   by-spec."type-of-is"."^3.4.0" =
     self.by-version."type-of-is"."3.4.0";
   by-version."type-of-is"."3.4.0" = self.buildNodePackage {
@@ -47104,15 +48980,15 @@
     cpu = [ ];
   };
   by-spec."typescript"."*" =
-    self.by-version."typescript"."1.9.0-dev.20160408";
-  by-version."typescript"."1.9.0-dev.20160408" = self.buildNodePackage {
-    name = "typescript-1.9.0-dev.20160408";
-    version = "1.9.0-dev.20160408";
+    self.by-version."typescript"."1.9.0-dev.20160610-1.0";
+  by-version."typescript"."1.9.0-dev.20160610-1.0" = self.buildNodePackage {
+    name = "typescript-1.9.0-dev.20160610-1.0";
+    version = "1.9.0-dev.20160610-1.0";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-1.9.0-dev.20160408.tgz";
-      name = "typescript-1.9.0-dev.20160408.tgz";
-      sha1 = "0fab58c2fa44bd7562c9b410a495b29acfce4689";
+      url = "https://registry.npmjs.org/typescript/-/typescript-1.9.0-dev.20160610-1.0.tgz";
+      name = "typescript-1.9.0-dev.20160610-1.0.tgz";
+      sha1 = "768216dcc2528b9445b5cecaeb599b22ca8a3072";
     };
     deps = {
     };
@@ -47122,7 +48998,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "typescript" = self.by-version."typescript"."1.9.0-dev.20160408";
+  "typescript" = self.by-version."typescript"."1.9.0-dev.20160610-1.0";
   by-spec."typescript"."=1.0.1" =
     self.by-version."typescript"."1.0.1";
   by-version."typescript"."1.0.1" = self.buildNodePackage {
@@ -47222,15 +49098,15 @@
     cpu = [ ];
   };
   by-spec."uc.micro"."^1.0.0" =
-    self.by-version."uc.micro"."1.0.0";
-  by-version."uc.micro"."1.0.0" = self.buildNodePackage {
-    name = "uc.micro-1.0.0";
-    version = "1.0.0";
+    self.by-version."uc.micro"."1.0.1";
+  by-version."uc.micro"."1.0.1" = self.buildNodePackage {
+    name = "uc.micro-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.0.tgz";
-      name = "uc.micro-1.0.0.tgz";
-      sha1 = "4c5a6dee941b515a5bd5cf5d05b121e0e49c5fb7";
+      url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.1.tgz";
+      name = "uc.micro-1.0.1.tgz";
+      sha1 = "b4bca8b68246f45e8ead366a7e6cbd05e27d3293";
     };
     deps = {
     };
@@ -47240,6 +49116,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."uc.micro"."^1.0.1" =
+    self.by-version."uc.micro"."1.0.1";
   by-spec."uglify-js"."*" =
     self.by-version."uglify-js"."2.6.2";
   by-version."uglify-js"."2.6.2" = self.buildNodePackage {
@@ -47253,7 +49131,7 @@
     };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
-      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
       "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
       "yargs-3.10.0" = self.by-version."yargs"."3.10.0";
     };
@@ -47437,19 +49315,19 @@
   };
   by-spec."uid-number"."~0.0.6" =
     self.by-version."uid-number"."0.0.6";
-  by-spec."uid-safe"."2.1.0" =
-    self.by-version."uid-safe"."2.1.0";
-  by-version."uid-safe"."2.1.0" = self.buildNodePackage {
-    name = "uid-safe-2.1.0";
-    version = "2.1.0";
+  by-spec."uid-safe"."2.1.1" =
+    self.by-version."uid-safe"."2.1.1";
+  by-version."uid-safe"."2.1.1" = self.buildNodePackage {
+    name = "uid-safe-2.1.1";
+    version = "2.1.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.0.tgz";
-      name = "uid-safe-2.1.0.tgz";
-      sha1 = "d00ce22aeb721dfe7c25bb2df49fd00966d38a64";
+      url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz";
+      name = "uid-safe-2.1.1.tgz";
+      sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666";
     };
     deps = {
-      "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1";
+      "base64-url-1.2.2" = self.by-version."base64-url"."1.2.2";
       "random-bytes-1.0.0" = self.by-version."random-bytes"."1.0.0";
     };
     optionalDependencies = {
@@ -47848,7 +49726,7 @@
       "blueimp-md5-2.1.0" = self.by-version."blueimp-md5"."2.1.0";
       "body-parser-1.14.2" = self.by-version."body-parser"."1.14.2";
       "color-0.11.1" = self.by-version."color"."0.11.1";
-      "cookie-parser-1.4.1" = self.by-version."cookie-parser"."1.4.1";
+      "cookie-parser-1.4.3" = self.by-version."cookie-parser"."1.4.3";
       "crossroads-0.12.2" = self.by-version."crossroads"."0.12.2";
       "diff2html-1.2.0" = self.by-version."diff2html"."1.2.0";
       "express-4.13.4" = self.by-version."express"."4.13.4";
@@ -47872,13 +49750,13 @@
       "rc-1.1.6" = self.by-version."rc"."1.1.6";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
-      "serve-static-1.10.2" = self.by-version."serve-static"."1.10.2";
+      "serve-static-1.10.3" = self.by-version."serve-static"."1.10.3";
       "signals-1.0.0" = self.by-version."signals"."1.0.0";
       "snapsvg-0.4.0" = self.by-version."snapsvg"."0.4.0";
-      "socket.io-1.4.5" = self.by-version."socket.io"."1.4.5";
+      "socket.io-1.4.6" = self.by-version."socket.io"."1.4.6";
       "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
       "temp-0.8.3" = self.by-version."temp"."0.8.3";
-      "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
+      "uuid-2.0.2" = self.by-version."uuid"."2.0.2";
       "winston-2.1.1" = self.by-version."winston"."2.1.1";
       "yargs-3.32.0" = self.by-version."yargs"."3.32.0";
     };
@@ -47967,6 +49845,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."unique-stream"."^2.0.2" =
+    self.by-version."unique-stream"."2.2.1";
+  by-version."unique-stream"."2.2.1" = self.buildNodePackage {
+    name = "unique-stream-2.2.1";
+    version = "2.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz";
+      name = "unique-stream-2.2.1.tgz";
+      sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369";
+    };
+    deps = {
+      "json-stable-stringify-1.0.1" = self.by-version."json-stable-stringify"."1.0.1";
+      "through2-filter-2.0.0" = self.by-version."through2-filter"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."unorm"."1.3.3" =
     self.by-version."unorm"."1.3.3";
   by-version."unorm"."1.3.3" = self.buildNodePackage {
@@ -48245,7 +50144,7 @@
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
     };
     optionalDependencies = {
     };
@@ -48429,7 +50328,7 @@
     deps = {
       "async-0.1.22" = self.by-version."async"."0.1.22";
       "deep-equal-1.0.1" = self.by-version."deep-equal"."1.0.1";
-      "i-0.3.4" = self.by-version."i"."0.3.4";
+      "i-0.3.5" = self.by-version."i"."0.3.5";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "ncp-0.2.7" = self.by-version."ncp"."0.2.7";
       "rimraf-1.0.9" = self.by-version."rimraf"."1.0.9";
@@ -48454,7 +50353,7 @@
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "deep-equal-1.0.1" = self.by-version."deep-equal"."1.0.1";
-      "i-0.3.4" = self.by-version."i"."0.3.4";
+      "i-0.3.5" = self.by-version."i"."0.3.5";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "ncp-0.4.2" = self.by-version."ncp"."0.4.2";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
@@ -48510,16 +50409,36 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."uuid"."^2.0.1" =
-    self.by-version."uuid"."2.0.1";
-  by-version."uuid"."2.0.1" = self.buildNodePackage {
-    name = "uuid-2.0.1";
-    version = "2.0.1";
+  by-spec."uue"."^3.0.0" =
+    self.by-version."uue"."3.0.0";
+  by-version."uue"."3.0.0" = self.buildNodePackage {
+    name = "uue-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz";
-      name = "uuid-2.0.1.tgz";
-      sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac";
+      url = "https://registry.npmjs.org/uue/-/uue-3.0.0.tgz";
+      name = "uue-3.0.0.tgz";
+      sha1 = "07af69344defa9851b7b845c1c18110b8264e51e";
+    };
+    deps = {
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."uuid"."^2.0.1" =
+    self.by-version."uuid"."2.0.2";
+  by-version."uuid"."2.0.2" = self.buildNodePackage {
+    name = "uuid-2.0.2";
+    version = "2.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/uuid/-/uuid-2.0.2.tgz";
+      name = "uuid-2.0.2.tgz";
+      sha1 = "48bd5698f0677e3c7901a1c46ef15b1643794726";
     };
     deps = {
     };
@@ -48529,22 +50448,24 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."uuid"."^2.0.2" =
+    self.by-version."uuid"."2.0.2";
   by-spec."uuid"."~2.0.1" =
-    self.by-version."uuid"."2.0.1";
+    self.by-version."uuid"."2.0.2";
   by-spec."v8-debug"."~0.7.1" =
-    self.by-version."v8-debug"."0.7.1";
-  by-version."v8-debug"."0.7.1" = self.buildNodePackage {
-    name = "v8-debug-0.7.1";
-    version = "0.7.1";
+    self.by-version."v8-debug"."0.7.7";
+  by-version."v8-debug"."0.7.7" = self.buildNodePackage {
+    name = "v8-debug-0.7.7";
+    version = "0.7.7";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/v8-debug/-/v8-debug-0.7.1.tgz";
-      name = "v8-debug-0.7.1.tgz";
-      sha1 = "705e65fa77f936dfef6b70a770df11eefde6580e";
+      url = "https://registry.npmjs.org/v8-debug/-/v8-debug-0.7.7.tgz";
+      name = "v8-debug-0.7.7.tgz";
+      sha1 = "c0a14e7d2957209da2508f63a251ce3ffeeb4935";
     };
     deps = {
-      "nan-2.2.1" = self.by-version."nan"."2.2.1";
-      "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
+      "node-pre-gyp-0.6.28" = self.by-version."node-pre-gyp"."0.6.28";
     };
     optionalDependencies = {
     };
@@ -48553,19 +50474,19 @@
     cpu = [ ];
   };
   by-spec."v8-profiler"."~5.6.0" =
-    self.by-version."v8-profiler"."5.6.0";
-  by-version."v8-profiler"."5.6.0" = self.buildNodePackage {
-    name = "v8-profiler-5.6.0";
-    version = "5.6.0";
+    self.by-version."v8-profiler"."5.6.5";
+  by-version."v8-profiler"."5.6.5" = self.buildNodePackage {
+    name = "v8-profiler-5.6.5";
+    version = "5.6.5";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.6.0.tgz";
-      name = "v8-profiler-5.6.0.tgz";
-      sha1 = "e85bbcd71a94a827ca42a33f63f7d01f54f1c24d";
+      url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.6.5.tgz";
+      name = "v8-profiler-5.6.5.tgz";
+      sha1 = "8b22e6ff3b76a1c75b1d53fd18d58e3f0a46f5be";
     };
     deps = {
-      "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26";
-      "nan-2.0.9" = self.by-version."nan"."2.0.9";
+      "nan-2.3.5" = self.by-version."nan"."2.3.5";
+      "node-pre-gyp-0.6.28" = self.by-version."node-pre-gyp"."0.6.28";
     };
     optionalDependencies = {
     };
@@ -48593,6 +50514,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."vali-date"."^1.0.0" =
+    self.by-version."vali-date"."1.0.0";
+  by-version."vali-date"."1.0.0" = self.buildNodePackage {
+    name = "vali-date-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz";
+      name = "vali-date-1.0.0.tgz";
+      sha1 = "1b904a59609fb328ef078138420934f6b86709a6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."valid-identifier"."0.0.1" =
     self.by-version."valid-identifier"."0.0.1";
   by-version."valid-identifier"."0.0.1" = self.buildNodePackage {
@@ -49041,8 +50981,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."vinyl"."^0.4.6" =
-    self.by-version."vinyl"."0.4.6";
   by-spec."vinyl"."^0.5.0" =
     self.by-version."vinyl"."0.5.3";
   by-version."vinyl"."0.5.3" = self.buildNodePackage {
@@ -49065,6 +51003,30 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."vinyl"."^1.0.0" =
+    self.by-version."vinyl"."1.1.1";
+  by-version."vinyl"."1.1.1" = self.buildNodePackage {
+    name = "vinyl-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/vinyl/-/vinyl-1.1.1.tgz";
+      name = "vinyl-1.1.1.tgz";
+      sha1 = "7940887eef09381eb3626ac4c0f9ab53d4b7e450";
+    };
+    deps = {
+      "clone-1.0.2" = self.by-version."clone"."1.0.2";
+      "clone-stats-0.0.1" = self.by-version."clone-stats"."0.0.1";
+      "replace-ext-0.0.1" = self.by-version."replace-ext"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."vinyl"."^1.1.1" =
+    self.by-version."vinyl"."1.1.1";
   by-spec."vinyl-fs"."^0.3.0" =
     self.by-version."vinyl-fs"."0.3.14";
   by-version."vinyl-fs"."0.3.14" = self.buildNodePackage {
@@ -49092,8 +51054,42 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."vinyl-fs"."^0.3.13" =
-    self.by-version."vinyl-fs"."0.3.14";
+  by-spec."vinyl-fs"."^2.4.3" =
+    self.by-version."vinyl-fs"."2.4.3";
+  by-version."vinyl-fs"."2.4.3" = self.buildNodePackage {
+    name = "vinyl-fs-2.4.3";
+    version = "2.4.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.3.tgz";
+      name = "vinyl-fs-2.4.3.tgz";
+      sha1 = "3d97e562ebfdd4b66921dea70626b84bde9d2d07";
+    };
+    deps = {
+      "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3";
+      "glob-stream-5.3.2" = self.by-version."glob-stream"."5.3.2";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
+      "gulp-sourcemaps-1.6.0" = self.by-version."gulp-sourcemaps"."1.6.0";
+      "is-valid-glob-0.3.0" = self.by-version."is-valid-glob"."0.3.0";
+      "lazystream-1.0.0" = self.by-version."lazystream"."1.0.0";
+      "lodash.isequal-4.2.0" = self.by-version."lodash.isequal"."4.2.0";
+      "merge-stream-1.0.0" = self.by-version."merge-stream"."1.0.0";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
+      "readable-stream-2.1.4" = self.by-version."readable-stream"."2.1.4";
+      "strip-bom-2.0.0" = self.by-version."strip-bom"."2.0.0";
+      "strip-bom-stream-1.0.0" = self.by-version."strip-bom-stream"."1.0.0";
+      "through2-2.0.1" = self.by-version."through2"."2.0.1";
+      "through2-filter-2.0.0" = self.by-version."through2-filter"."2.0.0";
+      "vali-date-1.0.0" = self.by-version."vali-date"."1.0.0";
+      "vinyl-1.1.1" = self.by-version."vinyl"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."vm-browserify"."0.0.4" =
     self.by-version."vm-browserify"."0.0.4";
   by-version."vm-browserify"."0.0.4" = self.buildNodePackage {
@@ -49242,43 +51238,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."watchpack"."^0.2.1" =
-    self.by-version."watchpack"."0.2.9";
-  by-version."watchpack"."0.2.9" = self.buildNodePackage {
-    name = "watchpack-0.2.9";
-    version = "0.2.9";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz";
-      name = "watchpack-0.2.9.tgz";
-      sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b";
-    };
-    deps = {
-      "async-0.9.2" = self.by-version."async"."0.9.2";
-      "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."watchpack"."^1.0.0" =
-    self.by-version."watchpack"."1.0.1";
-  by-version."watchpack"."1.0.1" = self.buildNodePackage {
-    name = "watchpack-1.0.1";
-    version = "1.0.1";
+    self.by-version."watchpack"."1.1.0";
+  by-version."watchpack"."1.1.0" = self.buildNodePackage {
+    name = "watchpack-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/watchpack/-/watchpack-1.0.1.tgz";
-      name = "watchpack-1.0.1.tgz";
-      sha1 = "3e37162267624543da11d9cf4cce5d0f455841e6";
+      url = "https://registry.npmjs.org/watchpack/-/watchpack-1.1.0.tgz";
+      name = "watchpack-1.1.0.tgz";
+      sha1 = "42d44627464a2fadffc9308c0f7562cfde795f24";
     };
     deps = {
-      "async-0.9.2" = self.by-version."async"."0.9.2";
-      "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "async-2.0.0-rc.4" = self.by-version."async"."2.0.0-rc.4";
+      "chokidar-1.5.2" = self.by-version."chokidar"."1.5.2";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
     };
     optionalDependencies = {
     };
@@ -49287,15 +51261,15 @@
     cpu = [ ];
   };
   by-spec."wcwidth"."^1.0.0" =
-    self.by-version."wcwidth"."1.0.0";
-  by-version."wcwidth"."1.0.0" = self.buildNodePackage {
-    name = "wcwidth-1.0.0";
-    version = "1.0.0";
+    self.by-version."wcwidth"."1.0.1";
+  by-version."wcwidth"."1.0.1" = self.buildNodePackage {
+    name = "wcwidth-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz";
-      name = "wcwidth-1.0.0.tgz";
-      sha1 = "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f";
+      url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz";
+      name = "wcwidth-1.0.1.tgz";
+      sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8";
     };
     deps = {
       "defaults-1.0.3" = self.by-version."defaults"."1.0.3";
@@ -49379,91 +51353,35 @@
   };
   "webdrvr" = self.by-version."webdrvr"."2.43.0-1";
   by-spec."webpack"."*" =
-    self.by-version."webpack"."2.1.0-beta.4";
-  by-version."webpack"."2.1.0-beta.4" = self.buildNodePackage {
-    name = "webpack-2.1.0-beta.4";
-    version = "2.1.0-beta.4";
+    self.by-version."webpack"."2.1.0-beta.13";
+  by-version."webpack"."2.1.0-beta.13" = self.buildNodePackage {
+    name = "webpack-2.1.0-beta.13";
+    version = "2.1.0-beta.13";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-2.1.0-beta.4.tgz";
-      name = "webpack-2.1.0-beta.4.tgz";
-      sha1 = "934a5d4fc43d2a7b1ef2f2d1a07d33e8f5f3be95";
+      url = "https://registry.npmjs.org/webpack/-/webpack-2.1.0-beta.13.tgz";
+      name = "webpack-2.1.0-beta.13.tgz";
+      sha1 = "d4b82a42a7cd397580611121b4c451bfe9ec7fde";
     };
     deps = {
-      "acorn-3.0.4" = self.by-version."acorn"."3.0.4";
+      "acorn-3.2.0" = self.by-version."acorn"."3.2.0";
       "async-1.5.2" = self.by-version."async"."1.5.2";
       "clone-1.0.2" = self.by-version."clone"."1.0.2";
       "enhanced-resolve-2.2.2" = self.by-version."enhanced-resolve"."2.2.2";
-      "interpret-1.0.0" = self.by-version."interpret"."1.0.0";
+      "interpret-1.0.1" = self.by-version."interpret"."1.0.1";
       "loader-runner-2.1.1" = self.by-version."loader-runner"."2.1.1";
-      "loader-utils-0.2.13" = self.by-version."loader-utils"."0.2.13";
+      "loader-utils-0.2.15" = self.by-version."loader-utils"."0.2.15";
       "memory-fs-0.3.0" = self.by-version."memory-fs"."0.3.0";
       "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "node-libs-browser-1.0.0" = self.by-version."node-libs-browser"."1.0.0";
-      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
-      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
+      "object-assign-4.1.0" = self.by-version."object-assign"."4.1.0";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
       "supports-color-3.1.2" = self.by-version."supports-color"."3.1.2";
       "tapable-0.2.4" = self.by-version."tapable"."0.2.4";
       "uglify-js-2.6.2" = self.by-version."uglify-js"."2.6.2";
-      "watchpack-1.0.1" = self.by-version."watchpack"."1.0.1";
-      "webpack-sources-0.1.1" = self.by-version."webpack-sources"."0.1.1";
-      "yargs-3.32.0" = self.by-version."yargs"."3.32.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "webpack" = self.by-version."webpack"."2.1.0-beta.4";
-  by-spec."webpack"."^1.12.9" =
-    self.by-version."webpack"."1.12.14";
-  by-version."webpack"."1.12.14" = self.buildNodePackage {
-    name = "webpack-1.12.14";
-    version = "1.12.14";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-1.12.14.tgz";
-      name = "webpack-1.12.14.tgz";
-      sha1 = "365517443abfb3cb43299ea444655be89aff91d5";
-    };
-    deps = {
-      "async-1.5.2" = self.by-version."async"."1.5.2";
-      "clone-1.0.2" = self.by-version."clone"."1.0.2";
-      "enhanced-resolve-0.9.1" = self.by-version."enhanced-resolve"."0.9.1";
-      "esprima-2.7.2" = self.by-version."esprima"."2.7.2";
-      "interpret-0.6.6" = self.by-version."interpret"."0.6.6";
-      "loader-utils-0.2.13" = self.by-version."loader-utils"."0.2.13";
-      "memory-fs-0.3.0" = self.by-version."memory-fs"."0.3.0";
-      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
-      "node-libs-browser-0.5.3" = self.by-version."node-libs-browser"."0.5.3";
-      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-      "supports-color-3.1.2" = self.by-version."supports-color"."3.1.2";
-      "tapable-0.1.10" = self.by-version."tapable"."0.1.10";
-      "uglify-js-2.6.2" = self.by-version."uglify-js"."2.6.2";
-      "watchpack-0.2.9" = self.by-version."watchpack"."0.2.9";
-      "webpack-core-0.6.8" = self.by-version."webpack-core"."0.6.8";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."webpack-core"."~0.6.0" =
-    self.by-version."webpack-core"."0.6.8";
-  by-version."webpack-core"."0.6.8" = self.buildNodePackage {
-    name = "webpack-core-0.6.8";
-    version = "0.6.8";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz";
-      name = "webpack-core-0.6.8.tgz";
-      sha1 = "edf9135de00a6a3c26dd0f14b208af0aa4af8d0a";
-    };
-    deps = {
-      "source-map-0.4.4" = self.by-version."source-map"."0.4.4";
-      "source-list-map-0.1.6" = self.by-version."source-list-map"."0.1.6";
+      "watchpack-1.1.0" = self.by-version."watchpack"."1.1.0";
+      "webpack-sources-0.1.2" = self.by-version."webpack-sources"."0.1.2";
+      "yargs-4.7.1" = self.by-version."yargs"."4.7.1";
     };
     optionalDependencies = {
     };
@@ -49471,19 +51389,20 @@
     os = [ ];
     cpu = [ ];
   };
+  "webpack" = self.by-version."webpack"."2.1.0-beta.13";
   by-spec."webpack-sources"."^0.1.0" =
-    self.by-version."webpack-sources"."0.1.1";
-  by-version."webpack-sources"."0.1.1" = self.buildNodePackage {
-    name = "webpack-sources-0.1.1";
-    version = "0.1.1";
+    self.by-version."webpack-sources"."0.1.2";
+  by-version."webpack-sources"."0.1.2" = self.buildNodePackage {
+    name = "webpack-sources-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.1.tgz";
-      name = "webpack-sources-0.1.1.tgz";
-      sha1 = "a71dd7c0ca3e264af088804bc384d93fad0442b6";
+      url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.2.tgz";
+      name = "webpack-sources-0.1.2.tgz";
+      sha1 = "057a3f3255f8ba561b901d9150589aa103a57e65";
     };
     deps = {
-      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
+      "source-map-0.5.6" = self.by-version."source-map"."0.5.6";
       "source-list-map-0.1.6" = self.by-version."source-list-map"."0.1.6";
     };
     optionalDependencies = {
@@ -49493,15 +51412,15 @@
     cpu = [ ];
   };
   by-spec."websocket-driver".">=0.5.1" =
-    self.by-version."websocket-driver"."0.6.4";
-  by-version."websocket-driver"."0.6.4" = self.buildNodePackage {
-    name = "websocket-driver-0.6.4";
-    version = "0.6.4";
+    self.by-version."websocket-driver"."0.6.5";
+  by-version."websocket-driver"."0.6.5" = self.buildNodePackage {
+    name = "websocket-driver-0.6.5";
+    version = "0.6.5";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.4.tgz";
-      name = "websocket-driver-0.6.4.tgz";
-      sha1 = "65b84d02113480d3fc05e63e809322042bdc940b";
+      url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz";
+      name = "websocket-driver-0.6.5.tgz";
+      sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36";
     };
     deps = {
       "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1";
@@ -49532,21 +51451,21 @@
     cpu = [ ];
   };
   by-spec."websocket-stream"."^3.0.1" =
-    self.by-version."websocket-stream"."3.1.0";
-  by-version."websocket-stream"."3.1.0" = self.buildNodePackage {
-    name = "websocket-stream-3.1.0";
-    version = "3.1.0";
+    self.by-version."websocket-stream"."3.2.1";
+  by-version."websocket-stream"."3.2.1" = self.buildNodePackage {
+    name = "websocket-stream-3.2.1";
+    version = "3.2.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.1.0.tgz";
-      name = "websocket-stream-3.1.0.tgz";
-      sha1 = "c6d9d13230b77e474c4b6736c295bba77cdd7f87";
+      url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.2.1.tgz";
+      name = "websocket-stream-3.2.1.tgz";
+      sha1 = "344629940eb8efd580fed0fde6d0617b44222335";
     };
     deps = {
       "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "through2-2.0.1" = self.by-version."through2"."2.0.1";
-      "ws-1.0.1" = self.by-version."ws"."1.0.1";
+      "ws-1.1.0" = self.by-version."ws"."1.1.0";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
@@ -49556,15 +51475,15 @@
     cpu = [ ];
   };
   by-spec."whatwg-fetch".">=0.10.0" =
-    self.by-version."whatwg-fetch"."0.11.0";
-  by-version."whatwg-fetch"."0.11.0" = self.buildNodePackage {
-    name = "whatwg-fetch-0.11.0";
-    version = "0.11.0";
+    self.by-version."whatwg-fetch"."1.0.0";
+  by-version."whatwg-fetch"."1.0.0" = self.buildNodePackage {
+    name = "whatwg-fetch-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.11.0.tgz";
-      name = "whatwg-fetch-0.11.0.tgz";
-      sha1 = "46b1d18d0aa99955971ef1a2f5aac506add28815";
+      url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-1.0.0.tgz";
+      name = "whatwg-fetch-1.0.0.tgz";
+      sha1 = "01c2ac4df40e236aaa18480e3be74bd5c8eb798e";
     };
     deps = {
     };
@@ -49612,19 +51531,37 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."which"."1" =
-    self.by-version."which"."1.2.4";
-  by-version."which"."1.2.4" = self.buildNodePackage {
-    name = "which-1.2.4";
-    version = "1.2.4";
-    bin = true;
+  by-spec."whet.extend"."~0.9.9" =
+    self.by-version."whet.extend"."0.9.9";
+  by-version."whet.extend"."0.9.9" = self.buildNodePackage {
+    name = "whet.extend-0.9.9";
+    version = "0.9.9";
+    bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/which/-/which-1.2.4.tgz";
-      name = "which-1.2.4.tgz";
-      sha1 = "1557f96080604e5b11b3599eb9f45b50a9efd722";
+      url = "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz";
+      name = "whet.extend-0.9.9.tgz";
+      sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."which"."1" =
+    self.by-version."which"."1.2.10";
+  by-version."which"."1.2.10" = self.buildNodePackage {
+    name = "which-1.2.10";
+    version = "1.2.10";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/which/-/which-1.2.10.tgz";
+      name = "which-1.2.10.tgz";
+      sha1 = "91cd9bd0751322411b659b40f054b21de957ab2d";
     };
     deps = {
-      "is-absolute-0.1.7" = self.by-version."is-absolute"."0.1.7";
       "isexe-1.1.2" = self.by-version."isexe"."1.1.2";
     };
     optionalDependencies = {
@@ -49634,11 +51571,11 @@
     cpu = [ ];
   };
   by-spec."which"."^1.0.7" =
-    self.by-version."which"."1.2.4";
+    self.by-version."which"."1.2.10";
   by-spec."which"."^1.1.1" =
-    self.by-version."which"."1.2.4";
+    self.by-version."which"."1.2.10";
   by-spec."which"."^1.2.1" =
-    self.by-version."which"."1.2.4";
+    self.by-version."which"."1.2.10";
   by-spec."which"."~1.0.5" =
     self.by-version."which"."1.0.9";
   by-version."which"."1.0.9" = self.buildNodePackage {
@@ -49659,11 +51596,33 @@
     cpu = [ ];
   };
   by-spec."which"."~1.2.1" =
-    self.by-version."which"."1.2.4";
+    self.by-version."which"."1.2.10";
   by-spec."which"."~1.2.2" =
-    self.by-version."which"."1.2.4";
-  by-spec."which"."~1.2.4" =
-    self.by-version."which"."1.2.4";
+    self.by-version."which"."1.2.10";
+  by-spec."which"."~1.2.8" =
+    self.by-version."which"."1.2.10";
+  by-spec."which"."~1.2.9" =
+    self.by-version."which"."1.2.10";
+  by-spec."wide-align"."^1.1.0" =
+    self.by-version."wide-align"."1.1.0";
+  by-version."wide-align"."1.1.0" = self.buildNodePackage {
+    name = "wide-align-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz";
+      name = "wide-align-1.1.0.tgz";
+      sha1 = "40edde802a71fea1f070da3e62dcda2e7add96ad";
+    };
+    deps = {
+      "string-width-1.0.1" = self.by-version."string-width"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."win-detect-browsers"."^1.0.1" =
     self.by-version."win-detect-browsers"."1.0.2";
   by-version."win-detect-browsers"."1.0.2" = self.buildNodePackage {
@@ -49678,7 +51637,7 @@
     deps = {
       "after-0.8.1" = self.by-version."after"."0.8.1";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "which-1.2.4" = self.by-version."which"."1.2.4";
+      "which-1.2.10" = self.by-version."which"."1.2.10";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
       "yargs-1.3.3" = self.by-version."yargs"."1.3.3";
     };
@@ -49688,6 +51647,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."win-release"."^1.0.0" =
+    self.by-version."win-release"."1.1.1";
+  by-version."win-release"."1.1.1" = self.buildNodePackage {
+    name = "win-release-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz";
+      name = "win-release-1.1.1.tgz";
+      sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209";
+    };
+    deps = {
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."window-size"."0.1.0" =
     self.by-version."window-size"."0.1.0";
   by-version."window-size"."0.1.0" = self.buildNodePackage {
@@ -49728,6 +51707,25 @@
   };
   by-spec."window-size"."^0.1.4" =
     self.by-version."window-size"."0.1.4";
+  by-spec."window-size"."^0.2.0" =
+    self.by-version."window-size"."0.2.0";
+  by-version."window-size"."0.2.0" = self.buildNodePackage {
+    name = "window-size-0.2.0";
+    version = "0.2.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
+      name = "window-size-0.2.0.tgz";
+      sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."windows-no-runnable"."~0.0.6" =
     self.by-version."windows-no-runnable"."0.0.6";
   by-version."windows-no-runnable"."0.0.6" = self.buildNodePackage {
@@ -50108,15 +52106,15 @@
     cpu = [ ];
   };
   by-spec."wrappy"."1" =
-    self.by-version."wrappy"."1.0.1";
-  by-version."wrappy"."1.0.1" = self.buildNodePackage {
-    name = "wrappy-1.0.1";
-    version = "1.0.1";
+    self.by-version."wrappy"."1.0.2";
+  by-version."wrappy"."1.0.2" = self.buildNodePackage {
+    name = "wrappy-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz";
-      name = "wrappy-1.0.1.tgz";
-      sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739";
+      url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+      name = "wrappy-1.0.2.tgz";
+      sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
     };
     deps = {
     };
@@ -50127,7 +52125,7 @@
     cpu = [ ];
   };
   by-spec."wrappy"."~1.0.1" =
-    self.by-version."wrappy"."1.0.1";
+    self.by-version."wrappy"."1.0.2";
   by-spec."wrench"."1.5.8" =
     self.by-version."wrench"."1.5.8";
   by-version."wrench"."1.5.8" = self.buildNodePackage {
@@ -50179,7 +52177,7 @@
       sha1 = "b1f52dc2e8dc0e3cb04d187a25f758a38a90ca3b";
     };
     deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "graceful-fs-4.1.4" = self.by-version."graceful-fs"."4.1.4";
       "imurmurhash-0.1.4" = self.by-version."imurmurhash"."0.1.4";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
     };
@@ -50281,12 +52279,29 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ws"."^0.8.0" =
-    self.by-version."ws"."0.8.1";
   by-spec."ws"."^1.0.0" =
-    self.by-version."ws"."1.0.1";
+    self.by-version."ws"."1.1.0";
+  by-version."ws"."1.1.0" = self.buildNodePackage {
+    name = "ws-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ws/-/ws-1.1.0.tgz";
+      name = "ws-1.1.0.tgz";
+      sha1 = "c1d6fd1515d3ceff1f0ae2759bf5fd77030aad1d";
+    };
+    deps = {
+      "options-0.0.6" = self.by-version."options"."0.0.6";
+      "ultron-1.0.2" = self.by-version."ultron"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."ws"."^1.0.1" =
-    self.by-version."ws"."1.0.1";
+    self.by-version."ws"."1.1.0";
   by-spec."wu"."*" =
     self.by-version."wu"."2.1.0";
   by-version."wu"."2.1.0" = self.buildNodePackage {
@@ -50328,18 +52343,18 @@
     cpu = [ ];
   };
   by-spec."x509"."*" =
-    self.by-version."x509"."0.2.4";
-  by-version."x509"."0.2.4" = self.buildNodePackage {
-    name = "x509-0.2.4";
-    version = "0.2.4";
+    self.by-version."x509"."0.2.5";
+  by-version."x509"."0.2.5" = self.buildNodePackage {
+    name = "x509-0.2.5";
+    version = "0.2.5";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/x509/-/x509-0.2.4.tgz";
-      name = "x509-0.2.4.tgz";
-      sha1 = "f3310792471f85122640a7206d88d3d1fa1956b5";
+      url = "https://registry.npmjs.org/x509/-/x509-0.2.5.tgz";
+      name = "x509-0.2.5.tgz";
+      sha1 = "2981c64dae023f2b21be08c0f2491a8e72bcbd78";
     };
     deps = {
-      "nan-2.0.9" = self.by-version."nan"."2.0.9";
+      "nan-2.2.0" = self.by-version."nan"."2.2.0";
     };
     optionalDependencies = {
     };
@@ -50347,21 +52362,22 @@
     os = [ ];
     cpu = [ ];
   };
-  "x509" = self.by-version."x509"."0.2.4";
-  by-spec."xcode"."0.8.0" =
-    self.by-version."xcode"."0.8.0";
-  by-version."xcode"."0.8.0" = self.buildNodePackage {
-    name = "xcode-0.8.0";
-    version = "0.8.0";
+  "x509" = self.by-version."x509"."0.2.5";
+  by-spec."xcode"."^0.8.5" =
+    self.by-version."xcode"."0.8.8";
+  by-version."xcode"."0.8.8" = self.buildNodePackage {
+    name = "xcode-0.8.8";
+    version = "0.8.8";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/xcode/-/xcode-0.8.0.tgz";
-      name = "xcode-0.8.0.tgz";
-      sha1 = "fe61edf9cb14f2bb07ca6cafdc864a4b4c1beed9";
+      url = "https://registry.npmjs.org/xcode/-/xcode-0.8.8.tgz";
+      name = "xcode-0.8.8.tgz";
+      sha1 = "1330877c4200f2094009e3bf144e6932596fcca0";
     };
     deps = {
-      "pegjs-0.6.2" = self.by-version."pegjs"."0.6.2";
-      "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "pegjs-0.9.0" = self.by-version."pegjs"."0.9.0";
+      "simple-plist-0.1.4" = self.by-version."simple-plist"."0.1.4";
     };
     optionalDependencies = {
     };
@@ -50578,15 +52594,15 @@
   by-spec."xml2js"."^0.4.4" =
     self.by-version."xml2js"."0.4.16";
   by-spec."xml2json".">=0.3.2" =
-    self.by-version."xml2json"."0.9.0";
-  by-version."xml2json"."0.9.0" = self.buildNodePackage {
-    name = "xml2json-0.9.0";
-    version = "0.9.0";
+    self.by-version."xml2json"."0.9.1";
+  by-version."xml2json"."0.9.1" = self.buildNodePackage {
+    name = "xml2json-0.9.1";
+    version = "0.9.1";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/xml2json/-/xml2json-0.9.0.tgz";
-      name = "xml2json-0.9.0.tgz";
-      sha1 = "cf85a24b1ab0291a409d79bba5c5da720c01ec31";
+      url = "https://registry.npmjs.org/xml2json/-/xml2json-0.9.1.tgz";
+      name = "xml2json-0.9.1.tgz";
+      sha1 = "e0c25cc0adff3974024210ab66d7076f11bec161";
     };
     deps = {
       "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
@@ -50731,7 +52747,7 @@
       sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5";
     };
     deps = {
-      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "lodash-4.13.1" = self.by-version."lodash"."4.13.1";
     };
     optionalDependencies = {
     };
@@ -50894,15 +52910,15 @@
     cpu = [ ];
   };
   by-spec."xregexp"."^3.0.0" =
-    self.by-version."xregexp"."3.1.0";
-  by-version."xregexp"."3.1.0" = self.buildNodePackage {
-    name = "xregexp-3.1.0";
-    version = "3.1.0";
+    self.by-version."xregexp"."3.1.1";
+  by-version."xregexp"."3.1.1" = self.buildNodePackage {
+    name = "xregexp-3.1.1";
+    version = "3.1.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/xregexp/-/xregexp-3.1.0.tgz";
-      name = "xregexp-3.1.0.tgz";
-      sha1 = "14d8461e0bdd38224bfee5039a0898fc42fcd336";
+      url = "https://registry.npmjs.org/xregexp/-/xregexp-3.1.1.tgz";
+      name = "xregexp-3.1.1.tgz";
+      sha1 = "8ee18d75ef5c7cb3f9967f8d29414a6ca5b1a184";
     };
     deps = {
     };
@@ -50995,6 +53011,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."y18n"."^3.2.1" =
+    self.by-version."y18n"."3.2.1";
   by-spec."yallist"."^2.0.0" =
     self.by-version."yallist"."2.0.0";
   by-version."yallist"."2.0.0" = self.buildNodePackage {
@@ -51046,7 +53064,7 @@
     };
     deps = {
       "camelcase-2.1.1" = self.by-version."camelcase"."2.1.1";
-      "cliui-3.1.2" = self.by-version."cliui"."3.1.2";
+      "cliui-3.2.0" = self.by-version."cliui"."3.2.0";
       "decamelize-1.2.0" = self.by-version."decamelize"."1.2.0";
       "os-locale-1.4.0" = self.by-version."os-locale"."1.4.0";
       "string-width-1.0.1" = self.by-version."string-width"."1.0.1";
@@ -51063,6 +53081,38 @@
     self.by-version."yargs"."3.32.0";
   by-spec."yargs"."^3.9.0" =
     self.by-version."yargs"."3.32.0";
+  by-spec."yargs"."^4.7.1" =
+    self.by-version."yargs"."4.7.1";
+  by-version."yargs"."4.7.1" = self.buildNodePackage {
+    name = "yargs-4.7.1";
+    version = "4.7.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/yargs/-/yargs-4.7.1.tgz";
+      name = "yargs-4.7.1.tgz";
+      sha1 = "e60432658a3387ff269c028eacde4a512e438dff";
+    };
+    deps = {
+      "camelcase-3.0.0" = self.by-version."camelcase"."3.0.0";
+      "cliui-3.2.0" = self.by-version."cliui"."3.2.0";
+      "decamelize-1.2.0" = self.by-version."decamelize"."1.2.0";
+      "lodash.assign-4.0.9" = self.by-version."lodash.assign"."4.0.9";
+      "os-locale-1.4.0" = self.by-version."os-locale"."1.4.0";
+      "pkg-conf-1.1.3" = self.by-version."pkg-conf"."1.1.3";
+      "read-pkg-up-1.0.1" = self.by-version."read-pkg-up"."1.0.1";
+      "require-main-filename-1.0.1" = self.by-version."require-main-filename"."1.0.1";
+      "set-blocking-1.0.0" = self.by-version."set-blocking"."1.0.0";
+      "string-width-1.0.1" = self.by-version."string-width"."1.0.1";
+      "window-size-0.2.0" = self.by-version."window-size"."0.2.0";
+      "y18n-3.2.1" = self.by-version."y18n"."3.2.1";
+      "yargs-parser-2.4.0" = self.by-version."yargs-parser"."2.4.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."yargs"."~1.3.1" =
     self.by-version."yargs"."1.3.3";
   by-spec."yargs"."~3.10.0" =
@@ -51138,6 +53188,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."yargs-parser"."^2.4.0" =
+    self.by-version."yargs-parser"."2.4.0";
+  by-version."yargs-parser"."2.4.0" = self.buildNodePackage {
+    name = "yargs-parser-2.4.0";
+    version = "2.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.0.tgz";
+      name = "yargs-parser-2.4.0.tgz";
+      sha1 = "1f367dc9c6cfa5660b6971230f3b277fc5e3adca";
+    };
+    deps = {
+      "camelcase-2.1.1" = self.by-version."camelcase"."2.1.1";
+      "lodash.assign-4.0.9" = self.by-version."lodash.assign"."4.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."yauzl"."2.4.1" =
     self.by-version."yauzl"."2.4.1";
   by-version."yauzl"."2.4.1" = self.buildNodePackage {
@@ -51210,7 +53281,7 @@
     deps = {
       "compress-commons-0.2.9" = self.by-version."compress-commons"."0.2.9";
       "lodash-3.2.0" = self.by-version."lodash"."3.2.0";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-1.0.34" = self.by-version."readable-stream"."1.0.34";
     };
     optionalDependencies = {
     };
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index ceb41e2e1ef2..447fd30060b0 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -136,7 +136,7 @@
 , "optimist"
 , "optparse"
 , "owl-deepcopy"
-, "parsoid"
+, { "parsoid": "0.4.1" }
 , "passport"
 , "passport-http"
 , "passport-local"
@@ -164,6 +164,7 @@
 , "sockjs"
 , "source-map"
 , "stylus"
+, "svgo"
 , "tar"
 , "temp"
 , "tern"

From f28ab85f2e34685bdf72186c0995f3e346adb2bc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Jun 2016 01:06:32 +0300
Subject: [PATCH 191/436] parsoid service: use default node

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

diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix
index ea97d6e30e83..0844190a5490 100644
--- a/nixos/modules/services/misc/parsoid.nix
+++ b/nixos/modules/services/misc/parsoid.nix
@@ -91,7 +91,7 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       serviceConfig = {
-        ExecStart = "${pkgs.nodePackages_0_10.parsoid}/lib/node_modules/parsoid/api/server.js -c ${confFile} -n ${toString cfg.workers}";
+        ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/api/server.js -c ${confFile} -n ${toString cfg.workers}";
       };
     };
 

From 3f241c172c1e8d4d5f9350d5a5bf62037795aa6b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Jun 2016 03:28:50 +0300
Subject: [PATCH 192/436] remarkjs: mark as broken

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

diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix
index 153b165da1e5..180fed4e8971 100644
--- a/pkgs/development/web/remarkjs/default.nix
+++ b/pkgs/development/web/remarkjs/default.nix
@@ -62,5 +62,6 @@ in stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.rickynils ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.mit;
+    broken = true;
   };
 }

From 9ddc8a1a5a2556dd411ea281df293c003c4d89fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 10 Jun 2016 20:49:58 -0300
Subject: [PATCH 193/436] arc-gtk-theme-git: 2016-06-02 -> 2016-06-06

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

diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
index b14746cfec50..025ef0913bea 100644
--- a/pkgs/misc/themes/arc/default.nix
+++ b/pkgs/misc/themes/arc/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  version = "2016-06-02";
+  version = "2016-06-06";
   name = "arc-gtk-theme-${version}";
 
   src = fetchFromGitHub {
     owner = "horst3180";
     repo = "arc-theme";
-    rev = "226098a06b646981022f0e260fd4d3ca64ff5616";
-    sha256 = "1lg2iig1rws2h0p7qy1pavphyzdcchmfdlv126696jczz21d67qm";
+    rev = "d24a7b5b4eb25e1a094bdf4e125332cfb8e2c8c1";
+    sha256 = "07rf21xhyz3if4n5ccmzmjf9rz9w7wkvci7ccivhh6lkillfbxgi";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 659bea9dda982c7bf4518d58ebc7db4186b9fd5b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Jun 2016 03:38:32 +0300
Subject: [PATCH 194/436] dropbear: disable on Darwin

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

diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index d102ef5d7c3c..bc9fb6ee4dee 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     description = "A small footprint implementation of the SSH 2 protocol";
     license = licenses.mit;
     maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }

From 4a0ca7d92ee59c5c033bf7d51e0a8e348e5eef31 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Jun 2016 03:39:44 +0300
Subject: [PATCH 195/436] grub4dos: enable only on Linux

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

diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index 0195022f7038..94a0b3289dd6 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
     homepage = "http://grub4dos.chenall.net/";
     description = "GRUB for DOS is the dos extension of GRUB";
     maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
     license = licenses.gpl2;
   };
 }

From b195bf1ed2dccec652912d23af2ef6a0043821ce Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Jun 2016 03:40:22 +0300
Subject: [PATCH 196/436] dspam: disable on Darwin

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

diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix
index 4c615e6f6b33..1ac47fbf7224 100644
--- a/pkgs/servers/mail/dspam/default.nix
+++ b/pkgs/servers/mail/dspam/default.nix
@@ -102,7 +102,7 @@ in stdenv.mkDerivation rec {
     homepage = http://dspam.nuclearelephant.com/;
     description = "Community Driven Antispam Filter";
     license = licenses.agpl3;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
   };
 }

From da0b516a5f0363be0ed91547f8a9bcef52a60603 Mon Sep 17 00:00:00 2001
From: Christian Lask <christian@hiberno.net>
Date: Sat, 11 Jun 2016 09:55:32 +0200
Subject: [PATCH 197/436] vivaldi: 1.1 -> 1.2

---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 107de6784251..95a1e621b07f 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -10,16 +10,16 @@
 }:
 
 let
-  version = "1.1";
-  build = "453.47-1";
+  version = "1.2";
+  build = "490.39-1";
   fullVersion = "stable_${version}.${build}";
 
   info = if stdenv.is64bit then {
       arch = "amd64";
-      sha256 = "09kadsi4ydjciq092i6linapqzjdzx915zqmz7vfq6w1yp9mqbwq";
+      sha256 = "188fb91f1eb41e1dcaeda982567260adb6c004f4df00de55eed962e6ca7c621e";
     } else {
       arch = "i386";
-      sha256 = "0b5410phnkpg6sz0j345vdn0r6n89rm865bchqw8p4kx7pmy78z3";
+      sha256 = "0c699a0d7ced5e77c41a85e81077a1b4561d64071ec89e0e875a1c55e78634eb";
     };
 in stdenv.mkDerivation rec {
   product    = "vivaldi";

From 94627e658beabf2b4c766d31afa273a55879b46a Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sat, 11 Jun 2016 04:18:26 -0400
Subject: [PATCH 198/436] tmux: enable multiple outputs

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

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index ad15fa98a4b3..feff4b56ed72 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
   name = "tmux-${version}";
   version = "2.2";
 
+  outputs = [ "out" "bin" "man" ];
+
   src = fetchFromGitHub {
     owner = "tmux";
     repo = "tmux";

From ab09c37f999f34adc9c2d7c4450add7f614fc78c Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Thu, 9 Jun 2016 21:20:11 +0200
Subject: [PATCH 199/436] nim: 0.13.0 -> 0.14.2

---
 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 f81370992a65..eef60bcd9675 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "nim-0.13.0";
+  name = "nim-0.14.2";
 
   src = fetchurl {
     url = "http://nim-lang.org/download/${name}.tar.xz";
-    sha256 = "1adiij20n1cigsc44dbp60jdbydmkfp7ixbddmcn6h4dfvjzaqfd";
+    sha256 = "14jy7wza54jawja21r6v676qyj0i9kg1jpn5bxwn8wfm1vbki3cg";
   };
 
   buildPhase   = "sh build.sh";

From a3bff717386bc407e8b9a3c4704e2dcbc033181d Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Thu, 9 Jun 2016 22:40:49 +0200
Subject: [PATCH 200/436] nimble: 0.7.2 -> 0.7.4

---
 pkgs/development/tools/nimble/default.nix | 47 +++++++++++------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/tools/nimble/default.nix b/pkgs/development/tools/nimble/default.nix
index 10a19d9e0963..51fa9cad0d5b 100644
--- a/pkgs/development/tools/nimble/default.nix
+++ b/pkgs/development/tools/nimble/default.nix
@@ -1,37 +1,36 @@
-{ stdenv, fetchFromGitHub, nim }:
+{ stdenv, fetchFromGitHub, nim, openssl }:
 
-let
-  srcs = {
-    nimble = fetchFromGitHub {
-      owner = "nim-lang";
-      repo = "nimble";
-      rev = "v0.7.2";
-      sha256 = "0j9b519cv91xwn6k0alynakh7grbq4m6yy5bdwdrqmc7lag35r0i";
-    };
-    nim = fetchFromGitHub {
-      owner = "nim-lang";
-      repo = "nim";
-      rev = "v0.13.0";
-      sha256 = "14grhkwdva4wmvihm1413ly86sf0qk96bd473pvsbgkp46cg8rii";
-    };
-  };
-in
 stdenv.mkDerivation rec {
   name = "nimble-${version}";
-  version = "0.7.2";
 
-  src = srcs.nimble;
+  version = "0.7.4";
+
+  src = fetchFromGitHub {
+    owner = "nim-lang";
+    repo = "nimble";
+    rev = "v${version}";
+    sha256 = "1l477f1zlqpc738jg47pz599cwjasgy9jqdsplj3ywd12xfqpc96";
+  };
 
   buildInputs = [ nim ];
 
-  postUnpack = ''
-    mkdir -p $sourceRoot/vendor
-    ln -s ${srcs.nim} $sourceRoot/vendor/nim
+  patchPhase = ''
+    substituteInPlace src/nimble.nim.cfg --replace "./vendor/nim" "${nim}/share"
   '';
-  buildPhase   = ''
+
+  buildPhase = ''
     nim c src/nimble
   '';
-  installPhase = "installBin src/nimble";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp src/nimble $out/bin
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.cc.libc openssl]}" \
+        --add-needed libcrypto.so \
+        "$out/bin/nimble"
+  '';
+
+  dontStrip = true;
 
   meta = with stdenv.lib; {
     description = "Package manager for the Nim programming language";

From dbed53a79f335535e3ca2610d0e3d154a2243151 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sat, 11 Jun 2016 16:44:57 +0200
Subject: [PATCH 201/436] gnome3: add gnome-session debug option

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 91601f387cbe..700faad0c695 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -78,6 +78,8 @@ in {
         type = types.listOf types.path;
         description = "List of packages for which gsettings are overridden.";
       };
+
+      debug = mkEnableOption "gnome-session debug messages";
     };  
 
     environment.gnome3.packageSet = mkOption {
@@ -159,7 +161,7 @@ in {
           # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
           ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
 
-          ${gnome3.gnome_session}/bin/gnome-session&
+          ${gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
           waitPID=$!
         '';
       };

From beb4182cc8a7072d9c331643c7e2a6d81767b654 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sat, 11 Jun 2016 16:45:27 +0200
Subject: [PATCH 202/436] gnome3.gdm: fix version 3.14 for being used with
 gnome-shell 3.20. Closes #16063

---
 pkgs/desktops/gnome-3/3.20/core/gdm/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.20/core/gdm/default.nix
index 0d21bf546665..4b951ce5adea 100644
--- a/pkgs/desktops/gnome-3/3.20/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gdm/default.nix
@@ -33,6 +33,10 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
 
+  postInstall = ''
+    mv $out/share/gdm/greeter/applications/gnome-shell.desktop $out/share/gdm/greeter/applications/org.gnome.Shell.desktop
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GDM;
     description = "A program that manages graphical display servers and handles graphical user logins";

From 7d02cc1dd50766058b2ec2c6d3a741d96db5d27b Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 11 Jun 2016 18:53:30 +0200
Subject: [PATCH 203/436] all-packages references to Go packages includes all
 outputs

---
 doc/languages-frameworks/go.xml | 19 ++++++++++++++
 pkgs/top-level/all-packages.nix | 46 ++++++++++++++++-----------------
 2 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
index 520c338b9a87..7365f5abe681 100644
--- a/doc/languages-frameworks/go.xml
+++ b/doc/languages-frameworks/go.xml
@@ -140,6 +140,25 @@ the following arguments are of special significance to the function:
 
 </para>
 
+<para>
+  <varname>buildGoPackage</varname> produces <xref linkend='chap-multiple-output' xrefstyle="select: title" />
+  where <varname>bin</varname> includes program binaries. You can test build a Go binary as follows:
+
+  <screen>
+    $ nix-build -A deis.bin
+  </screen>
+
+  or build all outputs with:
+
+  <screen>
+    $ nix-build -A deis.all
+  </screen>
+
+  <varname>bin</varname> output will be installed by default with <varname>nix-env -i</varname>
+  or <varname>systemPackages</varname>.
+
+</para>
+
 <para>
 You may use Go packages installed into the active Nix profiles by adding
 the following to your ~/.bashrc:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75fdb3c2ea35..b7b3c4950ebf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -446,7 +446,7 @@ in
 
   ascii = callPackage ../tools/text/ascii { };
 
-  asciinema = (callPackage ../tools/misc/asciinema {}).bin;
+  asciinema = callPackage ../tools/misc/asciinema {};
 
   asymptote = callPackage ../tools/graphics/asymptote {
     texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; };
@@ -730,7 +730,7 @@ in
 
   ddate = callPackage ../tools/misc/ddate { };
 
-  deis = (callPackage ../development/tools/deis {}).bin;
+  deis = callPackage ../development/tools/deis {};
 
   dfilemanager = self.kde5.dfilemanager;
 
@@ -819,7 +819,7 @@ in
 
   heatseeker = callPackage ../tools/misc/heatseeker { };
 
-  interlock = (callPackage ../servers/interlock {}).bin;
+  interlock = callPackage ../servers/interlock {};
 
   mathics = pythonPackages.mathics;
 
@@ -881,7 +881,7 @@ in
 
   mcrypt = callPackage ../tools/misc/mcrypt { };
 
-  mongodb-tools = (callPackage ../tools/misc/mongodb-tools { }).bin;
+  mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
 
   mstflint = callPackage ../tools/misc/mstflint { };
 
@@ -1514,7 +1514,7 @@ in
     inherit (perlPackages) ImageExifTool JSON;
   };
 
-  flannel = (callPackage ../tools/networking/flannel {}).bin;
+  flannel = callPackage ../tools/networking/flannel { };
 
   flashbench = callPackage ../os-specific/linux/flashbench { };
 
@@ -1644,7 +1644,7 @@ in
   gawkInteractive = appendToName "interactive"
     (gawk.override { interactive = true; });
 
-  gawp = (callPackage ../tools/misc/gawp {}).bin;
+  gawp = callPackage ../tools/misc/gawp { };
 
   gazeboSimulator = recurseIntoAttrs {
     sdformat = gazeboSimulator.sdformat4;
@@ -1690,7 +1690,7 @@ in
 
   gifsicle = callPackage ../tools/graphics/gifsicle { };
 
-  git-lfs = (callPackage ../applications/version-management/git-lfs {}).bin;
+  git-lfs = callPackage ../applications/version-management/git-lfs { };
 
   gitfs = callPackage ../tools/filesystems/gitfs { };
 
@@ -1758,14 +1758,14 @@ in
 
   goaccess = callPackage ../tools/misc/goaccess { };
 
-  go-mtpfs = (callPackage ../tools/filesystems/go-mtpfs { }).bin;
+  go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
 
-  go-pup = (callPackage ../development/tools/pup { }).bin;
+  go-pup = callPackage ../development/tools/pup { };
 
-  go-sct = (callPackage ../tools/X11/go-sct { }).bin;
+  go-sct = callPackage ../tools/X11/go-sct { };
 
   # rename to upower-notify?
-  go-upower-notify = (callPackage ../tools/misc/upower-notify { }).bin;
+  go-upower-notify = callPackage ../tools/misc/upower-notify { };
 
   googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
 
@@ -2350,7 +2350,7 @@ in
   lshw = callPackage ../tools/system/lshw { };
 
   lxc = callPackage ../os-specific/linux/lxc { };
-  lxd = (callPackage ../tools/admin/lxd { }).bin;
+  lxd = callPackage ../tools/admin/lxd { };
 
   lzip = callPackage ../tools/compression/lzip { };
 
@@ -2607,7 +2607,7 @@ in
 
   ngrep = callPackage ../tools/networking/ngrep { };
 
-  ngrok = (callPackage ../tools/networking/ngrok { }).bin;
+  ngrok = callPackage ../tools/networking/ngrok { };
 
   noip = callPackage ../tools/networking/noip { };
 
@@ -3237,7 +3237,7 @@ in
 
   s3cmd = callPackage ../tools/networking/s3cmd { };
 
-  s3gof3r = (callPackage ../tools/networking/s3gof3r { }).bin;
+  s3gof3r = callPackage ../tools/networking/s3gof3r { };
 
   s6Dns = callPackage ../tools/networking/s6-dns { };
 
@@ -3329,7 +3329,7 @@ in
 
   skippy-xd = callPackage ../tools/X11/skippy-xd {};
 
-  skydns = (callPackage ../servers/skydns { }).bin;
+  skydns = callPackage ../servers/skydns { };
 
   sipcalc = callPackage ../tools/networking/sipcalc { };
 
@@ -3714,7 +3714,7 @@ in
 
   weather = callPackage ../applications/misc/weather { };
 
-  wego = (callPackage ../applications/misc/wego { }).bin;
+  wego = callPackage ../applications/misc/wego { };
 
   wal_e = callPackage ../tools/backup/wal-e { };
 
@@ -3740,7 +3740,7 @@ in
 
   testdisk = callPackage ../tools/misc/testdisk { };
 
-  textql = (callPackage ../development/tools/textql { }).bin;
+  textql = callPackage ../development/tools/textql { };
 
   html2text = callPackage ../tools/text/html2text { };
 
@@ -4085,7 +4085,7 @@ in
 
   mksh = callPackage ../shells/mksh { };
 
-  oh = (callPackage ../shells/oh { }).bin;
+  oh = callPackage ../shells/oh { };
 
   pash = callPackage ../shells/pash { };
 
@@ -4551,9 +4551,9 @@ in
 
   go = self.go_1_6;
 
-  go-repo-root = (callPackage ../development/tools/go-repo-root { }).bin;
+  go-repo-root = callPackage ../development/tools/go-repo-root { };
 
-  gox = (callPackage ../development/tools/gox { }).bin;
+  gox = callPackage ../development/tools/gox { };
 
   gprolog = callPackage ../development/compilers/gprolog { };
 
@@ -5606,7 +5606,7 @@ in
     perf = linuxPackages.perf;
   };
 
-  mesos-dns = (callPackage ../servers/mesos-dns { }).bin;
+  mesos-dns = callPackage ../servers/mesos-dns { };
 
   mujs = callPackage ../development/interpreters/mujs { };
 
@@ -6215,7 +6215,7 @@ in
 
   gob2 = callPackage ../development/tools/misc/gob2 { };
 
-  gotty = (callPackage ../servers/gotty { }).bin;
+  gotty = callPackage ../servers/gotty { };
 
   gradleGen = callPackage ../development/tools/build-managers/gradle { };
   gradle = self.gradleGen.gradleLatest;
@@ -9627,7 +9627,7 @@ in
 
   buildGoPackage = buildGo16Package;
 
-  go2nix = (callPackage ../development/tools/go2nix { }).bin;
+  go2nix = callPackage ../development/tools/go2nix { };
 
   ### DEVELOPMENT / LISP MODULES
 

From 8086145649a3014f7e16797f91a031945d0e94d1 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Sat, 11 Jun 2016 18:32:12 +0200
Subject: [PATCH 204/436] nanomsg: 0.8-beta -> 1.0.0

---
 pkgs/development/libraries/nanomsg/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index 89fdd334f954..6c0e633459bf 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchurl }:
+{ stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "0.8-beta";
+  version = "1.0.0";
   name = "nanomsg-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/nanomsg/nanomsg/releases/download/0.8-beta/${name}.tar.gz";
-    sha256 = "0ix9yd6shqmgm1mxig8ww2jpbgg2n5dms0wrv1q81ihclml0rkkm";
+  src = fetchFromGitHub {
+    owner = "nanomsg";
+    repo = "nanomsg";
+    rev = version;
+    sha256 = "1iqlmvz5k8m4srb120g3kfkmm1w2p16hyxmx2asvihd21j285fmw";
   };
 
-  installPhase = ''
-    mkdir -p "$out"
-    make install PREFIX="$out"
-  '';
+  buildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
     description= "Socket library that provides several common communication patterns";

From 205ec15d1eef46e944b60a2ba1860812997be6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 10 Jun 2016 21:52:47 -0300
Subject: [PATCH 205/436] catfish: 1.4.1 -> 1.4.2

---
 pkgs/applications/search/catfish/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix
index 795d804038d8..bad10a8607a6 100644
--- a/pkgs/applications/search/catfish/default.nix
+++ b/pkgs/applications/search/catfish/default.nix
@@ -3,13 +3,13 @@
 
 pythonPackages.buildPythonApplication rec {
   majorver = "1.4";
-  minorver = "1";
+  minorver = "2";
   version = "${majorver}.${minorver}";
   name = "catfish-${version}";
 
   src = fetchurl {
     url = "https://launchpad.net/catfish-search/${majorver}/${version}/+download/${name}.tar.bz2";
-    sha256 = "0dc9xq1l1w22xk1hg63mgwr0920jqxrwfzmkhif01yms1m7vfdv8";
+    sha256 = "0j3by9yfs4j9za3s5qdxrsm7idmps69pimc9d0mjyakvviy0izm3";
   };
 
   nativeBuildInputs = [
@@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
     gnome3.dconf
     pythonPackages.pyxdg
     pythonPackages.ptyprocess
-    pycairo
+    pythonPackages.pycairo
   ];
 
   propagatedBuildInputs = [
@@ -34,8 +34,9 @@ pythonPackages.buildPythonApplication rec {
     xdg_utils
     findutils
   ];
-  
+
   preFixup = ''
+    rm "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.pyc"
     for f in \
       "$out/${pythonPackages.python.sitePackages}/catfish_lib/catfishconfig.py" \
       "$out/share/applications/catfish.desktop"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75fdb3c2ea35..6b3a9f477daa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12048,7 +12048,7 @@ in
   carddav-util = callPackage ../tools/networking/carddav-util { };
 
   catfish = callPackage ../applications/search/catfish {
-    pythonPackages = python3Packages;
+    pythonPackages = python2Packages;
   };
 
   cava = callPackage ../applications/audio/cava { };

From 3850123f32d498958bccf271781a12aaf1689c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 11 Jun 2016 21:10:27 +0200
Subject: [PATCH 206/436] nixos/docker: use wrapped modprobe

We need to use wrapped modprobe, so that it finds the right
modules. Docker needs modprobe to load overlay kernel module
for example.

This fixes an an error starting docker if the booted system's kernel
version is different from the /run/current-system profile's one.
---
 nixos/modules/virtualisation/docker.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 97b2927cf1bd..c99fc78d49e7 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -95,7 +95,7 @@ in
           LimitNPROC = 1048576;
         } // proxy_env;
 
-        path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
+        path = [ config.system.sbin.modprobe ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
         environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
 
         postStart = if cfg.socketActivation then "" else cfg.postStart;

From c0316aaf8453db7ddeaaa5e362b26cf2a81bfe42 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 11 Jun 2016 11:54:31 -0700
Subject: [PATCH 207/436] mlterm: init at 3.3.8

A multi-lingual terminal that supports REGIS and SIXEL graphics
---
 pkgs/applications/misc/mlterm/default.nix | 38 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/misc/mlterm/default.nix

diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
new file mode 100644
index 000000000000..cfcff9554e7d
--- /dev/null
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, libX11, gdk_pixbuf, cairo, libXft, gtk2, fribidi }:
+
+stdenv.mkDerivation rec {
+  name = "mlterm-${version}";
+  version = "3.3.8";
+
+  src = fetchurl {
+    url = "https://downloads.sourceforge.net/project/mlterm/01release/${name}/${name}.tar.gz";
+    sha256 = "088pgxynzxxii7wdmjp2fdkxydirx4k05588zkhlzalkb5l8ji1i";
+  };
+
+  buildInputs = [ pkgconfig libX11 gdk_pixbuf cairo libXft gtk2 fribidi ];
+
+  preConfigure = ''
+    sed -ie 's#-L/usr/local/lib -R/usr/local/lib##g' \
+      xwindow/libtype/Makefile.in \
+      main/Makefile.in \
+      java/Makefile.in \
+      tool/mlimgloader/Makefile.in \
+      tool/registobmp/Makefile.in \
+      tool/mlconfig/Makefile.in
+    sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' tool/mlconfig/po/Makefile.in.in
+  '';
+
+  configureFlags = [
+    "--with-imagelib=gdk-pixbuf"
+    "--with-type-engines=cairo,xft,xcore"
+    "--with-x"
+    "--enable-ind"
+ ];
+
+  meta = with stdenv.lib; {
+    homepage = https://sourceforge.net/projects/mlterm/;
+    license = licenses.bsd2;
+    maintainers = [ maintainers.vrthra ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 318d77c09d1b..ab86cb6805db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14868,6 +14868,8 @@ in
 
   xterm = callPackage ../applications/misc/xterm { };
 
+  mlterm = callPackage ../applications/misc/mlterm { };
+
   finalterm = callPackage ../applications/misc/finalterm { };
 
   roxterm = callPackage ../applications/misc/roxterm {

From 72d589080f4387eea433e5b87309c9e5a2ee4a03 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 11 Jun 2016 21:18:27 +0200
Subject: [PATCH 208/436] emacs25pre: 25.0.94 -> 25.0.95

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

diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs-25/default.nix
index eaadd985be75..e3e5f60dd001 100644
--- a/pkgs/applications/editors/emacs-25/default.nix
+++ b/pkgs/applications/editors/emacs-25/default.nix
@@ -23,13 +23,13 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "emacs-25.0.94";
+  name = "emacs-25.0.95";
 
   builder = ./builder.sh;
 
   src = fetchurl {
     url = "ftp://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.xz";
-    sha256 = "19kd9iwj4rz7llihs7a4gmag98n3asrxn3jh6mdmyn24w2kmxi69";
+    sha256 = "0bmvg7cbrwfa9rbryjrqv2qcllgwja92sx9ikirl80r5d09caf0l";
   };
 
   patches = lib.optionals stdenv.isDarwin [

From 1105674352f8de2d69d7fdf805f30ce6ea3b5711 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sun, 12 Jun 2016 04:05:53 +0800
Subject: [PATCH 209/436] oath-toolkit: 2.4.1 -> 2.6.1

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

diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix
index 216ce3d23364..98635f8cc85d 100644
--- a/pkgs/tools/security/oath-toolkit/default.nix
+++ b/pkgs/tools/security/oath-toolkit/default.nix
@@ -6,11 +6,11 @@ let
     else pam;
 in
 stdenv.mkDerivation rec {
-  name = "oath-toolkit-2.4.1";
+  name = "oath-toolkit-2.6.1";
 
   src = fetchurl {
     url = "mirror://savannah/oath-toolkit/${name}.tar.gz";
-    sha256 = "094vbq66sn5f2dsy14hajpsfdnaivjxf70xzs91nrsq0q75l5ylv";
+    sha256 = "0ybg0gnddmhxga0jwdipyz8jv5mxs0kiiflhvzffl9mw0wcq6mww";
   };
 
   

From d49e0ff79f84aac0518edfe249b29e6b8144da63 Mon Sep 17 00:00:00 2001
From: Erik Rybakken <erik.rybakken@math.ntnu.no>
Date: Sat, 11 Jun 2016 23:10:24 +0200
Subject: [PATCH 210/436] vimPlugins: add localvimrc

---
 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 98a8a4ddf249..1ac2e82b4b0c 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -638,6 +638,17 @@ rec {
     dependencies = [];
 
   };
+  
+  vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-localvimrc-2016-06-06";
+    src = fetchgit {
+      url = "git://github.com/embear/vim-localvimrc";
+      rev = "f104384cd9127b5a75ed889b551fd7f46faeb74a";
+      sha256 = "0k1ava8nhshkm7llhmagpsmvgwy8xcc0mn3chdk6hz8gzz9755py";
+    };
+    dependencies = [];
+
+  };
 
   tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "tslime-vim-2015-08-14";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index cdb411051aa4..1771a618e143 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -32,6 +32,7 @@
 "github:ctrlpvim/ctrlp.vim"
 "github:digitaltoad/vim-jade"
 "github:eagletmt/neco-ghc"
+"github:embear/vim-localvimrc"
 "github:enomsg/vim-haskellConcealPlus"
 "github:esneider/YUNOcommit.vim"
 "github:fatih/vim-go"

From 6b2cdf8cd1c5913179640853eea74af4d0c7b8d4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 11 Jun 2016 16:27:31 +0200
Subject: [PATCH 211/436] sane-backends-git: 2016-05-09 -> 2016-06-11

fujitsu backend v131:
- hide compression-arg option when jpeg disabled
- add Send/SC/GHS macros for recent scanners
- add initial support for fi-74x0
- add initial support for fi-7030
- set has_MS_lamp=0 for fi-71x0
- add I18N macros to all option titles and descriptions
- add usb ids for many newer scanners
---
 pkgs/applications/graphics/sane/backends/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index a56b6b0b8406..9d418234d3a4 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "2016-05-09";
+  version = "2016-06-11";
   src = fetchgit {
-    sha256 = "17y2l59vz2l0y5ya89390x6lim75p1mp8s5c2wzp9l4d5fy8j8dd";
-    rev = "1e013654cc3af09f4731ab9ec8d8324d03a7de4a";
+    sha256 = "6312c514e3c47f3f7003e3f54750485950720aaa35c8f0e5b7a361bc04e2a795";
+    rev = "5ba37467e88ca8052973b37128ce8fd36ad5d61d";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

From 1212d921c1712130a200fed9f4e9277445f87860 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 11 Jun 2016 18:12:21 +0200
Subject: [PATCH 212/436] lrzip: 0.621 -> 0.630

Changes: http://ck-hack.blogspot.com/2016/06/lrzip-0630.html
---
 pkgs/tools/compression/lrzip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix
index 3846ec97d3b8..e95afac9443d 100644
--- a/pkgs/tools/compression/lrzip/default.nix
+++ b/pkgs/tools/compression/lrzip/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}:
 
 stdenv.mkDerivation rec {
-  version = "0.621";
+  version = "0.630";
   name = "lrzip-${version}";
 
   src = fetchurl {
     url = "http://ck.kolivas.org/apps/lrzip/${name}.tar.bz2";
-    sha256 = "0szb1habydj9fwwrhgpjfws6v7hdphnqc5527i0vvc5rx2z6zhii";
+    sha256 = "01ykxliqw4cavx9f2gawxfa9wf52cjy1qx28cnkrh6i3lfzzcq94";
   };
 
   buildInputs = [ zlib lzo bzip2 nasm perl ];

From 9f266996b401179c254ae2dd913aa01d111ca6b3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 11 Jun 2016 19:48:35 +0200
Subject: [PATCH 213/436] btrfs-progs: 4.5.3 -> 4.6

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

diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index a7470384ad4e..69e5f8c401c5 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -2,14 +2,14 @@
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
 }:
 
-let version = "4.5.3"; in
+let version = "4.6"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1lzbw275xgv69v4z8hmsf3jnip38116hxhkpv0madk8wv049drz6";
+    sha256 = "1wjd1017k0jsdcjdmcj540qg2gpjiw3vq6bhg3wd7n4dk5d5cryq";
   };
 
   buildInputs = [

From 6558f0add3f15e62f182bf33e1acf0c857d78832 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 11 Jun 2016 21:11:43 +0200
Subject: [PATCH 214/436] sane-backends-git: fix corrupted hash

---
 pkgs/applications/graphics/sane/backends/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index 9d418234d3a4..dbf79bf20acb 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -3,7 +3,7 @@
 callPackage ./generic.nix (args // {
   version = "2016-06-11";
   src = fetchgit {
-    sha256 = "6312c514e3c47f3f7003e3f54750485950720aaa35c8f0e5b7a361bc04e2a795";
+    sha256 = "0jpavig7bg7l72drlwipmsg03j6qdy5aq2r3kj6a2h6ahpnm2549";
     rev = "5ba37467e88ca8052973b37128ce8fd36ad5d61d";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };

From c3d5a0a7df17a0f9735d7c7196fbb2f029fbd81e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 11 Jun 2016 23:35:45 +0200
Subject: [PATCH 215/436] libpsl: list 2016-05-23 -> 2016-06-10

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

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index ea4db82c510d..2c524f20ce1f 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -3,10 +3,10 @@
 
 let
 
-  listVersion = "2016-05-23";
+  listVersion = "2016-06-10";
   listSources = fetchFromGitHub {
-    sha256 = "1sld9s9d9g3fnppyvvn5w0xw50g1gq43d7yyk9yb710268kh31jc";
-    rev = "05f7a0a82e2fea5afb8ba3736db3c294db270849";
+    sha256 = "125wqxargnzj3phqj7ss55p4lm957hsabfbm1db2j04d6ridms6i";
+    rev = "b28087cf291ef5c51fec31403842fa352a6028f7";
     repo = "list";
     owner = "publicsuffix";
   };

From 105a903d94a335370fbf23af7266e8ccb20bb20c Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Fri, 10 Jun 2016 16:44:39 -0700
Subject: [PATCH 216/436] xterm: 320 -> 325

Update xterm, also enable sixel, and regis support for graphics
---
 pkgs/applications/misc/xterm/default.nix             | 12 +++++++++---
 pkgs/applications/misc/xterm/sixel-256.support.patch | 11 +++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/misc/xterm/sixel-256.support.patch

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 2c47e1c98050..0d7816918081 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-320";
+  name = "xterm-325";
 
   src = fetchurl {
     url = "ftp://invisible-island.net/xterm/${name}.tgz";
-    sha256 = "19r4rs5pjq944m7aiqligazf6wgmv4f023x3bx183h1l8dbvn3d6";
+    sha256 = "06sz66z4hvjjkvm3r5a5z442iis8lz8yjfzc629pwhj01ixb0c9v";
   };
 
   buildInputs =
@@ -13,9 +13,15 @@ stdenv.mkDerivation rec {
       ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit
     ];
 
+  patches = [
+    ./sixel-256.support.patch
+  ];
+
   configureFlags = [
     "--enable-wide-chars"
     "--enable-256-color"
+    "--enable-sixel-graphics"
+    "--enable-regis-graphics"
     "--enable-load-vt-fonts"
     "--enable-i18n"
     "--enable-doublechars"
@@ -39,7 +45,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://invisible-island.net/xterm;
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [viric vrthra];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/applications/misc/xterm/sixel-256.support.patch b/pkgs/applications/misc/xterm/sixel-256.support.patch
new file mode 100644
index 000000000000..480e67e89ca3
--- /dev/null
+++ b/pkgs/applications/misc/xterm/sixel-256.support.patch
@@ -0,0 +1,11 @@
+--- xterm-325/graphics.c	2016-05-17 03:04:40.000000000 -0700
++++ xterm-325/graphics.c	2016-06-11 16:37:29.552584281 -0700
+@@ -667,7 +667,7 @@
+     case 330:
+ 	return 4U;
+     case 340:
+-	return 16U;
++	return 256U;
+     case 382:
+ 	return 2U;
+     default:

From cb6e9e5e24c01052de2a14ddff32eaca549cf2fd Mon Sep 17 00:00:00 2001
From: Julien Dehos <dehos@lisic.univ-littoral.fr>
Date: Sun, 12 Jun 2016 02:46:08 +0200
Subject: [PATCH 217/436] armadillo: init at 7.200.1b

---
 .../libraries/armadillo/default.nix           | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/armadillo/default.nix

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
new file mode 100644
index 000000000000..8d904efe0d66
--- /dev/null
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, cmake, pkgconfig, atlas, blas, openblas}:
+
+stdenv.mkDerivation rec {
+  version = "7.200.1b";
+  name = "armadillo-${version}";
+  
+  src = fetchurl {
+    url = "http://sourceforge.net/projects/arma/files/armadillo-${version}.tar.xz";
+    sha256 = "00s8xrywc4aipipq1zpd6q9gzqmsiv8cwd25zvb1csrpninmidvc";
+  };
+
+  unpackCmd = [ "tar -xf ${src}" ];
+  
+  nativeBuildInputs = [ cmake atlas blas openblas ];
+  
+  meta = with stdenv.lib; {
+    description = "C++ linear algebra library";
+    homepage = "http://arma.sourceforge.net" ;
+    license = licenses.mpl20;
+    platforms = stdenv.lib.platforms.linux ;
+    maintainers = [ stdenv.lib.maintainers.juliendehos ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f6b40dc92f5..ca4a92c57885 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6610,6 +6610,8 @@ in
     #      apr with db58 on freebsd (nov 2015), for unknown reasons
   };
 
+  armadillo = callPackage ../development/libraries/armadillo {};
+
   assimp = callPackage ../development/libraries/assimp { };
 
   asio = callPackage ../development/libraries/asio { };

From d0cb52596ee15fcfcf6e97d4c86d61b9cc7a9c40 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 11 Jun 2016 21:00:47 -0500
Subject: [PATCH 218/436] libmpack: fix building on darwin

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

diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix
index 867a7ccf79df..b45d5f3d2ce0 100644
--- a/pkgs/development/libraries/libmpack/default.nix
+++ b/pkgs/development/libraries/libmpack/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
     inherit rev;
     sha256 = "1h3pbmykm69gfyi0wz647gz5836a6f3jc4azzll7i3mkpc11gcrd";
   };
+  LIBTOOL = "libtool";
   buildInputs = [ libtool ];
   installPhase = ''
     mkdir -p $out/lib/libmpack

From 9b385535e86cc56458fde630bba6903e3bfc2f80 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 11 Jun 2016 20:34:57 -0700
Subject: [PATCH 219/436] mupdf: 1.8 -> 1.9

Updates mupdf, and libmupdf.so
---
 pkgs/applications/misc/mupdf/default.nix | 51 ++++++++----------------
 1 file changed, 17 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index b7e4e1966c9a..fb475f047b46 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,42 +1,25 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg
-, libX11, libXext }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig
+, zlib, freetype, libjpeg, jbig2dec, openjpeg
+, libX11, libXcursor, libXrandr, libXinerama, libXext, harfbuzz, mesa }:
 
 stdenv.mkDerivation rec {
-  version = "1.8";
+  version = "1.9";
   name = "mupdf-${version}";
 
   src = fetchurl {
     url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz";
-    sha256 = "01n26cy41lc2fjri63s4js23ixxb4nd37aafry3hz4i4id6wd8x2";
+    sha256 = "15p2k1n3afc7bnqrc0zfqz31fjfq3rrrrj4fwwy5az26d11ynxhp";
   };
 
+  NIX_CFLAGS_COMPILE= [ "-fPIC" ];
   nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ openjpeg libjpeg jbig2dec ];
-  buildInputs = [ zlib freetype libX11 libXext ];
+  buildInputs = [ zlib freetype libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama];
 
-  enableParallelBuilding = true;
+  installPhase = ''
+    make install prefix=$out
+    gcc -shared -o $out/lib/libmupdf.so.${version} -Wl,--whole-archive $out/lib/libmupdf.a -Wl,--no-whole-archive
 
-  my_soname = "libmupdf.so.1.3";
-  my_soname_js_none = "libmupdf-js-none.so.1.3";
-  preBuild = ''
-    export makeFlags="prefix=$out build=release XCFLAGS=-fpic"
-    export NIX_CFLAGS_COMPILE=" $NIX_CFLAGS_COMPILE -I$(echo ${openjpeg}/include/openjpeg-*) "
-
-    # Copied from Gentoo ebuild
-    rm -rf thirdparty
-    sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-     -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
-     -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
-     -e "\$a\$(MUPDF_JS_NONE_LIB):" \
-     -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-     -e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \
-     -i Makefile
-
-    sed -e "s/libopenjpeg1/libopenjp2/" -i Makerules
-  '';
-
-  postInstall = ''
-    ln -s ${my_soname} $out/lib/libmupdf.so
+    ln -s $out/lib/libmupdf.so.${version} $out/lib/libmupdf.so
 
     mkdir -p "$out/lib/pkgconfig"
     cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF
@@ -63,14 +46,14 @@ stdenv.mkDerivation rec {
     Terminal=false
     EOF
   '';
+  enableParallelBuilding = true;
 
-  meta = {
-    homepage = http://mupdf.com/;
+  meta = with stdenv.lib; {
+    homepage = http://mupdf.com;
     repositories.git = git://git.ghostscript.com/mupdf.git;
     description = "Lightweight PDF viewer and toolkit written in portable C";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = with stdenv.lib.platforms; linux;
-    inherit version;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ viric vrthra ];
+    platforms = platforms.linux;
   };
 }

From 3d7c8bd179ccbacdd442471b1abb483328f7ee4d Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Sun, 12 Jun 2016 01:14:08 -0400
Subject: [PATCH 220/436] fish: fix completion from NIX_PROFILES

Load NIX_PROFILES at shell startup, not at build time.
This one was missed in #16039.
---
 pkgs/shells/fish/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 62ec6194fcd8..0124f914866c 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
 
     # make fish pick up completions from nix profile
     if status --is-interactive
-      set -l profiles (echo $NIX_PROFILES | ${coreutils}/bin/tr ' ' '\n')
+      set -l profiles (echo \$NIX_PROFILES | ${coreutils}/bin/tr ' ' '\n')
       set fish_complete_path \$profiles"/share/fish/vendor_completions.d" \$fish_complete_path
     end
     EOF

From bef4cf54d5c6b392b353425eb90023efcf44230e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 9 Jun 2016 22:47:18 +0200
Subject: [PATCH 221/436] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20160611 using the following inputs:

  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/8f99b2654a0009e6a88aabef9002b6af2d03ec2b
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/1a80e0660e630f6dd98f34c3d82c23dc824ada01
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/504ee2b3bbedca0ea623d0d914a00509d3386067
---
 .../haskell-modules/configuration-lts-0.0.nix |   13 +
 .../haskell-modules/configuration-lts-0.1.nix |   13 +
 .../haskell-modules/configuration-lts-0.2.nix |   13 +
 .../haskell-modules/configuration-lts-0.3.nix |   13 +
 .../haskell-modules/configuration-lts-0.4.nix |   13 +
 .../haskell-modules/configuration-lts-0.5.nix |   13 +
 .../haskell-modules/configuration-lts-0.6.nix |   13 +
 .../haskell-modules/configuration-lts-0.7.nix |   13 +
 .../haskell-modules/configuration-lts-1.0.nix |   13 +
 .../haskell-modules/configuration-lts-1.1.nix |   14 +
 .../configuration-lts-1.10.nix                |   14 +
 .../configuration-lts-1.11.nix                |   14 +
 .../configuration-lts-1.12.nix                |   14 +
 .../configuration-lts-1.13.nix                |   14 +
 .../configuration-lts-1.14.nix                |   14 +
 .../configuration-lts-1.15.nix                |   14 +
 .../haskell-modules/configuration-lts-1.2.nix |   14 +
 .../haskell-modules/configuration-lts-1.4.nix |   14 +
 .../haskell-modules/configuration-lts-1.5.nix |   14 +
 .../haskell-modules/configuration-lts-1.7.nix |   14 +
 .../haskell-modules/configuration-lts-1.8.nix |   14 +
 .../haskell-modules/configuration-lts-1.9.nix |   14 +
 .../haskell-modules/configuration-lts-2.0.nix |   14 +
 .../haskell-modules/configuration-lts-2.1.nix |   14 +
 .../configuration-lts-2.10.nix                |   14 +
 .../configuration-lts-2.11.nix                |   14 +
 .../configuration-lts-2.12.nix                |   14 +
 .../configuration-lts-2.13.nix                |   14 +
 .../configuration-lts-2.14.nix                |   14 +
 .../configuration-lts-2.15.nix                |   14 +
 .../configuration-lts-2.16.nix                |   14 +
 .../configuration-lts-2.17.nix                |   14 +
 .../configuration-lts-2.18.nix                |   14 +
 .../configuration-lts-2.19.nix                |   14 +
 .../haskell-modules/configuration-lts-2.2.nix |   14 +
 .../configuration-lts-2.20.nix                |   14 +
 .../configuration-lts-2.21.nix                |   14 +
 .../configuration-lts-2.22.nix                |   14 +
 .../haskell-modules/configuration-lts-2.3.nix |   14 +
 .../haskell-modules/configuration-lts-2.4.nix |   14 +
 .../haskell-modules/configuration-lts-2.5.nix |   14 +
 .../haskell-modules/configuration-lts-2.6.nix |   14 +
 .../haskell-modules/configuration-lts-2.7.nix |   14 +
 .../haskell-modules/configuration-lts-2.8.nix |   14 +
 .../haskell-modules/configuration-lts-2.9.nix |   14 +
 .../haskell-modules/configuration-lts-3.0.nix |   14 +
 .../haskell-modules/configuration-lts-3.1.nix |   14 +
 .../configuration-lts-3.10.nix                |   14 +
 .../configuration-lts-3.11.nix                |   14 +
 .../configuration-lts-3.12.nix                |   14 +
 .../configuration-lts-3.13.nix                |   14 +
 .../configuration-lts-3.14.nix                |   14 +
 .../configuration-lts-3.15.nix                |   14 +
 .../configuration-lts-3.16.nix                |   14 +
 .../configuration-lts-3.17.nix                |   14 +
 .../configuration-lts-3.18.nix                |   15 +
 .../configuration-lts-3.19.nix                |   15 +
 .../haskell-modules/configuration-lts-3.2.nix |   14 +
 .../configuration-lts-3.20.nix                |   15 +
 .../configuration-lts-3.21.nix                |   15 +
 .../configuration-lts-3.22.nix                |   15 +
 .../haskell-modules/configuration-lts-3.3.nix |   14 +
 .../haskell-modules/configuration-lts-3.4.nix |   14 +
 .../haskell-modules/configuration-lts-3.5.nix |   14 +
 .../haskell-modules/configuration-lts-3.6.nix |   14 +
 .../haskell-modules/configuration-lts-3.7.nix |   14 +
 .../haskell-modules/configuration-lts-3.8.nix |   14 +
 .../haskell-modules/configuration-lts-3.9.nix |   14 +
 .../haskell-modules/configuration-lts-4.0.nix |   19 +
 .../haskell-modules/configuration-lts-4.1.nix |   19 +
 .../haskell-modules/configuration-lts-4.2.nix |   19 +
 .../haskell-modules/configuration-lts-5.0.nix |   19 +
 .../haskell-modules/configuration-lts-5.1.nix |   19 +
 .../configuration-lts-5.10.nix                |   22 +
 .../configuration-lts-5.11.nix                |   23 +
 .../configuration-lts-5.12.nix                |   23 +
 .../configuration-lts-5.13.nix                |   24 +
 .../configuration-lts-5.14.nix                |   24 +
 .../configuration-lts-5.15.nix                |   24 +
 .../configuration-lts-5.16.nix                |   24 +
 .../configuration-lts-5.17.nix                |   25 +
 .../configuration-lts-5.18.nix                |   25 +
 .../haskell-modules/configuration-lts-5.2.nix |   19 +
 .../haskell-modules/configuration-lts-5.3.nix |   19 +
 .../haskell-modules/configuration-lts-5.4.nix |   20 +
 .../haskell-modules/configuration-lts-5.5.nix |   21 +
 .../haskell-modules/configuration-lts-5.6.nix |   22 +
 .../haskell-modules/configuration-lts-5.7.nix |   22 +
 .../haskell-modules/configuration-lts-5.8.nix |   22 +
 .../haskell-modules/configuration-lts-5.9.nix |   22 +
 .../haskell-modules/configuration-lts-6.0.nix |   30 +
 .../haskell-modules/configuration-lts-6.1.nix |   30 +
 .../haskell-modules/configuration-lts-6.2.nix |  102 +
 .../haskell-modules/hackage-packages.nix      | 5818 +++++++++--------
 94 files changed, 4665 insertions(+), 2739 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 0c90cf0ba541..9fd4c90f0c3c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1127,6 +1127,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1630,6 +1631,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2795,6 +2797,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2951,6 +2954,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3044,6 +3048,7 @@ self: super: {
   "elm-core-sources" = dontDistribute super."elm-core-sources";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4175,6 +4180,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_1_2_1";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -5029,6 +5036,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5417,6 +5425,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7719,11 +7728,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8300,6 +8311,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8543,6 +8555,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index a99ab6445078..77ade8e3c1b7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1127,6 +1127,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1630,6 +1631,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2795,6 +2797,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2951,6 +2954,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3044,6 +3048,7 @@ self: super: {
   "elm-core-sources" = dontDistribute super."elm-core-sources";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4175,6 +4180,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_1_2_1";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -5029,6 +5036,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5417,6 +5425,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7719,11 +7728,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8300,6 +8311,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8543,6 +8555,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 14f4a2bdcae9..621109dc2ffc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1127,6 +1127,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1630,6 +1631,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2795,6 +2797,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2951,6 +2954,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3044,6 +3048,7 @@ self: super: {
   "elm-core-sources" = dontDistribute super."elm-core-sources";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4175,6 +4180,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_1_2_1";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -5029,6 +5036,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5417,6 +5425,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7719,11 +7728,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8300,6 +8311,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8543,6 +8555,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 047003dfb38d..88141d78e112 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1127,6 +1127,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1630,6 +1631,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2795,6 +2797,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2951,6 +2954,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3044,6 +3048,7 @@ self: super: {
   "elm-core-sources" = dontDistribute super."elm-core-sources";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4175,6 +4180,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_1_2_1";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -5029,6 +5036,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5417,6 +5425,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7719,11 +7728,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8300,6 +8311,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8543,6 +8555,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 4dd0d3dca7a3..b26216c83ca1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1127,6 +1127,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1630,6 +1631,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2795,6 +2797,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2951,6 +2954,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3044,6 +3048,7 @@ self: super: {
   "elm-core-sources" = dontDistribute super."elm-core-sources";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4173,6 +4178,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_1_2_1";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -5027,6 +5034,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5415,6 +5423,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7716,11 +7725,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8297,6 +8308,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8540,6 +8552,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 5fb9067393ea..80885a3d3fae 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1127,6 +1127,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1630,6 +1631,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2795,6 +2797,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2951,6 +2954,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3044,6 +3048,7 @@ self: super: {
   "elm-core-sources" = dontDistribute super."elm-core-sources";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4173,6 +4178,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_1_2_1";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -5027,6 +5034,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5415,6 +5423,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7716,11 +7725,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8297,6 +8308,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8540,6 +8552,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 612959b6fc2e..eea580cbc3b9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1126,6 +1126,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1629,6 +1630,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2794,6 +2796,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2950,6 +2953,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3043,6 +3047,7 @@ self: super: {
   "elm-core-sources" = dontDistribute super."elm-core-sources";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4172,6 +4177,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_1_2_1";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -5025,6 +5032,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5413,6 +5421,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7713,11 +7722,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8294,6 +8305,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8537,6 +8549,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 5a9c4a1aab35..4b388209814b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1126,6 +1126,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1629,6 +1630,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2794,6 +2796,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2950,6 +2953,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3043,6 +3047,7 @@ self: super: {
   "elm-core-sources" = dontDistribute super."elm-core-sources";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4172,6 +4177,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_1_2_1";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -5025,6 +5032,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5413,6 +5421,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7713,11 +7722,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8294,6 +8305,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8537,6 +8549,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 184ed2ade480..b2788d7ad80c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1124,6 +1124,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1627,6 +1628,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2788,6 +2790,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2944,6 +2947,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3035,6 +3039,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4165,6 +4170,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_1";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -5017,6 +5024,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5405,6 +5413,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7704,11 +7713,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8284,6 +8295,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8527,6 +8539,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index bf3e9ce93b93..9c8c01581061 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1124,6 +1124,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1627,6 +1628,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2786,6 +2788,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2941,6 +2944,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3032,6 +3036,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4161,6 +4166,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -5011,6 +5018,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5399,6 +5407,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7697,11 +7706,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8275,6 +8286,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8516,6 +8528,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8534,6 +8547,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 6c05309cb07e..2195eb712489 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1123,6 +1123,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1626,6 +1627,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2782,6 +2784,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2937,6 +2940,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3028,6 +3032,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4151,6 +4156,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4995,6 +5002,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5383,6 +5391,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7677,11 +7686,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8254,6 +8265,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8493,6 +8505,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8511,6 +8524,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 73e37ae69c40..78eab3c96b2d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1123,6 +1123,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1626,6 +1627,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2782,6 +2784,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2937,6 +2940,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3028,6 +3032,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4150,6 +4155,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4993,6 +5000,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5380,6 +5388,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7674,11 +7683,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8251,6 +8262,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8490,6 +8502,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8508,6 +8521,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index b818c0136de1..94b2a6f7758f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1123,6 +1123,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1626,6 +1627,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2782,6 +2784,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2937,6 +2940,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3028,6 +3032,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4150,6 +4155,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4993,6 +5000,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5380,6 +5388,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7674,11 +7683,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8251,6 +8262,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8490,6 +8502,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8508,6 +8521,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index a602a7a2bb00..b54795b55676 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1123,6 +1123,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1626,6 +1627,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2782,6 +2784,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2937,6 +2940,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3028,6 +3032,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4149,6 +4154,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4992,6 +4999,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5379,6 +5387,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7673,11 +7682,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8250,6 +8261,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8488,6 +8500,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8506,6 +8519,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 7a4cb99b05ad..0a6d5785e71f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1122,6 +1122,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1624,6 +1625,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2779,6 +2781,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2934,6 +2937,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3025,6 +3029,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4146,6 +4151,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4989,6 +4996,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5376,6 +5384,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7669,11 +7678,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8246,6 +8257,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8484,6 +8496,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8502,6 +8515,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index d54d9ab0ff5f..acec6559fc0f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1121,6 +1121,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1623,6 +1624,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2776,6 +2778,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2931,6 +2934,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3022,6 +3026,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4142,6 +4147,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4985,6 +4992,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5372,6 +5380,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7662,11 +7671,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8238,6 +8249,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8476,6 +8488,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8494,6 +8507,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index e8f963d6e1d9..e755131dbd93 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1124,6 +1124,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1627,6 +1628,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2784,6 +2786,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2939,6 +2942,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3030,6 +3034,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4158,6 +4163,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -5008,6 +5015,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5396,6 +5404,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7692,11 +7701,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8270,6 +8281,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8511,6 +8523,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8529,6 +8542,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index a69d1a8739c5..88cfd3ba9fda 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1123,6 +1123,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1626,6 +1627,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2783,6 +2785,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2938,6 +2941,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3029,6 +3033,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4156,6 +4161,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -5005,6 +5012,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5393,6 +5401,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7688,11 +7697,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8266,6 +8277,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8506,6 +8518,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8524,6 +8537,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 32dee6b7f3c0..a9a1b471957b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1123,6 +1123,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1626,6 +1627,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2782,6 +2784,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2937,6 +2940,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3028,6 +3032,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4155,6 +4160,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -5004,6 +5011,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5392,6 +5400,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7687,11 +7696,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8265,6 +8276,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8505,6 +8517,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8523,6 +8536,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 590551bccacf..4ace5cedcd66 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1123,6 +1123,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1626,6 +1627,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2782,6 +2784,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2937,6 +2940,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3028,6 +3032,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4155,6 +4160,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4999,6 +5006,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5387,6 +5395,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7682,11 +7691,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8260,6 +8271,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8500,6 +8512,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8518,6 +8531,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 904e59ff1fc0..cc26126b5fb5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1123,6 +1123,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1626,6 +1627,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2782,6 +2784,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2937,6 +2940,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3028,6 +3032,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4152,6 +4157,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4996,6 +5003,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5384,6 +5392,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7678,11 +7687,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8256,6 +8267,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8496,6 +8508,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8514,6 +8527,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 10cad7ef6611..dabdb009bced 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1123,6 +1123,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1626,6 +1627,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2782,6 +2784,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2937,6 +2940,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3028,6 +3032,7 @@ self: super: {
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = doDistribute super."elm-package_0_2_2";
@@ -4151,6 +4156,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4995,6 +5002,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5383,6 +5391,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7677,11 +7686,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8255,6 +8266,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8495,6 +8507,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_8_3";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_2";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8513,6 +8526,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index ffcecf2e451f..92a7324d206d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1616,6 +1617,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2765,6 +2767,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2920,6 +2923,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3012,6 +3016,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4129,6 +4134,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4967,6 +4974,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5350,6 +5358,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7624,11 +7633,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8195,6 +8206,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8432,6 +8444,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8450,6 +8463,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 98d1ce5c2931..122cd3ff24ee 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1616,6 +1617,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2765,6 +2767,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2920,6 +2923,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_5";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3012,6 +3016,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4129,6 +4134,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4967,6 +4974,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5350,6 +5358,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7624,11 +7633,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8195,6 +8206,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8432,6 +8444,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8450,6 +8463,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 5f5f8fb7fe9a..c619e1ac4914 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1609,6 +1610,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2755,6 +2757,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2910,6 +2913,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3001,6 +3005,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4114,6 +4119,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4950,6 +4957,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5331,6 +5339,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7600,11 +7609,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8165,6 +8176,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8400,6 +8412,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8418,6 +8431,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 1cca8924c317..6faa2bd2cd04 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1608,6 +1609,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2754,6 +2756,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2909,6 +2912,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3000,6 +3004,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4113,6 +4118,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4949,6 +4956,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5330,6 +5338,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7597,11 +7606,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8160,6 +8171,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8395,6 +8407,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8413,6 +8426,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 810fca6ba468..f573ae627913 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1608,6 +1609,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2754,6 +2756,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2909,6 +2912,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3000,6 +3004,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4113,6 +4118,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4949,6 +4956,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5330,6 +5338,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7596,11 +7605,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8159,6 +8170,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8394,6 +8406,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8412,6 +8425,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 4ee3b5ea86d5..c7475950fede 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1608,6 +1609,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2754,6 +2756,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2909,6 +2912,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3000,6 +3004,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4113,6 +4118,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4949,6 +4956,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5329,6 +5337,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7595,11 +7604,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8158,6 +8169,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8393,6 +8405,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8411,6 +8424,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index b76ca7e7c581..e6239bf52642 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1608,6 +1609,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2754,6 +2756,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2909,6 +2912,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3000,6 +3004,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4112,6 +4117,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4947,6 +4954,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5327,6 +5335,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7593,11 +7602,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8156,6 +8167,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8391,6 +8403,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8409,6 +8422,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index ea09d02a2e9d..cdb508f6450a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1608,6 +1609,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2754,6 +2756,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2909,6 +2912,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3000,6 +3004,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4111,6 +4116,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4946,6 +4953,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5326,6 +5334,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7591,11 +7600,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8153,6 +8164,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8388,6 +8400,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8406,6 +8419,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 0403b50e2e07..66932ca59d61 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1608,6 +1609,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2752,6 +2754,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2907,6 +2910,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2998,6 +3002,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4108,6 +4113,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4943,6 +4950,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5323,6 +5331,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7587,11 +7596,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8149,6 +8160,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8384,6 +8396,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8402,6 +8415,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 010fe952019d..9bf122de2cb7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1608,6 +1609,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2751,6 +2753,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2906,6 +2909,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2997,6 +3001,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4105,6 +4110,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4940,6 +4947,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5320,6 +5328,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7583,11 +7592,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8145,6 +8156,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8380,6 +8392,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8398,6 +8411,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 4014b94d7cbe..5607371ab84c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1608,6 +1609,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2750,6 +2752,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2905,6 +2908,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2995,6 +2999,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4103,6 +4108,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4938,6 +4945,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5318,6 +5326,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7580,11 +7589,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8141,6 +8152,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8376,6 +8388,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8394,6 +8407,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 294d6ce26d09..59e751fdfbd2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1608,6 +1609,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2750,6 +2752,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2905,6 +2908,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2995,6 +2999,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4102,6 +4107,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4937,6 +4944,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5317,6 +5325,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7579,11 +7588,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8140,6 +8151,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8375,6 +8387,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8393,6 +8406,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 3416a218ed8d..306422bbf2ce 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -1114,6 +1114,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1615,6 +1616,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2763,6 +2765,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2918,6 +2921,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3010,6 +3014,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4127,6 +4132,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4965,6 +4972,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5348,6 +5356,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7622,11 +7631,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8193,6 +8204,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8430,6 +8442,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8448,6 +8461,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 75288b5ce2c9..ed26e69ca327 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1608,6 +1609,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2750,6 +2752,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2905,6 +2908,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2995,6 +2999,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4102,6 +4107,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4937,6 +4944,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5317,6 +5325,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7579,11 +7588,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8139,6 +8150,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8374,6 +8386,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8392,6 +8405,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 1c0bde4dafe0..a9bf9fee36e7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1608,6 +1609,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2750,6 +2752,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2905,6 +2908,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2995,6 +2999,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4102,6 +4107,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4937,6 +4944,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5317,6 +5325,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7578,11 +7587,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8138,6 +8149,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8373,6 +8385,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8391,6 +8404,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index ef9cb326074e..9a62e1401063 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1608,6 +1609,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2750,6 +2752,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2905,6 +2908,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2995,6 +2999,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4102,6 +4107,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4936,6 +4943,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5316,6 +5324,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7577,11 +7586,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8137,6 +8148,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8372,6 +8384,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8390,6 +8403,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 1e314a42ea07..fcb54ecc2d60 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -1114,6 +1114,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1615,6 +1616,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2763,6 +2765,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2918,6 +2921,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3010,6 +3014,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4126,6 +4131,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4963,6 +4970,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5346,6 +5354,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7620,11 +7629,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8191,6 +8202,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8428,6 +8440,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8446,6 +8459,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 0a48b64acd49..706055b71089 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -1114,6 +1114,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1615,6 +1616,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2763,6 +2765,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2918,6 +2921,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3010,6 +3014,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4126,6 +4131,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4963,6 +4970,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5346,6 +5354,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7618,11 +7627,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8189,6 +8200,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8426,6 +8438,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8444,6 +8457,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 5806bcdd1939..49ec0590c8b2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -1114,6 +1114,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1615,6 +1616,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2762,6 +2764,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2917,6 +2920,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3009,6 +3013,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4125,6 +4130,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4962,6 +4969,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5345,6 +5353,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7617,11 +7626,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8188,6 +8199,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8425,6 +8437,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8443,6 +8456,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 3a53fd60b699..6422171ac13b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -1112,6 +1112,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1612,6 +1613,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2759,6 +2761,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2914,6 +2917,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3006,6 +3010,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4121,6 +4126,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4958,6 +4965,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5341,6 +5349,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7612,11 +7621,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8183,6 +8194,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8420,6 +8432,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8438,6 +8451,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 9eba1f5025be..d482d0a570dc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -1112,6 +1112,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1612,6 +1613,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2759,6 +2761,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2914,6 +2917,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3006,6 +3010,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4121,6 +4126,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4958,6 +4965,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5341,6 +5349,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7613,11 +7622,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8184,6 +8195,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8421,6 +8433,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8439,6 +8452,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 03853c72c04e..c8189bb01d9f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1611,6 +1612,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2758,6 +2760,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2913,6 +2916,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3005,6 +3009,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4119,6 +4124,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4956,6 +4963,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5339,6 +5347,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7610,11 +7619,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8178,6 +8189,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8415,6 +8427,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8433,6 +8446,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index ead963ec6037..0adc4484107e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = dontDistribute super."acid-state";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1609,6 +1610,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2756,6 +2758,7 @@ self: super: {
   "dice" = dontDistribute super."dice";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2911,6 +2914,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -3002,6 +3006,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4115,6 +4120,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4951,6 +4958,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5334,6 +5342,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7604,11 +7613,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -8170,6 +8181,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8405,6 +8417,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_11_1";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8423,6 +8436,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index ad5e27fc616e..7ed1dc7a8d48 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1093,6 +1093,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1571,6 +1572,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2693,6 +2695,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2843,6 +2846,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2932,6 +2936,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4022,6 +4027,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4846,6 +4853,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5213,6 +5221,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7438,11 +7447,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7984,6 +7995,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8217,6 +8229,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8235,6 +8248,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 9315b001babc..e5923a0b7665 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1093,6 +1093,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1570,6 +1571,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2692,6 +2694,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2842,6 +2845,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2931,6 +2935,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4020,6 +4025,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4844,6 +4851,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5211,6 +5219,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7433,11 +7442,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7979,6 +7990,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8212,6 +8224,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8230,6 +8243,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 8b0d90e92872..1f39731090af 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1091,6 +1091,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1564,6 +1565,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2682,6 +2684,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2830,6 +2833,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2918,6 +2922,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4002,6 +4007,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4823,6 +4830,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5188,6 +5196,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7398,11 +7407,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_5";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7940,6 +7951,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8169,6 +8181,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8187,6 +8200,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 9790785c6fbd..a8a64a4c821c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1091,6 +1091,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1564,6 +1565,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2682,6 +2684,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2830,6 +2833,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2918,6 +2922,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4001,6 +4006,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4822,6 +4829,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5187,6 +5195,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7397,11 +7406,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_5";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7939,6 +7950,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8168,6 +8180,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8186,6 +8199,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 36792a074f28..9fa1b3db3eb5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -1091,6 +1091,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1564,6 +1565,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2681,6 +2683,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2829,6 +2832,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2917,6 +2921,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3999,6 +4004,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4820,6 +4827,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5185,6 +5193,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7394,11 +7403,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_5";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7936,6 +7947,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8164,6 +8176,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8182,6 +8195,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index dd5b83310e77..68501a67aac9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -1091,6 +1091,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1564,6 +1565,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2681,6 +2683,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2829,6 +2832,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2917,6 +2921,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3999,6 +4004,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4819,6 +4826,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5184,6 +5192,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7391,11 +7400,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_5";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7933,6 +7944,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8161,6 +8173,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8179,6 +8192,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index fdf02391efd2..f334241cdab7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -1091,6 +1091,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1564,6 +1565,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2680,6 +2682,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2828,6 +2831,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2916,6 +2920,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3998,6 +4003,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4817,6 +4824,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5182,6 +5190,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7389,11 +7398,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_5";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7931,6 +7942,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8159,6 +8171,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8177,6 +8190,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 379b32df0d55..8376c7671f45 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -1091,6 +1091,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1564,6 +1565,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2680,6 +2682,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2828,6 +2831,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2916,6 +2920,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3998,6 +4003,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4814,6 +4821,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5179,6 +5187,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7385,11 +7394,13 @@ self: super: {
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_5";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7927,6 +7938,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8155,6 +8167,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8173,6 +8186,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 8c169120d5a5..aba5c47240b1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -1090,6 +1090,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1563,6 +1564,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2679,6 +2681,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2827,6 +2830,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2915,6 +2919,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3997,6 +4002,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4813,6 +4820,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5178,6 +5186,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7380,11 +7389,13 @@ self: super: {
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_5";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7922,6 +7933,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8148,6 +8160,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8166,6 +8179,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 7b905aa3a8c4..451f906ec941 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -1090,6 +1090,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1562,6 +1563,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2678,6 +2680,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2826,6 +2829,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2914,6 +2918,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3995,6 +4000,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4811,6 +4818,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5175,6 +5183,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7375,11 +7384,13 @@ self: super: {
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_5";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7917,6 +7928,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8143,6 +8155,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8161,6 +8174,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 48a43fd58d58..98dbb84ced67 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -1090,6 +1090,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1562,6 +1563,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2678,6 +2680,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2826,6 +2829,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2914,6 +2918,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3995,6 +4000,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4701,6 +4708,7 @@ self: super: {
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
   "http-accept" = dontDistribute super."http-accept";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_25";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4810,6 +4818,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5174,6 +5183,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7374,11 +7384,13 @@ self: super: {
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_5";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7916,6 +7928,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8142,6 +8155,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8160,6 +8174,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 14fe8239edbd..6f931a665ad0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -1090,6 +1090,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1561,6 +1562,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2675,6 +2677,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2823,6 +2826,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2911,6 +2915,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3992,6 +3997,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4696,6 +4703,7 @@ self: super: {
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
   "http-accept" = dontDistribute super."http-accept";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_26_1";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4805,6 +4813,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5168,6 +5177,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7367,11 +7377,13 @@ self: super: {
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_5";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7908,6 +7920,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8134,6 +8147,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8152,6 +8166,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index b5e3f1a97f6e..a4c77cdbe059 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1568,6 +1569,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2690,6 +2692,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2839,6 +2842,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2928,6 +2932,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4016,6 +4021,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4840,6 +4847,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5207,6 +5215,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7427,11 +7436,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_1";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7972,6 +7983,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8205,6 +8217,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8223,6 +8236,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 1b81866173e5..5e4ddc00bced 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -1089,6 +1089,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1560,6 +1561,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2674,6 +2676,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2822,6 +2825,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2910,6 +2914,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3991,6 +3996,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4695,6 +4702,7 @@ self: super: {
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
   "http-accept" = dontDistribute super."http-accept";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_26_2";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4804,6 +4812,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5167,6 +5176,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7365,11 +7375,13 @@ self: super: {
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_5";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7905,6 +7917,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8131,6 +8144,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8149,6 +8163,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 68b55ab297cd..38f722a40705 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -1089,6 +1089,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1560,6 +1561,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2673,6 +2675,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2821,6 +2824,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2909,6 +2913,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3988,6 +3993,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4692,6 +4699,7 @@ self: super: {
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
   "http-accept" = dontDistribute super."http-accept";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_26_2";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4801,6 +4809,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5162,6 +5171,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7357,11 +7367,13 @@ self: super: {
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7893,6 +7905,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8119,6 +8132,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8137,6 +8151,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 6af9be05b68d..f8abe547ef19 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -1089,6 +1089,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1560,6 +1561,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2673,6 +2675,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2821,6 +2824,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2909,6 +2913,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3987,6 +3992,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4691,6 +4698,7 @@ self: super: {
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
   "http-accept" = dontDistribute super."http-accept";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_26_2";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4800,6 +4808,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5159,6 +5168,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7354,11 +7364,13 @@ self: super: {
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7890,6 +7902,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8116,6 +8129,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8134,6 +8148,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index b182a5f45e55..01afd2e914d2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1568,6 +1569,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2690,6 +2692,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2839,6 +2842,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2928,6 +2932,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4015,6 +4020,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4838,6 +4845,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5205,6 +5213,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7425,11 +7434,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_2";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7969,6 +7980,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8202,6 +8214,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8220,6 +8233,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 5df06f358fea..ccab948157df 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1568,6 +1569,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2690,6 +2692,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2839,6 +2842,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2928,6 +2932,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4015,6 +4020,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4838,6 +4845,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5205,6 +5213,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7425,11 +7434,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_2";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7968,6 +7979,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8201,6 +8213,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8219,6 +8232,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 5c9ca2308f45..bc55eb86f768 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1567,6 +1568,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2689,6 +2691,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2838,6 +2841,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_6";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2927,6 +2931,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4013,6 +4018,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4835,6 +4842,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5200,6 +5208,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7417,11 +7426,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_2";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7960,6 +7971,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8190,6 +8202,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8208,6 +8221,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 5ec2fadc5851..74f84ebcd87d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1567,6 +1568,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2689,6 +2691,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2838,6 +2841,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2927,6 +2931,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4011,6 +4016,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4833,6 +4840,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5198,6 +5206,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7413,11 +7422,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_2";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7956,6 +7967,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8186,6 +8198,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8204,6 +8217,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index a313001fa910..7100d604816d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1565,6 +1566,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2686,6 +2688,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2835,6 +2838,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2924,6 +2928,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4008,6 +4013,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4829,6 +4836,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5194,6 +5202,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7407,11 +7416,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7949,6 +7960,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8179,6 +8191,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8197,6 +8210,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 47b4d5414ff5..e91f93cb9d94 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1565,6 +1566,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2684,6 +2686,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2832,6 +2835,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2921,6 +2925,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4005,6 +4010,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4826,6 +4833,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5191,6 +5199,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7403,11 +7412,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7945,6 +7956,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8174,6 +8186,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8192,6 +8205,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 114434704dad..4f1cb49ec6fb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1091,6 +1091,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_12_4";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1564,6 +1565,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2682,6 +2684,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2830,6 +2833,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2918,6 +2922,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -4002,6 +4007,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables" = doDistribute super."hashtables_1_2_0_2";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -4823,6 +4830,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5188,6 +5196,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -7400,11 +7409,13 @@ self: super: {
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_4";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servant-yaml" = dontDistribute super."servant-yaml";
@@ -7942,6 +7953,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "sync-mht" = dontDistribute super."sync-mht";
@@ -8171,6 +8183,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_12_2";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -8189,6 +8202,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index 27f57069c590..1489ad8b8c46 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -1070,6 +1070,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1539,6 +1540,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2037,6 +2039,7 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
   "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
@@ -2632,6 +2635,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2776,6 +2780,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2862,6 +2867,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3797,6 +3803,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3925,6 +3932,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4611,6 +4620,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_26_2";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4716,6 +4726,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5065,6 +5076,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -6181,6 +6193,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7197,11 +7210,13 @@ self: super: {
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7723,6 +7738,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7943,6 +7959,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7961,6 +7978,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8533,6 +8551,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 4ccc69aea3dc..405337bd5905 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -1070,6 +1070,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1537,6 +1538,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2035,6 +2037,7 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
   "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
@@ -2630,6 +2633,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2774,6 +2778,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2860,6 +2865,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3793,6 +3799,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3921,6 +3928,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4607,6 +4616,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_26_2";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4712,6 +4722,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5057,6 +5068,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -6171,6 +6183,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7187,11 +7200,13 @@ self: super: {
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7713,6 +7728,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7933,6 +7949,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7951,6 +7968,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8523,6 +8541,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index 6200493c49d8..7ab7b8bd3487 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -1070,6 +1070,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1537,6 +1538,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2033,6 +2035,7 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
   "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
@@ -2626,6 +2629,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2770,6 +2774,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2856,6 +2861,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3784,6 +3790,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3909,6 +3916,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4593,6 +4602,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_26_2";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4698,6 +4708,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5040,6 +5051,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -6152,6 +6164,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7162,11 +7175,13 @@ self: super: {
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7683,6 +7698,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7903,6 +7919,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7921,6 +7938,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8492,6 +8510,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index ece58ffe1b30..5211d725f1b8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -1064,6 +1064,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1529,6 +1530,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2020,6 +2022,7 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
   "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
@@ -2605,6 +2608,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2745,6 +2749,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2831,6 +2836,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3750,6 +3756,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3874,6 +3881,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4558,6 +4567,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_27";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4662,6 +4672,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -5001,6 +5012,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -6107,6 +6119,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7108,11 +7121,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_1";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7623,6 +7638,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7838,6 +7854,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7856,6 +7873,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8423,6 +8441,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index c3d6270621e6..0c8cd4363053 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -1063,6 +1063,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1527,6 +1528,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2015,6 +2017,7 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
   "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
@@ -2600,6 +2603,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2740,6 +2744,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2826,6 +2831,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3745,6 +3751,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3869,6 +3876,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4553,6 +4562,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_27";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4657,6 +4667,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4995,6 +5006,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -6100,6 +6112,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7099,11 +7112,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7614,6 +7629,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7829,6 +7845,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7847,6 +7864,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8413,6 +8431,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.10.nix b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
index fcdbf56a30b0..f0ee3c234bdf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
@@ -1057,6 +1057,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1520,6 +1521,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2002,6 +2004,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2578,6 +2582,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2715,6 +2720,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2801,6 +2807,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3657,6 +3664,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3706,6 +3714,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3830,6 +3839,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4507,6 +4518,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_27";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4610,6 +4622,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4942,6 +4955,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5576,6 +5590,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6026,6 +6041,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7011,11 +7027,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_7";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7521,6 +7539,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7734,6 +7753,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7752,6 +7772,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8308,6 +8329,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.11.nix b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
index ed9b8e5a7a3d..0c9d35778f15 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
@@ -1056,6 +1056,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1517,6 +1518,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -1998,6 +2000,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2573,6 +2577,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2710,6 +2715,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2796,6 +2802,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3651,6 +3658,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3700,6 +3708,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3824,6 +3833,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4497,6 +4508,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_27";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4599,6 +4611,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4931,6 +4944,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5565,6 +5579,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6015,6 +6030,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -6999,11 +7015,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_7";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7460,6 +7478,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_16_0";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7508,6 +7527,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7720,6 +7740,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7738,6 +7759,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8291,6 +8313,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.12.nix b/pkgs/development/haskell-modules/configuration-lts-5.12.nix
index c3daabe3ef78..e44d12108557 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.12.nix
@@ -1055,6 +1055,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1516,6 +1517,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -1997,6 +1999,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2572,6 +2576,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2709,6 +2714,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2794,6 +2800,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3648,6 +3655,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3697,6 +3705,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3821,6 +3830,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4493,6 +4504,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_27";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4595,6 +4607,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4927,6 +4940,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5555,6 +5569,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6005,6 +6020,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -6986,11 +7002,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_7";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7446,6 +7464,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_16_0";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7494,6 +7513,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7706,6 +7726,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7724,6 +7745,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8277,6 +8299,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.13.nix b/pkgs/development/haskell-modules/configuration-lts-5.13.nix
index 7e10df38bf94..ce64aa59fb08 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.13.nix
@@ -1054,6 +1054,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1512,6 +1513,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -1989,6 +1991,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2564,6 +2568,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2700,6 +2705,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2785,6 +2791,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3639,6 +3646,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3688,6 +3696,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3812,6 +3821,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4484,6 +4495,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
@@ -4583,6 +4595,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4914,6 +4927,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5540,6 +5554,7 @@ self: super: {
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5989,6 +6004,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -6968,11 +6984,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_7";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7428,6 +7446,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_16_0";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7476,6 +7495,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7688,6 +7708,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7706,6 +7727,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8257,6 +8279,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
@@ -8446,6 +8469,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_17_1";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
   "yaml-rpc" = dontDistribute super."yaml-rpc";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.14.nix b/pkgs/development/haskell-modules/configuration-lts-5.14.nix
index c84be31b77b8..99379eb967aa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.14.nix
@@ -1052,6 +1052,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1508,6 +1509,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -1983,6 +1985,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2555,6 +2559,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2691,6 +2696,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2776,6 +2782,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3628,6 +3635,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3677,6 +3685,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3801,6 +3810,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4472,6 +4483,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
@@ -4571,6 +4583,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4902,6 +4915,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5526,6 +5540,7 @@ self: super: {
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5974,6 +5989,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -6951,11 +6967,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_7";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7408,6 +7426,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_16_0";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7456,6 +7475,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7666,6 +7686,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7684,6 +7705,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8231,6 +8253,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
@@ -8419,6 +8442,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_17_1";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
   "yaml-rpc" = dontDistribute super."yaml-rpc";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.15.nix b/pkgs/development/haskell-modules/configuration-lts-5.15.nix
index 50dfd0e17545..38f3a5856478 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.15.nix
@@ -1051,6 +1051,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1507,6 +1508,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -1982,6 +1984,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2552,6 +2556,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2688,6 +2693,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2772,6 +2778,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3623,6 +3630,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3672,6 +3680,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3796,6 +3805,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4465,6 +4476,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
@@ -4564,6 +4576,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4895,6 +4908,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5518,6 +5532,7 @@ self: super: {
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5966,6 +5981,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -6941,11 +6957,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_7";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7398,6 +7416,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_16_0";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7446,6 +7465,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7655,6 +7675,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4_1";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7673,6 +7694,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8219,6 +8241,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
@@ -8407,6 +8430,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_17_1";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
   "yaml-rpc" = dontDistribute super."yaml-rpc";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.16.nix b/pkgs/development/haskell-modules/configuration-lts-5.16.nix
index e64a8a4294cc..b66daa8e1678 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.16.nix
@@ -1049,6 +1049,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1500,6 +1501,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -1974,6 +1976,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2537,6 +2541,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2673,6 +2678,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2756,6 +2762,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3607,6 +3614,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3656,6 +3664,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3780,6 +3789,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4447,6 +4458,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
@@ -4545,6 +4557,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4875,6 +4888,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5496,6 +5510,7 @@ self: super: {
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5942,6 +5957,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -6910,11 +6926,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_7";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7363,6 +7381,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_16_0";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7411,6 +7430,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7618,6 +7638,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7635,6 +7656,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8180,6 +8202,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
@@ -8368,6 +8391,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_17_1";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
   "yaml-rpc" = dontDistribute super."yaml-rpc";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.17.nix b/pkgs/development/haskell-modules/configuration-lts-5.17.nix
index f63e3532fb9f..5b7523cca501 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.17.nix
@@ -1047,6 +1047,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1497,6 +1498,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -1970,6 +1972,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2533,6 +2537,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2669,6 +2674,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2752,6 +2758,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3603,6 +3610,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3652,6 +3660,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3776,6 +3785,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -3943,6 +3954,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_3_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -4442,6 +4454,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
@@ -4540,6 +4553,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4870,6 +4884,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5490,6 +5505,7 @@ self: super: {
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5935,6 +5951,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
   "parsec-parsers" = dontDistribute super."parsec-parsers";
@@ -6901,11 +6918,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_7";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7353,6 +7372,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_16_0";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7401,6 +7421,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7608,6 +7629,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7625,6 +7647,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8168,6 +8191,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
@@ -8355,6 +8379,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_17_1";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
   "yaml-rpc" = dontDistribute super."yaml-rpc";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.18.nix b/pkgs/development/haskell-modules/configuration-lts-5.18.nix
index 5783a2f558da..8a31ac270099 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.18.nix
@@ -1046,6 +1046,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1496,6 +1497,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -1968,6 +1970,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2527,6 +2531,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2662,6 +2667,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2745,6 +2751,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3593,6 +3600,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3642,6 +3650,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3766,6 +3775,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -3933,6 +3944,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_3_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -4431,6 +4443,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
@@ -4527,6 +4540,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4855,6 +4869,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5473,6 +5488,7 @@ self: super: {
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5915,6 +5931,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
   "parsec-parsers" = dontDistribute super."parsec-parsers";
@@ -6880,11 +6897,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_7";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7332,6 +7351,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_16_0";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7380,6 +7400,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7586,6 +7607,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7603,6 +7625,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8143,6 +8166,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
@@ -8330,6 +8354,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_17_1";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
   "yaml-rpc" = dontDistribute super."yaml-rpc";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index c66cfb432508..bd08bd4cc6c6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -1063,6 +1063,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1527,6 +1528,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2015,6 +2017,7 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
   "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
@@ -2600,6 +2603,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2739,6 +2743,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2825,6 +2830,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3740,6 +3746,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3864,6 +3871,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4548,6 +4557,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_27";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4651,6 +4661,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4988,6 +4999,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -6090,6 +6102,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7084,11 +7097,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7598,6 +7613,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7813,6 +7829,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7831,6 +7848,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8397,6 +8415,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
index b898ac218d89..64f98014e50c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
@@ -1061,6 +1061,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1525,6 +1526,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2012,6 +2014,7 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
   "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
@@ -2595,6 +2598,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2733,6 +2737,7 @@ self: super: {
   "dtw" = dontDistribute super."dtw";
   "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2819,6 +2824,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3729,6 +3735,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3853,6 +3860,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4537,6 +4546,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_27";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4640,6 +4650,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4976,6 +4987,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -6075,6 +6087,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7066,11 +7079,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7578,6 +7593,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7793,6 +7809,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7811,6 +7828,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8374,6 +8392,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
index 5889ce2628e2..eade3de4f0ce 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
@@ -1060,6 +1060,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1524,6 +1525,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2011,6 +2013,7 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
   "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
@@ -2590,6 +2593,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2727,6 +2731,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2813,6 +2818,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3721,6 +3727,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3845,6 +3852,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4529,6 +4538,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_27";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4632,6 +4642,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4968,6 +4979,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5608,6 +5620,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6062,6 +6075,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7052,11 +7066,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7564,6 +7580,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7778,6 +7795,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7796,6 +7814,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8359,6 +8378,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
index 7ace07b9a258..08edfc3d3acb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
@@ -1060,6 +1060,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1524,6 +1525,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2010,6 +2012,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2588,6 +2592,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2725,6 +2730,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2811,6 +2817,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3719,6 +3726,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3843,6 +3851,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4526,6 +4536,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_27";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4629,6 +4640,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4965,6 +4977,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5605,6 +5618,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6059,6 +6073,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7049,11 +7064,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7561,6 +7578,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7775,6 +7793,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7793,6 +7812,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8354,6 +8374,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.6.nix b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
index af90be145eb2..2106714d40a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
@@ -1059,6 +1059,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1523,6 +1524,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2009,6 +2011,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2586,6 +2590,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2723,6 +2728,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2809,6 +2815,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3665,6 +3672,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3714,6 +3722,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3838,6 +3847,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4520,6 +4531,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_27";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4623,6 +4635,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4959,6 +4972,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5597,6 +5611,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6050,6 +6065,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7038,11 +7054,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7550,6 +7568,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7764,6 +7783,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7782,6 +7802,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8341,6 +8362,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.7.nix b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
index 361134e31705..66db2ec58b5c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
@@ -1059,6 +1059,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1523,6 +1524,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2006,6 +2008,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2583,6 +2587,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2720,6 +2725,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2806,6 +2812,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3662,6 +3669,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3711,6 +3719,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3835,6 +3844,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4516,6 +4527,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_27";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4619,6 +4631,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4955,6 +4968,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5592,6 +5606,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6045,6 +6060,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7032,11 +7048,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7544,6 +7562,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7758,6 +7777,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7776,6 +7796,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8334,6 +8355,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.8.nix b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
index 5fcc84e3e4f3..1f1a93514cd1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
@@ -1059,6 +1059,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1523,6 +1524,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2006,6 +2008,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2583,6 +2587,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2720,6 +2725,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2806,6 +2812,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3662,6 +3669,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3711,6 +3719,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3835,6 +3844,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4516,6 +4527,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_27";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4619,6 +4631,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4955,6 +4968,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5592,6 +5606,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6045,6 +6060,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7032,11 +7048,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_6";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7544,6 +7562,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7758,6 +7777,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7776,6 +7796,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8333,6 +8354,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.9.nix b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
index 5d9ad584e543..1337abf23faf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
@@ -1059,6 +1059,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1522,6 +1523,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -2004,6 +2006,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2580,6 +2584,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2717,6 +2722,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2803,6 +2809,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3659,6 +3666,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3708,6 +3716,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3832,6 +3841,8 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = doDistribute super."hashmap_1_3_0_1";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
   "hasim" = dontDistribute super."hasim";
@@ -4511,6 +4522,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client" = doDistribute super."http-client_0_4_27";
   "http-client-auth" = dontDistribute super."http-client-auth";
@@ -4614,6 +4626,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4947,6 +4960,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5584,6 +5598,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6035,6 +6050,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec" = doDistribute super."parsec_3_1_9";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
@@ -7020,11 +7036,13 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_7";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "servius" = doDistribute super."servius_1_2_0_1";
@@ -7530,6 +7548,7 @@ self: super: {
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
   "symbol" = dontDistribute super."symbol";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7743,6 +7762,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
@@ -7761,6 +7781,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -8318,6 +8339,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
diff --git a/pkgs/development/haskell-modules/configuration-lts-6.0.nix b/pkgs/development/haskell-modules/configuration-lts-6.0.nix
index c70cc7798a78..e987d0ebc9a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-6.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-6.0.nix
@@ -1032,6 +1032,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1468,6 +1469,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -1929,6 +1931,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2470,6 +2474,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2589,6 +2594,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2671,6 +2677,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3489,6 +3496,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3538,6 +3546,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3659,6 +3668,7 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
   "hashmap" = dontDistribute super."hashmap";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -3825,6 +3835,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_3_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -4070,6 +4081,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_18";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -4091,6 +4103,7 @@ self: super: {
   "hp2any-manager" = dontDistribute super."hp2any-manager";
   "hp2html" = dontDistribute super."hp2html";
   "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = doDistribute super."hpack_0_14_0";
   "hpaco" = dontDistribute super."hpaco";
   "hpaco-lib" = dontDistribute super."hpaco-lib";
   "hpage" = dontDistribute super."hpage";
@@ -4306,6 +4319,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
@@ -4396,6 +4410,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4545,6 +4560,7 @@ self: super: {
   "iptables-helpers" = dontDistribute super."iptables-helpers";
   "iptadmin" = dontDistribute super."iptadmin";
   "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-client" = doDistribute super."irc-client_0_3_0_0";
   "irc-colors" = dontDistribute super."irc-colors";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = doDistribute super."irc-dcc_1_2_0";
@@ -4715,6 +4731,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5194,7 +5211,9 @@ self: super: {
   "mi" = dontDistribute super."mi";
   "microbench" = dontDistribute super."microbench";
   "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens" = doDistribute super."microlens_0_4_4_0";
   "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-platform" = doDistribute super."microlens-platform_0_3_1_0";
   "microtimer" = dontDistribute super."microtimer";
   "mida" = dontDistribute super."mida";
   "midi" = dontDistribute super."midi";
@@ -5308,6 +5327,7 @@ self: super: {
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5737,6 +5757,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
   "parsec-parsers" = dontDistribute super."parsec-parsers";
@@ -6652,10 +6673,12 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_1_0_3";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7086,6 +7109,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_16_0";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7131,6 +7155,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7329,6 +7354,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7346,6 +7372,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -7652,6 +7679,7 @@ self: super: {
   "unlambda" = dontDistribute super."unlambda";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_7_0";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7861,6 +7889,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
@@ -8044,6 +8073,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_17_1";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
   "yaml-rpc" = dontDistribute super."yaml-rpc";
diff --git a/pkgs/development/haskell-modules/configuration-lts-6.1.nix b/pkgs/development/haskell-modules/configuration-lts-6.1.nix
index 4641909e7357..17faa92a3a97 100644
--- a/pkgs/development/haskell-modules/configuration-lts-6.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-6.1.nix
@@ -1029,6 +1029,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1464,6 +1465,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -1916,6 +1918,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2455,6 +2459,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2574,6 +2579,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2651,6 +2657,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3458,6 +3465,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB" = doDistribute super."hPDB_1_2_0_5";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
@@ -3507,6 +3515,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3628,6 +3637,7 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
   "hashmap" = dontDistribute super."hashmap";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -3793,6 +3803,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_3_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -4035,6 +4046,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_18";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -4056,6 +4068,7 @@ self: super: {
   "hp2any-manager" = dontDistribute super."hp2any-manager";
   "hp2html" = dontDistribute super."hp2html";
   "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = doDistribute super."hpack_0_14_0";
   "hpaco" = dontDistribute super."hpaco";
   "hpaco-lib" = dontDistribute super."hpaco-lib";
   "hpage" = dontDistribute super."hpage";
@@ -4270,6 +4283,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
@@ -4359,6 +4373,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4507,6 +4522,7 @@ self: super: {
   "iptables-helpers" = dontDistribute super."iptables-helpers";
   "iptadmin" = dontDistribute super."iptadmin";
   "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-client" = doDistribute super."irc-client_0_3_0_0";
   "irc-colors" = dontDistribute super."irc-colors";
   "irc-core" = dontDistribute super."irc-core";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -4675,6 +4691,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5149,7 +5166,9 @@ self: super: {
   "mi" = dontDistribute super."mi";
   "microbench" = dontDistribute super."microbench";
   "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens" = doDistribute super."microlens_0_4_4_0";
   "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-platform" = doDistribute super."microlens-platform_0_3_1_0";
   "microtimer" = dontDistribute super."microtimer";
   "mida" = dontDistribute super."mida";
   "midi" = dontDistribute super."midi";
@@ -5261,6 +5280,7 @@ self: super: {
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5687,6 +5707,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
   "parsec-parsers" = dontDistribute super."parsec-parsers";
@@ -6587,10 +6608,12 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_1_0_3";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7020,6 +7043,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_16_0";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7065,6 +7089,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7260,6 +7285,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7277,6 +7303,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -7581,6 +7608,7 @@ self: super: {
   "unlambda" = dontDistribute super."unlambda";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_7_0";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7787,6 +7815,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
@@ -7967,6 +7996,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_17_1";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
   "yaml-rpc" = dontDistribute super."yaml-rpc";
diff --git a/pkgs/development/haskell-modules/configuration-lts-6.2.nix b/pkgs/development/haskell-modules/configuration-lts-6.2.nix
index fce15326d9fc..41957b889ec5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-6.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-6.2.nix
@@ -1022,6 +1022,7 @@ self: super: {
   "accelerate-utility" = dontDistribute super."accelerate-utility";
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
   "acid-state" = doDistribute super."acid-state_0_14_0";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
@@ -1154,8 +1155,78 @@ self: super: {
   "amazon-emailer" = dontDistribute super."amazon-emailer";
   "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
   "amazon-products" = dontDistribute super."amazon-products";
+  "amazonka" = doDistribute super."amazonka_1_4_2";
+  "amazonka-apigateway" = doDistribute super."amazonka-apigateway_1_4_2";
   "amazonka-application-autoscaling" = dontDistribute super."amazonka-application-autoscaling";
+  "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_1_4_2";
+  "amazonka-certificatemanager" = doDistribute super."amazonka-certificatemanager_1_4_2";
+  "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_1_4_2";
+  "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_1_4_2";
+  "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_1_4_2";
+  "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_1_4_2";
+  "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_1_4_2";
+  "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_1_4_2";
+  "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_1_4_2";
+  "amazonka-cloudwatch-events" = doDistribute super."amazonka-cloudwatch-events_1_4_2";
+  "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_1_4_2";
+  "amazonka-codecommit" = doDistribute super."amazonka-codecommit_1_4_2";
+  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_1_4_2";
+  "amazonka-codepipeline" = doDistribute super."amazonka-codepipeline_1_4_2";
+  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_1_4_2";
+  "amazonka-cognito-idp" = doDistribute super."amazonka-cognito-idp_1_4_2";
+  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_1_4_2";
+  "amazonka-config" = doDistribute super."amazonka-config_1_4_2";
+  "amazonka-core" = doDistribute super."amazonka-core_1_4_2";
+  "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_1_4_2";
+  "amazonka-devicefarm" = doDistribute super."amazonka-devicefarm_1_4_2";
+  "amazonka-directconnect" = doDistribute super."amazonka-directconnect_1_4_2";
   "amazonka-discovery" = dontDistribute super."amazonka-discovery";
+  "amazonka-dms" = doDistribute super."amazonka-dms_1_4_2";
+  "amazonka-ds" = doDistribute super."amazonka-ds_1_4_2";
+  "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_1_4_2";
+  "amazonka-dynamodb-streams" = doDistribute super."amazonka-dynamodb-streams_1_4_2";
+  "amazonka-ec2" = doDistribute super."amazonka-ec2_1_4_2";
+  "amazonka-ecr" = doDistribute super."amazonka-ecr_1_4_2";
+  "amazonka-ecs" = doDistribute super."amazonka-ecs_1_4_2";
+  "amazonka-efs" = doDistribute super."amazonka-efs_1_4_2";
+  "amazonka-elasticache" = doDistribute super."amazonka-elasticache_1_4_2";
+  "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_1_4_2";
+  "amazonka-elasticsearch" = doDistribute super."amazonka-elasticsearch_1_4_2";
+  "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_1_4_2";
+  "amazonka-elb" = doDistribute super."amazonka-elb_1_4_2";
+  "amazonka-emr" = doDistribute super."amazonka-emr_1_4_2";
+  "amazonka-gamelift" = doDistribute super."amazonka-gamelift_1_4_2";
+  "amazonka-glacier" = doDistribute super."amazonka-glacier_1_4_2";
+  "amazonka-iam" = doDistribute super."amazonka-iam_1_4_2";
+  "amazonka-importexport" = doDistribute super."amazonka-importexport_1_4_2";
+  "amazonka-inspector" = doDistribute super."amazonka-inspector_1_4_2";
+  "amazonka-iot" = doDistribute super."amazonka-iot_1_4_2";
+  "amazonka-iot-dataplane" = doDistribute super."amazonka-iot-dataplane_1_4_2";
+  "amazonka-kinesis" = doDistribute super."amazonka-kinesis_1_4_2";
+  "amazonka-kinesis-firehose" = doDistribute super."amazonka-kinesis-firehose_1_4_2";
+  "amazonka-kms" = doDistribute super."amazonka-kms_1_4_2";
+  "amazonka-lambda" = doDistribute super."amazonka-lambda_1_4_2";
+  "amazonka-marketplace-analytics" = doDistribute super."amazonka-marketplace-analytics_1_4_2";
+  "amazonka-marketplace-metering" = doDistribute super."amazonka-marketplace-metering_1_4_2";
+  "amazonka-ml" = doDistribute super."amazonka-ml_1_4_2";
+  "amazonka-opsworks" = doDistribute super."amazonka-opsworks_1_4_2";
+  "amazonka-rds" = doDistribute super."amazonka-rds_1_4_2";
+  "amazonka-redshift" = doDistribute super."amazonka-redshift_1_4_2";
+  "amazonka-route53" = doDistribute super."amazonka-route53_1_4_2";
+  "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_1_4_2";
+  "amazonka-s3" = doDistribute super."amazonka-s3_1_4_2";
+  "amazonka-sdb" = doDistribute super."amazonka-sdb_1_4_2";
+  "amazonka-ses" = doDistribute super."amazonka-ses_1_4_2";
+  "amazonka-sns" = doDistribute super."amazonka-sns_1_4_2";
+  "amazonka-sqs" = doDistribute super."amazonka-sqs_1_4_2";
+  "amazonka-ssm" = doDistribute super."amazonka-ssm_1_4_2";
+  "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_1_4_2";
+  "amazonka-sts" = doDistribute super."amazonka-sts_1_4_2";
+  "amazonka-support" = doDistribute super."amazonka-support_1_4_2";
+  "amazonka-swf" = doDistribute super."amazonka-swf_1_4_2";
+  "amazonka-test" = doDistribute super."amazonka-test_1_4_2";
+  "amazonka-waf" = doDistribute super."amazonka-waf_1_4_2";
+  "amazonka-workspaces" = doDistribute super."amazonka-workspaces_1_4_2";
   "ampersand" = dontDistribute super."ampersand";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
@@ -1383,6 +1454,7 @@ self: super: {
   "bdo" = dontDistribute super."bdo";
   "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
   "bein" = dontDistribute super."bein";
@@ -1833,6 +1905,8 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = doDistribute super."clckwrks-plugin-media_0_6_15";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_1";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2368,6 +2442,7 @@ self: super: {
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
   "dictparser" = dontDistribute super."dictparser";
   "diet" = dontDistribute super."diet";
   "diff-gestalt" = dontDistribute super."diff-gestalt";
@@ -2486,6 +2561,7 @@ self: super: {
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
   "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
   "dvdread" = dontDistribute super."dvdread";
@@ -2563,6 +2639,7 @@ self: super: {
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-export" = dontDistribute super."elm-export";
   "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
   "elm-init" = dontDistribute super."elm-init";
   "elm-make" = dontDistribute super."elm-make";
   "elm-package" = dontDistribute super."elm-package";
@@ -3363,6 +3440,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
   "hR" = dontDistribute super."hR";
@@ -3411,6 +3489,7 @@ self: super: {
   "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
   "hackage-server" = dontDistribute super."hackage-server";
   "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = doDistribute super."hackage-whatsnew_0_1_0_0";
   "hackage2hwn" = dontDistribute super."hackage2hwn";
   "hackage2twitter" = dontDistribute super."hackage2twitter";
   "hackager" = dontDistribute super."hackager";
@@ -3531,6 +3610,7 @@ self: super: {
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
   "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
   "hashmap" = dontDistribute super."hashmap";
   "hashring" = dontDistribute super."hashring";
   "hashtables-plus" = dontDistribute super."hashtables-plus";
@@ -3694,6 +3774,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_3_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3859,6 +3940,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_34";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -3934,6 +4016,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_18";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -3955,6 +4038,7 @@ self: super: {
   "hp2any-manager" = dontDistribute super."hp2any-manager";
   "hp2html" = dontDistribute super."hp2html";
   "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = doDistribute super."hpack_0_14_0";
   "hpaco" = dontDistribute super."hpaco";
   "hpaco-lib" = dontDistribute super."hpaco-lib";
   "hpage" = dontDistribute super."hpage";
@@ -4169,6 +4253,7 @@ self: super: {
   "htsn" = dontDistribute super."htsn";
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
+  "http-api-data" = doDistribute super."http-api-data_0_2_2";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
@@ -4257,6 +4342,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
   "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
@@ -4404,6 +4490,7 @@ self: super: {
   "iptables-helpers" = dontDistribute super."iptables-helpers";
   "iptadmin" = dontDistribute super."iptadmin";
   "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-client" = doDistribute super."irc-client_0_3_0_0";
   "irc-colors" = dontDistribute super."irc-colors";
   "irc-core" = dontDistribute super."irc-core";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -4571,6 +4658,7 @@ self: super: {
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
   "kibro" = dontDistribute super."kibro";
   "kicad-data" = dontDistribute super."kicad-data";
   "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
@@ -5043,7 +5131,9 @@ self: super: {
   "mi" = dontDistribute super."mi";
   "microbench" = dontDistribute super."microbench";
   "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens" = doDistribute super."microlens_0_4_4_0";
   "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-platform" = doDistribute super."microlens-platform_0_3_1_0";
   "microtimer" = dontDistribute super."microtimer";
   "mida" = dontDistribute super."mida";
   "midi" = dontDistribute super."midi";
@@ -5155,6 +5245,7 @@ self: super: {
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_4";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5577,6 +5668,7 @@ self: super: {
   "parport" = dontDistribute super."parport";
   "parse-dimacs" = dontDistribute super."parse-dimacs";
   "parse-help" = dontDistribute super."parse-help";
+  "parseargs" = doDistribute super."parseargs_0_2_0_4";
   "parsec-extra" = dontDistribute super."parsec-extra";
   "parsec-numbers" = dontDistribute super."parsec-numbers";
   "parsec-parsers" = dontDistribute super."parsec-parsers";
@@ -5732,6 +5824,7 @@ self: super: {
   "pipes-s3" = dontDistribute super."pipes-s3";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_2_3";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
@@ -6467,10 +6560,12 @@ self: super: {
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
   "servant-quickcheck" = dontDistribute super."servant-quickcheck";
   "servant-response" = dontDistribute super."servant-response";
   "servant-router" = dontDistribute super."servant-router";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
   "servant-swagger" = doDistribute super."servant-swagger_1_0_3";
   "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -6895,6 +6990,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_16_0";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -6939,6 +7035,7 @@ self: super: {
   "sylvia" = dontDistribute super."sylvia";
   "sym" = dontDistribute super."sym";
   "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
   "symengine-hs" = dontDistribute super."symengine-hs";
   "sync" = dontDistribute super."sync";
   "synchronous-channels" = dontDistribute super."synchronous-channels";
@@ -7133,6 +7230,7 @@ self: super: {
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-orphans" = doDistribute super."th-orphans_0_13_0";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7150,6 +7248,7 @@ self: super: {
   "thread-local-storage" = dontDistribute super."thread-local-storage";
   "threadPool" = dontDistribute super."threadPool";
   "threadmanager" = dontDistribute super."threadmanager";
+  "threads" = doDistribute super."threads_0_5_1_3";
   "threads-pool" = dontDistribute super."threads-pool";
   "threads-supervisor" = dontDistribute super."threads-supervisor";
   "threadscope" = dontDistribute super."threadscope";
@@ -7452,6 +7551,7 @@ self: super: {
   "unlambda" = dontDistribute super."unlambda";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_7_0";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7658,6 +7758,7 @@ self: super: {
   "web-inv-route" = dontDistribute super."web-inv-route";
   "web-mongrel2" = dontDistribute super."web-mongrel2";
   "web-page" = dontDistribute super."web-page";
+  "web-plugins" = doDistribute super."web-plugins_0_2_8";
   "web-routes-boomerang" = doDistribute super."web-routes-boomerang_0_28_4";
   "web-routes-mtl" = dontDistribute super."web-routes-mtl";
   "web-routes-quasi" = dontDistribute super."web-routes-quasi";
@@ -7835,6 +7936,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_17_1";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
   "yaml-rpc" = dontDistribute super."yaml-rpc";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 99a406095109..f353dcbffbbe 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -259,8 +259,6 @@ self: {
        pname = "ADPfusion";
        version = "0.5.1.0";
        sha256 = "cd3acc617c59a90e94b6666f5f6814515a2a11625d8794c977afe51520586951";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bits containers mmorph mtl OrderedBits primitive
          PrimitiveArray QuickCheck strict template-haskell th-orphans
@@ -465,18 +463,13 @@ self: {
      }) {};
 
   "ALUT" = callPackage
-    ({ mkDerivation, base, freealut, OpenAL, pretty, StateVar
-     , transformers
-     }:
+    ({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }:
      mkDerivation {
        pname = "ALUT";
        version = "2.4.0.2";
        sha256 = "b8364da380f5f1d85d13e427851a153be2809e1838d16393e37566f34b384b87";
-       isLibrary = true;
-       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;
@@ -849,7 +842,7 @@ self: {
        executableToolDepends = [ emacs ];
        jailbreak = true;
        postInstall = ''
-         files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/{Primitive.agda,Builtin/"*.agda})
+         files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
          for f in "''${files[@]}" ; do
            $out/bin/agda $f
          done
@@ -1034,13 +1027,13 @@ self: {
      }) {};
 
   "AppleScript" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation }:
      mkDerivation {
        pname = "AppleScript";
        version = "0.2.0.1";
        sha256 = "796b0a7deaa5a6ae0f30f98f9451afa5033aea96b41df52b1d4bd7b27d8fbcca";
-       libraryHaskellDepends = [ base ];
-       doHaddock = false;
+       isLibrary = false;
+       isExecutable = false;
        homepage = "https://github.com/reinerp/haskell-AppleScript";
        description = "Call AppleScript from Haskell, and then call back into Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -1376,8 +1369,6 @@ self: {
        pname = "BenchmarkHistory";
        version = "0.0.0.2";
        sha256 = "a3ab4de30a90e70c3b8bfe28d956322312c5e14b42f94da1051c71ff0853fa3d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cassava deepseq directory statistics time vector
        ];
@@ -3472,21 +3463,14 @@ self: {
      }) {};
 
   "ChasingBottoms_1_3_0_8" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
-     , syb
-     }:
+    ({ mkDerivation, base, containers, mtl, QuickCheck, random, syb }:
      mkDerivation {
        pname = "ChasingBottoms";
        version = "1.3.0.8";
        sha256 = "bb05710630f876767d79b684fd5f3fe59ea39c63e7bef4193c7ee8132479d2b8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl QuickCheck random syb
        ];
-       executableHaskellDepends = [
-         array base containers mtl QuickCheck random syb
-       ];
        jailbreak = true;
        description = "For testing partial and infinite values";
        license = stdenv.lib.licenses.mit;
@@ -3494,21 +3478,14 @@ self: {
      }) {};
 
   "ChasingBottoms_1_3_0_9" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
-     , syb
-     }:
+    ({ mkDerivation, base, containers, mtl, QuickCheck, random, syb }:
      mkDerivation {
        pname = "ChasingBottoms";
        version = "1.3.0.9";
        sha256 = "0cdb9b9f47f9b08477e249b0f3d0d93ad63acd99610cea1bb64bc8513454dd92";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl QuickCheck random syb
        ];
-       executableHaskellDepends = [
-         array base containers mtl QuickCheck random syb
-       ];
        jailbreak = true;
        description = "For testing partial and infinite values";
        license = stdenv.lib.licenses.mit;
@@ -3942,8 +3919,6 @@ self: {
        pname = "ConfigFile";
        version = "1.1.4";
        sha256 = "ae087b359ff2945a62b671449227e0a811d143ee651179f4e7e9c66548e0f514";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl parsec ];
        homepage = "http://software.complete.org/configfile";
        description = "Configuration file reading & writing";
@@ -4462,21 +4437,14 @@ self: {
      }) {};
 
   "DMuCheck" = callPackage
-    ({ mkDerivation, base, binary, directory, distributed-process
-     , distributed-process-simplelocalnet, hint, MuCheck
-     , network-transport-tcp, unix
-     }:
+    ({ mkDerivation, base, MuCheck }:
      mkDerivation {
        pname = "DMuCheck";
        version = "0.3.0.2";
        sha256 = "4d0d343eedc2660f2e1f722acccca80e5fdbf993a5049d372d48350b819fb001";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [
-         base binary directory distributed-process
-         distributed-process-simplelocalnet hint MuCheck
-         network-transport-tcp unix
-       ];
+       executableHaskellDepends = [ base MuCheck ];
        jailbreak = true;
        homepage = "https://bitbucket.com/osu-testing/d-mucheck";
        description = "Distributed Mutation Analysis framework for MuCheck";
@@ -4533,7 +4501,7 @@ self: {
          regex-posix split syb time unix
        ];
        libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [ array base bytestring HTF ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        description = "Darcs Patch Manager";
        license = "GPL";
@@ -5491,16 +5459,13 @@ self: {
 
   "Earley_0_9_0" = callPackage
     ({ mkDerivation, base, ListLike, tasty, tasty-hunit
-     , tasty-quickcheck, unordered-containers
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "Earley";
        version = "0.9.0";
        sha256 = "5ec955f00c872cc585bc2dd82fec137f53b095fde73a498e2a0ca7e0eb8140aa";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
-       executableHaskellDepends = [ base unordered-containers ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        jailbreak = true;
        description = "Parsing all context-free grammars using Earley's algorithm";
@@ -5510,7 +5475,7 @@ self: {
 
   "Earley_0_10_1_0" = callPackage
     ({ mkDerivation, base, ListLike, tasty, tasty-hunit
-     , tasty-quickcheck, unordered-containers
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "Earley";
@@ -5518,10 +5483,7 @@ self: {
        sha256 = "a90c5c1e210a0e37db577ace20b1ca2aa33d22454766ecaeb5dc253cb7d4887e";
        revision = "2";
        editedCabalFile = "310e7216914ee8e8338bc9481f6aa75f7cb2324d35ab03d29973b93bee2a725a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
-       executableHaskellDepends = [ base unordered-containers ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -5530,16 +5492,13 @@ self: {
 
   "Earley" = callPackage
     ({ mkDerivation, base, ListLike, tasty, tasty-hunit
-     , tasty-quickcheck, unordered-containers
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "Earley";
        version = "0.11.0.1";
        sha256 = "c207a40926bb0b9de05641a0fc03c22849a2c7e0bc007d2ffef37f33793985b3";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
-       executableHaskellDepends = [ base unordered-containers ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -5803,8 +5762,6 @@ self: {
        pname = "EsounD";
        version = "0.2";
        sha256 = "59b6f6676e5cd005e296ee8e8f0669522d981f94fb96874deb223133d09842b4";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base base-unicode-symbols bindings-EsounD monad-control network
          regions safer-file-handles storablevector transformers unix
@@ -6750,8 +6707,6 @@ self: {
        pname = "Frames";
        version = "0.1.2.1";
        sha256 = "3e98ce3aa849d7912b955f6f0e4898fd3f59d2e2961189c02d7a4c6c0174816f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base ghc-prim pipes primitive readable template-haskell text
          transformers vector vinyl
@@ -6770,8 +6725,6 @@ self: {
        pname = "Frames";
        version = "0.1.3";
        sha256 = "8bf6f8b64e377c25becf697de4707e4dbcaaba8fd7fa62b526faf89ae7082cc1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base ghc-prim pipes primitive readable template-haskell text
          transformers vector vinyl
@@ -6789,8 +6742,6 @@ self: {
        pname = "Frames";
        version = "0.1.4";
        sha256 = "3330b53867f07959c58b2cfc237390422ea08ca474b329547f092b6cb2bf39a0";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base ghc-prim pipes primitive readable template-haskell text
          transformers vector vinyl
@@ -6820,8 +6771,6 @@ self: {
        pname = "FreeTypeGL";
        version = "0.0.4";
        sha256 = "4e85f39777c29cc145b760289906b3a9f8e518296af258004223d87bbbdc5183";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base freetype2 OpenGL ];
        jailbreak = true;
        description = "Loadable texture fonts for OpenGL";
@@ -7225,23 +7174,17 @@ self: {
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT_2_7_0_5" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, freeglut
-     , mesa, OpenGL, OpenGLRaw, random, StateVar, transformers
+    ({ mkDerivation, array, base, containers, freeglut, mesa, OpenGL
+     , StateVar, transformers
      }:
      mkDerivation {
        pname = "GLUT";
        version = "2.7.0.5";
        sha256 = "72d4545ef6ca0ad473f0780d6bc934febc7dfbf0b42aad8c3a8ca67e663795bf";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base containers OpenGL StateVar transformers
        ];
        librarySystemDepends = [ freeglut mesa ];
-       executableHaskellDepends = [
-         array base bytestring OpenGLRaw random
-       ];
-       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -7249,23 +7192,17 @@ self: {
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT_2_7_0_6" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, freeglut
-     , mesa, OpenGL, OpenGLRaw, random, StateVar, transformers
+    ({ mkDerivation, array, base, containers, freeglut, mesa, OpenGL
+     , StateVar, transformers
      }:
      mkDerivation {
        pname = "GLUT";
        version = "2.7.0.6";
        sha256 = "c2166db513482178bd5f331a591d70f00d78e9f19afe9e1e572d222e7855d43a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base containers OpenGL StateVar transformers
        ];
        librarySystemDepends = [ freeglut mesa ];
-       executableHaskellDepends = [
-         array base bytestring OpenGLRaw random
-       ];
-       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -7273,23 +7210,17 @@ self: {
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT_2_7_0_7" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, freeglut
-     , mesa, OpenGL, OpenGLRaw, random, StateVar, transformers
+    ({ mkDerivation, array, base, containers, freeglut, mesa, OpenGL
+     , StateVar, transformers
      }:
      mkDerivation {
        pname = "GLUT";
        version = "2.7.0.7";
        sha256 = "3a9f292f6a417c90f39065c7e0d441798b99276ccdd1c0f3feff50955b937c93";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base containers OpenGL StateVar transformers
        ];
        librarySystemDepends = [ freeglut mesa ];
-       executableHaskellDepends = [
-         array base bytestring OpenGLRaw random
-       ];
-       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -7297,21 +7228,16 @@ self: {
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, OpenGL
-     , OpenGLRaw, random, StateVar, transformers
+    ({ mkDerivation, array, base, containers, OpenGL, StateVar
+     , transformers
      }:
      mkDerivation {
        pname = "GLUT";
        version = "2.7.0.10";
        sha256 = "4b11cbf9b7876c0ec14bf0673006bd23e7ffc7d396568987b326a1b706497569";
-       isLibrary = true;
-       isExecutable = true;
        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;
@@ -7964,8 +7890,6 @@ self: {
        pname = "GrammarProducts";
        version = "0.1.1.2";
        sha256 = "9023283298ad178efaf9ba965e7a0005ff41a8a01d2e0f581ed3c29e414f15a2";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          ADPfusion ansi-wl-pprint base bytestring containers data-default
          FormalGrammars lens newtype parsers PrimitiveArray semigroups
@@ -8416,8 +8340,6 @@ self: {
        pname = "HDBC";
        version = "2.4.0.1";
        sha256 = "7a3ee21c41e716111c4a3742a66eb448683719a9384afbf7021c5942ac73d2ad";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers convertible mtl old-time text time
          utf8-string
@@ -8450,8 +8372,6 @@ self: {
        pname = "HDBC-odbc";
        version = "2.5.0.0";
        sha256 = "729982fb31e2d7816e8600212236f32d9d9a59191d73ce57fce097be2234953b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring concurrent-extra HDBC mtl time utf8-string
        ];
@@ -8470,14 +8390,11 @@ self: {
        pname = "HDBC-postgresql";
        version = "2.3.2.3";
        sha256 = "4396038e1a66ba14b6b3388f2ee303c938e55c3fe0fe5df059a70335761e64cb";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring convertible HDBC mtl old-time parsec time
          utf8-string
        ];
        librarySystemDepends = [ postgresql ];
-       executableSystemDepends = [ postgresql ];
        jailbreak = true;
        homepage = "http://github.com/hdbc/hdbc-postgresql";
        description = "PostgreSQL driver for HDBC";
@@ -8519,11 +8436,8 @@ self: {
        pname = "HDBC-sqlite3";
        version = "2.3.3.1";
        sha256 = "a783d9ab707ebfc68e3e46bd1bbb5d3d5493f50a7ccf31223d9848cff986ebea";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring HDBC mtl utf8-string ];
        librarySystemDepends = [ sqlite ];
-       executableSystemDepends = [ sqlite ];
        homepage = "https://github.com/hdbc/hdbc-sqlite3";
        description = "Sqlite v3 driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -8579,8 +8493,6 @@ self: {
        pname = "HFuse";
        version = "0.2.4.5";
        sha256 = "e28e0689dfe5f7bc312b842adb02e172b56c3f53a1819ebda7ab39eace6c24a1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ fuse ];
        preConfigure = ''
@@ -9553,8 +9465,6 @@ self: {
        pname = "HSH";
        version = "2.1.2";
        sha256 = "788a7f25336e7fe9c7d38b68bb4cc0030712fc47e0cdf282267dea1e46b0da9f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring directory filepath hslogger MissingH mtl process
          regex-base regex-compat regex-posix unix
@@ -10819,13 +10729,10 @@ self: {
        pname = "HandsomeSoup";
        version = "0.3.5";
        sha256 = "35cf24eb6330bfd1c3a2460293da4380ad6267797ded9e0c93bdd590a9553fb4";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers HTTP hxt hxt-http MaybeT 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";
@@ -10841,13 +10748,10 @@ self: {
        pname = "HandsomeSoup";
        version = "0.4.2";
        sha256 = "0ae2dad3fbde1efee9e45b84b2aeb5b526cc7b3ea2cbc5715494f7bde3ceeefb";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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";
@@ -11514,8 +11418,6 @@ self: {
        pname = "Hoed";
        version = "0.3.6";
        sha256 = "8508f5077a0a45662af4dddd44bf1ce55fb4cd007b0246ce193ff6d439c351db";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cereal containers directory filepath FPretty
          libgraph mtl process RBTree regex-posix template-haskell
@@ -12358,16 +12260,10 @@ self: {
        sha256 = "477eecd8af2f070ff648f576ee81ee04efa45cc77b606f7fc09b6f2c156df299";
        revision = "1";
        editedCabalFile = "47b2855a9c5769eadfdbb4eaddca6c66e6de21432d555162f2cc4dcde6e0861a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-nums bytestring-trie
          containers utf8-string
        ];
-       executableHaskellDepends = [
-         attoparsec base bytestring bytestring-nums bytestring-trie
-         containers utf8-string
-       ];
        jailbreak = true;
        homepage = "http://github.com/solidsnack/JSONb/";
        description = "JSON parser that uses byte strings";
@@ -13182,12 +13078,8 @@ self: {
        pname = "LDAP";
        version = "0.6.10";
        sha256 = "4050875df6157fd71ce14bb0025499a1e9ccbb4d7a03686d68d3521dd2539f82";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ lber openldap ];
-       executableHaskellDepends = [ base ];
-       executableSystemDepends = [ lber openldap ];
        homepage = "https://github.com/ezyang/ldap-haskell";
        description = "Haskell binding for C LDAP API";
        license = stdenv.lib.licenses.bsd3;
@@ -13751,8 +13643,6 @@ self: {
        pname = "LogicGrowsOnTrees";
        version = "1.1.0.2";
        sha256 = "f3f6e7ee3022a60d279eff5d27fd6d3a7ca25972f18077594f90a15ed9cf16fb";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          AbortT-mtl AbortT-transformers base bytestring cereal cmdtheline
          composition containers data-ivar derive directory hslogger
@@ -13760,9 +13650,6 @@ 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
@@ -13785,18 +13672,12 @@ self: {
        pname = "LogicGrowsOnTrees-MPI";
        version = "1.0.0.1.1";
        sha256 = "22f5bcb22e731984e40a76ae1d48b0e59329ac5d3bd633efef7cb8140de8146b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal cmdtheline containers data-ivar derive
          hslogger hslogger-template LogicGrowsOnTrees
          MonadCatchIO-transformers stm transformers
        ];
        librarySystemDepends = [ openmpi ];
-       executableHaskellDepends = [
-         base cereal cmdtheline hslogger LogicGrowsOnTrees
-       ];
-       executableSystemDepends = [ openmpi ];
        jailbreak = true;
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
@@ -13813,16 +13694,11 @@ self: {
        pname = "LogicGrowsOnTrees-network";
        version = "1.0.0.4";
        sha256 = "7a01eb40f87b5810bfccfb23d49e4a04f7bb630f201425caaa0eeb0a82d9b973";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base cereal cmdtheline composition containers hslogger
          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
@@ -13843,16 +13719,11 @@ self: {
        pname = "LogicGrowsOnTrees-processes";
        version = "1.0.0.2";
        sha256 = "766b912ffe650e0ab7cd23a54b51fa440b9e411b63be1d520936bb815af93334";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal cmdtheline containers filepath FindBin
          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
@@ -14039,7 +13910,7 @@ self: {
      , containers, directory, extensible-exceptions, ghc, ghc-paths
      , hashable, haskell-src, hint, html, monad-par, mtl, mueval
      , network, network-uri, pretty, process, random, syb
-     , template-haskell, time, transformers, unix
+     , template-haskell, tf-random, time, transformers, unix
      }:
      mkDerivation {
        pname = "MagicHaskeller";
@@ -14050,13 +13921,13 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers directory ghc ghc-paths hashable
          haskell-src html mtl network network-uri pretty random syb
-         template-haskell time
+         template-haskell tf-random time
        ];
        executableHaskellDepends = [
          abstract-par array base bytestring cgi containers directory
          extensible-exceptions ghc ghc-paths hashable haskell-src hint html
          monad-par mtl mueval network network-uri pretty process random syb
-         template-haskell time transformers unix
+         template-haskell tf-random time transformers unix
        ];
        homepage = "http://nautilus.cs.miyazaki-u.ac.jp/~skata/MagicHaskeller.html";
        description = "Automatic inductive functional programmer by systematic search";
@@ -14205,10 +14076,7 @@ self: {
        sha256 = "4238c8f7ea1ecd2497d0a948493acbdc47728b2528b6e7841ef064b783d68b1c";
        revision = "1";
        editedCabalFile = "035cea173a56cf920ebb4c84b4033d2ea270c1ee24d07ad323b9b2701ebc72e7";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base ];
        doHaddock = false;
        homepage = "https://github.com/conal/MemoTrie";
        description = "Trie-based memo functions";
@@ -15179,15 +15047,12 @@ self: {
      }) {};
 
   "NaturalSort" = callPackage
-    ({ mkDerivation, base, bytestring, QuickCheck, strict }:
+    ({ mkDerivation, base, bytestring, strict }:
      mkDerivation {
        pname = "NaturalSort";
        version = "0.2.1";
        sha256 = "49fd310566c86d85714a1839f1bc845891771dbc023a0befee16f073bbac50f6";
-       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;
@@ -15309,12 +15174,12 @@ self: {
      }) {integer = null;};
 
   "NineP" = callPackage
-    ({ mkDerivation, base, binary, bytestring }:
+    ({ mkDerivation, base, binary }:
      mkDerivation {
        pname = "NineP";
        version = "0.0.2.1";
        sha256 = "4bb1516b9fb340118960043e0c72aa62316be8ff3f78cc8c1354e2fac96dd8cc";
-       libraryHaskellDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary ];
        homepage = "http://9ph.googlecode.com";
        description = "9P2000 in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -15908,13 +15773,10 @@ self: {
        pname = "OpenAL";
        version = "1.7.0.4";
        sha256 = "3989f6c4fe437843551004dd011c4308bf63d787ae4fbb8ce71d44b1b0b1f118";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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;
@@ -16427,8 +16289,6 @@ self: {
        pname = "PDBtools";
        version = "0.0.3";
        sha256 = "d80810bd44765b86c0ebf247f32ddded301eddb587fe12a0bdc378ee6b8fb0c4";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://www.github.com/rotskoff";
        description = "A library for analysis of 3-D protein coordinates";
@@ -16821,14 +16681,11 @@ self: {
        pname = "Plot-ho-matic";
        version = "0.9.0.8";
        sha256 = "22b6f69b384eb9883560b837cdf8dbe70b76099a10818adca803298c22cbe3bd";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cairo cereal Chart Chart-cairo containers
          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;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17327,7 +17184,6 @@ self: {
        testHaskellDepends = [
          base containers template-haskell test-framework
        ];
-       jailbreak = true;
        homepage = "https://github.com/nick8325/quickcheck";
        description = "Automatic testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -17388,8 +17244,6 @@ self: {
        pname = "QuickPlot";
        version = "0.1.0.1";
        sha256 = "02864cb2f1abcea25b5956421cfdd596c3b4d3ceafcd54d3aad26f443ba53fb5";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring haskell-src-meta parsec scientific
          snap snap-core template-haskell text vector websockets
@@ -18501,8 +18355,6 @@ self: {
        pname = "SHA";
        version = "1.6.4.1";
        sha256 = "743bc6d7dd3e74a44bfca8920f0f0ba5855722a62f6cc44f0a38d10c11bddc0d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ array base binary bytestring ];
        description = "Implementations of the SHA suite of message digest functions";
        license = stdenv.lib.licenses.bsd3;
@@ -18510,17 +18362,14 @@ self: {
      }) {};
 
   "SHA" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, directory
-     , QuickCheck, test-framework, test-framework-quickcheck2
+    ({ mkDerivation, array, base, binary, bytestring, QuickCheck
+     , test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "SHA";
        version = "1.6.4.2";
        sha256 = "c470176f63cbe49fd0502a1b32ef22bc01b1af42385583b8be94547750958a8c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ array base binary bytestring ];
-       executableHaskellDepends = [ base bytestring directory ];
        testHaskellDepends = [
          array base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2
@@ -18872,8 +18721,6 @@ self: {
        pname = "SegmentTree";
        version = "0.3";
        sha256 = "6188c1b1276d7fa0391098a563df73dd522d20b57dc5321fe3418a9e3ca84fc1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Data structure for querying the set (or count) of intervals covering given point";
        license = stdenv.lib.licenses.bsd3;
@@ -20329,10 +20176,7 @@ self: {
        pname = "Takusen";
        version = "0.8.7";
        sha256 = "9e9fe740a9030e27ee84343a7e308853b0e5d50371a841d9a3979a9f8d99ac57";
-       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 = [ "x86_64-darwin" ];
@@ -21624,10 +21468,7 @@ self: {
        pname = "Win32-notify";
        version = "0.3.0.1";
        sha256 = "c49159d8154f9ff7d30207901125ceadc2aa94baa3b2996ff0884e9f0158eb7f";
-       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;
@@ -21639,8 +21480,6 @@ self: {
        pname = "Win32-security";
        version = "0.1.1";
        sha256 = "9eca6c3efea64d83ee3aaf2ec0706695087e98e47c77163ac497f70ad4f90436";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
        homepage = "https://github.com/anton-dessiatov/Win32-security";
        description = "Haskell bindings to a security-related functions of the Windows API";
@@ -22120,7 +21959,7 @@ self: {
        pname = "Yablog";
        version = "0.2.0";
        sha256 = "737b4a1ab300cc2d5b8689640b51092b5a54d8ad4cb4bb451699b2367caa4761";
-       isLibrary = true;
+       isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base blaze-builder blaze-html bytestring case-insensitive
@@ -22133,7 +21972,6 @@ self: {
          yesod-default yesod-form yesod-newsfeed yesod-platform
          yesod-recaptcha yesod-static
        ];
-       jailbreak = true;
        homepage = "http://gitweb.konn-san.com/repo/Yablog/tree/master";
        description = "A simple blog engine powered by Yesod";
        license = stdenv.lib.licenses.bsd3;
@@ -22268,11 +22106,7 @@ self: {
        pname = "Yampa-core";
        version = "0.2.0";
        sha256 = "b78b1367c404e50021a7f17748d894e0c74a8b22dc8e48c7fbceea8fa4adaf1a";
-       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;
@@ -22507,14 +22341,11 @@ self: {
        pname = "abcBridge";
        version = "0.15";
        sha256 = "45fef882d6e9c3f7ad48621fc835417df5c161c6743ebc4e4d3cabe9445b113c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aig base base-compat containers directory vector
        ];
        librarySystemDepends = [ abc ];
        libraryToolDepends = [ c2hs ];
-       executableHaskellDepends = [ base base-compat ];
        testHaskellDepends = [
          aig base base-compat directory QuickCheck tasty tasty-ant-xml
          tasty-hunit tasty-quickcheck vector
@@ -22801,8 +22632,6 @@ self: {
        pname = "accelerate-cufft";
        version = "0.0";
        sha256 = "a7f5f2ee43acebd1a5caf6fd268b05def2d279485bf1e7021a0299097ef9ca89";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          accelerate accelerate-cuda accelerate-fourier accelerate-utility
          base cuda cufft
@@ -23028,6 +22857,18 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "accuerr" = callPackage
+    ({ mkDerivation, base, bifunctors, lens }:
+     mkDerivation {
+       pname = "accuerr";
+       version = "0.2.0.0";
+       sha256 = "9a186a37c2c9ccac3a8a3cd1cd76a60c4fcf2852dffde255d5375ba4193fc916";
+       libraryHaskellDepends = [ base bifunctors lens ];
+       homepage = "http://www.github.com/massysett/accuerr";
+       description = "Data type like Either but with accumulating error type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ace" = callPackage
     ({ mkDerivation, attoparsec, base, bifunctors, blaze-html
      , blaze-markup, data-default, hspec, HUnit, mtl, parsec, text
@@ -24216,8 +24057,6 @@ self: {
        pname = "adp-multi";
        version = "0.2.3";
        sha256 = "4728f3d87728adead1d6ebb33e032dd05673cc43573dc00d52a9522154f7b5d2";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ array base containers htrace ];
        testHaskellDepends = [
          array base containers htrace HUnit mtl QuickCheck random-shuffle
@@ -24238,8 +24077,6 @@ self: {
        pname = "adp-multi-monadiccp";
        version = "0.2.1";
        sha256 = "dae838558f728af3cf1e58aaccfcc66fe66a0d3d33332eb365d710e71facf48f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ adp-multi base containers monadiccp ];
        testHaskellDepends = [
          adp-multi base containers monadiccp mtl QuickCheck test-framework
@@ -25466,18 +25303,11 @@ self: {
        pname = "agentx";
        version = "0.2.0.0";
        sha256 = "e61dc3994aaf70cf8823064d56e839ee1af18ae6be30e294214f759064ccb65e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base binary bitwise bytestring containers data-default Diff
          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
-       ];
        jailbreak = true;
        description = "AgentX protocol for write SNMP subagents";
        license = stdenv.lib.licenses.bsd3;
@@ -26527,8 +26357,6 @@ self: {
        pname = "alsa-pcm";
        version = "0.6.0.4";
        sha256 = "9aae1379903b8445073f8a2b6ccf86b904b4045247747516530a165a3f76ca2a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          alsa-core array base extensible-exceptions sample-frame
          storable-record
@@ -26562,8 +26390,6 @@ self: {
        pname = "alsa-seq";
        version = "0.6.0.6";
        sha256 = "f5e58660f07943f0cc33eb2e1ada5e111c43d4114eeb4e0ac0251d72c43b7144";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          alsa-core array base bytestring data-accessor enumset
          extensible-exceptions poll transformers utility-ht
@@ -26829,7 +26655,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka" = callPackage
+  "amazonka_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, base, bytestring, conduit
      , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
      , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
@@ -26845,6 +26671,29 @@ self: {
          retry text time transformers transformers-base transformers-compat
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Comprehensive Amazon Web Services SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka" = callPackage
+    ({ mkDerivation, amazonka-core, base, bytestring, conduit
+     , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
+     , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
+     , time, transformers, transformers-base, transformers-compat
+     }:
+     mkDerivation {
+       pname = "amazonka";
+       version = "1.4.3";
+       sha256 = "18aa7816d755df58a824fc252d34cb1f81c6cba2ca2a7194c3a3f0d630c26686";
+       libraryHaskellDepends = [
+         amazonka-core base bytestring conduit conduit-extra directory
+         exceptions http-conduit ini mmorph monad-control mtl resourcet
+         retry text time transformers transformers-base transformers-compat
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Comprehensive Amazon Web Services SDK";
        license = "unknown";
@@ -26891,7 +26740,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-apigateway" = callPackage
+  "amazonka-apigateway_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -26904,6 +26753,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon API Gateway SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-apigateway" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-apigateway";
+       version = "1.4.3";
+       sha256 = "74fe95daa465255ad2a49f3f0b78242c5e1ec33d81d0e9dfffa833324894d948";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon API Gateway SDK";
        license = "unknown";
@@ -26916,8 +26785,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-application-autoscaling";
-       version = "1.4.2";
-       sha256 = "acf3b5b1badbd50e7f2cafe2fdf75d44ee3352f423367f434b4c1a12a3ed57ab";
+       version = "1.4.3";
+       sha256 = "5506a59b594355ab0e78f3e1c0f550bd5b2a858c4a0688732a4931e6ac096f6c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -27010,7 +26879,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-autoscaling" = callPackage
+  "amazonka-autoscaling_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -27023,6 +26892,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Auto Scaling SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-autoscaling" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-autoscaling";
+       version = "1.4.3";
+       sha256 = "4a47502b75b54cae3ab3da1792f5862a1e726e551d25bc0ba54f7854a66fa3df";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
        license = "unknown";
@@ -27049,7 +26938,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-certificatemanager" = callPackage
+  "amazonka-certificatemanager_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -27062,6 +26951,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Certificate Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-certificatemanager" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-certificatemanager";
+       version = "1.4.3";
+       sha256 = "d1228f95581d90f53a29dba53c1d7a1d0eb7439e278c4c5aca70af01f3e30d55";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Certificate Manager SDK";
        license = "unknown";
@@ -27150,7 +27059,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-cloudformation" = callPackage
+  "amazonka-cloudformation_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -27163,6 +27072,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudFormation SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-cloudformation" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudformation";
+       version = "1.4.3";
+       sha256 = "3b2069debd35ddfd08af2281902d7c063b267fd2a23b71057321cd2e55cd7690";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
        license = "unknown";
@@ -27251,7 +27180,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-cloudfront" = callPackage
+  "amazonka-cloudfront_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -27264,6 +27193,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudFront SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-cloudfront" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudfront";
+       version = "1.4.3";
+       sha256 = "5241ccb0d39cc055f97eb6496835783a97de0ce0b33c765a1325d01119abecbe";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
        license = "unknown";
@@ -27352,7 +27301,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-cloudhsm" = callPackage
+  "amazonka-cloudhsm_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -27365,6 +27314,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudHSM SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-cloudhsm" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudhsm";
+       version = "1.4.3";
+       sha256 = "6848989619b58c75fa1d72d122e96c621b881bf4c376b9325eeb54c8c3200c43";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
        license = "unknown";
@@ -27453,7 +27422,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-cloudsearch" = callPackage
+  "amazonka-cloudsearch_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -27466,6 +27435,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudSearch SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-cloudsearch" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudsearch";
+       version = "1.4.3";
+       sha256 = "7126175d24355afa678c9dd59400fd1b1a40c18240d96de88bd831b0099c0c26";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
        license = "unknown";
@@ -27554,7 +27543,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-cloudsearch-domains" = callPackage
+  "amazonka-cloudsearch-domains_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -27567,6 +27556,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudSearch Domain SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-cloudsearch-domains" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudsearch-domains";
+       version = "1.4.3";
+       sha256 = "4416cb88845bd27c845ecac50029e7721f3d13d26d24ab6c9c571b5c2c543f7d";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
        license = "unknown";
@@ -27655,7 +27664,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-cloudtrail" = callPackage
+  "amazonka-cloudtrail_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -27668,6 +27677,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudTrail SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-cloudtrail" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudtrail";
+       version = "1.4.3";
+       sha256 = "04ea4c78e0d73f71e1144eb5a357e1e6bce16109453ab30c31d8e7a9ae77fa6f";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
        license = "unknown";
@@ -27756,7 +27785,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-cloudwatch" = callPackage
+  "amazonka-cloudwatch_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -27769,6 +27798,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudWatch SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-cloudwatch" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudwatch";
+       version = "1.4.3";
+       sha256 = "98df67a18bfdf4c00736f6be41576877f8191ac936ab2f5666b160cb80c22d5f";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
        license = "unknown";
@@ -27795,7 +27844,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-cloudwatch-events" = callPackage
+  "amazonka-cloudwatch-events_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -27808,6 +27857,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudWatch Events SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-cloudwatch-events" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudwatch-events";
+       version = "1.4.3";
+       sha256 = "fb839e3e4c402151e138b1d69356600f2d378d53631a3616b6228f620713df56";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Events SDK";
        license = "unknown";
@@ -27896,7 +27965,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-cloudwatch-logs" = callPackage
+  "amazonka-cloudwatch-logs_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -27909,6 +27978,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudWatch Logs SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-cloudwatch-logs" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudwatch-logs";
+       version = "1.4.3";
+       sha256 = "de201710b2d594519b1c9d8b20fab92e1a0f4e777e5c05ed1bd32c91ae260161";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
        license = "unknown";
@@ -27955,7 +28044,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-codecommit" = callPackage
+  "amazonka-codecommit_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -27968,6 +28057,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CodeCommit SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-codecommit" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-codecommit";
+       version = "1.4.3";
+       sha256 = "fe8d033203bccb7c8c7242a063a814cdbb8a22fb4a95e5fa4f01b200d547966b";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeCommit SDK";
        license = "unknown";
@@ -28056,7 +28165,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-codedeploy" = callPackage
+  "amazonka-codedeploy_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -28069,6 +28178,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CodeDeploy SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-codedeploy" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-codedeploy";
+       version = "1.4.3";
+       sha256 = "d216d3af7472428fecab9763e65e2f2ea412dfaaf8debbbe5e37ab158c5392d9";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
        license = "unknown";
@@ -28115,7 +28244,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-codepipeline" = callPackage
+  "amazonka-codepipeline_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -28128,6 +28257,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CodePipeline SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-codepipeline" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-codepipeline";
+       version = "1.4.3";
+       sha256 = "2422824f998a0808151310c88c780bfa411a0f56966f93f614694f4dd526fdb1";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodePipeline SDK";
        license = "unknown";
@@ -28216,7 +28365,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-cognito-identity" = callPackage
+  "amazonka-cognito-identity_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -28229,6 +28378,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Cognito Identity SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-cognito-identity" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cognito-identity";
+       version = "1.4.3";
+       sha256 = "a45aa18f815e75da5e928ec8dfe7ed827394b0b1f4654bf059fe1f3897bfb232";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
        license = "unknown";
@@ -28255,7 +28424,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-cognito-idp" = callPackage
+  "amazonka-cognito-idp_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -28268,6 +28437,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Cognito Identity Provider SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-cognito-idp" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cognito-idp";
+       version = "1.4.3";
+       sha256 = "a7c23b78acf5ca6701540bd74bb5e20b007acbce0bf97905083e2e5dcab940e2";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity Provider SDK";
        license = "unknown";
@@ -28356,7 +28545,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-cognito-sync" = callPackage
+  "amazonka-cognito-sync_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -28369,6 +28558,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Cognito Sync SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-cognito-sync" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cognito-sync";
+       version = "1.4.3";
+       sha256 = "51a484d6dd44e9d6f9506bd8d97f04ccfa48a04e79aadb193b8644e17a696be7";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
        license = "unknown";
@@ -28457,7 +28666,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-config" = callPackage
+  "amazonka-config_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -28470,6 +28679,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Config SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-config" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-config";
+       version = "1.4.3";
+       sha256 = "d9c105b20e1269c55a59180ef61f040315643f873c0075b8b95e84723508e266";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
        license = "unknown";
@@ -28639,7 +28868,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-core" = callPackage
+  "amazonka-core_1_4_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, cryptonite, deepseq
      , exceptions, hashable, http-conduit, http-types, lens, memory, mtl
@@ -28670,6 +28899,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-core" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
+     , case-insensitive, conduit, conduit-extra, cryptonite, deepseq
+     , exceptions, hashable, http-conduit, http-types, lens, memory, mtl
+     , QuickCheck, quickcheck-unicode, resourcet, scientific, semigroups
+     , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , text, time, transformers, transformers-compat
+     , unordered-containers, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "amazonka-core";
+       version = "1.4.3";
+       sha256 = "8270e26104bb0cbc7654d3522dce631c9804b433ec9ff5a2a0c7f844938eead0";
+       libraryHaskellDepends = [
+         aeson attoparsec base bifunctors bytestring case-insensitive
+         conduit conduit-extra cryptonite deepseq exceptions hashable
+         http-conduit http-types lens memory mtl resourcet scientific
+         semigroups tagged text time transformers transformers-compat
+         unordered-containers xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         aeson base bytestring case-insensitive http-types QuickCheck
+         quickcheck-unicode tasty tasty-hunit tasty-quickcheck
+         template-haskell text time
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Core data types and functionality for Amazonka libraries";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-datapipeline_0_3_3" = callPackage
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
@@ -28752,7 +29012,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-datapipeline" = callPackage
+  "amazonka-datapipeline_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -28765,6 +29025,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Data Pipeline SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-datapipeline" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-datapipeline";
+       version = "1.4.3";
+       sha256 = "04bb3873f247a6fc75b5f0a7822e28c1d212765b7918d490474b6bb0faf3d781";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
        license = "unknown";
@@ -28811,7 +29091,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-devicefarm" = callPackage
+  "amazonka-devicefarm_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -28824,6 +29104,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Device Farm SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-devicefarm" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-devicefarm";
+       version = "1.4.3";
+       sha256 = "36ac89a5166ac8bf89d628b43ea7bd88e6624e9fedd6e7de2a7be5501a3d35cd";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Device Farm SDK";
        license = "unknown";
@@ -28912,7 +29212,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-directconnect" = callPackage
+  "amazonka-directconnect_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -28925,6 +29225,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Direct Connect SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-directconnect" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-directconnect";
+       version = "1.4.3";
+       sha256 = "96f67da0a8afb2013c84fc5650e700736711105b7924ce8f288f7f61ba133c7d";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
        license = "unknown";
@@ -28937,8 +29257,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-discovery";
-       version = "1.4.2";
-       sha256 = "89b5279777aaf404c6801efe126402ca8844f7329773c685ebdf3b9df0ed99ad";
+       version = "1.4.3";
+       sha256 = "bfe7c0601d44ca07c28171cb1def3eec5297fa690e6d005edeed4659ec49365f";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -28969,7 +29289,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-dms" = callPackage
+  "amazonka-dms_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -28982,6 +29302,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Database Migration Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-dms" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-dms";
+       version = "1.4.3";
+       sha256 = "1714e72bc22176cab07ab9932cec4050e816c450afc3bf6a2810f3318066f8ff";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Database Migration Service SDK";
        license = "unknown";
@@ -29028,7 +29368,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-ds" = callPackage
+  "amazonka-ds_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -29041,6 +29381,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Directory Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-ds" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ds";
+       version = "1.4.3";
+       sha256 = "d3433eb5c52093f2274055595174bda99e32eb3a4c4760811c22f9c0bbcfe700";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Directory Service SDK";
        license = "unknown";
@@ -29129,7 +29489,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-dynamodb" = callPackage
+  "amazonka-dynamodb_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -29142,6 +29502,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon DynamoDB SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-dynamodb" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-dynamodb";
+       version = "1.4.3";
+       sha256 = "309d695e84fcf5fb2234031b5c650ae2d72ee9bb91bee1cc2522b95228e4d652";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
        license = "unknown";
@@ -29188,7 +29568,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-dynamodb-streams" = callPackage
+  "amazonka-dynamodb-streams_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -29201,6 +29581,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon DynamoDB Streams SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-dynamodb-streams" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-dynamodb-streams";
+       version = "1.4.3";
+       sha256 = "61cc56bdbd831438d1daa1149106df1b1f5f0d8f6d8b20cbafcb4ad2869206c5";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB Streams SDK";
        license = "unknown";
@@ -29305,7 +29705,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-ec2" = callPackage
+  "amazonka-ec2_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -29318,6 +29718,27 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       doCheck = false;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic Compute Cloud SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-ec2" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ec2";
+       version = "1.4.3";
+       sha256 = "caeb98e701196d9350d44cd6b1f7b1f5790cc1c4bbbb30dd70824d025c7cc1b7";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        doCheck = false;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
@@ -29345,7 +29766,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-ecr" = callPackage
+  "amazonka-ecr_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -29358,6 +29779,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon EC2 Container Registry SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-ecr" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ecr";
+       version = "1.4.3";
+       sha256 = "e9c1475c8eb4b89cafc7df8f2e8d6c4cff16b349db5407d014ef49726d7b1861";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Registry SDK";
        license = "unknown";
@@ -29446,7 +29887,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-ecs" = callPackage
+  "amazonka-ecs_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -29459,6 +29900,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon EC2 Container Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-ecs" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ecs";
+       version = "1.4.3";
+       sha256 = "4c10a7da68605f7a9656714cb134cf47d920b2aa02f0c38e0c06f8ddf9152471";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
        license = "unknown";
@@ -29505,7 +29966,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-efs" = callPackage
+  "amazonka-efs_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -29518,6 +29979,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic File System SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-efs" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-efs";
+       version = "1.4.3";
+       sha256 = "c65054594451e774e1e9ad1fbfbf8a724dac86cbd4efa01aa5119d3d9f7a8301";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic File System SDK";
        license = "unknown";
@@ -29606,7 +30087,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-elasticache" = callPackage
+  "amazonka-elasticache_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -29619,6 +30100,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon ElastiCache SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-elasticache" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-elasticache";
+       version = "1.4.3";
+       sha256 = "673912e1f5db5762dd00da1312cc09e2265da0ac6a35d92ee2bbb6e88230f879";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
        license = "unknown";
@@ -29707,7 +30208,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-elasticbeanstalk" = callPackage
+  "amazonka-elasticbeanstalk_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -29720,6 +30221,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic Beanstalk SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-elasticbeanstalk" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-elasticbeanstalk";
+       version = "1.4.3";
+       sha256 = "675730e477fcf3926605dc42bf08f3fba48f7272cc63cb5c845bb16c296fbd9b";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
        license = "unknown";
@@ -29766,7 +30287,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-elasticsearch" = callPackage
+  "amazonka-elasticsearch_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -29779,6 +30300,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elasticsearch Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-elasticsearch" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-elasticsearch";
+       version = "1.4.3";
+       sha256 = "9e7b1911946ce7a0df8c7ef13277f32a06a26e2a7a6334b3d1514cf089d014d5";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elasticsearch Service SDK";
        license = "unknown";
@@ -29867,7 +30408,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-elastictranscoder" = callPackage
+  "amazonka-elastictranscoder_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -29880,6 +30421,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic Transcoder SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-elastictranscoder" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-elastictranscoder";
+       version = "1.4.3";
+       sha256 = "9a5d534e54f5421a37103b4117d07bcf16eb241a0bd153457037f1f83ccb8b2f";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
        license = "unknown";
@@ -29968,7 +30529,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-elb" = callPackage
+  "amazonka-elb_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -29981,6 +30542,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic Load Balancing SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-elb" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-elb";
+       version = "1.4.3";
+       sha256 = "81fae99dff50a8feb54150afdb5ef6a06b1be57b6d46957e37c503a730bd2d56";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
        license = "unknown";
@@ -30069,7 +30650,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-emr" = callPackage
+  "amazonka-emr_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -30082,6 +30663,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic MapReduce SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-emr" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-emr";
+       version = "1.4.3";
+       sha256 = "b31ab69a06ea6ba585a89c133a78ed0ea2cb89faa9e2a04b6d12228167fa8e75";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
        license = "unknown";
@@ -30108,7 +30709,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-gamelift" = callPackage
+  "amazonka-gamelift_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -30121,6 +30722,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon GameLift SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-gamelift" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-gamelift";
+       version = "1.4.3";
+       sha256 = "c7fa8f5e3d83a6c1b2848676e270534dac9c8084d702abcd2edc79b603766429";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon GameLift SDK";
        license = "unknown";
@@ -30209,7 +30830,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-glacier" = callPackage
+  "amazonka-glacier_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -30222,6 +30843,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Glacier SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-glacier" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-glacier";
+       version = "1.4.3";
+       sha256 = "dddfa10e13eceba289a534fa6f7accd2969c8c6cc06b967e5bf35604c6738bec";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
        license = "unknown";
@@ -30310,7 +30951,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-iam" = callPackage
+  "amazonka-iam_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -30323,6 +30964,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Identity and Access Management SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-iam" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-iam";
+       version = "1.4.3";
+       sha256 = "4208dcc7e9f4a5c351246d4c33f7215079dad2325e0e894186284d86c8243734";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
        license = "unknown";
@@ -30411,7 +31072,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-importexport" = callPackage
+  "amazonka-importexport_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -30424,6 +31085,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Import/Export SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-importexport" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-importexport";
+       version = "1.4.3";
+       sha256 = "ce555f40f865c0ef4680b6fd2344927f86f44bc04cb4f97d8bdd47c18de3ca64";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
        license = "unknown";
@@ -30470,7 +31151,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-inspector" = callPackage
+  "amazonka-inspector_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -30483,6 +31164,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Inspector SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-inspector" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-inspector";
+       version = "1.4.3";
+       sha256 = "0f54b9b7c5bf3317390e86e3351806116fc55dce8614f26c79af7bfed1bf28c8";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Inspector SDK";
        license = "unknown";
@@ -30529,7 +31230,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-iot" = callPackage
+  "amazonka-iot_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -30542,6 +31243,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon IoT SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-iot" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-iot";
+       version = "1.4.3";
+       sha256 = "4b9f17daddab2f04f60d84109e8c78077bd1feae610f0053fbe7edf0317c3e91";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon IoT SDK";
        license = "unknown";
@@ -30588,7 +31309,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-iot-dataplane" = callPackage
+  "amazonka-iot-dataplane_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -30601,6 +31322,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon IoT Data Plane SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-iot-dataplane" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-iot-dataplane";
+       version = "1.4.3";
+       sha256 = "2c3ef08bc6a294591f029a7189a35acf5cbd9bc332f1f3f8f94cca0a8e9a5b96";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon IoT Data Plane SDK";
        license = "unknown";
@@ -30689,7 +31430,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-kinesis" = callPackage
+  "amazonka-kinesis_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -30702,6 +31443,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-kinesis" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis";
+       version = "1.4.3";
+       sha256 = "6b9f597488893470ef9914857ec3e593aea3a41b2c69794d95065ce3e332e812";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
        license = "unknown";
@@ -30748,7 +31509,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-kinesis-firehose" = callPackage
+  "amazonka-kinesis-firehose_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -30761,6 +31522,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis Firehose SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-kinesis-firehose" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis-firehose";
+       version = "1.4.3";
+       sha256 = "2add7d8f8b27cbc339c473244007683d7ceab6caa00258c9030ed8983d16853a";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis Firehose SDK";
        license = "unknown";
@@ -30849,7 +31630,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-kms" = callPackage
+  "amazonka-kms_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -30862,6 +31643,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Key Management Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-kms" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kms";
+       version = "1.4.3";
+       sha256 = "933a098970511c03b72698138329350ac722dd84dbd3fc76b49e2eb5504a73ed";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
        license = "unknown";
@@ -30950,7 +31751,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-lambda" = callPackage
+  "amazonka-lambda_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -30963,6 +31764,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Lambda SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-lambda" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-lambda";
+       version = "1.4.3";
+       sha256 = "4ed68d68eaa379b41f0ccf4ef82981687bd029fea84b544a0137ce0408d01787";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
        license = "unknown";
@@ -31009,7 +31830,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-marketplace-analytics" = callPackage
+  "amazonka-marketplace-analytics_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -31022,6 +31843,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Marketplace Commerce Analytics SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-marketplace-analytics" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-marketplace-analytics";
+       version = "1.4.3";
+       sha256 = "cca9bd6001747c33714601b7b9cc85623e179e99f67e05e04d38be340d80dec7";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Marketplace Commerce Analytics SDK";
        license = "unknown";
@@ -31048,7 +31889,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-marketplace-metering" = callPackage
+  "amazonka-marketplace-metering_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -31061,6 +31902,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Marketplace Metering SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-marketplace-metering" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-marketplace-metering";
+       version = "1.4.3";
+       sha256 = "577270b944784ea27d8cc0e911757c5a5fe18657892d2862e5e20e3e64b37a21";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Marketplace Metering SDK";
        license = "unknown";
@@ -31121,7 +31982,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-ml" = callPackage
+  "amazonka-ml_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -31134,6 +31995,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Machine Learning SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-ml" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ml";
+       version = "1.4.3";
+       sha256 = "dd5731a2df42ecb1d07968436ed27c1a72b61a3e1b5a3b7c8c04d38ed9ada4dd";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Machine Learning SDK";
        license = "unknown";
@@ -31222,7 +32103,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-opsworks" = callPackage
+  "amazonka-opsworks_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -31235,6 +32116,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon OpsWorks SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-opsworks" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-opsworks";
+       version = "1.4.3";
+       sha256 = "8a3844b702d7d68e7f26b8a886e3c4ca3984b6f2522c13f0e7c5174f2e8ef273";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
        license = "unknown";
@@ -31323,7 +32224,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-rds" = callPackage
+  "amazonka-rds_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -31336,6 +32237,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Relational Database Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-rds" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-rds";
+       version = "1.4.3";
+       sha256 = "4d58e361bdc88245b71e718edace7f2a360fecb7bf243a61d0eac1424abf2acf";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
        license = "unknown";
@@ -31424,7 +32345,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-redshift" = callPackage
+  "amazonka-redshift_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -31437,6 +32358,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Redshift SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-redshift" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-redshift";
+       version = "1.4.3";
+       sha256 = "af9d7957c68c0e66cb1301b611bc196adaead8eb2b88210d369dc01ed377fe68";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
        license = "unknown";
@@ -31539,7 +32480,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-route53" = callPackage
+  "amazonka-route53_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -31552,6 +32493,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Route 53 SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-route53" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-route53";
+       version = "1.4.3";
+       sha256 = "a7fb42486f54b7e1b858edc907a57be656b20a2da8a08c982e3d8bf0c592b0cf";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
        license = "unknown";
@@ -31640,7 +32601,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-route53-domains" = callPackage
+  "amazonka-route53-domains_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -31653,6 +32614,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Route 53 Domains SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-route53-domains" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-route53-domains";
+       version = "1.4.3";
+       sha256 = "1a773fc3c18faa770874fc708ff0cb6b7150a09836c3a9c6332b9d222a4fe18b";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
        license = "unknown";
@@ -31743,7 +32724,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-s3" = callPackage
+  "amazonka-s3_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , lens, tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -31756,6 +32737,27 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       doCheck = false;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Simple Storage Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-s3" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-s3";
+       version = "1.4.3";
+       sha256 = "9ed6c9e7675e99a545a84ac2c979a7542ecd898dd6e4c2fbbbba2c4a40d8fc50";
+       libraryHaskellDepends = [ amazonka-core base lens text ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        doCheck = false;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
@@ -31845,7 +32847,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-sdb" = callPackage
+  "amazonka-sdb_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -31858,6 +32860,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon SimpleDB SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-sdb" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sdb";
+       version = "1.4.3";
+       sha256 = "7fac8b39c2210e09d1ef15f7c964b64397c1b6165638c92f4069be8002ebf1d3";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
        license = "unknown";
@@ -31946,7 +32968,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-ses" = callPackage
+  "amazonka-ses_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -31959,6 +32981,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Simple Email Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-ses" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ses";
+       version = "1.4.3";
+       sha256 = "2ccab07f3c08d9145c2bc936048e5f973532871f1a366e0111a2bf70973d96a2";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
        license = "unknown";
@@ -32047,7 +33089,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-sns" = callPackage
+  "amazonka-sns_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -32060,6 +33102,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Simple Notification Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-sns" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sns";
+       version = "1.4.3";
+       sha256 = "681335a9d385af666d5c895b982fb757fa65862a0047d3a498d544f6d136544a";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
        license = "unknown";
@@ -32148,7 +33210,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-sqs" = callPackage
+  "amazonka-sqs_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -32161,6 +33223,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Simple Queue Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-sqs" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sqs";
+       version = "1.4.3";
+       sha256 = "2e94eaab5fc5c9a4471bfe834ccf975c1776b268cb291281740db62148825ece";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
        license = "unknown";
@@ -32249,7 +33331,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-ssm" = callPackage
+  "amazonka-ssm_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -32262,6 +33344,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Simple Systems Management Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-ssm" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ssm";
+       version = "1.4.3";
+       sha256 = "260a3e4178f48f4df2bb2574809ac7c81c7208fa9d77225c6101844bb21c38c1";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Systems Management Service SDK";
        license = "unknown";
@@ -32350,7 +33452,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-storagegateway" = callPackage
+  "amazonka-storagegateway_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -32363,6 +33465,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Storage Gateway SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-storagegateway" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-storagegateway";
+       version = "1.4.3";
+       sha256 = "5522fa5aa0bfed529b5b85385d2000aedf5b1c8fb5400bf280d4b131275b7b47";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
        license = "unknown";
@@ -32451,7 +33573,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-sts" = callPackage
+  "amazonka-sts_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -32464,6 +33586,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Security Token Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-sts" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sts";
+       version = "1.4.3";
+       sha256 = "d36e38218fe83a696c13dfef9362028cb23f73b96fb468bb9b809ef69598606c";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
        license = "unknown";
@@ -32552,7 +33694,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-support" = callPackage
+  "amazonka-support_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -32565,6 +33707,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Support SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-support" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-support";
+       version = "1.4.3";
+       sha256 = "d9acfb0d35f3c987dd534c0a59959cef44825facfc4665ba20bf286e4023d70f";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
        license = "unknown";
@@ -32655,7 +33817,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-swf" = callPackage
+  "amazonka-swf_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -32668,6 +33830,27 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       doCheck = false;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Simple Workflow Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-swf" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-swf";
+       version = "1.4.3";
+       sha256 = "0443d02c23d93eca09f6b91ad7aa1e32ab02e6b92e0bb6595ab65ce5f13ab469";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        doCheck = false;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
@@ -32723,7 +33906,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-test" = callPackage
+  "amazonka-test_1_4_2" = callPackage
     ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, groom, http-client
      , http-types, process, resourcet, tasty, tasty-hunit
@@ -32740,6 +33923,30 @@ self: {
          resourcet tasty tasty-hunit template-haskell temporary text time
          unordered-containers yaml
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Common functionality for Amazonka library test-suites";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-test" = callPackage
+    ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
+     , case-insensitive, conduit, conduit-extra, groom, http-client
+     , http-types, process, resourcet, tasty, tasty-hunit
+     , template-haskell, temporary, text, time, unordered-containers
+     , yaml
+     }:
+     mkDerivation {
+       pname = "amazonka-test";
+       version = "1.4.3";
+       sha256 = "10310abf1036afb3f2ea688b300d738700f780a2459a10f306b1bedff9019d9b";
+       libraryHaskellDepends = [
+         aeson amazonka-core base bifunctors bytestring case-insensitive
+         conduit conduit-extra groom http-client http-types process
+         resourcet tasty tasty-hunit template-haskell temporary text time
+         unordered-containers yaml
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Common functionality for Amazonka library test-suites";
        license = "unknown";
@@ -32786,7 +33993,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-waf" = callPackage
+  "amazonka-waf_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -32799,6 +34006,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon WAF SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-waf" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-waf";
+       version = "1.4.3";
+       sha256 = "7e9c9d7ca82c8d1e95e7aabf696980040f8644d96c011438e06c51dd41655a85";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WAF SDK";
        license = "unknown";
@@ -32859,7 +34086,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amazonka-workspaces" = callPackage
+  "amazonka-workspaces_1_4_2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -32872,6 +34099,26 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon WorkSpaces SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-workspaces" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-workspaces";
+       version = "1.4.3";
+       sha256 = "61828d17aec286062dd453e69b730e180a651f59387c7355872d1cae47805d78";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkSpaces SDK";
        license = "unknown";
@@ -33343,10 +34590,7 @@ self: {
        pname = "anonymous-sums";
        version = "0.4.0.0";
        sha256 = "116626dd139f7ba57b66d790915ff21cdf09f267da16f873f396ae76aad16749";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base ];
        homepage = "http://www.github.com/massysett/anonymous-sums";
        description = "Anonymous sum types";
        license = stdenv.lib.licenses.bsd3;
@@ -33391,10 +34635,7 @@ self: {
        pname = "ansi-terminal";
        version = "0.6.2.1";
        sha256 = "965a38671ddd195b243af9d0284faedb52b852eace5f7cced11e6fcf2e47b7f6";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base unix ];
-       executableHaskellDepends = [ base unix ];
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
@@ -33407,10 +34648,7 @@ self: {
        pname = "ansi-terminal";
        version = "0.6.2.2";
        sha256 = "da082cfcbd7f65b808adea6c9915ad58643b8a22c7bcd21d3dbaf091828dd4bf";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base unix ];
-       executableHaskellDepends = [ base unix ];
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
@@ -33423,10 +34661,7 @@ self: {
        pname = "ansi-terminal";
        version = "0.6.2.3";
        sha256 = "4dc02cb53e9ca7c8800bbdfc0337b961e5a945382cd09a6a40c6170126e0ee42";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base unix ];
-       executableHaskellDepends = [ base unix ];
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
@@ -33440,10 +34675,7 @@ self: {
        sha256 = "d980c265cacf6d6aa37a24d056e730b678680e07d3ab87210affb415de0ac1af";
        revision = "1";
        editedCabalFile = "3ab6d9878470a4f5ec495d6aea47396172d162518aa37abf8e50fe58d6323715";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
-       executableHaskellDepends = [ ansi-terminal base ];
        jailbreak = true;
        homepage = "http://github.com/batterseapower/ansi-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
@@ -33457,10 +34689,7 @@ self: {
        pname = "ansi-wl-pprint";
        version = "0.6.7.2";
        sha256 = "015ec4414242089fff5d6d567b392b6bb4fa5f85afff7f0708566082e1d91774";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
-       executableHaskellDepends = [ ansi-terminal base ];
        homepage = "http://github.com/batterseapower/ansi-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
        license = stdenv.lib.licenses.bsd3;
@@ -33473,10 +34702,7 @@ self: {
        pname = "ansi-wl-pprint";
        version = "0.6.7.3";
        sha256 = "3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708";
-       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;
@@ -33662,10 +34888,7 @@ self: {
        pname = "anydbm";
        version = "1.0.7";
        sha256 = "d33410fc5fad79bd5a5bcc24248f6e5a7a3133ede5111c31a8c58068b219b3e7";
-       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";
@@ -35755,8 +36978,6 @@ self: {
        pname = "ascii-progress";
        version = "0.3.2.0";
        sha256 = "51a70a0d1fd39138f6d143bf52080c765d0f0b69d5af887f2fa80a950448c771";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          async base concurrent-output data-default time
        ];
@@ -35777,8 +36998,6 @@ self: {
        pname = "ascii-progress";
        version = "0.3.3.0";
        sha256 = "7e3fa6b80c09a83c9ba8a0644ef304ca92d65b76383b8dd023ff9f89ebec913e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          async base concurrent-output data-default time
        ];
@@ -35965,8 +37184,6 @@ self: {
        sha256 = "f9a8a8ec41e89ebb4af6bd6b8a4c45515e44d7d61524d02b52881bfe7caf4783";
        revision = "1";
        editedCabalFile = "6c8f01076a88b9ea0f2ce9b5fa2b09dc658332bd4dedfbc8d6e7fae25ea5ed1f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
        jailbreak = true;
        homepage = "http://github.com/vincenthz/hs-asn1-data";
@@ -35983,8 +37200,6 @@ self: {
        sha256 = "83999c03cbc993f7e0dea010942a4dc39ae986c498c57eadc1e5ee1b4e23aca1";
        revision = "1";
        editedCabalFile = "1543bc1ee13d3f4b9ee6f9445edede596d5fe7f8a4551333b54634aad5b112a3";
-       isLibrary = true;
-       isExecutable = 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";
@@ -36805,7 +38020,6 @@ self: {
          haskeline hint mtl parsec pretty regex-pcre template-haskell text
          time vector
        ];
-       jailbreak = true;
        homepage = "http://atomo-lang.org/";
        description = "A highly dynamic, extremely simple, very fun programming language";
        license = stdenv.lib.licenses.bsd3;
@@ -37250,8 +38464,6 @@ self: {
        pname = "audacity";
        version = "0.0";
        sha256 = "1f578e6cf8bfc5524a9e49ff306a736ab1c5db2a8a4ab4a3e4f47cb34a2fd7ed";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base deepseq utility-ht ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/audacity";
@@ -38138,8 +39350,6 @@ self: {
        sha256 = "496dafa5f847a4401d8ec34c45e11e77ee558ea9dc09caef2680f7c2c8c907a7";
        revision = "1";
        editedCabalFile = "60b1c78a946c4c45dae2771dfedeebacb1229e0f61d03dbf3ed76dbcbbb96c13";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
@@ -38179,8 +39389,6 @@ self: {
        sha256 = "f1e3df0c141823f384f3410c9eef92eb410b716b0caa6534aec67dacb82b1697";
        revision = "2";
        editedCabalFile = "9759b26f78a14b3e31eb516e471af0ad00840793a0029170c5e27ffaf14e1838";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
@@ -38219,8 +39427,6 @@ self: {
        sha256 = "14a9a9f4435f92b9a0364de66469e293f3ad09c7fe54aacce3486280866de30a";
        revision = "2";
        editedCabalFile = "73e3d00ce401c09e55bfd27b2d73afff8709d43967718182c5ebc8b406d6bcf6";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
@@ -38259,8 +39465,6 @@ self: {
        sha256 = "33c254d949af40c55f3f82c95b76bd9d456039fef44ecd675f343fc14e9857d6";
        revision = "1";
        editedCabalFile = "ce643c305e10f780d10157dfe4eb51ce840b206a7ba736616f445d38725ec02f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
@@ -38299,8 +39503,6 @@ self: {
        sha256 = "6c85bac359ea94d78f287b45c6e7e981dc260a1c029a7888ed752a1c0e64d32b";
        revision = "1";
        editedCabalFile = "15033cfa014e706515a9d2b59c4996a921e41bfd9a460d7f8388d3faa55e9ff5";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
@@ -38339,8 +39541,6 @@ self: {
        sha256 = "3504c96a00d12fa0fe4ae5ab4dafa3eec7ca576a02ed7906cff70a75625a75a6";
        revision = "1";
        editedCabalFile = "57beb101b4203e6784df90817aadfbda98972052e31f85fa620f2d7dcdf6a446";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
@@ -38377,8 +39577,6 @@ self: {
        pname = "aws";
        version = "0.13.2";
        sha256 = "998a9ddc9bc3e74a292e733aac1e9af0ec654d17aa1834319f9f6af4d907ff59";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
@@ -38415,8 +39613,6 @@ self: {
        pname = "aws";
        version = "0.14.0";
        sha256 = "b5b959f9b0ae8c07baf91e067b4005dc554d76c1ab15d019f13a4dc88a8a813e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
@@ -38555,8 +39751,6 @@ self: {
        pname = "aws-elastic-transcoder";
        version = "0.2.0.2";
        sha256 = "896b7cdb17313b8a5e848de797ab61a3d1ab3779b6bf2d571cda50e5317ebe09";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson aws aws-sign4 base bytestring conduit containers http-conduit
          http-types QuickCheck regex-compat safe text time transformers
@@ -39531,8 +40725,8 @@ self: {
      }) {};
 
   "bamse" = callPackage
-    ({ mkDerivation, base, com, directory, filepath, HUnit, old-time
-     , pretty, process, QuickCheck, regex-compat
+    ({ mkDerivation, base, com, directory, filepath, old-time, pretty
+     , process, regex-compat
      }:
      mkDerivation {
        pname = "bamse";
@@ -39543,7 +40737,6 @@ 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 = [ "x86_64-darwin" ];
@@ -39727,8 +40920,6 @@ self: {
        sha256 = "9f7c56af995b47791ee0ffa69c27d3de0b895125dbd5fe0c84d8b621467f90ba";
        revision = "2";
        editedCabalFile = "bcb912e8105f792720b8515ddf9b37d6a1eecd17cb325cc40bd688641068e9e6";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-svg bytestring template-haskell text
          unordered-containers
@@ -40839,6 +42030,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bearriver" = callPackage
+    ({ mkDerivation, base, dunai, mtl, transformers }:
+     mkDerivation {
+       pname = "bearriver";
+       version = "0.10.4";
+       sha256 = "c1117be28a5852f92fcdc08143b0c430b34e0c571652a439dd9a27baba9a3e2b";
+       libraryHaskellDepends = [ base dunai mtl transformers ];
+       homepage = "keera.co.uk";
+       description = "A replacement of Yampa based on Monadic Stream Functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "beautifHOL" = callPackage
     ({ mkDerivation, array, base, haskell98, mtl }:
      mkDerivation {
@@ -41070,8 +42273,6 @@ self: {
        pname = "bet";
        version = "0.1.2.3";
        sha256 = "a818d927e09c0386842658f70682089c16bc241961834af07fdbb0155015c13f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bifunctors binary bytestring containers exceptions
          HsOpenSSL http-client http-client-openssl lens mtl semigroupoids
@@ -41136,8 +42337,6 @@ self: {
        pname = "bff";
        version = "0.3.1.2";
        sha256 = "5d44be6c1890b08ed18b8ebac8cf2565747f2c20f143edb7c0d0c311e73dbec4";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bimap category-extras containers derive haskell98 mtl
          template-haskell unix
@@ -41221,8 +42420,6 @@ self: {
        pname = "bibtex";
        version = "0.1.0.6";
        sha256 = "090a3b9589388bdf9d2bf60d8d1898aa0313a2874b551ba86cbbd049f3ee5f04";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base latex parsec utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/BibTeX";
        description = "Parse, format and processing BibTeX files";
@@ -42010,8 +43207,6 @@ self: {
        pname = "binary-protocol-zmq";
        version = "0.2";
        sha256 = "beaad38fb11794b368e69f3b84d46809440a1afae26110401c79c9c0a6b94a92";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring mtl zeromq-haskell
        ];
@@ -43254,8 +44449,7 @@ self: {
 
   "bio" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, mtl, old-time, parallel, parsec, process, QuickCheck
-     , random, tagsoup
+     , directory, mtl, parallel, parsec, QuickCheck, random, tagsoup
      }:
      mkDerivation {
        pname = "bio";
@@ -43267,9 +44461,7 @@ self: {
          array base binary bytestring containers directory mtl parallel
          parsec QuickCheck tagsoup
        ];
-       executableHaskellDepends = [
-         base bytestring containers old-time process QuickCheck random
-       ];
+       executableHaskellDepends = [ base bytestring random ];
        jailbreak = true;
        homepage = "http://biohaskell.org/Libraries/Bio";
        description = "A bioinformatics library";
@@ -43855,8 +45047,6 @@ self: {
        pname = "bits-atomic";
        version = "0.1.3";
        sha256 = "e0ac3456cf0338e1d5ed33f4c3c6b932d652add2ac827c6a1b6636c6e754cb8d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Atomic bit operations on memory locations for low-level synchronization";
        license = stdenv.lib.licenses.bsd3;
@@ -43895,8 +45085,6 @@ self: {
        pname = "bits-extras";
        version = "0.1.3";
        sha256 = "27a5dcf562e5f4c011421263859e09f65d4c382cd123abd73807f456f56cc96b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
@@ -44941,15 +46129,17 @@ self: {
      }) {};
 
   "blink1" = callPackage
-    ({ mkDerivation, base, unix }:
+    ({ mkDerivation, base, bytestring, text, unix, usb, vector }:
      mkDerivation {
        pname = "blink1";
        version = "0.4";
        sha256 = "128bba0aa3247b4a6546c41b0b7f85ad1869c0ec8aaa20ff2bbb8b89c9e38714";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base unix ];
-       executableHaskellDepends = [ base unix ];
+       libraryHaskellDepends = [ base bytestring text unix usb vector ];
+       executableHaskellDepends = [
+         base bytestring text unix usb vector
+       ];
        description = "Control library for blink(1) LED from ThingM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46120,15 +47310,10 @@ self: {
        pname = "brick";
        version = "0.3.1";
        sha256 = "0e97e82a8dc3b9eba8f11cdf69818b6a919dbe6e8c7710b55483c3908ecfc7a9";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers contravariant data-default deepseq lens
          template-haskell text text-zipper transformers vector vty
        ];
-       executableHaskellDepends = [
-         base data-default lens text vector vty
-       ];
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
@@ -46144,15 +47329,10 @@ self: {
        pname = "brick";
        version = "0.4.1";
        sha256 = "bea0df7fdcb476fc955f7301e77bfb8845008ab0e36cab2c2dcc1cf679a4595d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers contravariant data-default deepseq lens
          template-haskell text text-zipper transformers vector vty
        ];
-       executableHaskellDepends = [
-         base data-default lens text vector vty
-       ];
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
@@ -46168,16 +47348,11 @@ self: {
        pname = "brick";
        version = "0.7";
        sha256 = "99547ab0ebbe3cf298466d4084802a40c3a2bf2021d491f064a39e309d2e596b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers contravariant data-default deepseq microlens
          microlens-mtl microlens-th template-haskell text text-zipper
          transformers vector vty
        ];
-       executableHaskellDepends = [
-         base data-default microlens microlens-th text vector vty
-       ];
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
@@ -46470,8 +47645,6 @@ self: {
        sha256 = "1f3d34897047c124f858b6097bf29ebf250d85aaad74c2c44183607041472bcc";
        revision = "1";
        editedCabalFile = "1ef2b2d9f4768be3250cf2f971639c1a0e410e6bb9b035e922305c62c5f00887";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring time unix ];
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
@@ -46485,8 +47658,6 @@ self: {
        pname = "btrfs";
        version = "0.1.2.0";
        sha256 = "a1e7bdb44c587686299e3e9e3910fb7a271bcd7462ee6fac0ffccd8c7a60fe0c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring time unix ];
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
@@ -46649,14 +47820,11 @@ self: {
        pname = "bugzilla";
        version = "0.2.1.1";
        sha256 = "ad30a9b8cbe7e9b994d6898ff68007e0c5a5a45b873e9a52dd51cf68d5945ea5";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring connection containers
          data-default http-conduit http-types iso8601-time resourcet text
          time transformers unordered-containers vector
        ];
-       executableHaskellDepends = [ base containers text time ];
        jailbreak = true;
        homepage = "https://github.com/sethfowler/hsbugzilla";
        description = "A Haskell interface to the Bugzilla native REST API";
@@ -47001,8 +48169,6 @@ self: {
        pname = "bv";
        version = "0.4.1";
        sha256 = "dd092150f1792e76e168365d69798d3a27b911ce9de8b21a47c5fed42acf45bb";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        homepage = "https://github.com/iagoabal/haskell-bv";
        description = "Bit-vector arithmetic library";
@@ -47018,13 +48184,10 @@ self: {
        pname = "byline";
        version = "0.2.2.0";
        sha256 = "f1a00142d77643a3da1ddabf9d9f1308e7ee1d8ea758d8161ed118a3d7c4123a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base colour containers exceptions haskeline mtl
          terminfo-hs text transformers
        ];
-       executableHaskellDepends = [ base text ];
        jailbreak = true;
        homepage = "http://github.com/pjones/byline";
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
@@ -47061,8 +48224,6 @@ self: {
        pname = "bytedump";
        version = "1.0";
        sha256 = "ae17b5040f0423eec792505f14d1d3e53f5ff81ddf83524f1c5dc7a16c0dc0dd";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/vincenthz/hs-bytedump";
        description = "Flexible byte dump helpers for human readers";
@@ -47543,8 +48704,6 @@ self: {
        pname = "bytestring-nums";
        version = "0.3.6";
        sha256 = "bdca97600d91f00bb3c0f654784e3fbd2d62fcf4671820578105487cdf39e7cd";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://github.com/solidsnack/bytestring-nums";
        description = "Parse numeric literals from ByteStrings";
@@ -47669,13 +48828,13 @@ self: {
      }) {};
 
   "bytestring-short" = callPackage
-    ({ mkDerivation, base, bytestring }:
+    ({ mkDerivation, base, bytestring, deepseq, QuickCheck }:
      mkDerivation {
        pname = "bytestring-short";
        version = "0.1.0.0";
        sha256 = "39b303951403758dcf626f48e4501b93865d3b4d52d90ae594bbe91a4fc9fca6";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [ base ];
+       libraryHaskellDepends = [ base bytestring deepseq ];
+       testHaskellDepends = [ base bytestring QuickCheck ];
        description = "Backport copy of ShortByteString";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47766,24 +48925,24 @@ self: {
      }) {};
 
   "bytestringparser" = callPackage
-    ({ mkDerivation, base, bytestring, containers }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "bytestringparser";
        version = "0.3";
        sha256 = "0d0b686fcb68901a54045377e003aeb9b6fd6877c107b2e830254e12eeda29bd";
-       libraryHaskellDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
   "bytestringparser-temporary" = callPackage
-    ({ mkDerivation, base, bytestring, containers }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "bytestringparser-temporary";
        version = "0.4.1";
        sha256 = "eda2b21f45cc42f057f8afdee0969cbdec9b91f7ded3c0e6d7f555580cee2a05";
-       libraryHaskellDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49335,8 +50494,8 @@ self: {
      }) {};
 
   "cabal-rpm" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath, process, time
-     , unix
+    ({ mkDerivation, base, Cabal, directory, filepath, old-locale
+     , process, time, unix
      }:
      mkDerivation {
        pname = "cabal-rpm";
@@ -49345,7 +50504,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base Cabal directory filepath process time unix
+         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";
@@ -49986,8 +51145,6 @@ self: {
        pname = "cacophony";
        version = "0.6.0";
        sha256 = "2a1b2cf962fbf2743efb36439428b89882add585a4877436533b9fc755d98a9c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cryptonite deepseq free lens memory mtl
        ];
@@ -50010,8 +51167,6 @@ self: {
        pname = "cacophony";
        version = "0.7.0";
        sha256 = "e67a7fb0e957b47dd6a9b4b956cad17ff42022bca119bb08422d52050a51379f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cryptonite deepseq free lens memory monad-coroutine
          mtl transformers
@@ -50149,13 +51304,14 @@ self: {
      }) {inherit (pkgs) cairo;};
 
   "cairo" = callPackage
-    ({ mkDerivation, array, base, bytestring, cairo, mtl, text
-     , utf8-string
+    ({ mkDerivation, array, base, bytestring, Cabal, cairo
+     , gtk2hs-buildtools, mtl, text, utf8-string
      }:
      mkDerivation {
        pname = "cairo";
        version = "0.13.3.0";
        sha256 = "fe895ad001228f56b167ab76de1d645f46966062544bf831b0fb9fa7e938ff08";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring mtl text utf8-string
        ];
@@ -50381,8 +51537,6 @@ self: {
        pname = "call";
        version = "0.1.4.2";
        sha256 = "2fe8f1ade21ea24c67ab2447189f756b75a60cbb4d2221a0058bc62050c00461";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bindings-portaudio boundingboxes colors containers
          control-bool deepseq directory filepath free freetype2 GLFW-b
@@ -50390,7 +51544,6 @@ self: {
          OpenGL OpenGLRaw random template-haskell text transformers vector
          WAVE
        ];
-       executableHaskellDepends = [ base lens ];
        jailbreak = true;
        homepage = "https://github.com/fumieval/call";
        description = "The call game engine";
@@ -50677,8 +51830,6 @@ self: {
        pname = "caramia";
        version = "0.7.2.2";
        sha256 = "fa3129d63816e1ccb47a57808ece432a2b6ab652eeba15ac6a76d6799af277b3";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers exceptions gl lens linear mtl semigroups
          text transformers vector
@@ -50790,8 +51941,6 @@ self: {
        pname = "cartel";
        version = "0.14.2.6";
        sha256 = "8c4540ece37f0a708032d06bde61a4d6a198ba3b8242fafd385dfb121f5aa416";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base directory filepath time transformers
        ];
@@ -50814,8 +51963,6 @@ self: {
        pname = "cartel";
        version = "0.14.2.8";
        sha256 = "c8d36712a4504f3a22d6290d8952535f32c533b33d4e54fa461a0867c7e09989";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base directory filepath time transformers
        ];
@@ -50837,8 +51984,6 @@ self: {
        pname = "cartel";
        version = "0.16.0.0";
        sha256 = "67594fa408d74553038b677b650863f457309d69d968b01f4dda3bdf46a8b6b3";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base directory filepath time transformers
        ];
@@ -51545,8 +52690,6 @@ self: {
        pname = "cassava-streams";
        version = "0.2.0.0";
        sha256 = "b4e825309533f9bd33728de92950eea33f362ea5bfd4e04689777b3760f69d6d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cassava io-streams vector
        ];
@@ -51880,8 +53023,6 @@ self: {
        pname = "cci";
        version = "0.3.1";
        sha256 = "87390d636e6877bfb982ce60b3accef9d73153ea03632cec967526eb8eb96a5f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ cci ];
        testHaskellDepends = [
@@ -52255,8 +53396,6 @@ self: {
        sha256 = "e6257b4b0e884db8a817d265d9a7f9a6c76af8190504f32dadbbf64b0fcee5a1";
        revision = "1";
        editedCabalFile = "6b4b703a1c34a9fa3e0223f3ff2796183c7b9b7351da1ad34478225637e837ba";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          asn1-data base bytestring containers crypto-pubkey-types cryptohash
          directory filepath mtl pem process time
@@ -52478,8 +53617,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.6.14";
-       sha256 = "9e46ab2f0014e585f3bd8fd85a86926acec04b338bdfe2d6af82ca35cab130cd";
+       version = "6.6.15";
+       sha256 = "f58a557fecdc7066ec60653e7c902b8baedcf4f44a81f890265374b6dab9affa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -52533,7 +53672,6 @@ 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;
@@ -52795,9 +53933,8 @@ self: {
      }) {};
 
   "cheapskate_0_1_0_4" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
-     , data-default, http-types, mtl, syb, text, uniplate, wai
-     , wai-extra, xss-sanitize
+    ({ mkDerivation, base, blaze-html, bytestring, containers
+     , data-default, mtl, syb, text, uniplate, xss-sanitize
      }:
      mkDerivation {
        pname = "cheapskate";
@@ -52809,9 +53946,7 @@ self: {
          base blaze-html containers data-default mtl syb text uniplate
          xss-sanitize
        ];
-       executableHaskellDepends = [
-         aeson base blaze-html bytestring http-types text wai wai-extra
-       ];
+       executableHaskellDepends = [ base blaze-html bytestring text ];
        jailbreak = true;
        homepage = "http://github.com/jgm/cheapskate";
        description = "Experimental markdown processor";
@@ -52820,9 +53955,8 @@ self: {
      }) {};
 
   "cheapskate" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
-     , data-default, http-types, mtl, syb, text, uniplate, wai
-     , wai-extra, xss-sanitize
+    ({ mkDerivation, base, blaze-html, bytestring, containers
+     , data-default, mtl, syb, text, uniplate, xss-sanitize
      }:
      mkDerivation {
        pname = "cheapskate";
@@ -52834,9 +53968,7 @@ self: {
          base blaze-html containers data-default mtl syb text uniplate
          xss-sanitize
        ];
-       executableHaskellDepends = [
-         aeson base blaze-html bytestring http-types text wai wai-extra
-       ];
+       executableHaskellDepends = [ base blaze-html bytestring text ];
        homepage = "http://github.com/jgm/cheapskate";
        description = "Experimental markdown processor";
        license = stdenv.lib.licenses.bsd3;
@@ -53463,8 +54595,6 @@ self: {
        pname = "cipher-aes128";
        version = "0.6.4";
        sha256 = "4a95c3f572aacbe3b0d68c593f45c16014ef96b5e38dd32a8fb6466e10bf7f24";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal crypto-api tagged
        ];
@@ -53480,8 +54610,6 @@ self: {
        pname = "cipher-aes128";
        version = "0.7.0.1";
        sha256 = "18aecff826ca46e188062b972dfbda7360f6f73e2ffe45aa15bdc676debb7662";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal crypto-api tagged
        ];
@@ -54566,30 +55694,6 @@ self: {
      }) {};
 
   "clash-lib" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
-     , concurrent-supply, containers, deepseq, directory, errors, fgl
-     , filepath, hashable, lens, mtl, pretty, process, template-haskell
-     , text, time, transformers, unbound-generics, unordered-containers
-     , uu-parsinglib, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "clash-lib";
-       version = "0.6.16";
-       sha256 = "f2da35653db0ef4834ccd97f403084d0e0d706a59070547922ff7f34f739fb0a";
-       revision = "1";
-       editedCabalFile = "02a7623d96f27553486c2b3df4a4ff15e4c2f96c4fe5c82ff462bf3b35cc0d16";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring clash-prelude concurrent-supply
-         containers deepseq directory errors fgl filepath hashable lens mtl
-         pretty process template-haskell text time transformers
-         unbound-generics unordered-containers uu-parsinglib wl-pprint-text
-       ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - As a Library";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "clash-lib_0_6_17" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
      , concurrent-supply, containers, deepseq, directory, errors, fgl
      , filepath, hashable, lens, mtl, pretty, process, template-haskell
@@ -54609,7 +55713,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-prelude_0_9_2" = callPackage
@@ -54744,27 +55847,6 @@ self: {
      }) {};
 
   "clash-prelude" = callPackage
-    ({ mkDerivation, array, base, data-default, doctest, ghc-prim
-     , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens
-     , QuickCheck, reflection, singletons, template-haskell
-     }:
-     mkDerivation {
-       pname = "clash-prelude";
-       version = "0.10.8";
-       sha256 = "0fb1a0b3e8bc03cee43303f31a9a17f0d89f2e1cdcdf468a807a6199ea7cb9db";
-       libraryHaskellDepends = [
-         array base data-default ghc-prim ghc-typelits-extra
-         ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection
-         singletons template-haskell
-       ];
-       testHaskellDepends = [ base doctest ];
-       doCheck = false;
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - Prelude library";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "clash-prelude_0_10_9" = callPackage
     ({ mkDerivation, array, base, data-default, doctest, ghc-prim
      , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens
      , QuickCheck, reflection, singletons, template-haskell
@@ -54781,10 +55863,10 @@ self: {
          singletons template-haskell
        ];
        testHaskellDepends = [ base doctest ];
+       doCheck = false;
        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
@@ -55289,23 +56371,6 @@ self: {
      }) {};
 
   "clash-vhdl" = callPackage
-    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
-     , text, unordered-containers, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "clash-vhdl";
-       version = "0.6.12";
-       sha256 = "cff549b30950aa8eabb8e113233b356a2e10e3b893119f7cbea31a9cc1c0e3c0";
-       libraryHaskellDepends = [
-         base clash-lib clash-prelude fgl lens mtl text unordered-containers
-         wl-pprint-text
-       ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - VHDL backend";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "clash-vhdl_0_6_13" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -55320,7 +56385,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
@@ -56438,7 +57502,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clckwrks-plugin-media" = callPackage
+  "clckwrks-plugin-media_0_6_15" = callPackage
     ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal
      , clckwrks, containers, directory, filepath, gd, happstack-server
      , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack
@@ -56462,6 +57526,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clckwrks-plugin-media" = callPackage
+    ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal
+     , clckwrks, containers, directory, filepath, gd, happstack-server
+     , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack
+     , reform-hsp, safecopy, text, web-plugins, web-routes
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "clckwrks-plugin-media";
+       version = "0.6.16";
+       sha256 = "7e4dbb81a28a3e4bf81c5d1ef5d0820a858877c00d1f2c98488d391a4a478598";
+       libraryHaskellDepends = [
+         acid-state attoparsec base blaze-html cereal clckwrks containers
+         directory filepath gd happstack-server hsp ixset magic mtl reform
+         reform-happstack reform-hsp safecopy text web-plugins web-routes
+         web-routes-th
+       ];
+       libraryToolDepends = [ hsx2hs ];
+       homepage = "http://clckwrks.com/";
+       description = "media plugin for clckwrks";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clckwrks-plugin-page_0_4_3" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
      , containers, directory, filepath, happstack-hsp, happstack-server
@@ -56488,7 +57576,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clckwrks-plugin-page" = callPackage
+  "clckwrks-plugin-page_0_4_3_1" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
      , containers, directory, filepath, happstack-hsp, happstack-server
      , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
@@ -56514,6 +57602,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "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, web-plugins, web-routes
+     , web-routes-happstack, web-routes-th
+     }:
+     mkDerivation {
+       pname = "clckwrks-plugin-page";
+       version = "0.4.3.2";
+       sha256 = "d3f7584c71e5695ac00f608cb6bb45a71c983f9ed001c841f3b53e631c94fbbf";
+       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
+         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
@@ -57307,8 +58420,6 @@ self: {
        sha256 = "5e66581205cb76a2621a7bf5cb42411a8cc1d37fe3b8a266803266c2991fb62b";
        revision = "1";
        editedCabalFile = "e37c92e6337ccbacd95f77938a1d0459f52cdb1a51c920a96610793cf2b5e4dc";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base filepath process template-haskell transformers
        ];
@@ -57326,8 +58437,6 @@ self: {
        pname = "cmdargs";
        version = "0.10.13";
        sha256 = "66117c1fadaa2a79be07998287ca7cee334c249615b0fab9b91467ad813bbf6e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base filepath process template-haskell transformers
        ];
@@ -57345,8 +58454,6 @@ self: {
        pname = "cmdargs";
        version = "0.10.14";
        sha256 = "38b60053c11394a1876d2744950eece66ca9e4364298c1383f247894044bce58";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base filepath process template-haskell transformers
        ];
@@ -57382,8 +58489,6 @@ self: {
        pname = "cmdlib";
        version = "0.3.6";
        sha256 = "5643d219c371f903c3f877b5955de4ca99a723bc96165f4f629d3e3dbc3fb357";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base mtl split syb transformers ];
        description = "a library for command line parsing & online help";
        license = stdenv.lib.licenses.bsd3;
@@ -57472,8 +58577,9 @@ self: {
 
   "cnc-spec-compiler" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, binary, bytestring
-     , containers, directory, fgl, filepath, HUnit, mtl, parsec, pretty
-     , prettyclass, process, split, stringtable-atom, unix, zlib
+     , containers, directory, fgl, filepath, graphviz, HaXml, haxr
+     , hubigraph, HUnit, mtl, parsec, pretty, prettyclass, process
+     , split, stringtable-atom, unix, zlib
      }:
      mkDerivation {
        pname = "cnc-spec-compiler";
@@ -57483,8 +58589,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [
          ansi-terminal array base binary bytestring containers directory fgl
-         filepath HUnit mtl parsec pretty prettyclass process split
-         stringtable-atom unix zlib
+         filepath graphviz HaXml haxr hubigraph HUnit mtl parsec pretty
+         prettyclass process split stringtable-atom unix zlib
        ];
        homepage = "http://software.intel.com/en-us/articles/intel-concurrent-collections-for-cc/";
        description = "Compiler/Translator for CnC Specification Files";
@@ -58176,7 +59282,8 @@ self: {
        pname = "com";
        version = "1.2.3.1";
        sha256 = "f5085572cd0b0c8f8fdf115fad5c842657e803c70b2ce1c230ee452f87a9dff8";
-       doHaddock = false;
+       isLibrary = false;
+       isExecutable = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
@@ -59284,8 +60391,6 @@ self: {
        pname = "concraft";
        version = "0.9.4";
        sha256 = "030f63c8c08dba11ac85b08746a145df45276930de8fc937ecf6260b1cac079f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson array base binary bytestring cmdargs comonad containers
          crf-chain1-constrained crf-chain2-tiers data-lens lazy-io
@@ -59598,8 +60703,6 @@ self: {
        pname = "concurrent-state";
        version = "0.6.0.0";
        sha256 = "e6071814c277106cb13b458a7161dd42269e9a7c2419b17992a1908a7fb3342d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base exceptions mtl stm transformers ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/concurrent-state";
@@ -60938,23 +62041,18 @@ 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, text
+     , scientific, string-conversions, template-haskell
      , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "configifier";
        version = "0.1.0";
        sha256 = "bda7c1ae24e838204f972f64816e6e7ec5552b3ea03a2e17eb5c9e9ea9ad030e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring case-insensitive containers directory either
          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
@@ -61216,13 +62314,12 @@ self: {
      }:
      mkDerivation {
        pname = "connection-pool";
-       version = "0.2";
-       sha256 = "a6c3ba5f1905832cefdf9afc55cbf46a6c6a321ecac19254f20f091402b440fa";
+       version = "0.2.1";
+       sha256 = "2364c5a7b5d0dbeb00478070a4e527ab019ffb86e14e726a2a9ee56f8cb884dc";
        libraryHaskellDepends = [
          base between data-default-class monad-control network resource-pool
          streaming-commons time transformers-base
        ];
-       jailbreak = true;
        homepage = "https://github.com/trskop/connection-pool";
        description = "Connection pool built on top of resource-pool and streaming-commons";
        license = stdenv.lib.licenses.bsd3;
@@ -61725,29 +62822,19 @@ self: {
      }) {};
 
   "continuum" = callPackage
-    ({ 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, base, bytestring, cereal, containers, mtl
+     , nanomsg-haskell, time
      }:
      mkDerivation {
        pname = "continuum";
        version = "0.1.0.7";
        sha256 = "a6bbd7bee80d5216e4678fc9bdf85f4136b079ed8d2e2cf8585c76420bb0386e";
-       isLibrary = true;
-       isExecutable = true;
        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 = [ "x86_64-darwin" ];
-     }) {hyperleveldb = null;};
+     }) {};
 
   "continuum-client" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, mtl
@@ -62312,8 +63399,6 @@ self: {
        sha256 = "13c4943c302700a207426aabcd6dab5a5de85de2353acacbcf4159e924f9835d";
        revision = "3";
        editedCabalFile = "9958bc1e79fce365c2c3a1629abe13ce1cf35588252d625bc86e5e10667401fa";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers mtl old-locale old-time text time
        ];
@@ -62331,8 +63416,6 @@ self: {
        pname = "convertible";
        version = "1.1.1.0";
        sha256 = "e9f9a70904b9995314c2aeb41580d654a2c76293feb955fb6bd63256c355286c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers mtl old-locale old-time text time
        ];
@@ -62368,13 +63451,10 @@ self: {
        pname = "convertible-text";
        version = "0.4.0.2";
        sha256 = "df8dc391ff4d82e3d18b049e3c4db50198aa1345c101d088683a075d5ba217f3";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          attempt base bytestring containers old-time template-haskell text
          time
        ];
-       jailbreak = true;
        homepage = "http://github.com/snoyberg/convertible/tree/text";
        description = "Typeclasses and instances for converting between types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -62917,17 +63997,12 @@ self: {
      }) {};
 
   "country-codes_0_1_2" = callPackage
-    ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, tagsoup
-     , text
-     }:
+    ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, text }:
      mkDerivation {
        pname = "country-codes";
        version = "0.1.2";
        sha256 = "e49ccaa859c375f41def1429d7718f8b1440e31d30146e13b46f11fbf24be298";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ aeson base shakespeare text ];
-       executableHaskellDepends = [ base tagsoup text ];
        testHaskellDepends = [ aeson base HTF HUnit ];
        jailbreak = true;
        homepage = "https://github.com/prowdsponsor/country-codes";
@@ -62937,17 +64012,12 @@ self: {
      }) {};
 
   "country-codes" = callPackage
-    ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, tagsoup
-     , text
-     }:
+    ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, text }:
      mkDerivation {
        pname = "country-codes";
        version = "0.1.3";
        sha256 = "062843cebfcb4df513e4688456311f07a2eb693935a053ce2eade2c8d586d1b5";
-       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";
@@ -63346,8 +64416,6 @@ self: {
        pname = "cpu";
        version = "0.1.2";
        sha256 = "5627feb4974a3ff8499c42cc958927e88761a2e004c4000d34e9cd6a15ad2974";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/vincenthz/hs-cpu";
        description = "Cpu information and properties helpers";
@@ -63360,8 +64428,6 @@ self: {
        pname = "cpuid";
        version = "0.2.3";
        sha256 = "f8198ab4408219fe001c0a50908af38a766e2a0b3afb8260307838e5517add88";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base data-accessor enumset ];
        homepage = "http://code.haskell.org/cpuid/";
        description = "Binding for the cpuid machine instruction on x86 compatible processors";
@@ -63750,8 +64816,6 @@ self: {
        pname = "craftwerk";
        version = "0.1";
        sha256 = "a39d24c7e05469883f35d642c393c04a8bca6d03d1bd41905fd5a981ddb00200";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base colour mtl vector-space ];
        jailbreak = true;
        homepage = "http://mahrz.github.com/craftwerk.html";
@@ -63782,8 +64846,6 @@ self: {
        pname = "craftwerk-gtk";
        version = "0.1";
        sha256 = "ced95080b5b735d57a13b9082ebdadf5015926f4f49a3b181a3e974ba01f66a1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base cairo containers craftwerk craftwerk-cairo gtk mtl
        ];
@@ -64006,15 +65068,12 @@ self: {
        pname = "criterion";
        version = "1.0.2.0";
        sha256 = "1de2f6c9975135959fd8948ad2889310e5d19a736f9051a48c0fec081359ac0a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base binary bytestring cassava containers
          deepseq directory either filepath Glob hastache mtl mwc-random
          optparse-applicative parsec statistics text time transformers
          vector vector-algorithms
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck statistics test-framework
          test-framework-hunit test-framework-quickcheck2 vector
@@ -64039,15 +65098,12 @@ self: {
        sha256 = "5cedd41bb6e5a85e65b51fdb00cb32038b826b8d18af072a8319cab43a452d38";
        revision = "1";
        editedCabalFile = "4de7233df470abf00ce1db761e7f46db68dd7855cc491d49584de149e922f5db";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base binary bytestring cassava containers
          deepseq directory filepath Glob hastache mtl mwc-random
          optparse-applicative parsec statistics text time transformers
          transformers-compat vector vector-algorithms
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck statistics test-framework
          test-framework-hunit test-framework-quickcheck2 vector
@@ -64469,9 +65525,9 @@ self: {
      }) {};
 
   "crypto-numbers_0_2_3" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-random, HUnit
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, vector
+    ({ mkDerivation, base, byteable, bytestring, crypto-random
+     , ghc-prim, HUnit, integer-gmp, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, vector
      }:
      mkDerivation {
        pname = "crypto-numbers";
@@ -64479,7 +65535,9 @@ self: {
        sha256 = "f77dabd4dd6aa6343ba351b2ae1c55e4b9ef85c7911eadf6914704401cada25b";
        revision = "4";
        editedCabalFile = "696ab7efd05590e0a45b905855e89493fe79e841291fdd45186b4215b6f7f6d2";
-       libraryHaskellDepends = [ base bytestring crypto-random vector ];
+       libraryHaskellDepends = [
+         base bytestring crypto-random ghc-prim integer-gmp vector
+       ];
        testHaskellDepends = [
          base byteable bytestring crypto-random HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
@@ -65470,18 +66528,12 @@ self: {
        pname = "csv-conduit";
        version = "0.6.3";
        sha256 = "e42711dde5be65630d63dfabf48dff5bbf47fe83e1e5591972de67402fe561b5";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array attoparsec attoparsec-conduit base blaze-builder bytestring
          conduit conduit-extra containers data-default ghc-prim mmorph
          monad-control 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
@@ -65504,18 +66556,12 @@ self: {
        pname = "csv-conduit";
        version = "0.6.6";
        sha256 = "7329056af16c2f81382ad0cc3437232b80e9910288daf687519a2e2cd2ee5d8b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring conduit
          conduit-extra containers data-default ghc-prim mmorph monad-control
          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
@@ -65681,12 +66727,7 @@ self: {
        pname = "cube";
        version = "0.2.0";
        sha256 = "d71f6392f0323ab12da36c43e8780a39c3d547e217d63d19205f056839a30c6a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal containers STL ];
-       executableHaskellDepends = [
-         base bytestring cereal containers hspec STL
-       ];
        testHaskellDepends = [
          base bytestring cereal containers hspec STL
        ];
@@ -65845,12 +66886,12 @@ self: {
      }) {};
 
   "curl" = callPackage
-    ({ mkDerivation, base, bytestring, containers, curl }:
+    ({ mkDerivation, base, bytestring, curl }:
      mkDerivation {
        pname = "curl";
        version = "1.3.8";
        sha256 = "9087c936bfcdb865bad3166baa3f12bf37acf076fa76010e3b5f82a1d485446e";
-       libraryHaskellDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ curl ];
        description = "Haskell binding to libcurl";
        license = stdenv.lib.licenses.bsd3;
@@ -66413,7 +67454,6 @@ self: {
          HUnit mtl QuickCheck shelly split test-framework
          test-framework-hunit test-framework-quickcheck2 text zip-archive
        ];
-       jailbreak = true;
        doCheck = false;
        postInstall = ''
          mkdir -p $out/etc/bash_completion.d
@@ -66476,7 +67516,6 @@ self: {
          vector zlib
        ];
        executableSystemDepends = [ curl ];
-       jailbreak = true;
        homepage = "http://darcs.net/";
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
@@ -67893,8 +68932,6 @@ self: {
        pname = "data-object-yaml";
        version = "0.3.4.2";
        sha256 = "5785ea86b5c2da50edc5dc595d9deadae0a5868f294a6b9664f1aceb38c949a1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring conduit containers convertible-text data-object
          failure text transformers yaml
@@ -68004,10 +69041,7 @@ self: {
        sha256 = "47997d8b36d3103d024ed572255abf51707984743514f619e2fb17796b422e56";
        revision = "1";
        editedCabalFile = "60185d3fdb87fe62f297eb4473d58a7ccf93d1b6ee790a8b2faed79e1ac833c1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base containers ];
-       executableHaskellDepends = [ base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/IOReification";
        description = "Reify a recursive data structure into an explicit graph";
        license = stdenv.lib.licenses.bsd3;
@@ -68022,10 +69056,7 @@ self: {
        sha256 = "61350a1e96cb1276c2b6b8b13fa1bade5d4e63c702509a3f5e90bbc19ad9b202";
        revision = "1";
        editedCabalFile = "f7f3a5b2f482a67eb77f4ba32e15f91bcfa4c220cdda9dde22cd9d9ff18ab447";
-       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;
@@ -68363,8 +69394,6 @@ self: {
        pname = "dataenc";
        version = "0.14.0.7";
        sha256 = "f9d370a1ac1b9cd3c66abd13ad351270d020a21fcd774f49dae6cfa9f8a98ff3";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ array base containers ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding";
@@ -73222,8 +74251,6 @@ self: {
        pname = "diagrams-wx";
        version = "0.1.1.0";
        sha256 = "472855bcd4f7df78002a35099ba9b0eb21e5473c30e6eff74ecc9dcafa35b9ba";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base cairo diagrams-cairo diagrams-lib wx wxcore
        ];
@@ -73300,6 +74327,19 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "dictionary-sharing" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "dictionary-sharing";
+       version = "0.1.0.0";
+       sha256 = "8c3b5184d5d6056433d51a49c5402e4ab7b0260073d5342685b8e141d2be5a01";
+       revision = "2";
+       editedCabalFile = "71d347366e563d81041dc8b9c226a53bd98e2ba3774e17cacbd84d3726c3ab5f";
+       libraryHaskellDepends = [ base containers ];
+       description = "Sharing/memoization of class members";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dictparser" = callPackage
     ({ mkDerivation, base, hspec, parsec, split }:
      mkDerivation {
@@ -74660,18 +75700,19 @@ self: {
   "distributed-process" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , data-accessor, deepseq, distributed-static, exceptions, hashable
-     , mtl, network-transport, random, rank1dynamic, stm, syb, time
-     , transformers
+     , mtl, network-transport, random, rank1dynamic, stm, syb
+     , template-haskell, time, transformers
      }:
      mkDerivation {
        pname = "distributed-process";
-       version = "0.6.2";
-       sha256 = "ea3a29d9fa80d273807012c79f6af05e6c4022d29c5be1ef113fe335526a1fe9";
+       version = "0.6.4";
+       sha256 = "013d53a6768cb1bbb14b50898cc75033cc058c6f289e6e5add30852a0449414f";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static exceptions hashable mtl network-transport random
-         rank1dynamic stm syb time transformers
+         rank1dynamic stm syb template-haskell time transformers
        ];
+       doCheck = false;
        homepage = "http://haskell-distributed.github.com/";
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -74749,8 +75790,6 @@ self: {
        pname = "distributed-process-azure";
        version = "0.1.0";
        sha256 = "4f64d22e0ff0dc94e6ecfd99cc7133ab5c5df4dbbe3415bd2c99fdaee98f8035";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          azure-service-api base binary bytestring certificate
          distributed-process distributed-static executable-path filepath
@@ -74897,6 +75936,8 @@ self: {
        pname = "distributed-process-execution";
        version = "0.1.2.2";
        sha256 = "9fbfca6b394e52af462586127a0edc2efc2a160ae8f69a9d34234a71e3dbf7b5";
+       revision = "1";
+       editedCabalFile = "c7fad93838da34d675ea6484d0697e437ab3453d580e9759fa0c5bd66f86d7bf";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
@@ -75039,13 +76080,10 @@ self: {
        pname = "distributed-process-p2p";
        version = "0.1.3.2";
        sha256 = "613c65aa986085e61cf65b55bf174cc2f31a79e5b666daf1ef402bcad940a28e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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;
@@ -75065,8 +76103,6 @@ self: {
        pname = "distributed-process-platform";
        version = "0.1.0";
        sha256 = "752980d006aaa5319b91da7b5bd5124322552fff9e9cb7de816aff89b7f5ae2f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          fingertree hashable mtl stm time transformers unordered-containers
@@ -75129,8 +76165,6 @@ self: {
        pname = "distributed-process-simplelocalnet";
        version = "0.2.2.0";
        sha256 = "219d7137acc4633728bec1708e4408d29ce7f1e8277551c988a788cfbc2c9508";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor distributed-process
          network network-multicast network-transport network-transport-tcp
@@ -75152,8 +76186,6 @@ self: {
        pname = "distributed-process-simplelocalnet";
        version = "0.2.3.0";
        sha256 = "5ece5c8cf825c6b0fbdd7c0c499d95ae77008530b1a43acc66fc17c9480e0705";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor distributed-process
          network network-multicast network-transport network-transport-tcp
@@ -75175,8 +76207,6 @@ self: {
        pname = "distributed-process-simplelocalnet";
        version = "0.2.3.2";
        sha256 = "c3351cf8a782dda756689b3747ede1e3879dcb913a07065eb4ec0052a963825f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor distributed-process
          network network-multicast network-transport network-transport-tcp
@@ -75393,13 +76423,10 @@ self: {
        pname = "distributed-process-zookeeper";
        version = "0.2.1.0";
        sha256 = "98e74ca698daf1434fda5ac2cb277e8849080ef897e907716a196c1348c84bcd";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
@@ -76648,10 +77675,7 @@ self: {
        pname = "dotgen";
        version = "0.4.2";
        sha256 = "cf0de20a435d74aeb9a32b8bcb3ebfa1b6659ac3f26edefe2df9e1aaf1481891";
-       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;
@@ -77082,8 +78106,6 @@ self: {
        pname = "drawille";
        version = "0.1.0.6";
        sha256 = "3282ca7d783580f95349ffd85b6f668f57a354aad74a84c37406fc8ef2636c09";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        homepage = "https://github.com/yamadapc/haskell-drawille";
@@ -77423,8 +78445,6 @@ self: {
        pname = "dtrace";
        version = "0.1";
        sha256 = "393b9e0f3ed92d2b817ae162ad5478116d001ec8e05ddf3c65a0334029a45f63";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to the DTrace system tracing utility";
        license = stdenv.lib.licenses.bsd3;
@@ -77532,6 +78552,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dunai" = callPackage
+    ({ mkDerivation, base, transformers, transformers-base }:
+     mkDerivation {
+       pname = "dunai";
+       version = "0.1.0.0";
+       sha256 = "fa6908be1794caa9ad335f1acc92fd837c238a8f8dea9740dd875f212046500d";
+       libraryHaskellDepends = [ base transformers transformers-base ];
+       description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "duplo" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
      , base64-bytestring, bytestring, containers, directory
@@ -77916,22 +78947,18 @@ self: {
      }) {};
 
   "dynobud" = callPackage
-    ({ 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
+    ({ 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
      , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , time, unordered-containers, vector, vector-binary-instances
-     , zeromq4-haskell
+     , time, vector, vector-binary-instances
      }:
      mkDerivation {
        pname = "dynobud";
        version = "1.9.1.0";
        sha256 = "3995a1186ca493ae30fc38b72fbfa49b8f4b5858e266a9b6b24135267deedde5";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base binary casadi-bindings casadi-bindings-core cereal
          containers data-default-class directory distributive
@@ -77939,12 +78966,6 @@ 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
@@ -78464,8 +79485,6 @@ self: {
        sha256 = "84bcc319f4b7dc48994de082819bc656e6a001fdf40c2f7327b9a2acc2d5bd21";
        revision = "1";
        editedCabalFile = "27d6fb19e1707aa05883ca4ffd6715dcc81db287c71508d6aaa420cefc8f29c1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ array base containers random ];
        jailbreak = true;
        homepage = "http://github.com/batterseapower/edit-distance";
@@ -78480,8 +79499,6 @@ self: {
        pname = "edit-distance";
        version = "0.2.1.3";
        sha256 = "a0b2e59ab50b30af604681eba822b15bbb90d9b477b8d233a6f12b1fd4c9dac6";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ array base containers random ];
        homepage = "http://github.com/batterseapower/edit-distance";
        description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
@@ -78891,7 +79908,7 @@ self: {
 
   "ehs" = callPackage
     ({ mkDerivation, base, bytestring, haskell-src-meta, parsec
-     , template-haskell, text, time, transformers
+     , template-haskell, text, transformers
      }:
      mkDerivation {
        pname = "ehs";
@@ -78899,13 +79916,10 @@ self: {
        sha256 = "3d84485f15b876982c857a57e6e0fec85417c85eddd6b6f4344b3db30f8b934d";
        revision = "3";
        editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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;
@@ -79344,12 +80358,9 @@ self: {
        pname = "ekg-push";
        version = "0.0.3";
        sha256 = "be683041cb6935aa194a9d241b5f11c2038b7056884fbc0a10ec1f148706b7fb";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring ekg-core text time unordered-containers
        ];
-       executableHaskellDepends = [ base ekg-core ];
        jailbreak = true;
        homepage = "https://github.com/adarqui/ekg-push";
        description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library";
@@ -79800,6 +80811,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "elm-hybrid" = callPackage
+    ({ mkDerivation, base, directory, filepath, split, text, time }:
+     mkDerivation {
+       pname = "elm-hybrid";
+       version = "0.1.0.0";
+       sha256 = "4b5eea5c6d8c26206da439aa4c3dfc2678f1a91432d15be662c6149b024b5f12";
+       libraryHaskellDepends = [
+         base directory filepath split text time
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://gitlab.com/paramander/elm-hybrid";
+       description = "Combine Elm with Haskell for data based applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "elm-init" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-unicode-symbols
      , bytestring, containers, directory, file-embed, filepath, process
@@ -81511,8 +82537,6 @@ self: {
        sha256 = "b83980c6f537ab812ac8605a9fe8c3bb9764bb5ae098e20ef882fd5aa824f7b6";
        revision = "1";
        editedCabalFile = "146f86cb3df790cd26c0ec2f7061027257c7932a64ff8a6725eee5356a887776";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base containers ersatz toysolver transformers
        ];
@@ -82339,8 +83363,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "0.13.0.0";
-       sha256 = "5cacd62d1ff67ce2500d1bbff7670f2b8728b6a6c8418cc67fb04f4ca68780c3";
+       version = "0.13.0.1";
+       sha256 = "eec222913fbc5f52e74216536a0344084a9bc689324d922813a9bf46ecd421c7";
        libraryHaskellDepends = [
          aeson array async base bytestring cereal connection containers dns
          dotnet-timespan http-client protobuf random semigroups stm text
@@ -83160,8 +84184,6 @@ self: {
        pname = "explicit-exception";
        version = "0.1.7.3";
        sha256 = "e1730a5b8ef61a672e9da88207d43e7cb160507df5146779788a7cf3290d3738";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Exception";
@@ -83176,8 +84198,6 @@ self: {
        pname = "explicit-exception";
        version = "0.1.8";
        sha256 = "7fee7a3781db3c3bf82079e635d510088dbb6f4295fde887c603819ec14cd16f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base deepseq transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Exception";
        description = "Exceptions which are explicit in the type signature";
@@ -86069,17 +87089,12 @@ self: {
        pname = "ffmpeg-light";
        version = "0.11.0";
        sha256 = "120899b72de9112e057cde89ab0c4a832091ba67101bbe191cd50f8744931117";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base either exceptions JuicyPixels mtl transformers vector
        ];
        libraryPkgconfigDepends = [
          ffmpeg libavcodec libavdevice libavformat libswscale
        ];
-       executableHaskellDepends = [
-         base JuicyPixels mtl transformers vector
-       ];
        homepage = "http://github.com/acowley/ffmpeg-light";
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
@@ -90266,8 +91281,6 @@ self: {
        pname = "freetype2";
        version = "0.1.1";
        sha256 = "da18f9d3047277ba47e162dafa0b2a4777bfb6157b39ad91f9e808ba36f65e99";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Haskell binding for FreeType 2 library";
        license = stdenv.lib.licenses.bsd3;
@@ -90364,8 +91377,6 @@ self: {
        pname = "friday-scale-dct";
        version = "1.0.0.1";
        sha256 = "0a40db255149c553169d8c2cc8f7ae11b511061b45a3e5c810f9be3390951b48";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base base-compat carray fft friday vector
        ];
@@ -90647,12 +91658,9 @@ self: {
        pname = "ftdi";
        version = "0.2.0.1";
        sha256 = "a892fae6e1c12c3fc1db3f10e84b99c46f6145ac3fb3bcad519bcb619f5dcebe";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring safe transformers usb
        ];
-       jailbreak = true;
        description = "A thin layer over USB to communicate with FTDI chips";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
@@ -90685,8 +91693,6 @@ self: {
        pname = "ftphs";
        version = "1.0.9.1";
        sha256 = "ce0b05b2fc7f93a6195184ed1a8edee69a7a9cf4aa3d15ebeb25421715571bf2";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base hslogger MissingH mtl network parsec regex-compat
        ];
@@ -90751,17 +91757,14 @@ self: {
      }) {};
 
   "full-text-search" = callPackage
-    ({ mkDerivation, alex, array, base, containers, happy, QuickCheck
-     , tasty, tasty-quickcheck, text, vector
+    ({ mkDerivation, array, base, containers, QuickCheck, tasty
+     , tasty-quickcheck, text, vector
      }:
      mkDerivation {
        pname = "full-text-search";
        version = "0.2.1.3";
        sha256 = "f3de82428b67819c1284f18192922e20cda5cb3cdb447297018507b13e3ca368";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ array base containers text vector ];
-       executableToolDepends = [ alex happy ];
        testHaskellDepends = [
          array base containers QuickCheck tasty tasty-quickcheck text vector
        ];
@@ -91495,14 +92498,15 @@ self: {
      }) {};
 
   "gconf" = callPackage
-    ({ mkDerivation, base, GConf, glib, gtk2hs-buildtools, text }:
+    ({ mkDerivation, base, Cabal, GConf, glib, gtk2hs-buildtools, text
+     }:
      mkDerivation {
        pname = "gconf";
        version = "0.13.1.0";
        sha256 = "57cfa606ef4dcd377e0d77d59b880439382ad05604b3e3d439fd64af64a21dad";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib text ];
        libraryPkgconfigDepends = [ GConf ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GNOME configuration database system";
        license = stdenv.lib.licenses.lgpl21;
@@ -92769,8 +93773,8 @@ self: {
      }:
      mkDerivation {
        pname = "geoip2";
-       version = "0.2.0.0";
-       sha256 = "942f7fbb0a5a433d2211a3ffb80911cb1fcef8acd7a5d73f0a25d524cdb0c6e5";
+       version = "0.2.0.1";
+       sha256 = "aea9398ead56cc14ac7e99adacd199918b23fdc633c9adf0837bdcfb9eef72e8";
        libraryHaskellDepends = [
          base bytestring cereal containers iproute mmap reinterpret-cast
          text
@@ -92920,9 +93924,9 @@ self: {
   "gf" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi
      , containers, directory, exceptions, filepath, happy, haskeline
-     , HTF, httpd-shed, HUnit, json, lifted-base, mtl, network
-     , network-uri, old-locale, parallel, pretty, process, random
-     , terminfo, time, time-compat, unix, utf8-string
+     , HTF, httpd-shed, HUnit, json, mtl, network, network-uri
+     , old-locale, parallel, pretty, process, random, terminfo, time
+     , time-compat, unix, utf8-string
      }:
      mkDerivation {
        pname = "gf";
@@ -92937,7 +93941,7 @@ self: {
          utf8-string
        ];
        libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [ base containers lifted-base mtl ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base Cabal directory filepath HTF HUnit process
        ];
@@ -93160,8 +94164,6 @@ self: {
        pname = "ghc-exactprint";
        version = "0.5.0.1";
        sha256 = "ecdae12d521d0997a48a91507f241f80532df468f09095a50cc6f1629cd43ce8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers directory filepath free ghc ghc-paths mtl syb
        ];
@@ -93184,8 +94186,6 @@ self: {
        pname = "ghc-exactprint";
        version = "0.5.1.1";
        sha256 = "ab88a158b659641a1a940b1ebeaeefe8d41e53f1da2bee139914bbad21f15d8a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers directory filepath free ghc ghc-boot
          ghc-paths mtl syb
@@ -93863,10 +94863,7 @@ self: {
        pname = "ghc-time-alloc-prof";
        version = "0.0.0";
        sha256 = "f9b40315889766b53c0ad03b6e4a2af71da558d217afdb1d6072e9672f006828";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ attoparsec base containers text time ];
-       executableHaskellDepends = [ attoparsec base containers text ];
        homepage = "https://github.com/maoe/ghc-time-alloc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
@@ -94460,12 +95457,13 @@ self: {
 
   "gi-atk_2_0_4" = callPackage
     ({ mkDerivation, atk, base, bytestring, containers, gi-glib
-     , gi-gobject, haskell-gi-base, text, transformers
+     , gi-gobject, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-atk";
        version = "2.0.4";
        sha256 = "0ff8915112f0f0f24e1a80e390e780ec81b4dcb4a41bc155743865dc8f49ffca";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -94501,12 +95499,14 @@ self: {
 
   "gi-cairo_1_0_4" = callPackage
     ({ mkDerivation, base, bytestring, cairo-gobject, containers
-     , gobjectIntrospection, haskell-gi-base, text, transformers
+     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-cairo";
        version = "1.0.4";
        sha256 = "6532815f3b225d62c8ed9f865572a6d8ab740fa041adca20ea78b4e9a1735fec";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -94541,13 +95541,14 @@ self: {
 
   "gi-gdk_3_0_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, gdk3, gi-cairo
-     , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango
+     , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, haskell-gi
      , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gdk";
        version = "3.0.4";
        sha256 = "e6a8fc97a124b625a70002aaf0bbe2ae5d33356bd3a733addbbb2eaebee8473f";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
          gi-gobject gi-pango haskell-gi-base text transformers
@@ -94582,12 +95583,14 @@ self: {
 
   "gi-gdkpixbuf_2_0_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, gdk_pixbuf, gi-gio
-     , gi-glib, gi-gobject, haskell-gi-base, text, transformers
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
        version = "2.0.4";
        sha256 = "434c75e7e200869c084d661f0fcf7c22526ef59fcbf9c2bab6aaae8611cdb9cf";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -94623,12 +95626,14 @@ self: {
 
   "gi-gio_2_0_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , glib, gobjectIntrospection, haskell-gi-base, text, transformers
+     , glib, gobjectIntrospection, haskell-gi, haskell-gi-base, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-gio";
        version = "2.0.4";
        sha256 = "197f50d604ccd56dd6610d699657f1926189d5da7685018ef4c1ad33642bcb94";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -94644,12 +95649,14 @@ self: {
 
   "gi-girepository" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-gobject
-     , gobjectIntrospection, haskell-gi-base, text, transformers
+     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-girepository";
        version = "1.0.4";
        sha256 = "1c00a09129041157bf1a3a01b3a0167bea4a9ad6b29b84e00583aba269e555ed";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gobject haskell-gi-base text
          transformers
@@ -94684,12 +95691,14 @@ self: {
 
   "gi-glib_2_0_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib
-     , gobjectIntrospection, haskell-gi-base, text, transformers
+     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-glib";
        version = "2.0.4";
        sha256 = "3015352ac2ebc49664c2a1618e16418985b09993f3ad20792e17121c9ab1fce7";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -94725,12 +95734,14 @@ self: {
 
   "gi-gobject_2_0_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-glib, glib
-     , gobjectIntrospection, haskell-gi-base, text, transformers
+     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-gobject";
        version = "2.0.4";
        sha256 = "a177cf48261764f3ae2aaa41a900ef5d08b96eaa8813d112c2b7a64588b3ab0f";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib haskell-gi-base text
          transformers
@@ -94746,12 +95757,13 @@ self: {
 
   "gi-gst" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , gstreamer, haskell-gi-base, text, transformers
+     , gstreamer, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gst";
        version = "1.0.4";
        sha256 = "6bf1d0d2e85e1c999d7e3ed14e9ff53f1f84ecf61555767db4e09499b95b025c";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -94765,13 +95777,14 @@ self: {
 
   "gi-gstaudio" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , gi-gst, gi-gstbase, gst_plugins_base, haskell-gi-base, text
-     , transformers
+     , gi-gst, gi-gstbase, gst_plugins_base, haskell-gi, haskell-gi-base
+     , text, transformers
      }:
      mkDerivation {
        pname = "gi-gstaudio";
        version = "1.0.4";
        sha256 = "63af4a27bbbe5a20d8d4cf0c4c61f051056a52e99635c18105e792c5dc40e0ef";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
          haskell-gi-base text transformers
@@ -94785,12 +95798,14 @@ self: {
 
   "gi-gstbase" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , gi-gst, gst_plugins_base, haskell-gi-base, text, transformers
+     , gi-gst, gst_plugins_base, haskell-gi, haskell-gi-base, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-gstbase";
        version = "1.0.4";
        sha256 = "ca2ed5d1ee65417f65062010d87d4a90525c7cbb76652b685d1de2f063fd96c3";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst
          haskell-gi-base text transformers
@@ -94804,13 +95819,14 @@ self: {
 
   "gi-gstvideo" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , gi-gst, gi-gstbase, gst_plugins_base, haskell-gi-base, text
-     , transformers
+     , gi-gst, gi-gstbase, gst_plugins_base, haskell-gi, haskell-gi-base
+     , text, transformers
      }:
      mkDerivation {
        pname = "gi-gstvideo";
        version = "1.0.4";
        sha256 = "cf02df311648bcedeb377ed386237d0f0695365d09d6be9ec6ae4f26ff74f894";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
          haskell-gi-base text transformers
@@ -94847,12 +95863,13 @@ self: {
   "gi-gtk" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo
      , gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
-     , haskell-gi-base, text, transformers
+     , haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gtk";
        version = "3.0.4";
        sha256 = "a6527c34665a8d395ea529d44d97742f92f2bf1f55d97d9225e727e39e3ad158";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-pango haskell-gi-base text
@@ -94885,13 +95902,14 @@ self: {
 
   "gi-gtkosxapplication" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-gdkpixbuf
-     , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi-base
-     , text, transformers
+     , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi
+     , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gtkosxapplication";
        version = "2.0.4";
        sha256 = "6c41278cdc0829ab06d83245250cd8c9192770e03d4916f2084ca2eb0d5c1b79";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk
          haskell-gi-base text transformers
@@ -94906,12 +95924,14 @@ self: {
   "gi-gtksource" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo
      , gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-gtk
-     , gi-pango, gtksourceview, haskell-gi-base, text, transformers
+     , gi-pango, gtksourceview, haskell-gi, haskell-gi-base, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-gtksource";
        version = "3.0.4";
        sha256 = "aa360eecff313dc03abe6d352f3ee237af5dd1b4df372fab0617fa84b35cadf9";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi-base text
@@ -94925,13 +95945,14 @@ self: {
      }) {inherit (pkgs.gnome) gtksourceview;};
 
   "gi-javascriptcore" = callPackage
-    ({ mkDerivation, base, bytestring, containers, haskell-gi-base
-     , javascriptcoregtk, text, transformers
+    ({ mkDerivation, base, bytestring, containers, haskell-gi
+     , haskell-gi-base, javascriptcoregtk, text, transformers
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
        version = "3.0.4";
        sha256 = "33de003d6ae4a8595f1b509618dcf83048ab0e0837b541d33d0610d7f6f6f641";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -94943,13 +95964,14 @@ self: {
      }) {javascriptcoregtk = null;};
 
   "gi-javascriptcore_4_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, containers, haskell-gi-base
-     , javascriptcoregtk, text, transformers
+    ({ mkDerivation, base, bytestring, containers, haskell-gi
+     , haskell-gi-base, javascriptcoregtk, text, transformers
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
        version = "4.0.4";
        sha256 = "408c500fea9217ddfe84bdd1ff4dfaabe5113def51f19a9e00da17574753a072";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -94963,13 +95985,14 @@ self: {
 
   "gi-notify" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-gdkpixbuf
-     , gi-glib, gi-gobject, haskell-gi-base, libnotify, text
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libnotify, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-notify";
        version = "0.7.4";
        sha256 = "ff72dd988345b970b5fb0258349cebd0178ddbf523389748e1abaf57651965c3";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -95005,12 +96028,14 @@ self: {
 
   "gi-pango_1_0_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , gobjectIntrospection, haskell-gi-base, pango, text, transformers
+     , gobjectIntrospection, haskell-gi, haskell-gi-base, pango, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-pango";
        version = "1.0.4";
        sha256 = "692d8d357d24f76f5d386d66f3f3be877f7cc72968c60d0b3f3309007b27dd22";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -95027,12 +96052,14 @@ self: {
 
   "gi-pangocairo" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-cairo, gi-glib
-     , gi-gobject, gi-pango, haskell-gi-base, pango, text, transformers
+     , gi-gobject, gi-pango, haskell-gi, haskell-gi-base, pango, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-pangocairo";
        version = "1.0.4";
        sha256 = "e75d3931e3c58f2be33783ac06aa87b9ada8ca6668c5d78e6c0b6fd638a234e6";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
          haskell-gi-base text transformers
@@ -95046,12 +96073,14 @@ self: {
 
   "gi-poppler" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-cairo, gi-gio
-     , gi-glib, gi-gobject, haskell-gi-base, poppler, text, transformers
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, poppler, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-poppler";
        version = "0.18.4";
        sha256 = "01bc646881b6275d22ef6633fb95dd5fc49c44738e7c1cc27284fceb4c8ca74d";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -95065,12 +96094,14 @@ self: {
 
   "gi-soup" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-gio, gi-glib
-     , gi-gobject, haskell-gi-base, libsoup, text, transformers
+     , gi-gobject, haskell-gi, haskell-gi-base, libsoup, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-soup";
        version = "2.4.4";
        sha256 = "8284732ddd001d87221992d47fd980d4629ac62e2460b3710a75926b1de5bce6";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -95084,13 +96115,14 @@ self: {
 
   "gi-vte" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-atk, gi-gdk
-     , gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi-base
-     , text, transformers, vte
+     , gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi
+     , haskell-gi-base, text, transformers, vte
      }:
      mkDerivation {
        pname = "gi-vte";
        version = "2.91.4";
        sha256 = "82fcc4afa1044e3a9fa975f0950a6b46e16fb11934fefed23b9d14935d2f5259";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
          gi-gtk gi-pango haskell-gi-base text transformers
@@ -95105,13 +96137,14 @@ self: {
   "gi-webkit" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo
      , gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-gtk
-     , gi-javascriptcore, gi-soup, haskell-gi-base, text, transformers
-     , webkit
+     , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text
+     , transformers, webkit
      }:
      mkDerivation {
        pname = "gi-webkit";
        version = "3.0.4";
        sha256 = "0a2b689e9f8433d4da321be15f9bf488e57e652cbdb47288d3bfaef2e1a65134";
+       setupHaskellDepends = [ base 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
@@ -95127,12 +96160,14 @@ self: {
   "gi-webkit2" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo
      , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-javascriptcore
-     , gi-soup, haskell-gi-base, text, transformers, webkit2gtk
+     , gi-soup, haskell-gi, haskell-gi-base, text, transformers
+     , webkit2gtk
      }:
      mkDerivation {
        pname = "gi-webkit2";
        version = "4.0.4";
        sha256 = "3748f8b1d30683822b887527668ac7e87b879d72c2b4d1e2576d51c3dedf0d37";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
          gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi-base text
@@ -95148,13 +96183,14 @@ self: {
 
   "gi-webkit2webextension" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-gobject, gi-gtk
-     , gi-javascriptcore, gi-soup, haskell-gi-base, text, transformers
-     , webkit2gtk-web-extension
+     , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text
+     , transformers, webkit2gtk-web-extension
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
        version = "4.0.4";
        sha256 = "afe4d27191c98d5db379a87953b680d6d8ed508b74a28c5bea0ac37ae5f78493";
+       setupHaskellDepends = [ base haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gobject gi-gtk gi-javascriptcore
          gi-soup haskell-gi-base text transformers
@@ -95314,13 +96350,14 @@ self: {
      }) {system-glib = pkgs.glib;};
 
   "gio" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, glib, mtl
-     , system-glib
+    ({ mkDerivation, array, base, bytestring, Cabal, containers, glib
+     , gtk2hs-buildtools, mtl, system-glib
      }:
      mkDerivation {
        pname = "gio";
        version = "0.13.3.0";
        sha256 = "f20d17c56ee29cdd102234c00be1cdf0e5c12b7abe6c0a9723668a6f72a57417";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring containers glib mtl
        ];
@@ -95478,14 +96515,11 @@ self: {
        pname = "giphy-api";
        version = "0.4.0.0";
        sha256 = "bb2952f54232cead3e66350b514ca31aac511bf172be45115b98dd8777859876";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base containers http-api-data http-client http-client-tls
          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
@@ -95835,7 +96869,7 @@ self: {
 
   "git-annex" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
-     , bloomfilter, bup, byteable, bytestring, case-insensitive
+     , 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
@@ -95865,6 +96899,10 @@ self: {
        ];
        isLibrary = false;
        isExecutable = true;
+       setupHaskellDepends = [
+         base bytestring Cabal data-default directory exceptions filepath
+         hslogger IfElse MissingH process unix unix-compat
+       ];
        executableHaskellDepends = [
          aeson async aws base blaze-builder bloomfilter byteable bytestring
          case-insensitive clientsession concurrent-output conduit
@@ -96289,6 +97327,7 @@ self: {
        sha256 = "da5f7c8458321e039f8634cce7ce539bf5c0464e9487072ab79a68fa074d5aa8";
        isLibrary = false;
        isExecutable = true;
+       setupHaskellDepends = [ base hslogger MissingH ];
        executableHaskellDepends = [
          base bytestring containers directory exceptions filepath github
          hslogger IfElse MissingH mtl network network-uri
@@ -97331,13 +98370,14 @@ self: {
      }) {inherit (pkgs) glib;};
 
   "glib" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib, text
-     , utf8-string
+    ({ mkDerivation, base, bytestring, Cabal, containers, glib
+     , gtk2hs-buildtools, text, utf8-string
      }:
      mkDerivation {
        pname = "glib";
        version = "0.13.4.0";
        sha256 = "8bbc24b8a7f4de0fc02d60f12bf1b5154a151ffcad25964b65e958977100a0d9";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          base bytestring containers text utf8-string
        ];
@@ -98018,8 +99058,6 @@ self: {
        pname = "gnuplot";
        version = "0.5.4.1";
        sha256 = "fa54c95f5dad96e3af6a13429cf6852bffe97bd52bdd99bdce60ca9e78bee8f7";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base containers data-accessor data-accessor-transformers
          deepseq filepath process temporary time transformers utility-ht
@@ -100446,8 +101484,6 @@ self: {
        pname = "graphics-drawingcombinators";
        version = "1.5.1";
        sha256 = "4e8ffecad64bc9529869059a62c3dc2ca177465dc8c3890e0be6b74b4aa61148";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bitmap bitmap-opengl FTGL OpenGL stb-image
        ];
@@ -100614,15 +101650,10 @@ self: {
        pname = "graphviz";
        version = "2999.17.0.1";
        sha256 = "bbc721a46515cf16961aa67285d274502a64347bd400b64fa799d28d690dd468";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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 filepath QuickCheck text
        ];
@@ -100644,15 +101675,10 @@ self: {
        pname = "graphviz";
        version = "2999.17.0.2";
        sha256 = "23c8626061e85eb09021e93e69bad3fc83619187e5f5e55fb6a3f35b8b6bd6fd";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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 filepath QuickCheck text
        ];
@@ -100673,15 +101699,10 @@ self: {
        pname = "graphviz";
        version = "2999.18.0.2";
        sha256 = "0ce1dca248e549b005798472cc6b906143369d987cf482fc0435b1029e5cc567";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
        ];
@@ -100702,15 +101723,10 @@ self: {
        pname = "graphviz";
        version = "2999.18.1.0";
        sha256 = "fe3575744144337ad0339a8c6aa10e93197444f8c93a359865d8b2e06b68e19f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
        ];
@@ -100967,8 +101983,6 @@ self: {
        pname = "gridland";
        version = "0.1.0.3";
        sha256 = "2936472e5eb065e1fe28bd5d2f9d524be8d63f6eba0627527acf1668ec38b760";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array astar base containers grid htiled mtl random safe SDL SDL-gfx
          SDL-image SDL-mixer tuple vector
@@ -101566,18 +102580,18 @@ self: {
      }) {};
 
   "gstreamer" = callPackage
-    ({ mkDerivation, array, base, bytestring, directory, glib
+    ({ mkDerivation, array, base, bytestring, Cabal, directory, glib
      , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl
      }:
      mkDerivation {
        pname = "gstreamer";
        version = "0.12.8";
        sha256 = "ff437ed983c8d7d38add69a601707f86fcfcbc1a079c4463e67cb6a1dfcf69ad";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring directory glib mtl
        ];
        libraryPkgconfigDepends = [ gst_plugins_base gstreamer ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
@@ -101760,13 +102774,14 @@ self: {
      }) {gtk2 = pkgs.gnome2.gtk;};
 
   "gtk" = callPackage
-    ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk2, mtl, pango, text
+    ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
+     , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk";
        version = "0.14.5";
        sha256 = "ffdfb54247dfbdf3b9936504802e3e0d2238cf5a0c145e745899d2c17f7c7001";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
@@ -101823,16 +102838,16 @@ self: {
      }) {};
 
   "gtk-mac-integration" = callPackage
-    ({ mkDerivation, array, base, containers, glib, gtk
+    ({ mkDerivation, array, base, Cabal, containers, glib, gtk
      , gtk-mac-integration-gtk2, gtk2hs-buildtools, mtl
      }:
      mkDerivation {
        pname = "gtk-mac-integration";
        version = "0.3.3.0";
        sha256 = "639a8f6993a902346555f0cef188418fadb8f272f98d5f1f485e4c2b832641c3";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ array base containers glib gtk mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
@@ -102127,24 +103142,17 @@ self: {
 
   "gtk3_0_13_4" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time
-     , transformers
+     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk3";
        version = "0.13.4";
        sha256 = "10abee0435f2d2a2e07d28a44ed81e86d7d8c9b9157d6e7c1cb59e7760783e10";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       executableHaskellDepends = [
-         array base cairo text time transformers
-       ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -102153,24 +103161,17 @@ self: {
 
   "gtk3_0_13_6" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time
-     , transformers
+     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk3";
        version = "0.13.6";
        sha256 = "00ab7d347ebf1b3f4af8de7ebec8e5f72564a4680acbf376b711b9670a5dda89";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       executableHaskellDepends = [
-         array base cairo text time transformers
-       ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -102179,24 +103180,17 @@ self: {
 
   "gtk3_0_13_7" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time
-     , transformers
+     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk3";
        version = "0.13.7";
        sha256 = "29bf3dcdb39d01dbbced766ab1d72add67e73e01181668bc3423a71359d94f96";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       executableHaskellDepends = [
-         array base cairo text time transformers
-       ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -102205,24 +103199,17 @@ self: {
 
   "gtk3_0_13_8" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time
-     , transformers
+     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk3";
        version = "0.13.8";
        sha256 = "f3923ad4471aeea07c8f1fb6ddb24f18f5ae9ae6990a9b95f88382f06c6ee1a3";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       executableHaskellDepends = [
-         array base cairo text time transformers
-       ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -102231,24 +103218,17 @@ self: {
 
   "gtk3_0_13_9" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time
-     , transformers
+     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk3";
        version = "0.13.9";
        sha256 = "79cbf8db4a89f171caf33eda96cee59686c029cbd72651a06076ea92c4ddacfe";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       executableHaskellDepends = [
-         array base cairo text time transformers
-       ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -102257,25 +103237,18 @@ self: {
 
   "gtk3_0_14_0" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time
-     , transformers
+     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk3";
        version = "0.14.0";
        sha256 = "ec548d8a63caabf449ada2c3f2589c6b15e741572affb8362161fd2ab7e4d6c8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       executableHaskellDepends = [
-         array base cairo text time transformers
-       ];
        doHaddock = false;
-       jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -102284,25 +103257,18 @@ self: {
 
   "gtk3_0_14_1" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time
-     , transformers
+     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk3";
        version = "0.14.1";
        sha256 = "4ebbb02611cbbc2a0ff592afb8cf37ffc6c10ec716464975872f46853c38c5a7";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       executableHaskellDepends = [
-         array base cairo text time transformers
-       ];
        doHaddock = false;
-       jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -102311,25 +103277,18 @@ self: {
 
   "gtk3_0_14_2" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time
-     , transformers
+     , glib, gtk2hs-buildtools, gtk3, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk3";
        version = "0.14.2";
        sha256 = "da198906bf3807e61c6d3c85c8537f424d9073d517d511d38197c569a1cb3d1d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       executableHaskellDepends = [
-         array base cairo text time transformers
-       ];
        doHaddock = false;
-       jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -102337,22 +103296,18 @@ self: {
      }) {inherit (pkgs) gtk3;};
 
   "gtk3" = callPackage
-    ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk3, mtl, pango, text, time, transformers
+    ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
+     , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk3";
        version = "0.14.5";
        sha256 = "be24beff4a7fc08e7cb9b4e8d623f3ae884730c8dc22af12ab65efd362b0bc48";
-       isLibrary = true;
-       isExecutable = true;
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk3 ];
-       executableHaskellDepends = [
-         array base cairo text time transformers
-       ];
        doHaddock = false;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
@@ -102361,16 +103316,16 @@ self: {
      }) {inherit (pkgs) gtk3;};
 
   "gtk3-mac-integration" = callPackage
-    ({ mkDerivation, array, base, containers, glib
+    ({ mkDerivation, array, base, Cabal, containers, glib
      , gtk-mac-integration-gtk3, gtk2hs-buildtools, gtk3, mtl
      }:
      mkDerivation {
        pname = "gtk3-mac-integration";
        version = "0.3.3.0";
        sha256 = "c55a0c38dca1904bef528568d914a76f349ba87279b4a8ed3997bb9ac6b0a2e3";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
@@ -102435,18 +103390,18 @@ self: {
      }) {};
 
   "gtksourceview2" = callPackage
-    ({ mkDerivation, array, base, containers, glib, gtk
+    ({ mkDerivation, array, base, Cabal, containers, glib, gtk
      , gtk2hs-buildtools, gtksourceview, mtl, text
      }:
      mkDerivation {
        pname = "gtksourceview2";
        version = "0.13.3.0";
        sha256 = "20747e2bff7b9e49bc4952a4ba706c72c02edafdb7eb86e00038dd438b5937cc";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base containers glib gtk mtl text
        ];
        libraryPkgconfigDepends = [ gtksourceview ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
@@ -102472,18 +103427,18 @@ self: {
      }) {inherit (pkgs.gnome) gtksourceview;};
 
   "gtksourceview3" = callPackage
-    ({ mkDerivation, array, base, containers, glib, gtk2hs-buildtools
-     , gtk3, gtksourceview, mtl, text
+    ({ mkDerivation, array, base, Cabal, containers, glib
+     , gtk2hs-buildtools, gtk3, gtksourceview, mtl, text
      }:
      mkDerivation {
        pname = "gtksourceview3";
        version = "0.13.3.0";
        sha256 = "c260f3d49e3ee2e3da2e9884f948e904b7e376bb885d0ce7da346bcab58042f2";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base containers glib gtk3 mtl text
        ];
        libraryPkgconfigDepends = [ gtksourceview ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
@@ -103007,7 +103962,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hOpenPGP" = callPackage
+  "hOpenPGP_2_4_4" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
      , conduit, conduit-extra, containers, crypto-cipher-types
@@ -103048,6 +104003,47 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hOpenPGP" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
+     , conduit, conduit-extra, containers, crypto-cipher-types
+     , cryptonite, data-default-class, errors, hashable
+     , incremental-parser, ixset-typed, lens, memory, monad-loops
+     , nettle, network, network-uri, newtype, openpgp-asciiarmor
+     , QuickCheck, quickcheck-instances, resourcet, securemem
+     , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, time-locale-compat, transformers, unordered-containers
+     , wl-pprint-extras, zlib
+     }:
+     mkDerivation {
+       pname = "hOpenPGP";
+       version = "2.5";
+       sha256 = "8b2a18c9ee5c4df209b61fea9a261038e83e6840cce412f89ebdd5bb427e5309";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bifunctors binary
+         binary-conduit byteable bytestring bzlib conduit conduit-extra
+         containers crypto-cipher-types cryptonite data-default-class errors
+         hashable incremental-parser ixset-typed lens memory monad-loops
+         nettle network network-uri newtype openpgp-asciiarmor resourcet
+         securemem semigroups split text time time-locale-compat
+         transformers unordered-containers wl-pprint-extras zlib
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bifunctors binary binary-conduit byteable
+         bytestring bzlib conduit conduit-extra containers
+         crypto-cipher-types cryptonite data-default-class errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype QuickCheck quickcheck-instances
+         resourcet securemem semigroups split tasty tasty-hunit
+         tasty-quickcheck text time time-locale-compat transformers
+         unordered-containers wl-pprint-extras zlib
+       ];
+       homepage = "http://floss.scru.org/hOpenPGP/";
+       description = "native Haskell implementation of OpenPGP (RFC4880)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hPDB_1_2_0" = callPackage
     ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq
      , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel
@@ -104155,8 +105151,8 @@ self: {
      }) {};
 
   "hackage-server" = callPackage
-    ({ mkDerivation, acid-state, aeson, alex, array, async, attoparsec
-     , base, base16-bytestring, base64-bytestring, binary, blaze-builder
+    ({ mkDerivation, acid-state, aeson, alex, array, async, 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
@@ -104172,7 +105168,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         acid-state aeson array async attoparsec base base16-bytestring
+         acid-state aeson array async 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
@@ -104213,7 +105209,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hackage-whatsnew" = callPackage
+  "hackage-whatsnew_0_1_0_0" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath
      , hackage-db, process, temporary
      }:
@@ -104230,6 +105226,26 @@ self: {
        jailbreak = true;
        description = "Check for differences between working directory and hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hackage-whatsnew" = callPackage
+    ({ mkDerivation, base, Cabal, containers, directory, filepath
+     , hackage-db, process, temporary
+     }:
+     mkDerivation {
+       pname = "hackage-whatsnew";
+       version = "0.1.0.1";
+       sha256 = "0d20f9aff145861f0746950028304a285968a72c5d3aeec797d9826dbca1e02d";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal containers directory filepath hackage-db process
+         temporary
+       ];
+       homepage = "https://github.com/stepcut/hackage-whatsnew";
+       description = "Check for differences between working directory and hackage";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hackage2hwn" = callPackage
@@ -106302,16 +107318,13 @@ self: {
      }) {appindicator = null;};
 
   "happindicator3" = callPackage
-    ({ mkDerivation, appindicator, base, glib, gtk3, text }:
+    ({ mkDerivation, appindicator, base, glib, gtk3 }:
      mkDerivation {
        pname = "happindicator3";
        version = "0.2.1";
        sha256 = "225156270dc7cb2bb399aee76c9273a62683d8835c7045027a7906a3cf010326";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base glib gtk3 ];
        libraryPkgconfigDepends = [ appindicator ];
-       executableHaskellDepends = [ base gtk3 text ];
        jailbreak = true;
        homepage = "https://github.com/mlacorte/happindicator3";
        description = "Binding to the appindicator library";
@@ -106396,8 +107409,6 @@ self: {
        pname = "happstack";
        version = "7.0.2";
        sha256 = "d9d4f581718d4f0fedd5d1f41ce127a6e651545a9398619c0bee3debb377d5b5";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base happstack-server ];
        doHaddock = false;
        jailbreak = true;
@@ -106603,20 +107614,17 @@ self: {
   "happstack-contrib" = callPackage
     ({ mkDerivation, base, bytestring, directory, happstack-data
      , happstack-ixset, happstack-server, happstack-state
-     , happstack-util, HTTP, HUnit, mtl, network, old-time, syb, unix
+     , happstack-util, HTTP, mtl, network, old-time, syb, unix
      }:
      mkDerivation {
        pname = "happstack-contrib";
        version = "0.2.1";
        sha256 = "e550c0e74b1873ac051a886626f44571cf8543e179096f391f1cbecaa4750d33";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring directory happstack-data happstack-ixset
          happstack-server happstack-state happstack-util HTTP mtl network
          old-time syb unix
        ];
-       executableHaskellDepends = [ HUnit ];
        jailbreak = true;
        homepage = "http://happstack.com";
        description = "Web related tools and services";
@@ -106635,8 +107643,6 @@ self: {
        sha256 = "889654ad957d43fd719b4f62a97b943beb622bb2f25701ae388d46db2ab1546c";
        revision = "1";
        editedCabalFile = "dbf53b1d5012ac975d184455269f3d631ba2352e9642b707b98465c47225fd06";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers mtl pretty syb syb-with-class
          syb-with-class-instances-text template-haskell text time
@@ -106672,15 +107678,13 @@ self: {
      , filepath, happstack, happstack-data, happstack-hsp
      , happstack-ixset, happstack-server, happstack-state
      , happstack-util, harp, hsp, hsx, html, HTTP, json, mtl, network
-     , old-time, random, RJson, syb, text, time, trhsx, utf8-string
-     , web-routes, web-routes-mtl
+     , old-time, random, RJson, syb, text, time, utf8-string, web-routes
+     , web-routes-mtl
      }:
      mkDerivation {
        pname = "happstack-facebook";
        version = "0.30";
        sha256 = "0c517c663da5323fe6677fa73f8ba862725e1bb813566af63d38ee1f6716cde5";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          applicative-extras base bytestring containers filepath happstack
          happstack-data happstack-hsp happstack-ixset happstack-server
@@ -106688,7 +107692,6 @@ self: {
          network old-time random RJson syb text time utf8-string web-routes
          web-routes-mtl
        ];
-       executableToolDepends = [ trhsx ];
        homepage = "http://src.seereason.com/happstack-facebook/";
        description = "A package for building Facebook applications using Happstack";
        license = stdenv.lib.licenses.bsd3;
@@ -106867,8 +107870,6 @@ self: {
        pname = "happstack-ixset";
        version = "6.0.1";
        sha256 = "d122eeff5fa0e0321a8a76d2b1ff39f9d99cc70df5dc13be9db970e723b0d0c2";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers happstack-data happstack-util mtl syb
          syb-with-class template-haskell
@@ -107089,6 +108090,8 @@ self: {
        pname = "happstack-server";
        version = "7.4.6";
        sha256 = "8647b5f59de1b8c4d9788fff164ef6584e0f07b53bdcad06642e551eb357565c";
+       revision = "1";
+       editedCabalFile = "f22d3c92561c090cfa160ad6a90e31fe0bf5fc2019152067cf1fff73a1c1951a";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -107100,6 +108103,7 @@ self: {
        testHaskellDepends = [
          base bytestring containers HUnit parsec zlib
        ];
+       jailbreak = true;
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
@@ -107119,6 +108123,8 @@ self: {
        pname = "happstack-server";
        version = "7.4.6.1";
        sha256 = "f4893c48b909b275d25a4061be85c637ebb6c5ee63f890c39b3bfefb8698ab9b";
+       revision = "1";
+       editedCabalFile = "7096323c9515734764cb0816263d4ee046a4ac91257086948c264c44d4ca9bd5";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -107130,6 +108136,7 @@ self: {
        testHaskellDepends = [
          base bytestring containers HUnit parsec zlib
        ];
+       jailbreak = true;
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
@@ -107235,8 +108242,6 @@ self: {
        pname = "happstack-state";
        version = "6.1.4";
        sha256 = "09f7d8eaa7eec13f99d59b7c5bf7e88b3d2889b6879f0f54731a9c6f4801d7f5";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers directory extensible-exceptions
          filepath happstack-data happstack-util hslogger mtl old-time random
@@ -107276,8 +108281,6 @@ self: {
        pname = "happstack-util";
        version = "6.0.3";
        sha256 = "10de089778b70311d290420c7e6ad987da711b1c1961436ccf26c7cf4bd31a43";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring directory extensible-exceptions filepath
          hslogger mtl network old-locale old-time parsec process random
@@ -107638,8 +108641,6 @@ self: {
        pname = "has";
        version = "0.5.0.1";
        sha256 = "5a5cdc8fafbb89a79e6831a707ce303c18edf54e0b389aab9dc6302532e4cd7f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck ];
        homepage = "http://github.com/nonowarn/has";
        description = "Entity based records";
@@ -108036,8 +109037,6 @@ self: {
        pname = "hashed-storage";
        version = "0.5.11";
        sha256 = "734b5e91081e355384f86fdd67f242e095e8c5196b182a62cc996fdabdb21569";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers dataenc directory
          extensible-exceptions filepath mmap mtl zlib
@@ -108061,7 +109060,31 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "hashmap" = callPackage
+  "hashing" = callPackage
+    ({ mkDerivation, array, base, bytestring, cryptonite, mtl
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "hashing";
+       version = "0.1.0.0";
+       sha256 = "2f1c97a3ca2acd05f9e961ed0d594521420c6a14b38568326689318265d38ac5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bytestring mtl QuickCheck template-haskell
+       ];
+       executableHaskellDepends = [
+         array base bytestring mtl QuickCheck template-haskell
+       ];
+       testHaskellDepends = [
+         array base bytestring cryptonite mtl QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/wangbj/hashing/blob/master/README.md";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hashmap_1_3_0_1" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable }:
      mkDerivation {
        pname = "hashmap";
@@ -108074,6 +109097,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hashmap" = callPackage
+    ({ mkDerivation, base, containers, deepseq, hashable }:
+     mkDerivation {
+       pname = "hashmap";
+       version = "1.3.1.1";
+       sha256 = "a4c2d96c89b0a3fbf1ca06c6f8174c2fd996f3813017653a676ca075d8a07da7";
+       libraryHaskellDepends = [ base containers deepseq hashable ];
+       homepage = "https://github.com/foxik/hashmap";
+       description = "Persistent containers Map and Set based on hashing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hashring" = callPackage
     ({ mkDerivation, base, containers, hashable, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -108916,15 +109952,11 @@ self: {
        pname = "haskell-mpi";
        version = "1.4.0";
        sha256 = "c0aa02ffe77d4a39d5b33e3f846e7615c78b2ddfb6b36c9cdec335edb79488ab";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cereal extensible-exceptions
        ];
        librarySystemDepends = [ open-pal open-rte openmpi ];
        libraryToolDepends = [ c2hs ];
-       executableSystemDepends = [ open-pal open-rte openmpi ];
-       executableToolDepends = [ c2hs ];
        homepage = "http://github.com/bjpop/haskell-mpi";
        description = "Distributed parallel programming in Haskell using MPI";
        license = stdenv.lib.licenses.bsd3;
@@ -109799,8 +110831,6 @@ self: {
        pname = "haskell-xmpp";
        version = "1.0.2";
        sha256 = "a9345eb03a7ea0dc4a50af3a916ad2c455fb2232c6d36830afc8e70d6c259dfc";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base HaXml html mtl network polyparse pretty random
          regex-compat stm utf8-string
@@ -110805,8 +111835,6 @@ self: {
        pname = "haskore";
        version = "0.2.0.8";
        sha256 = "b4ac45e260e8ae417347985cc84062b684e59cc3519d18e765fa2d35f7c3d429";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring containers data-accessor event-list
          haskell-src markov-chain midi non-negative parsec process random
@@ -110876,13 +111904,10 @@ self: {
        pname = "haskore-synthesizer";
        version = "0.0.3.2";
        sha256 = "071de904ab39fd812a25395b51fbb6991dc5e22a3b9d2213067a884c0e08f705";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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";
@@ -111970,37 +112995,26 @@ self: {
      }) {};
 
   "haste-compiler" = callPackage
-    ({ 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, 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 {
        pname = "haste-compiler";
        version = "0.5.4.2";
        sha256 = "bfbf3a0f2c8a8c4387ef19aedf1a298a7ae15c6e77d01368044c13efb56bbcab";
        configureFlags = [ "-fportable" ];
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
        ];
-       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
-       ];
        jailbreak = true;
        homepage = "http://haste-lang.org/";
        description = "Haskell To ECMAScript compiler";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {bin-package-db = null;};
+     }) {};
 
   "haste-gapi" = callPackage
     ({ mkDerivation, base, data-default, haste-compiler, transformers
@@ -113374,7 +114388,7 @@ self: {
        broken = true;
      }) {bin-package-db = null;};
 
-  "hdevtools" = callPackage
+  "hdevtools_0_1_3_1" = callPackage
     ({ mkDerivation, base, bin-package-db, Cabal, cmdargs, directory
      , filepath, ghc, ghc-paths, network, process, syb, time
      , transformers, unix
@@ -113393,9 +114407,30 @@ 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;
        broken = true;
      }) {bin-package-db = null;};
 
+  "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.3.2";
+       sha256 = "f35932f3846badcd06a98beb62533bce20518b2ba52c0898ba120d46b32f9c48";
+       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;
+     }) {};
+
   "hdf" = callPackage
     ({ mkDerivation, base, directory, fgl, fgl-visualize, filepath
      , hosc, hsc3, murmur-hash, process, split, transformers
@@ -113742,15 +114777,12 @@ self: {
      }) {};
 
   "heap_1_0_2" = callPackage
-    ({ mkDerivation, base, QuickCheck }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "heap";
        version = "1.0.2";
        sha256 = "5a71b435989a320fe693f0f63042c534e8a4e49a535b5c7117159552496f8ff7";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base QuickCheck ];
        description = "Heaps in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113832,14 +114864,14 @@ self: {
      }) {};
 
   "heapsort" = callPackage
-    ({ mkDerivation, array, base, QuickCheck }:
+    ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "heapsort";
        version = "0.1.0";
        sha256 = "0aa7894611c78f93db49ece38d3731c20469d091db1ec9977e5e63285dd2fc3b";
        isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [ array base QuickCheck ];
+       executableHaskellDepends = [ array base ];
        homepage = "http://wiki.cs.pdx.edu/bartforge/heapsort";
        description = "Heapsort of MArrays as a demo of imperative programming";
        license = stdenv.lib.licenses.bsd3;
@@ -114271,8 +115303,6 @@ self: {
        sha256 = "4cbc6fe323dd997d17b7c3724ec229d78209796133611af3379c7e5ab320721a";
        revision = "1";
        editedCabalFile = "698732187d22f634ca220584e3b4056415c873360a85bc0a4ab7c1e2c86fca3d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring bytestring-show data-default-class time unix
        ];
@@ -114295,8 +115325,6 @@ self: {
        pname = "helics-wai";
        version = "0.5.1";
        sha256 = "61ac00d92870d2c5cb86fb15bcea21a0522bf12665f35b5c2a300ca7094d2b83";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring data-default-class helics vault wai
        ];
@@ -115253,13 +116281,9 @@ self: {
        pname = "hfann";
        version = "0.4.2";
        sha256 = "5a25fc2af7f99f1ba0d25394f7f98c657c24aa5d9a193bfdce71981f3311f926";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ doublefann ];
        libraryPkgconfigDepends = [ fann ];
-       executableHaskellDepends = [ base ];
-       executableSystemDepends = [ doublefann ];
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115436,13 +116460,13 @@ self: {
      }) {};
 
   "hfsevents_0_1_5" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, mtl, text, unix }:
+    ({ mkDerivation }:
      mkDerivation {
        pname = "hfsevents";
        version = "0.1.5";
        sha256 = "b348be81f278bcbf384a59029a0135c4aef6b687f2a7168a66aeea54a494e942";
-       libraryHaskellDepends = [ base bytestring cereal mtl text unix ];
-       jailbreak = true;
+       isLibrary = false;
+       isExecutable = false;
        homepage = "http://github.com/luite/hfsevents";
        description = "File/folder watching for OS X";
        license = stdenv.lib.licenses.bsd3;
@@ -115451,12 +116475,13 @@ self: {
      }) {};
 
   "hfsevents" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, mtl, text, unix }:
+    ({ mkDerivation }:
      mkDerivation {
        pname = "hfsevents";
        version = "0.1.6";
        sha256 = "74c3f3f3a5e55fff320c352a2d481069ff915860a0ab970864c6a0e6b65d3f05";
-       libraryHaskellDepends = [ base bytestring cereal mtl text unix ];
+       isLibrary = false;
+       isExecutable = false;
        homepage = "http://github.com/luite/hfsevents";
        description = "File/folder watching for OS X";
        license = stdenv.lib.licenses.bsd3;
@@ -115591,23 +116616,28 @@ self: {
 
   "hgeometry" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, containers
-     , data-clist, doctest, fixed-vector, hexpat, lens, linear, mtl
-     , parsec, random, semigroups, singletons, text, validation, vector
-     , vinyl
+     , data-clist, directory, doctest, fixed-vector, Frames, hexpat
+     , hspec, lens, linear, mtl, optparse-applicative, parsec, random
+     , semigroupoids, semigroups, singletons, template-haskell, text
+     , time, vector, vinyl
      }:
      mkDerivation {
        pname = "hgeometry";
-       version = "0.4.0.0";
-       sha256 = "8db0a79006967beabf10fc96d05921f6e198636309c86cd4a233c98194ede603";
+       version = "0.5.0.0";
+       sha256 = "ff38930b3416a9c3edf4576c653b734786a3998c52201d22035e1210eb9164e6";
        libraryHaskellDepends = [
-         base bifunctors bytestring containers data-clist fixed-vector
-         hexpat lens linear mtl parsec random semigroups singletons text
-         validation vector vinyl
+         base bifunctors bytestring containers data-clist directory
+         fixed-vector Frames hexpat lens linear mtl optparse-applicative
+         parsec random semigroupoids semigroups singletons template-haskell
+         text time vector vinyl
+       ];
+       testHaskellDepends = [
+         array base bytestring containers data-clist doctest Frames hspec
+         lens linear random semigroups vector vinyl
        ];
-       testHaskellDepends = [ array base data-clist doctest lens linear ];
        jailbreak = true;
-       homepage = "http://fstaals.net/software/hgeometry";
-       description = "Data types for geometric objects, geometric algorithms, and data structures";
+       homepage = "https://fstaals.net/software/hgeometry";
+       description = "Geometric Algorithms, Data structures, and Data types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
@@ -115728,12 +116758,9 @@ self: {
        pname = "hgrib";
        version = "0.3.1.0";
        sha256 = "d3e0d4b1088934c230c566458e327b535733de602aa96ca68fc9236b65e3d73b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ grib_api ];
        libraryToolDepends = [ c2hs ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base directory hspec ];
        jailbreak = true;
        homepage = "https://github.com/mjakob/hgrib";
@@ -116116,35 +117143,24 @@ self: {
        pname = "highlighter";
        version = "0.2.2";
        sha256 = "3d88a570d7e682cab28652ebc585a790a9e061c5be1d998573e23dd19e0d68f4";
-       isLibrary = true;
-       isExecutable = true;
        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, blaze-markup, bytestring
-     , containers, filepath, mtl, pcre-light, text
+    ({ mkDerivation, base, blaze-html, bytestring, containers, filepath
+     , mtl, pcre-light, text
      }:
      mkDerivation {
        pname = "highlighter2";
        version = "0.2.5";
        sha256 = "917718f0633c61184c5f768a817002bb8c8138759c846d245e1ea62862ffcdbe";
-       isLibrary = true;
-       isExecutable = true;
        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;
      }) {};
@@ -116160,12 +117176,9 @@ self: {
        revision = "1";
        editedCabalFile = "64831c173318277f3aa35f0d54000fe4d613219c5917a0a5f250de7ae549c146";
        configureFlags = [ "-fpcre-light" ];
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-html containers mtl parsec pcre-light utf8-string
        ];
-       executableHaskellDepends = [ base blaze-html containers filepath ];
        testHaskellDepends = [
          base blaze-html containers Diff directory filepath process
        ];
@@ -116187,12 +117200,9 @@ self: {
        revision = "1";
        editedCabalFile = "efd5828486ec9cf5638ea09498f6be0d12d8c443ad514e083e33e745dead70b1";
        configureFlags = [ "-fpcre-light" ];
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-html containers mtl parsec pcre-light utf8-string
        ];
-       executableHaskellDepends = [ base blaze-html containers filepath ];
        testHaskellDepends = [
          base blaze-html containers Diff directory filepath process
        ];
@@ -116214,12 +117224,9 @@ self: {
        revision = "1";
        editedCabalFile = "bd211d26df545362aa69036a1a8279e5d326cb53a7de5cd959f09b80b611a335";
        configureFlags = [ "-fpcre-light" ];
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-html containers mtl parsec pcre-light utf8-string
        ];
-       executableHaskellDepends = [ base blaze-html containers filepath ];
        testHaskellDepends = [
          base blaze-html containers Diff directory filepath process
        ];
@@ -116240,12 +117247,9 @@ self: {
        revision = "1";
        editedCabalFile = "7466b389fd27b0520d371b2b225cb6024e9b7dd371cffa78169c219ab449558b";
        configureFlags = [ "-fpcre-light" ];
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-html containers mtl parsec pcre-light utf8-string
        ];
-       executableHaskellDepends = [ base blaze-html containers filepath ];
        testHaskellDepends = [
          base blaze-html containers Diff directory filepath process
        ];
@@ -116265,13 +117269,10 @@ self: {
        version = "0.6.1";
        sha256 = "cb57caf861bda046043575772ffc7fd4cd21dd63a0ecdf26b624c7e930e0f30e";
        configureFlags = [ "-fpcre-light" ];
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
        ];
@@ -116291,13 +117292,10 @@ self: {
        version = "0.6.2";
        sha256 = "728f10ccba6dfa1604398ae527520d2debeef870472fe104c2bf0714c513b411";
        configureFlags = [ "-fpcre-light" ];
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
        ];
@@ -117318,8 +118316,6 @@ self: {
        pname = "hit";
        version = "0.6.2";
        sha256 = "1a9ea48c708332c55ccb8182fd4662ffdd9914f1b19520fd9c1e6d44ec928e1e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring containers cryptohash hourglass mtl
          parsec patience random system-fileio system-filepath unix-compat
@@ -117345,8 +118341,6 @@ self: {
        pname = "hit";
        version = "0.6.3";
        sha256 = "db86b3712029a4e40d1306dd6cc9ca2c9f4c77fe65a2b74106f1cbd2de26e471";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base byteable bytestring containers cryptohash hourglass
          mtl parsec patience random system-fileio system-filepath
@@ -117719,22 +118713,17 @@ self: {
 
   "hlatex" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, containers, derive
-     , directory, filepath, frquotes, mtl, process, template-haskell
-     , transformers, uniplate, utf8-string
+     , directory, filepath, mtl, process, template-haskell, transformers
+     , uniplate, utf8-string
      }:
      mkDerivation {
        pname = "hlatex";
        version = "0.3.1";
        sha256 = "1ea8a1097244818b694afd3f71aa2e56e8873b3019d3dcc973885be491a28d8e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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;
      }) {};
@@ -118899,7 +119888,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hlint" = callPackage
+  "hlint_1_9_34" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
      , directory, extra, filepath, haskell-src-exts, hscolour, process
      , refact, transformers, uniplate
@@ -118919,6 +119908,29 @@ self: {
        homepage = "https://github.com/ndmitchell/hlint#readme";
        description = "Source code suggestions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "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.35";
+       sha256 = "5e6289dadc77a0862ee12ec09136059011fd779c96ff6ffeec899170a97d7a8a";
+       isLibrary = true;
+       isExecutable = 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;
      }) {};
 
   "hlogger" = callPackage
@@ -118972,10 +119984,7 @@ self: {
        sha256 = "8370a8e6d386a8342d9c4a683b3c085890ee092e95549737ccf26b4fc62fba8d";
        revision = "1";
        editedCabalFile = "5375f1b11a455cfd90aeedf16499c79fc541857e7c73d4bdb41a704f2a561283";
-       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;
@@ -119365,8 +120374,6 @@ self: {
        pname = "hmatrix-nipals";
        version = "0.2";
        sha256 = "322bdf452889dbaeccca42e28afb3ebd85bf594da754cdee2a1f43121dbfd529";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base hmatrix ];
        homepage = "http://github.com/alanfalloon/hmatrix-nipals";
        description = "NIPALS method for Principal Components Analysis on large data-sets";
@@ -119846,15 +120853,10 @@ self: {
        pname = "hoauth2";
        version = "0.4.3";
        sha256 = "6f531f635c62cc7c42fb3e33193833adfdf789aafa2d2c754be2f23c609ab0e2";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring bytestring-show http-conduit http-types
          monad-control mtl random text transformers
        ];
-       executableHaskellDepends = [
-         aeson base bytestring http-conduit http-types text
-       ];
        jailbreak = true;
        homepage = "https://github.com/freizl/hoauth2";
        description = "hoauth2";
@@ -119870,14 +120872,9 @@ self: {
        pname = "hoauth2";
        version = "0.4.6";
        sha256 = "97234e47514c80252644edc4873140e64c16349bcf39e8e9d971cd7577a8c2ea";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
        ];
-       executableHaskellDepends = [
-         aeson base bytestring http-conduit http-types text
-       ];
        jailbreak = true;
        homepage = "https://github.com/freizl/hoauth2";
        description = "hoauth2";
@@ -119893,14 +120890,9 @@ self: {
        pname = "hoauth2";
        version = "0.4.7";
        sha256 = "b8273ca42a060b27fc9cc9ed18bb6dfdcb329073f388de4167a4767996b98bf8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
        ];
-       executableHaskellDepends = [
-         aeson base bytestring http-conduit http-types text
-       ];
        jailbreak = true;
        homepage = "https://github.com/freizl/hoauth2";
        description = "hoauth2";
@@ -119916,14 +120908,9 @@ self: {
        pname = "hoauth2";
        version = "0.4.8";
        sha256 = "6e489820dee16b926225e58555032e32d345b234b5a798db6e5a1d63d2843093";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
        ];
-       executableHaskellDepends = [
-         aeson base bytestring http-conduit http-types text
-       ];
        jailbreak = true;
        homepage = "https://github.com/freizl/hoauth2";
        description = "hoauth2";
@@ -119932,22 +120919,16 @@ self: {
      }) {};
 
   "hoauth2_0_5_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
-     , http-types, text, wai, warp
+    ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
+     , text
      }:
      mkDerivation {
        pname = "hoauth2";
        version = "0.5.0";
        sha256 = "8aedac3c8276965a6ace7c634f6c26932a13062e02d8139de3d6278eacd41c2d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
        ];
-       executableHaskellDepends = [
-         aeson base bytestring containers http-conduit http-types text wai
-         warp
-       ];
        jailbreak = true;
        homepage = "https://github.com/freizl/hoauth2";
        description = "hoauth2";
@@ -119956,22 +120937,16 @@ self: {
      }) {};
 
   "hoauth2_0_5_0_1" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
-     , http-types, text, wai, warp
+    ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
+     , text
      }:
      mkDerivation {
        pname = "hoauth2";
        version = "0.5.0.1";
        sha256 = "17766cb63f0f232b6ad21d855e32fa88da7d4f5ae5c545f391c5b92d4cd57468";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
        ];
-       executableHaskellDepends = [
-         aeson base bytestring containers http-conduit http-types text wai
-         warp
-       ];
        jailbreak = true;
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
@@ -119980,22 +120955,16 @@ self: {
      }) {};
 
   "hoauth2_0_5_2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
-     , http-types, text, wai, warp
+    ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
+     , text
      }:
      mkDerivation {
        pname = "hoauth2";
        version = "0.5.2";
        sha256 = "68a8d591d47e24f3a2bfe5b103512dee48805217af771c1de64612fc19f8084f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
        ];
-       executableHaskellDepends = [
-         aeson base bytestring containers http-conduit http-types text wai
-         warp
-       ];
        jailbreak = true;
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
@@ -120004,22 +120973,16 @@ self: {
      }) {};
 
   "hoauth2_0_5_3" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
-     , http-types, text, wai, warp
+    ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
+     , text
      }:
      mkDerivation {
        pname = "hoauth2";
        version = "0.5.3";
        sha256 = "650c867a16801120065c67a32fd5c3c60a0f083411c95273c8108e694bde3332";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
        ];
-       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;
@@ -120027,22 +120990,16 @@ self: {
      }) {};
 
   "hoauth2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
-     , http-types, text, wai, warp
+    ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
+     , text
      }:
      mkDerivation {
        pname = "hoauth2";
        version = "0.5.3.1";
        sha256 = "f61b65dfe6834a6a26c32f6cf38914b5587102e62e50eb3b02887b0c6927e7ad";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
        ];
-       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;
@@ -121298,7 +122255,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hopenpgp-tools" = callPackage
+  "hopenpgp-tools_0_18" = callPackage
     ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
      , base, base16-bytestring, binary, binary-conduit, bytestring
      , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
@@ -121329,6 +122286,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hopenpgp-tools" = callPackage
+    ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
+     , base, base16-bytestring, binary, binary-conduit, bytestring
+     , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
+     , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client
+     , http-client-tls, http-types, ixset-typed, lens, monad-loops
+     , openpgp-asciiarmor, optparse-applicative, resourcet, text, time
+     , time-locale-compat, transformers, unordered-containers
+     , wl-pprint-extras, wl-pprint-terminfo, yaml
+     }:
+     mkDerivation {
+       pname = "hopenpgp-tools";
+       version = "0.19";
+       sha256 = "458a909e57101b930b383f34f877bda7a99122a74a938316905d452d9e43a6dd";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint array attoparsec base base16-bytestring binary
+         binary-conduit bytestring conduit conduit-extra containers
+         crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP
+         http-client http-client-tls http-types ixset-typed lens monad-loops
+         openpgp-asciiarmor optparse-applicative resourcet text time
+         time-locale-compat transformers unordered-containers
+         wl-pprint-extras wl-pprint-terminfo yaml
+       ];
+       executableToolDepends = [ alex happy ];
+       homepage = "http://floss.scru.org/hopenpgp-tools";
+       description = "hOpenPGP-based command-line tools";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hopenssl" = callPackage
     ({ mkDerivation, base, bytestring, mtl, openssl }:
      mkDerivation {
@@ -121867,7 +122856,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hpack" = callPackage
+  "hpack_0_14_0" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
      , deepseq, directory, filepath, Glob, hspec, interpolate, mockery
      , QuickCheck, temporary, text, unordered-containers, yaml
@@ -121894,6 +122883,36 @@ self: {
        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, containers
+     , deepseq, directory, filepath, Glob, hspec, interpolate, mockery
+     , QuickCheck, temporary, text, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "hpack";
+       version = "0.14.1";
+       sha256 = "a930e8719c52f42826efab92f33252e3dfbf664296ce8075334b48e38bc51280";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base-compat containers deepseq directory filepath Glob
+         text unordered-containers yaml
+       ];
+       executableHaskellDepends = [
+         aeson base base-compat containers deepseq directory filepath Glob
+         text unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat containers deepseq directory
+         filepath Glob hspec interpolate mockery QuickCheck temporary text
+         unordered-containers yaml
+       ];
+       homepage = "https://github.com/sol/hpack#readme";
+       description = "An alternative format for Haskell packages";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "hpaco" = callPackage
@@ -122198,8 +123217,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpio";
-       version = "0.8.0.1";
-       sha256 = "0d327a22d17327be00927fc6284a4a0139167581c6d3fec268e14891d586b328";
+       version = "0.8.0.2";
+       sha256 = "b7f3c775454faea34a3bef496741f5d15ff5fc8319981b61b799ec895a21dca5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122222,38 +123241,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hpio_0_8_0_2" = callPackage
-    ({ mkDerivation, async, base, base-compat, bytestring, containers
-     , directory, doctest, exceptions, filepath, hlint, hspec, mtl
-     , mtl-compat, optparse-applicative, QuickCheck, text, transformers
-     , transformers-compat, unix, unix-bytestring
-     }:
-     mkDerivation {
-       pname = "hpio";
-       version = "0.8.0.2";
-       sha256 = "b7f3c775454faea34a3bef496741f5d15ff5fc8319981b61b799ec895a21dca5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat bytestring containers directory exceptions
-         filepath mtl mtl-compat QuickCheck text transformers
-         transformers-compat unix unix-bytestring
-       ];
-       executableHaskellDepends = [
-         async base base-compat exceptions mtl mtl-compat
-         optparse-applicative transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         async base base-compat bytestring containers directory doctest
-         exceptions filepath hlint hspec mtl mtl-compat QuickCheck text
-         transformers transformers-compat unix unix-bytestring
-       ];
-       homepage = "https://github.com/dhess/hpio";
-       description = "Monads for GPIO in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hplayground" = callPackage
     ({ mkDerivation, base, containers, data-default, haste-compiler
      , haste-perch, monads-tf, transformers
@@ -122329,29 +123316,20 @@ self: {
 
   "hpqtypes" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
-     , data-default-class, exceptions, HUnit, lifted-base, monad-control
-     , mtl, postgresql, QuickCheck, random, resource-pool, scientific
-     , test-framework, test-framework-hunit, text, time, transformers
-     , transformers-base, unordered-containers, vector
+     , data-default-class, exceptions, lifted-base, monad-control, mtl
+     , postgresql, resource-pool, text, time, transformers
+     , transformers-base, vector
      }:
      mkDerivation {
        pname = "hpqtypes";
        version = "1.4.4";
        sha256 = "4e1bcfc35caaa8abcee28316f8b0bdd6fadbebe223bacfb3118dec4d980fee36";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-default-class exceptions
          lifted-base monad-control mtl resource-pool text time transformers
          transformers-base vector
        ];
        librarySystemDepends = [ postgresql ];
-       executableHaskellDepends = [
-         aeson base bytestring exceptions HUnit lifted-base monad-control
-         mtl QuickCheck random scientific test-framework
-         test-framework-hunit text time transformers-base
-         unordered-containers vector
-       ];
        homepage = "https://github.com/scrive/hpqtypes";
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
@@ -122628,17 +123606,12 @@ self: {
      }) {};
 
   "hps" = callPackage
-    ({ mkDerivation, base, directory, filepath, hcg-minus, random }:
+    ({ mkDerivation, base, hcg-minus }:
      mkDerivation {
        pname = "hps";
        version = "0.15";
        sha256 = "30df792e10ce0a2d2886ce5b6b081e95640cc00d02d9f2aa6426e7919eccb54e";
-       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";
@@ -123748,10 +124721,9 @@ self: {
 
   "hsc3-graphs" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, cairo, containers
-     , 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
+     , 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
      }:
      mkDerivation {
        pname = "hsc3-graphs";
@@ -123765,12 +124737,7 @@ self: {
          hsc3-sf hsc3-unsafe hsc3-utils hsharc MonadRandom primes random
          random-shuffle sc3-rdu she split
        ];
-       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
-       ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/t/hsc3-graphs";
        description = "Haskell SuperCollider Graphs";
@@ -123846,13 +124813,10 @@ self: {
        pname = "hsc3-process";
        version = "0.10.0";
        sha256 = "ace3a309858541f5ec377403391d71176653601bcac3fa69adfa9576a74ae6c0";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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";
@@ -123894,22 +124858,17 @@ self: {
      , failure, hashtables, hosc, hsc3, hsc3-process, lifted-base
      , ListZipper, monad-control, QuickCheck, random, resourcet
      , test-framework, test-framework-quickcheck2, transformers
-     , transformers-base, unix
+     , transformers-base
      }:
      mkDerivation {
        pname = "hsc3-server";
        version = "0.10.0";
        sha256 = "57bcb588adc0cabc5114919c32c240be63de704545b4803ac44e447364059c02";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bitset bytestring containers data-default failure hashtables
          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
@@ -124839,8 +125798,6 @@ self: {
        pname = "hslogger";
        version = "1.2.6";
        sha256 = "7372e5d69a6a73011a677b914910f916b4cef59b1475eb635a1bd945043a1c7b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers directory mtl network old-locale process time unix
        ];
@@ -124859,8 +125816,6 @@ self: {
        pname = "hslogger";
        version = "1.2.8";
        sha256 = "de3572c313d5c453c7407bfab07edf052a523fd25c8cbc41457b0ed14e94ec44";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers directory mtl network old-locale process time unix
        ];
@@ -124878,8 +125833,6 @@ self: {
        pname = "hslogger";
        version = "1.2.9";
        sha256 = "be62cc2783876b9e6d857c5ae60ab4408131fc51314a7b7d971212395f0fb476";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers directory mtl network old-locale process time unix
        ];
@@ -124890,7 +125843,7 @@ self: {
      }) {};
 
   "hslogger" = callPackage
-    ({ mkDerivation, base, containers, directory, HUnit, mtl, network
+    ({ mkDerivation, base, containers, directory, mtl, network
      , old-locale, process, time, unix
      }:
      mkDerivation {
@@ -124900,7 +125853,6 @@ 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;
@@ -127092,7 +128044,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
-       jailbreak = true;
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML sample programs";
        license = stdenv.lib.licenses.bsd3;
@@ -127995,8 +128946,6 @@ self: {
        pname = "html5-entity";
        version = "0.2.0.3";
        sha256 = "2e067939e2c7d1a204ee219651f6c31205eed3ff6f43e0852ffc5bd5a1feb52e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base containers text ];
        homepage = "https://github.com/zudov/html5-entity/";
        description = "A library for looking up and validating HTML5 entities";
@@ -128168,7 +129117,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "http-api-data" = callPackage
+  "http-api-data_0_2_2" = callPackage
     ({ mkDerivation, base, bytestring, doctest, Glob, hspec, HUnit
      , QuickCheck, text, time, time-locale-compat
      }:
@@ -128187,6 +129136,26 @@ self: {
        homepage = "http://github.com/fizruk/http-api-data";
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "http-api-data" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, Glob, hspec, HUnit
+     , QuickCheck, text, time, time-locale-compat
+     }:
+     mkDerivation {
+       pname = "http-api-data";
+       version = "0.2.3";
+       sha256 = "66dae92ec5c137136a771f1050ed23a0ee923fe6c6f5ad2acabcfad20d727042";
+       libraryHaskellDepends = [
+         base bytestring text time time-locale-compat
+       ];
+       testHaskellDepends = [
+         base doctest Glob hspec HUnit QuickCheck text time
+       ];
+       homepage = "http://github.com/fizruk/http-api-data";
+       description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "http-attoparsec" = callPackage
@@ -129618,18 +130587,18 @@ self: {
      }) {};
 
   "http-dispatch" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive, hspec
-     , http-client, http-client-tls, http-types
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , case-insensitive, hspec, http-client, http-client-tls, http-types
      }:
      mkDerivation {
        pname = "http-dispatch";
-       version = "0.3.0.0";
-       sha256 = "db60bbb10034b944c940004db750de89a6baaa6a765606e20475af7650aa0f8a";
+       version = "0.5.0.0";
+       sha256 = "568304c179502e3f289a6192cf1eaff544305874667e85a3c77719da15683d47";
        libraryHaskellDepends = [
-         aeson base bytestring case-insensitive http-client http-client-tls
-         http-types
+         base base64-bytestring bytestring case-insensitive http-client
+         http-client-tls http-types
        ];
-       testHaskellDepends = [ base hspec ];
+       testHaskellDepends = [ aeson base hspec ];
        homepage = "http://github.com/owainlewis/http-dispatch#readme";
        description = "High level HTTP client for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -129664,8 +130633,6 @@ self: {
        pname = "http-enumerator";
        version = "0.7.3.3";
        sha256 = "463f4a7086ee9226ad882ddeb51d5086b237204ef2e0780e1c544eb2debd8283";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          asn1-data attoparsec attoparsec-enumerator base base64-bytestring
          blaze-builder blaze-builder-enumerator bytestring case-insensitive
@@ -129834,8 +130801,6 @@ self: {
        pname = "http-monad";
        version = "0.1.1";
        sha256 = "e75643a34100c171050f4f9011b2120c87269ebf49f372a7005aa63a49f1ee88";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers explicit-exception HTTP lazyio network
          parsec transformers utility-ht
@@ -130048,8 +131013,6 @@ self: {
        pname = "http-shed";
        version = "0.1";
        sha256 = "bb31968733cbe9d369c651b166f1ecbac9d325c371a9b2fd9723f79953224b2b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base network ];
        description = "A simple websever with an interact style API";
        license = stdenv.lib.licenses.bsd3;
@@ -130220,17 +131183,10 @@ self: {
        pname = "http2";
        version = "1.0.4";
        sha256 = "727fc0d39a62b02b677189f9ef745e3c8fd574334736594139767940dc4647b7";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring bytestring-builder containers mwc-random stm
          unordered-containers
        ];
-       executableHaskellDepends = [
-         aeson aeson-pretty array base bytestring bytestring-builder
-         containers directory filepath hex text unordered-containers vector
-         word8
-       ];
        testHaskellDepends = [
          aeson aeson-pretty array base bytestring bytestring-builder
          containers directory doctest filepath Glob hex hspec mwc-random stm
@@ -130252,17 +131208,10 @@ self: {
        pname = "http2";
        version = "1.3.1";
        sha256 = "547aa0826373711e4ec8d271f767cd8db74ac3cb822cdf58d305c18babd22f96";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring bytestring-builder containers psqueues stm
          unordered-containers
        ];
-       executableHaskellDepends = [
-         aeson aeson-pretty array base bytestring bytestring-builder
-         containers directory filepath hex text unordered-containers vector
-         word8
-       ];
        testHaskellDepends = [
          aeson aeson-pretty array base bytestring bytestring-builder
          containers directory doctest filepath Glob hex hspec mwc-random
@@ -130284,17 +131233,10 @@ self: {
        pname = "http2";
        version = "1.4.4";
        sha256 = "d6ff4d5578749082d3a319bf97a9e830e320be0b2f8701c2ef39ad896cf977c4";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring bytestring-builder containers psqueues stm
          unordered-containers
        ];
-       executableHaskellDepends = [
-         aeson aeson-pretty array base bytestring bytestring-builder
-         containers directory filepath hex text unordered-containers vector
-         word8
-       ];
        testHaskellDepends = [
          aeson aeson-pretty array base bytestring bytestring-builder
          containers directory doctest filepath Glob hex hspec psqueues stm
@@ -130315,17 +131257,10 @@ self: {
        pname = "http2";
        version = "1.4.5";
        sha256 = "34c6e481b2ce00180ce86370af3d06b01afe762360289fa945abbf8a55c5dba5";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring bytestring-builder containers psqueues stm
          unordered-containers
        ];
-       executableHaskellDepends = [
-         aeson aeson-pretty array base bytestring bytestring-builder
-         containers directory filepath hex text unordered-containers vector
-         word8
-       ];
        testHaskellDepends = [
          aeson aeson-pretty array base bytestring bytestring-builder
          containers directory doctest filepath Glob hex hspec psqueues stm
@@ -130346,17 +131281,10 @@ self: {
        pname = "http2";
        version = "1.6.0";
        sha256 = "2d33647a74f9945fa0e3a0982832eeb2c57cb46d3ddbacf5ba049ee59a60da97";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
@@ -130372,8 +131300,6 @@ self: {
        pname = "httpd-shed";
        version = "0.4.0.3";
        sha256 = "b0ff87d81e61f788d3920d952e4469d984742ba49c006df086c159886bf09218";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base network network-uri ];
        description = "A simple web-server with an interact style API";
        license = stdenv.lib.licenses.bsd3;
@@ -131492,7 +132418,7 @@ self: {
   "hxt_9_3_1_7" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , directory, filepath, HUnit, hxt-charproperties
-     , hxt-regex-xmlschema, hxt-unicode, mtl, network-uri, parsec
+     , hxt-regex-xmlschema, hxt-unicode, mtl, network, parsec
      }:
      mkDerivation {
        pname = "hxt";
@@ -131500,7 +132426,7 @@ self: {
        sha256 = "516c509f669afd0495b609606af64bae94b46b95bdcf0a553463a399a8c0edb5";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath HUnit
-         hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri
+         hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network
          parsec
        ];
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
@@ -131512,7 +132438,7 @@ self: {
   "hxt_9_3_1_10" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , directory, filepath, HUnit, hxt-charproperties
-     , hxt-regex-xmlschema, hxt-unicode, mtl, network-uri, parsec
+     , hxt-regex-xmlschema, hxt-unicode, mtl, network, parsec
      }:
      mkDerivation {
        pname = "hxt";
@@ -131520,7 +132446,7 @@ self: {
        sha256 = "8ec991ecbcab223e21b8055e8511bb24970288cd55fccd11cd272601f908ad4a";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath HUnit
-         hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri
+         hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network
          parsec
        ];
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
@@ -131532,7 +132458,7 @@ self: {
   "hxt_9_3_1_12" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , directory, filepath, HUnit, hxt-charproperties
-     , hxt-regex-xmlschema, hxt-unicode, mtl, network-uri, parsec
+     , hxt-regex-xmlschema, hxt-unicode, mtl, network, parsec
      }:
      mkDerivation {
        pname = "hxt";
@@ -131540,7 +132466,7 @@ self: {
        sha256 = "af2d7edb8bbed49c0d97bd5875dbb07a6395a62d5a84e477a21bb19d9a405e8c";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath HUnit
-         hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri
+         hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network
          parsec
        ];
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
@@ -131634,8 +132560,6 @@ self: {
        pname = "hxt-css";
        version = "0.1.0.1";
        sha256 = "bc04f9b17694ad33206a283db99bcf3d3a04cd3ae8ba2a6c3169823e3dd7187d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base hxt parsec split ];
        homepage = "https://github.com/redneb/hxt-css";
        description = "CSS selectors for HXT";
@@ -131649,8 +132573,6 @@ self: {
        pname = "hxt-css";
        version = "0.1.0.2";
        sha256 = "c3adfe73846b1274249835c142174dfc88167029be350761ec46cd97dc39c672";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base hxt parsec split ];
        homepage = "https://github.com/redneb/hxt-css";
        description = "CSS selectors for HXT";
@@ -131713,15 +132635,13 @@ self: {
      }) {};
 
   "hxt-http_9_1_5" = callPackage
-    ({ mkDerivation, base, bytestring, HTTP, hxt, network, network-uri
-     , parsec
-     }:
+    ({ mkDerivation, base, bytestring, HTTP, hxt, network, parsec }:
      mkDerivation {
        pname = "hxt-http";
        version = "9.1.5";
        sha256 = "69c5a8bf3e5c595f9da171189389d0129b0b154e0fa67962db98e0d43f025e9c";
        libraryHaskellDepends = [
-         base bytestring HTTP hxt network network-uri parsec
+         base bytestring HTTP hxt network parsec
        ];
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "Interface to native Haskell HTTP package HTTP";
@@ -131830,15 +132750,15 @@ self: {
 
   "hxt-relaxng_9_1_5_1" = callPackage
     ({ mkDerivation, base, containers, hxt, hxt-charproperties
-     , hxt-regex-xmlschema, network-uri, parsec
+     , hxt-regex-xmlschema, network, parsec
      }:
      mkDerivation {
        pname = "hxt-relaxng";
        version = "9.1.5.1";
        sha256 = "8687288236bd9c54ab113ad28f463a386eb20c07d5161b5ac016e7f9d2d45f9a";
        libraryHaskellDepends = [
-         base containers hxt hxt-charproperties hxt-regex-xmlschema
-         network-uri parsec
+         base containers hxt hxt-charproperties hxt-regex-xmlschema network
+         parsec
        ];
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "The HXT RelaxNG validator";
@@ -131848,15 +132768,15 @@ self: {
 
   "hxt-relaxng_9_1_5_3" = callPackage
     ({ mkDerivation, base, containers, hxt, hxt-charproperties
-     , hxt-regex-xmlschema, network-uri, parsec
+     , hxt-regex-xmlschema, network, parsec
      }:
      mkDerivation {
        pname = "hxt-relaxng";
        version = "9.1.5.3";
        sha256 = "34ce02afed789526407bd8b446a33a1f0458fe04ac783765d9295fd2fb7de084";
        libraryHaskellDepends = [
-         base containers hxt hxt-charproperties hxt-regex-xmlschema
-         network-uri parsec
+         base containers hxt hxt-charproperties hxt-regex-xmlschema network
+         parsec
        ];
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "The HXT RelaxNG validator";
@@ -132329,24 +133249,36 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "hylogen" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-reify, filepath
-     , fsnotify, hint, http-types, process, text, vector-space, wai
-     , warp, websockets
+  "hylide" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, filepath, fsnotify, hint
+     , http-types, hylogen, process, text, vector-space, wai, warp
+     , websockets
      }:
      mkDerivation {
-       pname = "hylogen";
-       version = "0.1.3.2";
-       sha256 = "6f6617a9a5f5a692a0a4eaa50a9ee7540e95992dcd6d8d06c8107e39f748e193";
+       pname = "hylide";
+       version = "0.1.4.0";
+       sha256 = "23887424cba4466f674bddc88ba65e751a690d4455469075de617f5c0595da3b";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base data-reify vector-space ];
+       libraryHaskellDepends = [ base hylogen vector-space ];
        executableHaskellDepends = [
-         aeson base bytestring filepath fsnotify hint http-types process
-         text wai warp websockets
+         aeson base bytestring filepath fsnotify hint http-types hylogen
+         process text wai warp websockets
        ];
+       homepage = "https://github.com/sleexyz/hylide";
+       description = "Livecoding WebGL renderer for Hylogen";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "hylogen" = callPackage
+    ({ mkDerivation, base, data-reify, vector-space }:
+     mkDerivation {
+       pname = "hylogen";
+       version = "0.1.4.1";
+       sha256 = "dc78062033fd5f6c4c4f1faed5229fe79a249f063c50d826dbd3b5af5ebfc4d3";
+       libraryHaskellDepends = [ base data-reify vector-space ];
        homepage = "https://github.com/sleexyz/hylogen";
-       description = "an EDSL for live-coding fragment shaders";
+       description = "Purely functional GLSL embedded in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
@@ -134494,13 +135426,10 @@ self: {
        pname = "imagemagick";
        version = "0.0.4.2";
        sha256 = "1956fd48139c43e73528c358021595c1b867abb6fba8bc0334770f74d4089178";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring filepath resourcet text transformers vector
        ];
        libraryPkgconfigDepends = [ imagemagick ];
-       executablePkgconfigDepends = [ imagemagick ];
        testHaskellDepends = [
          base bytestring directory filepath lifted-base QuickCheck resourcet
          tasty tasty-hunit text transformers vector
@@ -135172,8 +136101,6 @@ self: {
        pname = "indentparser";
        version = "0.1";
        sha256 = "5c1dd6eeeb8fb5e136528df6ffb7c0041e708b63f0bcd4e55fa297d960fd2b90";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://www.cse.iitk.ac.in/users/ppk/code/HASKELL/indentparser";
        description = "A parser for indentation based structures";
@@ -135463,24 +136390,18 @@ self: {
   "influxdb" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , data-default-class, dlist, exceptions, http-client, HUnit, mtl
-     , mwc-random, network-uri, retry, scientific, tagged, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text
-     , time, vector
+     , network-uri, retry, scientific, tagged, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-th, template-haskell, text, vector
      }:
      mkDerivation {
        pname = "influxdb";
        version = "0.10.0";
        sha256 = "063754458bbceb4a89e70c26a979f47e2c632a0ccaf93b53360870d44c5268bb";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default-class
          dlist exceptions http-client mtl network-uri retry scientific
          tagged template-haskell text vector
        ];
-       executableHaskellDepends = [
-         base bytestring http-client mtl mwc-random text time
-       ];
        testHaskellDepends = [
          base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
          tasty-th text vector
@@ -135674,23 +136595,19 @@ self: {
 
   "inline-c_0_5_5_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
-     , containers, cryptohash, directory, filepath, gsl, gslcblas
-     , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
-     , regex-posix, template-haskell, transformers, unordered-containers
-     , vector
+     , containers, cryptohash, directory, filepath, hashable, hspec, mtl
+     , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix
+     , template-haskell, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "inline-c";
        version = "0.5.5.1";
        sha256 = "1d43e051cb97cb016b373bf0dd2285fcdeaa8f03cd9449921454826e011a62eb";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring containers cryptohash
          directory filepath 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
@@ -135699,27 +136616,23 @@ self: {
        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" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
-     , containers, cryptohash, directory, filepath, gsl, gslcblas
-     , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
-     , regex-posix, template-haskell, transformers, unordered-containers
-     , vector
+     , containers, cryptohash, directory, filepath, hashable, hspec, mtl
+     , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix
+     , template-haskell, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "inline-c";
        version = "0.5.5.2";
        sha256 = "b1265ed095cc1b832d20e3c30de574817f906534f46660ed2ff55b85b15677d6";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring containers cryptohash
          directory filepath 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
@@ -135728,7 +136641,7 @@ self: {
        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 }:
@@ -136356,8 +137269,6 @@ self: {
        pname = "interpolation";
        version = "0.1";
        sha256 = "cad3e655c9893007058dfd8b128195a15434f0759e447c78722fb50aa50337fa";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base utility-ht ];
        testHaskellDepends = [
          array base containers QuickCheck utility-ht
@@ -136469,17 +137380,12 @@ self: {
      }) {};
 
   "intset" = callPackage
-    ({ mkDerivation, base, bits-extras, bytestring, deepseq, QuickCheck
-     , test-framework, test-framework-quickcheck2
-     }:
+    ({ mkDerivation, base, bits-extras, bytestring, deepseq }:
      mkDerivation {
        pname = "intset";
        version = "0.1.1.0";
        sha256 = "60d2c3923889cc99ede3544cd0576cc4927098dec4e49ba8aa86a8273ee29610";
        libraryHaskellDepends = [ base bits-extras bytestring deepseq ];
-       testHaskellDepends = [
-         base QuickCheck test-framework test-framework-quickcheck2
-       ];
        homepage = "https://github.com/pxqr/intset";
        description = "Pure, mergeable, succinct Int sets";
        license = stdenv.lib.licenses.bsd3;
@@ -137083,8 +137989,6 @@ self: {
        pname = "ipopt-hs";
        version = "0.5.1.0";
        sha256 = "aaf193c06daed43998d4d37f7916d8c1bb73b61e01815755eff61bd2c472344a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          ad ansi-wl-pprint base containers lens mtl template-haskell
          uu-parsinglib vector vector-space
@@ -137242,22 +138146,17 @@ self: {
 
   "ipython-kernel_0_6_1_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
-     , directory, filepath, mtl, parsec, SHA, tar, text, transformers
-     , uuid, zeromq4-haskell
+     , directory, filepath, mtl, SHA, tar, text, transformers, uuid
+     , zeromq4-haskell
      }:
      mkDerivation {
        pname = "ipython-kernel";
        version = "0.6.1.2";
        sha256 = "1431c7442b9081dd9169348b36f0befafeedca8a773b8d5349518b39fde1e4e2";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring cereal containers directory filepath mtl SHA
          tar text transformers uuid zeromq4-haskell
        ];
-       executableHaskellDepends = [
-         base filepath mtl parsec text transformers
-       ];
        jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
@@ -137267,22 +138166,17 @@ self: {
 
   "ipython-kernel_0_6_1_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
-     , directory, filepath, mtl, parsec, SHA, tar, text, transformers
-     , uuid, zeromq4-haskell
+     , directory, filepath, mtl, SHA, tar, text, transformers, uuid
+     , zeromq4-haskell
      }:
      mkDerivation {
        pname = "ipython-kernel";
        version = "0.6.1.3";
        sha256 = "d254f8d372bc5e8c5693897573106eae5514838c5e804ea7a973659e2d27e451";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring cereal containers directory filepath mtl SHA
          tar text transformers uuid zeromq4-haskell
        ];
-       executableHaskellDepends = [
-         base filepath mtl parsec text transformers
-       ];
        jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
@@ -137292,23 +138186,18 @@ self: {
 
   "ipython-kernel_0_8_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
-     , directory, filepath, mtl, parsec, process, SHA, temporary, text
+     , directory, filepath, mtl, process, SHA, temporary, text
      , transformers, unordered-containers, uuid, zeromq4-haskell
      }:
      mkDerivation {
        pname = "ipython-kernel";
        version = "0.8.3.0";
        sha256 = "e865322381ddc4271fc2b0650aeee70d04036e2114e1a77921878c150af5a60c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring cereal containers directory filepath mtl
          process SHA temporary text transformers unordered-containers uuid
          zeromq4-haskell
        ];
-       executableHaskellDepends = [
-         base filepath mtl parsec text transformers
-       ];
        jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
@@ -137318,23 +138207,18 @@ self: {
 
   "ipython-kernel" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
-     , directory, filepath, mtl, parsec, process, SHA, temporary, text
+     , directory, filepath, mtl, process, SHA, temporary, text
      , transformers, unordered-containers, uuid, zeromq4-haskell
      }:
      mkDerivation {
        pname = "ipython-kernel";
        version = "0.8.4.0";
        sha256 = "ac4c822836d5b2cecf7ac4c61fe32ed876b09d18bcbe44760a6096bcd7338264";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring cereal containers directory filepath mtl
          process SHA temporary text transformers unordered-containers uuid
          zeromq4-haskell
        ];
-       executableHaskellDepends = [
-         base filepath mtl parsec text transformers
-       ];
        jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
@@ -137408,7 +138292,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "irc-client" = callPackage
+  "irc-client_0_3_0_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, data-default-class
      , irc-conduit, irc-ctcp, old-locale, stm, stm-conduit, text, time
      , transformers
@@ -137424,6 +138308,25 @@ self: {
        homepage = "https://github.com/barrucadu/irc-client";
        description = "An IRC client library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "irc-client" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, data-default-class
+     , irc-conduit, irc-ctcp, old-locale, stm, stm-conduit, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "irc-client";
+       version = "0.4.0.0";
+       sha256 = "be5388f15ee90d5f58da28783c77348e424378635e13a0bb00a71369deb22a77";
+       libraryHaskellDepends = [
+         base bytestring conduit data-default-class irc-conduit irc-ctcp
+         old-locale stm stm-conduit text time transformers
+       ];
+       homepage = "https://github.com/barrucadu/irc-client";
+       description = "An IRC client library";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
@@ -137456,6 +138359,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-conduit_0_2_0_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
+     , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls
+     , transformers, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-conduit";
+       version = "0.2.0.0";
+       sha256 = "3c8956d695e7ea3a3a9764dd7128f6c9243e53d578a9ba39284757afbbbd7258";
+       libraryHaskellDepends = [
+         async base bytestring conduit conduit-extra connection irc irc-ctcp
+         network-conduit-tls text time tls transformers x509-validation
+       ];
+       homepage = "https://github.com/barrucadu/irc-conduit";
+       description = "Streaming IRC message library using conduits";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-core" = callPackage
     ({ mkDerivation, array, attoparsec, base, base64-bytestring
      , bytestring, config-value, connection, containers
@@ -138030,12 +138952,9 @@ self: {
        pname = "iteratee-mtl";
        version = "0.5.0.0";
        sha256 = "008a7dfc38986daf8b164472dd739b8185b5564246858450d093b04753056e28";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers ListLike MonadCatchIO-mtl mtl unix
        ];
-       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://inmachina.net/~jwlato/haskell/iteratee";
        description = "Iteratee-based I/O";
@@ -138521,8 +139440,6 @@ self: {
        pname = "jack";
        version = "0.7.0.3";
        sha256 = "33d3c0fa183e590b2bc9323edb4f0d22d202e9ed4ff3892bffe5d6ff583f5789";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring enumset event-list explicit-exception midi
          non-negative transformers unix
@@ -139486,6 +140403,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "js-jquery_3_0_0" = callPackage
+    ({ mkDerivation, base, HTTP }:
+     mkDerivation {
+       pname = "js-jquery";
+       version = "3.0.0";
+       sha256 = "ad576481282ac48923303bc8bad50baee424425a1021ccfb61215aac8d0bd026";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jsaddle_0_3_0_3" = callPackage
     ({ mkDerivation, base, doctest, glib, gtk3, lens, QuickCheck
      , template-haskell, text, transformers, vector, webkitgtk3
@@ -139566,9 +140498,8 @@ self: {
      }) {};
 
   "jsc" = callPackage
-    ({ mkDerivation, base, glib, gtk3, hslogger, jmacro, lens
-     , template-haskell, text, transformers, webkitgtk3
-     , webkitgtk3-javascriptcore
+    ({ mkDerivation, base, jmacro, lens, template-haskell, text
+     , transformers, webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "jsc";
@@ -139578,10 +140509,6 @@ 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
-       ];
        jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
@@ -140275,8 +141202,6 @@ self: {
        pname = "json-rpc-client";
        version = "0.2.4.0";
        sha256 = "9f65be9991b073441332023cdfdf232e8455a530fb2fe922af2932e39436cee7";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring json-rpc-server mtl text unordered-containers
          vector vector-algorithms
@@ -140300,8 +141225,6 @@ self: {
        pname = "json-rpc-server";
        version = "0.2.4.0";
        sha256 = "2a3a993a2d99f503fed13fad0193d005b2c75d768abdb64a254a687bb65e3ed1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring deepseq mtl text unordered-containers vector
        ];
@@ -140854,20 +141777,22 @@ self: {
 
   "juandelacosa" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring
-     , case-insensitive, docopt, entropy, http-types, mysql
-     , mysql-simple, network, raw-strings-qq, resource-pool, unix, wai
-     , warp
+     , data-default-class, docopt, entropy, fast-logger, http-types
+     , interpolatedstring-perl6, mtl, mysql, mysql-simple, network
+     , resource-pool, scotty, text, unix, wai, wai-extra
+     , wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "juandelacosa";
-       version = "0.0.1";
-       sha256 = "9c0d494b28384304cc9ba9bc8897c049d87e31a1f810c456ea759e31d6ab727f";
+       version = "0.1.1";
+       sha256 = "87e36dacdce82577ee52c1d87bdcf75e8e7e3230e42242f8c9b08f98c6c11f18";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base base64-bytestring bytestring case-insensitive docopt entropy
-         http-types mysql mysql-simple network raw-strings-qq resource-pool
-         unix wai warp
+         base base64-bytestring bytestring data-default-class docopt entropy
+         fast-logger http-types interpolatedstring-perl6 mtl mysql
+         mysql-simple network resource-pool scotty text unix wai wai-extra
+         wai-middleware-static warp
        ];
        description = "Manage users in MariaDB >= 10.1.1";
        license = stdenv.lib.licenses.mit;
@@ -141066,9 +141991,8 @@ self: {
      }) {};
 
   "kafka-client" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, digest
-     , dlist, hspec, hspec-discover, network, process, QuickCheck
-     , snappy, temporary, time, zlib
+    ({ mkDerivation, base, bytestring, cereal, digest, dlist, hspec
+     , hspec-discover, network, QuickCheck, snappy, time, zlib
      }:
      mkDerivation {
        pname = "kafka-client";
@@ -141078,8 +142002,7 @@ self: {
          base bytestring cereal digest dlist network snappy time zlib
        ];
        testHaskellDepends = [
-         base bytestring cereal containers hspec hspec-discover network
-         process QuickCheck temporary time
+         base bytestring cereal hspec hspec-discover QuickCheck time
        ];
        jailbreak = true;
        homepage = "https://github.com/abhinav/kafka-client";
@@ -141290,14 +142213,11 @@ self: {
        sha256 = "3bf057340e4a1953e2eef099e26215cd99d4c595feab82cc43c6be1cbf2c5344";
        revision = "1";
        editedCabalFile = "7b1860125ab2958d3831cb2536a6b939879f09951199649182bb848e70b583eb";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cmdargs containers data-default data-reify
          directory dotgen filepath netlist netlist-to-vhdl process random
          sized-types strict template-haskell
        ];
-       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "Kansas Lava is a hardware simulator and VHDL generator";
@@ -141313,13 +142233,10 @@ self: {
        pname = "kansas-lava-cores";
        version = "0.1.2.2";
        sha256 = "15502f0da60b224fc6b5a6fed21c2507c34ddbdbc51377736c3bc254186ad01c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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;
@@ -141990,10 +142907,7 @@ self: {
          unix-compat unordered-containers vector wai wai-app-static
          wai-extra warp warp-tls yaml zlib
        ];
-       executableHaskellDepends = [
-         base bytestring data-default directory http-types system-filepath
-         transformers wai wai-extra warp
-       ];
+       executableHaskellDepends = [ base data-default system-filepath ];
        testHaskellDepends = [
          base bytestring conduit hspec transformers unix
        ];
@@ -142033,10 +142947,7 @@ self: {
          unix-compat unordered-containers vector wai wai-app-static
          wai-extra warp warp-tls yaml zlib
        ];
-       executableHaskellDepends = [
-         base bytestring data-default directory http-types system-filepath
-         transformers wai wai-extra warp
-       ];
+       executableHaskellDepends = [ base data-default system-filepath ];
        testHaskellDepends = [
          base bytestring conduit hspec transformers unix
        ];
@@ -142076,10 +142987,7 @@ self: {
          unix-compat unordered-containers vector wai wai-app-static
          wai-extra warp warp-tls yaml zlib
        ];
-       executableHaskellDepends = [
-         base bytestring data-default directory http-types system-filepath
-         transformers wai wai-extra warp
-       ];
+       executableHaskellDepends = [ base data-default system-filepath ];
        testHaskellDepends = [
          base bytestring conduit hspec transformers unix
        ];
@@ -142370,10 +143278,7 @@ self: {
        pname = "keyring";
        version = "0.1.0.4";
        sha256 = "2ddbfe06b0cdbd888c5e2e420e698d746fd3f98ce9ba4f6cc3594f7db2f5f6c8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base udbus ];
-       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/lunaryorn/haskell-keyring";
        description = "Keyring access";
@@ -142511,6 +143416,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "khph" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
+     , directory, filepath, mtl, parsec, text, transformers, unix
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "khph";
+       version = "0.1.0";
+       sha256 = "dd0d4a800053df2e991c29a045934e194c648474d4d2d1053671e055f062e2f7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs containers directory filepath mtl
+         parsec text transformers unix unordered-containers yaml
+       ];
+       jailbreak = true;
+       homepage = "http://khumba.net/projects/khph";
+       description = "Command-line file tagging and organization tool";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "kibro" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -143155,8 +144081,6 @@ self: {
        pname = "laika";
        version = "0.1.3.1";
        sha256 = "a1873cd1fb75cc1ff45cca4565cf950ce25fa63bb4d15231349131f07fd63e2f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base-prelude either record system-fileio system-filepath
          template-haskell text transformers
@@ -143946,26 +144870,17 @@ self: {
      }) {};
 
   "lambdacube-gl" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , containers, exceptions, GLFW-b, JuicyPixels, lambdacube-ir, mtl
-     , network, OpenGLRaw, text, time, vector, vector-algorithms
-     , websockets
+    ({ mkDerivation, base, bytestring, containers, JuicyPixels
+     , lambdacube-ir, mtl, OpenGLRaw, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "lambdacube-gl";
        version = "0.5.0.5";
        sha256 = "29f0094d25905a3c6aadc6dcfcc0c77664db589c7e30ee20e8216e40a4403250";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
          vector vector-algorithms
        ];
-       executableHaskellDepends = [
-         aeson base base64-bytestring bytestring containers exceptions
-         GLFW-b JuicyPixels lambdacube-ir network OpenGLRaw text time vector
-         websockets
-       ];
        jailbreak = true;
        homepage = "http://lambdacube3d.com";
        description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
@@ -144013,8 +144928,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdatex";
-       version = "0.1.0.3";
-       sha256 = "d233ed18d1a6383544146832b45c0e56cbf1a95ececbb6b12963ccb27bcd4bc9";
+       version = "0.1.0.4";
+       sha256 = "0f289460551802ad7d01c1bfc0c52c827e20e961633e228e33cb9dc8bdd178bf";
        libraryHaskellDepends = [
          async base containers directory HaTeX mtl text transformers
        ];
@@ -144112,8 +145027,6 @@ self: {
        pname = "language-asn1";
        version = "0.5";
        sha256 = "e3fef756ed6c53c0e9d5058291071ca804f47a418ad0cada816bb440c3c45191";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base parsec syb ];
        homepage = "http://patch-tag.com/r/adept/language-asn1";
        description = "Parsing of ASN1 definitions";
@@ -144140,9 +145053,8 @@ self: {
      }) {};
 
   "language-boogie" = callPackage
-    ({ mkDerivation, ansi-terminal, base, cmdargs, containers, filepath
-     , HUnit, lens, mtl, parsec, pretty, random, stream-monad, time
-     , transformers
+    ({ mkDerivation, ansi-terminal, base, cmdargs, containers, lens
+     , mtl, parsec, pretty, random, stream-monad, time, transformers
      }:
      mkDerivation {
        pname = "language-boogie";
@@ -144155,8 +145067,8 @@ self: {
          transformers
        ];
        executableHaskellDepends = [
-         ansi-terminal base cmdargs containers filepath HUnit lens mtl
-         parsec pretty random stream-monad time transformers
+         ansi-terminal base cmdargs containers lens mtl parsec pretty random
+         stream-monad time transformers
        ];
        jailbreak = true;
        homepage = "https://bitbucket.org/nadiapolikarpova/boogaloo";
@@ -144228,7 +145140,6 @@ self: {
          array base containers filepath language-c-quote mainland-pretty
          template-haskell
        ];
-       testHaskellDepends = [ base language-c-quote ];
        jailbreak = true;
        homepage = "https://github.com/mchakravarty/language-c-inline/";
        description = "Inline C & Objective-C code in Haskell for language interoperability";
@@ -145170,24 +146081,19 @@ self: {
 
   "language-lua2" = callPackage
     ({ mkDerivation, base, containers, deepseq, Earley
-     , lexer-applicative, microlens, optparse-applicative, QuickCheck
-     , regex-applicative, semigroups, srcloc, tasty, tasty-hunit
-     , tasty-quickcheck, transformers, unordered-containers, wl-pprint
+     , lexer-applicative, microlens, QuickCheck, regex-applicative
+     , semigroups, srcloc, tasty, tasty-hunit, tasty-quickcheck
+     , transformers, unordered-containers, wl-pprint
      }:
      mkDerivation {
        pname = "language-lua2";
        version = "0.1.0.5";
        sha256 = "4f24d7b015dbe1c7e9d1ead835ce426223531b8b6f408ee97b3d18904424393d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers Earley lexer-applicative microlens
          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
@@ -146097,8 +147003,6 @@ self: {
        pname = "lazyio";
        version = "0.1.0.3";
        sha256 = "bb8d8c0c14ab35d80d0eee69e51b9111fea975eabe171c37a0f680adaff708be";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base transformers unsafe ];
        homepage = "http://www.haskell.org/haskellwiki/Lazy_IO";
        description = "Run IO actions lazily while respecting their order";
@@ -146959,8 +147863,6 @@ self: {
        pname = "lens-regex";
        version = "0.1.0";
        sha256 = "4954b3ae395661e916c536bfe837c42a1cd8223ea81ffd86b1fdd9b6abfc5142";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base lens regex-base template-haskell
        ];
@@ -147248,7 +148150,7 @@ self: {
      }) {};
 
   "leveldb-haskell_0_6_3" = callPackage
-    ({ mkDerivation, async, base, bytestring, data-default, directory
+    ({ mkDerivation, base, bytestring, data-default, directory
      , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, tasty
      , tasty-quickcheck, temporary, transformers
      }:
@@ -147256,16 +148158,11 @@ self: {
        pname = "leveldb-haskell";
        version = "0.6.3";
        sha256 = "65de64b4caa7812a97b8e0715e313c56de6996d182cefacfe4c3d4d498e4926e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring data-default exceptions filepath resourcet
          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
@@ -147277,7 +148174,7 @@ self: {
      }) {inherit (pkgs) leveldb;};
 
   "leveldb-haskell" = callPackage
-    ({ mkDerivation, async, base, bytestring, data-default, directory
+    ({ mkDerivation, base, bytestring, data-default, directory
      , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, tasty
      , tasty-quickcheck, temporary, transformers
      }:
@@ -147285,16 +148182,11 @@ self: {
        pname = "leveldb-haskell";
        version = "0.6.4";
        sha256 = "25a8f9c2cdd5a32423389173a6323bd804689f69aee1082c57887ea74ead1b04";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring data-default exceptions filepath resourcet
          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
@@ -147305,23 +148197,18 @@ self: {
      }) {inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
-    ({ mkDerivation, async, base, bytestring, data-default, filepath
-     , hspec, hspec-expectations, leveldb, mtl, process, QuickCheck
-     , resourcet, transformers
+    ({ mkDerivation, base, bytestring, data-default, filepath, hspec
+     , hspec-expectations, leveldb, mtl, process, QuickCheck, resourcet
+     , transformers
      }:
      mkDerivation {
        pname = "leveldb-haskell-fork";
        version = "0.3.4.4";
        sha256 = "589935f658b432546ba3e82f1473c55365a2a3fd01e3751faa93f3c2a79f2c08";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
@@ -147347,18 +148234,12 @@ self: {
      }) {};
 
   "levmar-chart" = callPackage
-    ({ mkDerivation, base, Chart, colour, data-accessor, levmar, random
-     }:
+    ({ mkDerivation, base, Chart, colour, data-accessor, levmar }:
      mkDerivation {
        pname = "levmar-chart";
        version = "0.2";
        sha256 = "5271f6dadec35b22d6fd00900992c819d2e7a7daa7e53016c9f19879a3684973";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
-       executableHaskellDepends = [
-         base Chart colour data-accessor levmar random
-       ];
        jailbreak = true;
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
        license = stdenv.lib.licenses.bsd3;
@@ -147461,26 +148342,13 @@ self: {
      }) {};
 
   "lhc" = callPackage
-    ({ 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 }:
      mkDerivation {
        pname = "lhc";
        version = "0.10";
        sha256 = "23b3cd7479108864b5a167b3fd1b1f58bf49b1773f590c68c766dcd4a999a0f4";
        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
-       ];
+       isExecutable = false;
        homepage = "http://lhc.seize.it/";
        description = "LHC Haskell Compiler";
        license = stdenv.lib.licenses.publicDomain;
@@ -147822,8 +148690,8 @@ self: {
   "liblastfm" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
      , cryptonite, hspec, hspec-expectations-lens, http-client
-     , http-client-tls, HUnit, lens, lens-aeson, network-uri
-     , profunctors, semigroups, text, transformers, xml-conduit
+     , http-client-tls, lens, lens-aeson, network-uri, profunctors
+     , semigroups, text, transformers, xml-conduit
      , xml-html-conduit-lens
      }:
      mkDerivation {
@@ -147837,8 +148705,8 @@ self: {
        ];
        testHaskellDepends = [
          aeson base bytestring cereal containers cryptonite hspec
-         hspec-expectations-lens http-client http-client-tls HUnit lens
-         lens-aeson network-uri profunctors text transformers xml-conduit
+         hspec-expectations-lens http-client http-client-tls lens lens-aeson
+         network-uri profunctors text transformers xml-conduit
          xml-html-conduit-lens
        ];
        description = "Lastfm API interface";
@@ -147866,10 +148734,7 @@ self: {
        pname = "libltdl";
        version = "0.1.0.3";
        sha256 = "f96f21553b2d6758aab7f59ecd96ad93b01dd61ae9aeca812214081e08a24415";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base ];
        homepage = "http://www.eecs.harvard.edu/~mainland/projects/libffi";
        description = "FFI interface to libltdl";
        license = stdenv.lib.licenses.bsd3;
@@ -148049,8 +148914,6 @@ self: {
        pname = "libssh2";
        version = "0.2.0.3";
        sha256 = "7caa9f23ae3ff54a819ff56bbecc7953fe39aa958c77feebd52849f2bf86cd75";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring network syb time ];
        librarySystemDepends = [ ssh2 ];
        libraryPkgconfigDepends = [ libssh2 ];
@@ -149318,8 +150181,6 @@ self: {
        pname = "linux-file-extents";
        version = "0.2.0.0";
        sha256 = "6c7cd9e700f666f774736d31a0e6aa7bfe9bd1e075c11eed701ba95095fd9bd0";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base unix ];
        homepage = "https://github.com/redneb/linux-file-extents";
        description = "Retrieve file fragmentation information under Linux";
@@ -149747,14 +150608,9 @@ self: {
        pname = "list-prompt";
        version = "0.1.1.0";
        sha256 = "c7323c7a802940deba1a7be46265fd8c01f548174d5f08923a607e1730ca4dee";
-       isLibrary = true;
-       isExecutable = true;
        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
        ];
@@ -150111,10 +150967,7 @@ self: {
        pname = "list-tries";
        version = "0.6.1";
        sha256 = "b886f6563a97680545bf54f47f7bfa2dace0540185e08c1fd4230e0ff947911a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base binary containers dlist ];
-       executableHaskellDepends = [ base binary containers dlist ];
        jailbreak = true;
        homepage = "http://iki.fi/matti.niemenmaa/list-tries/";
        description = "Tries and Patricia tries: finite sets and maps for list keys";
@@ -150400,8 +151253,6 @@ self: {
        pname = "llvm-extra";
        version = "0.6";
        sha256 = "c814cd36aacbf0f8627d4aa40fb8ea880f2100b3dd5b7e65f0877d70002d905a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers cpuid llvm-tf non-empty tfp transformers unsafe
          utility-ht
@@ -150419,8 +151270,6 @@ self: {
        pname = "llvm-ffi";
        version = "3.0.0";
        sha256 = "9b012f897d95f852e69221b87225d0b16ecfe06685007d65bef581c98f250b1e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ llvm ];
        homepage = "http://haskell.org/haskellwiki/LLVM";
@@ -150586,8 +151435,6 @@ self: {
        pname = "llvm-tf";
        version = "3.0.3.1";
        sha256 = "096c1de602ca2ae1d09e0a8ffa3bd3746aaa9619d078db2109fcb8b29f417d2e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers llvm-ffi non-empty process storable-record tfp
          transformers utility-ht
@@ -151135,12 +151982,12 @@ self: {
      }) {};
 
   "logfloat_0_12_1" = callPackage
-    ({ mkDerivation, array, base }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "logfloat";
        version = "0.12.1";
        sha256 = "0540467e6a818cce6236f16fecabce3c75a723cd1f26c96020c335b2b19423cc";
-       libraryHaskellDepends = [ array base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Log-domain floating point numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -151449,22 +152296,22 @@ self: {
 
   "lol" = callPackage
     ({ mkDerivation, arithmoi, base, binary, bytestring, constraints
-     , containers, crypto-api, data-default, deepseq, DRBG, MonadRandom
-     , mtl, numeric-prelude, QuickCheck, random, reflection, repa
-     , singletons, storable-record, tagged-transformer, template-haskell
-     , test-framework, test-framework-quickcheck2, th-desugar
-     , transformers, vector, vector-th-unbox
+     , containers, crypto-api, data-default, deepseq, DRBG
+     , monadcryptorandom, MonadRandom, mtl, numeric-prelude
+     , protocol-buffers, protocol-buffers-descriptor, QuickCheck, random
+     , reflection, repa, singletons, storable-record, tagged-transformer
+     , template-haskell, test-framework, test-framework-quickcheck2
+     , th-desugar, transformers, vector, vector-th-unbox
      }:
      mkDerivation {
        pname = "lol";
-       version = "0.2.0.1";
-       sha256 = "275b9cd28a8a2b9d8bdfeeda02cc409f820d3aeab79c3ce647561ffc3cb7b446";
-       revision = "1";
-       editedCabalFile = "47c14b05d02b22f27307dbfa5f1a499a9508d63512fc4a77a467ef22053b9149";
+       version = "0.3.0.0";
+       sha256 = "be380a35cbad61c4f6f24a45530167571c9791118a4a1559b01799757ee6003c";
        libraryHaskellDepends = [
          arithmoi base binary bytestring constraints containers crypto-api
-         data-default deepseq MonadRandom mtl numeric-prelude QuickCheck
-         random reflection repa singletons storable-record
+         data-default deepseq monadcryptorandom MonadRandom mtl
+         numeric-prelude protocol-buffers protocol-buffers-descriptor
+         QuickCheck random reflection repa singletons storable-record
          tagged-transformer template-haskell th-desugar transformers vector
          vector-th-unbox
        ];
@@ -151480,19 +152327,22 @@ self: {
      }) {};
 
   "lol-apps" = callPackage
-    ({ mkDerivation, base, constraints, deepseq, DRBG, lol, MonadRandom
-     , mtl, numeric-prelude, QuickCheck, random, repa, singletons
-     , test-framework, test-framework-quickcheck2, vector
+    ({ mkDerivation, arithmoi, base, constraints, deepseq, DRBG, lol
+     , MonadRandom, mtl, numeric-prelude, QuickCheck, random, repa
+     , singletons, test-framework, test-framework-quickcheck2, vector
      }:
      mkDerivation {
        pname = "lol-apps";
-       version = "0.0.0.1";
-       sha256 = "988a006f77beb0fdf40ad446d1ae333b93bc60d818e3623f323eb1ff9349d149";
-       revision = "2";
-       editedCabalFile = "0b6c201fff6fbe7f10bb5777ae8cefad4668865e5a30b260961453ad49eabb8f";
+       version = "0.1.0.0";
+       sha256 = "af6feda5287a1b7f913d1ff0ebbbab6fda440ac5b22036334b08dbe3fcc6a3ad";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base deepseq lol MonadRandom numeric-prelude
        ];
+       executableHaskellDepends = [
+         arithmoi lol MonadRandom numeric-prelude
+       ];
        testHaskellDepends = [
          base constraints deepseq DRBG lol MonadRandom mtl QuickCheck random
          repa singletons test-framework test-framework-quickcheck2 vector
@@ -151782,15 +152632,10 @@ self: {
        pname = "lp-diagrams-svg";
        version = "1.1";
        sha256 = "6cc63a8bf914fbc67e42c54c0c4327e81b650d56d9aee5b189946473453463b2";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
-       ];
        jailbreak = true;
        description = "SVG Backend for lp-diagrams";
        license = "GPL";
@@ -152583,18 +153428,16 @@ self: {
      }) {inherit (pkgs) lzma;};
 
   "lzma-clib" = callPackage
-    ({ mkDerivation, only-buildable-on-windows }:
+    ({ mkDerivation }:
      mkDerivation {
        pname = "lzma-clib";
        version = "5.2.2";
        sha256 = "0aed9cb8ef3a2b0e71c429b00161ee3fb342cce2603ccb934f507fb236a09fd5";
-       libraryHaskellDepends = [ only-buildable-on-windows ];
-       doHaddock = false;
-       jailbreak = true;
+       isLibrary = false;
+       isExecutable = false;
        description = "liblzma C library and headers for use by LZMA bindings";
        license = stdenv.lib.licenses.publicDomain;
-       broken = true;
-     }) {only-buildable-on-windows = null;};
+     }) {};
 
   "lzma-conduit_1_1_1" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, conduit, HUnit
@@ -152800,8 +153643,6 @@ self: {
        pname = "maccatcher";
        version = "2.1.5";
        sha256 = "cbafc38151d9c4c17c3055a7f8f0702bf5d7d5240db3369c84326e94ddcaa67c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base binary parsec process ];
        description = "Obtain the host MAC address on *NIX and Windows";
        license = stdenv.lib.licenses.bsd3;
@@ -154789,10 +155630,10 @@ self: {
      }) {};
 
   "marmalade-upload" = callPackage
-    ({ 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, 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 {
        pname = "marmalade-upload";
@@ -154805,9 +155646,8 @@ self: {
          http-types mtl network text transformers
        ];
        executableHaskellDepends = [
-         aeson base bytestring Cabal data-default directory filepath keyring
-         optparse-applicative process shake split text transformers
-         zip-archive
+         aeson base bytestring data-default directory filepath keyring
+         optparse-applicative text transformers
        ];
        testHaskellDepends = [
          aeson base exceptions tasty tasty-hunit text transformers
@@ -155457,7 +156297,7 @@ self: {
 
   "mbox-tools" = callPackage
     ({ mkDerivation, base, bytestring, codec-mbox, containers, fclabels
-     , hsemail, mtl, parsec, process, pureMD5, random
+     , hsemail, mtl, parsec, process, pureMD5
      }:
      mkDerivation {
        pname = "mbox-tools";
@@ -155467,7 +156307,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring codec-mbox containers fclabels hsemail mtl parsec
-         process pureMD5 random
+         process pureMD5
        ];
        homepage = "https://github.com/np/mbox-tools";
        description = "A collection of tools to process mbox files";
@@ -155533,7 +156373,7 @@ self: {
      }) {};
 
   "mcpi" = callPackage
-    ({ mkDerivation, base, network, pipes, split, transformers }:
+    ({ mkDerivation, base, network, split, transformers }:
      mkDerivation {
        pname = "mcpi";
        version = "0.0.1.2";
@@ -155541,7 +156381,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base network split transformers ];
-       executableHaskellDepends = [ base network pipes transformers ];
+       executableHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "https://github.com/DougBurke/hmcpi";
        description = "Connect to MineCraft running on a Raspberry PI";
@@ -155901,47 +156741,33 @@ self: {
 
   "memcache-conduit" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring
-     , conduit, conduit-extra, containers, hashtables, memcache-haskell
-     , monad-control, mtl, network, resourcet, split, stm, transformers
+     , conduit, conduit-extra, memcache-haskell, mtl, network, resourcet
+     , split
      }:
      mkDerivation {
        pname = "memcache-conduit";
        version = "0.0.3";
        sha256 = "f28e89dcbf1329dec98d67ce055a3eef12bc8c4ef9afeaf3c8adf10db5f632f8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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, conduit-extra
-     , containers, hashable, hashtables, HUnit, mtl, network, QuickCheck
-     , resourcet, split, stm, test-framework, test-framework-hunit
+    ({ mkDerivation, attoparsec, base, bytestring, hashable, HUnit
+     , network, QuickCheck, split, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-th, transformers
      }:
      mkDerivation {
        pname = "memcache-haskell";
        version = "0.0.10.1";
        sha256 = "4c1b7d9c5d12a4ae24ea73ace9489232831bb15b1d8e0d2bb53e926f53b16e48";
-       isLibrary = true;
-       isExecutable = true;
        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
@@ -156749,17 +157575,43 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens" = callPackage
+  "microlens_0_4_4_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
        version = "0.4.4.0";
        sha256 = "376423b8820d620644e919ff0333800cf499fcdf3969fa13a24494c66d0c64a2";
        libraryHaskellDepends = [ base ];
-       doHaddock = false;
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library with no dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "microlens" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "microlens";
+       version = "0.4.4.2";
+       sha256 = "d5a6e18813142c1aa9d5cb3196d0e40fe5103d4f52581db519099e44eae74145";
+       libraryHaskellDepends = [ base ];
+       doHaddock = false;
+       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_4_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "microlens";
+       version = "0.4.4.3";
+       sha256 = "b76878b66c43b2a2a131bfe99e163f95a736c94b8c48fa7b22c81549c4c07526";
+       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_2_1_0" = callPackage
@@ -157112,7 +157964,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens-platform" = callPackage
+  "microlens-platform_0_3_1_0" = callPackage
     ({ mkDerivation, base, hashable, microlens, microlens-ghc
      , microlens-mtl, microlens-th, text, unordered-containers, vector
      }:
@@ -157127,9 +157979,10 @@ self: {
        homepage = "http://github.com/aelve/microlens";
        description = "Feature-complete microlens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens-platform_0_3_1_1" = callPackage
+  "microlens-platform" = callPackage
     ({ mkDerivation, base, hashable, microlens, microlens-ghc
      , microlens-mtl, microlens-th, text, unordered-containers, vector
      }:
@@ -157144,7 +157997,6 @@ self: {
        homepage = "http://github.com/aelve/microlens";
        description = "Feature-complete microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-th_0_2_1_0" = callPackage
@@ -158300,8 +159152,6 @@ self: {
        pname = "mmap";
        version = "0.5.9";
        sha256 = "58fcbb04e1cb8e7c36c05823b02dce2faaa989c53d745a7f36192de2fc98b5f8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        description = "Memory mapped files for POSIX and Windows";
        license = stdenv.lib.licenses.bsd3;
@@ -160558,8 +161408,8 @@ self: {
 
   "monarch" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, doctest
-     , hspec, lifted-base, monad-control, mtl, network, pool-conduit
-     , stm, transformers, transformers-base
+     , lifted-base, monad-control, mtl, network, pool-conduit, stm
+     , transformers, transformers-base
      }:
      mkDerivation {
        pname = "monarch";
@@ -160569,9 +161419,7 @@ self: {
          base binary bytestring containers lifted-base monad-control mtl
          network pool-conduit stm transformers transformers-base
        ];
-       testHaskellDepends = [
-         base bytestring doctest hspec transformers
-       ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        homepage = "https://github.com/notogawa/monarch";
        description = "Monadic interface for TokyoTyrant";
@@ -161161,7 +162009,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monoid-extras" = callPackage
+  "monoid-extras_0_4_0_4" = callPackage
     ({ mkDerivation, base, groups, semigroupoids, semigroups }:
      mkDerivation {
        pname = "monoid-extras";
@@ -161170,9 +162018,10 @@ self: {
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monoid-extras_0_4_1" = callPackage
+  "monoid-extras" = callPackage
     ({ mkDerivation, base, groups, semigroupoids, semigroups }:
      mkDerivation {
        pname = "monoid-extras";
@@ -161181,7 +162030,6 @@ self: {
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-owns" = callPackage
@@ -162537,8 +163385,6 @@ self: {
        pname = "multiarg";
        version = "0.30.0.8";
        sha256 = "5a97d7fac38ce176809f93fa8d3634bd3db1d850bc678e442e7d13650e0698a2";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th
@@ -162558,8 +163404,6 @@ self: {
        pname = "multiarg";
        version = "0.30.0.10";
        sha256 = "c9fa623a8e06d62addc2b7ad5102ceac3a6f0db6a67afbc8e693d0d0aec417a1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th
@@ -162836,8 +163680,6 @@ self: {
        pname = "multistate";
        version = "0.7.1.1";
        sha256 = "609650cbbfd102c775b44be3fd7bb4f6732127e64b21dd45ea1af057c5ffb8a6";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base monad-control mtl tagged transformers transformers-base
        ];
@@ -163559,10 +164401,7 @@ self: {
      }) {};
 
   "mwc-random_0_13_2_2" = callPackage
-    ({ mkDerivation, base, HUnit, primitive, QuickCheck, statistics
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , time, vector
-     }:
+    ({ mkDerivation, base, primitive, time, vector }:
      mkDerivation {
        pname = "mwc-random";
        version = "0.13.2.2";
@@ -163570,10 +164409,6 @@ self: {
        revision = "1";
        editedCabalFile = "22b940db1257c69484e123d2bb733fa416f3bc75befe3da5e2ba743ae70083ae";
        libraryHaskellDepends = [ base primitive time vector ];
-       testHaskellDepends = [
-         base HUnit QuickCheck statistics test-framework
-         test-framework-hunit test-framework-quickcheck2 vector
-       ];
        jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/bos/mwc-random";
@@ -163583,10 +164418,7 @@ self: {
      }) {};
 
   "mwc-random_0_13_3_0" = callPackage
-    ({ mkDerivation, base, HUnit, primitive, QuickCheck, statistics
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , time, vector
-     }:
+    ({ mkDerivation, base, primitive, time, vector }:
      mkDerivation {
        pname = "mwc-random";
        version = "0.13.3.0";
@@ -163594,10 +164426,6 @@ self: {
        revision = "1";
        editedCabalFile = "1e4c368970dfef4c3ab4666c0917c2627292c7d1cd69b84a00ab8e46da311c9d";
        libraryHaskellDepends = [ base primitive time vector ];
-       testHaskellDepends = [
-         base HUnit QuickCheck statistics test-framework
-         test-framework-hunit test-framework-quickcheck2 vector
-       ];
        jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/bos/mwc-random";
@@ -163607,19 +164435,12 @@ self: {
      }) {};
 
   "mwc-random_0_13_3_2" = callPackage
-    ({ mkDerivation, base, HUnit, primitive, QuickCheck, statistics
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , time, vector
-     }:
+    ({ mkDerivation, base, primitive, time, vector }:
      mkDerivation {
        pname = "mwc-random";
        version = "0.13.3.2";
        sha256 = "2cb1e354ec8b31400d14716920f38eedd5161003249deedfd49cda290aae5806";
        libraryHaskellDepends = [ base 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";
@@ -163628,19 +164449,12 @@ self: {
      }) {};
 
   "mwc-random" = callPackage
-    ({ mkDerivation, base, HUnit, primitive, QuickCheck, statistics
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , time, vector
-     }:
+    ({ mkDerivation, base, primitive, time, vector }:
      mkDerivation {
        pname = "mwc-random";
        version = "0.13.4.0";
        sha256 = "c52cfdeab2fe6cae3e2b0de382757372df571b7c25a6712ab205fb784b5a8aea";
        libraryHaskellDepends = [ base 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";
@@ -164214,28 +165028,20 @@ self: {
      }) {};
 
   "nanovg" = callPackage
-    ({ mkDerivation, base, bytestring, containers, freeglut, gl, GLEW
-     , GLFW-b, hspec, inline-c, linear, mesa, monad-loops, QuickCheck
-     , text, transformers, vector
+    ({ mkDerivation, base, bytestring, containers, freeglut, GLEW
+     , hspec, inline-c, linear, mesa, QuickCheck, text, vector
      }:
      mkDerivation {
        pname = "nanovg";
-       version = "0.2.0.0";
-       sha256 = "5a594dea5114bea4be0951e6d0d9689996f10ac1e36ae8ae7dce51772a9765c3";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.3.0.0";
+       sha256 = "66225623b3841f35f68c177ab01c81c2ba47b1713b384df7c6f04124dca018b3";
        libraryHaskellDepends = [
          base bytestring containers linear text vector
        ];
        librarySystemDepends = [ freeglut GLEW mesa ];
-       executableHaskellDepends = [
-         base containers gl GLFW-b linear monad-loops text transformers
-         vector
-       ];
        testHaskellDepends = [
          base containers hspec inline-c linear QuickCheck
        ];
-       jailbreak = true;
        homepage = "https://github.com/cocreature/nanovg-hs";
        description = "Haskell bindings for nanovg";
        license = stdenv.lib.licenses.isc;
@@ -164980,27 +165786,18 @@ self: {
      , poly-arity, pred-trie, regex-compat, semigroups, text
      , transformers, tries, unordered-containers
      , wai-middleware-content-type, wai-middleware-verbs
-     , wai-transformers, warp
+     , wai-transformers
      }:
      mkDerivation {
        pname = "nested-routes";
        version = "7.0.0";
        sha256 = "eac01cd730d3cbcafab4a0ac2b6b8c3ca8cdcd31f996379092f2f60bc31c21a2";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring composition-extra errors exceptions
          hashable mtl poly-arity pred-trie regex-compat semigroups text
          transformers tries unordered-containers wai-middleware-content-type
          wai-middleware-verbs wai-transformers
        ];
-       executableHaskellDepends = [
-         attoparsec base bytestring composition-extra errors exceptions
-         hashable http-types mtl poly-arity 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 hspec hspec-wai http-types mtl poly-arity pred-trie
@@ -165019,27 +165816,18 @@ self: {
      , 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
+     , wai-transformers
      }:
      mkDerivation {
        pname = "nested-routes";
        version = "7.1.1";
        sha256 = "d6f8411ec298909e93abfc37748fb9579d4cc346edd4287a434f4fcd8ddccf02";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring composition-extra errors exceptions
          hashable hashtables mtl poly-arity pred-set pred-trie regex-compat
          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
@@ -165410,13 +166198,10 @@ self: {
        pname = "netwire";
        version = "5.0.1";
        sha256 = "199dd2bb49fdf31ed125e4063ba3545a0d73eff36c3ed38014df30965524f4c7";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers deepseq parallel profunctors random semigroups time
          transformers
        ];
-       executableHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://hub.darcs.net/ertes/netwire";
        description = "Functional reactive programming library";
@@ -165442,8 +166227,6 @@ self: {
        pname = "netwire-input-glfw";
        version = "0.0.4";
        sha256 = "8fb6ba62fe7b122d204ff8af390de98a1631af370b231d4a4e5e57b0166a7298";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers GLFW-b mtl netwire-input stm
        ];
@@ -165549,17 +166332,14 @@ self: {
      }) {};
 
   "network-address" = callPackage
-    ({ mkDerivation, base, Cabal, criterion, QuickCheck, test-framework
+    ({ mkDerivation, base, Cabal, QuickCheck, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "network-address";
        version = "0.2.0";
        sha256 = "614517e9712b1320ca86a1e77535e6cfb426850ca3e62e49f0eb776543e8e65f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base Cabal ];
-       executableHaskellDepends = [ base Cabal criterion ];
        testHaskellDepends = [
          base Cabal QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -165659,8 +166439,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-api-support";
-       version = "0.2.1";
-       sha256 = "829e03488cf95f57d00cdd37078487e3c857861bcf79e0eb3dcbcda55b4d1a68";
+       version = "0.2.2";
+       sha256 = "3efa63a9ce205d8d0af27fa440d633d1ec92ad8924dacce69612b1e73237e2ab";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring case-insensitive http-client
          http-client-tls http-types text time tls
@@ -166344,21 +167124,14 @@ self: {
      }) {};
 
   "network-service" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, network
-     , network-simple
-     }:
+    ({ mkDerivation, base, base64-bytestring, bytestring, network }:
      mkDerivation {
        pname = "network-service";
        version = "0.1.0.0";
        sha256 = "e41ea01bb2705fde2a862f487ee5e90deeb74ec2ec9282adcc48ba2322b840cb";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base base64-bytestring bytestring network
        ];
-       executableHaskellDepends = [
-         base base64-bytestring bytestring network network-simple
-       ];
        jailbreak = true;
        homepage = "https://github.com/angerman/network-service";
        description = "Provide a service at the data type level";
@@ -166776,31 +167549,23 @@ self: {
 
   "network-transport-zeromq" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, containers
-     , criterion, data-accessor, distributed-process
-     , distributed-process-tests, exceptions, network, network-transport
+     , data-accessor, exceptions, network-transport
      , network-transport-tests, random, semigroups, stm, stm-chans
-     , tasty, tasty-hunit, test-framework, transformers, zeromq4-haskell
+     , tasty, tasty-hunit, transformers, zeromq4-haskell
      }:
      mkDerivation {
        pname = "network-transport-zeromq";
        version = "0.2.1.1";
        sha256 = "93b56e1a2b337c24cc899874d23eed335ff640c5c1e143b69584c4d71f0cca35";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          async base binary bytestring containers data-accessor exceptions
          network-transport random semigroups stm stm-chans transformers
          zeromq4-haskell
        ];
-       executableHaskellDepends = [
-         base binary bytestring criterion distributed-process
-       ];
        testHaskellDepends = [
-         base bytestring containers distributed-process-tests network
-         network-transport network-transport-tests stm stm-chans tasty
-         tasty-hunit test-framework zeromq4-haskell
+         base network-transport network-transport-tests tasty tasty-hunit
+         zeromq4-haskell
        ];
-       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/tweag/network-transport-zeromq";
        description = "ZeroMQ backend for network-transport";
@@ -166932,8 +167697,6 @@ self: {
        pname = "network-websocket";
        version = "0.3";
        sha256 = "75cd59bd534b39db084c73843c6d29c33e8d3557c440ba19ad24b4252acd7814";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base haskell98 network webserver ];
        jailbreak = true;
        homepage = "http://github.com/michaelmelanson/network-websocket";
@@ -167022,9 +167785,8 @@ self: {
 
   "newt" = callPackage
     ({ mkDerivation, array, base, bytestring, cmdargs, containers
-     , directory, filemanip, filepath, HUnit, mtl, process, QuickCheck
-     , safe, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, Unixutils, uuid
+     , directory, filemanip, filepath, mtl, process, safe, text
+     , Unixutils
      }:
      mkDerivation {
        pname = "newt";
@@ -167036,11 +167798,7 @@ self: {
          array base bytestring cmdargs containers directory filemanip
          filepath mtl process safe text Unixutils
        ];
-       executableHaskellDepends = [
-         base cmdargs containers directory filepath HUnit mtl process
-         QuickCheck safe test-framework test-framework-hunit
-         test-framework-quickcheck2 Unixutils uuid
-       ];
+       executableHaskellDepends = [ base cmdargs containers mtl ];
        jailbreak = true;
        description = "A trivially simple app to create things from simple templates";
        license = stdenv.lib.licenses.bsd3;
@@ -167675,19 +168433,16 @@ self: {
      }) {};
 
   "nonlinear-optimization-ad" = callPackage
-    ({ mkDerivation, ad, base, csv, nonlinear-optimization, primitive
+    ({ mkDerivation, ad, base, nonlinear-optimization, primitive
      , reflection, vector
      }:
      mkDerivation {
        pname = "nonlinear-optimization-ad";
        version = "0.2.2";
        sha256 = "b263aa4b690d8e62917c2090f0549f341858795514b35015a5b27344df03481d";
-       isLibrary = true;
-       isExecutable = true;
        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;
@@ -168204,8 +168959,6 @@ self: {
        sha256 = "5327a9ffcc5997a062d2a9ea405130741114a0c6fe440a8e5b6d6c35fe56d8c4";
        revision = "1";
        editedCabalFile = "acbf128b14ff1177ed767ec9ebb89b1c3c0e998d5d031fdd0e4bc64ebc6bffe2";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base containers deepseq non-negative parsec QuickCheck random
          storable-record utility-ht
@@ -168559,23 +169312,16 @@ self: {
 
   "oberon0" = callPackage
     ({ mkDerivation, array, AspectAG, base, containers, ghc-prim, HList
-     , language-c, mtl, murder, template-haskell, transformers
-     , uu-parsinglib, uulib
+     , mtl, murder, template-haskell, transformers, uu-parsinglib, uulib
      }:
      mkDerivation {
        pname = "oberon0";
        version = "0.0.2";
        sha256 = "1b96e40cacb6a00856d55d7059fbefe5aa018a15bf9002189db2868cef7d1e71";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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";
@@ -168704,19 +169450,19 @@ self: {
      }) {};
 
   "octane" = callPackage
-    ({ mkDerivation, aeson, autoexporter, base, binary, binary-bits
-     , bytestring, containers, data-binary-ieee754, deepseq, tasty
-     , tasty-hspec, text
+    ({ mkDerivation, aeson, autoexporter, base, bimap, binary
+     , binary-bits, bytestring, containers, data-binary-ieee754, deepseq
+     , tasty, tasty-hspec, text
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.6.3";
-       sha256 = "37a21db8dda1e276e56fb1db6eb0411ec2f44abeeffa36c24f5cb971fdd00410";
+       version = "0.7.0";
+       sha256 = "3a257d55d375d959ecb8965c0c89a1b9259eba1befd3a0736727f96dcce5657d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson autoexporter base binary binary-bits bytestring containers
-         data-binary-ieee754 deepseq text
+         aeson autoexporter base bimap binary binary-bits bytestring
+         containers data-binary-ieee754 deepseq text
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -168727,15 +169473,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "octane_0_7_0" = callPackage
+  "octane_0_8_0" = callPackage
     ({ mkDerivation, aeson, autoexporter, base, bimap, binary
      , binary-bits, bytestring, containers, data-binary-ieee754, deepseq
      , tasty, tasty-hspec, text
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.7.0";
-       sha256 = "3a257d55d375d959ecb8965c0c89a1b9259eba1befd3a0736727f96dcce5657d";
+       version = "0.8.0";
+       sha256 = "da4655af7f357bf7ceeec9285ea4e59f12184bb7529322ea22a329d8796bd831";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -168940,8 +169686,6 @@ self: {
        pname = "oidc-client";
        version = "0.2.0.0";
        sha256 = "b2d7daa84844d0cc1057bbaffc836bb52ff2992b98a17b4b285778bacdefc03c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring exceptions http-client
          http-client-tls jose-jwt network network-uri text time tls
@@ -169193,18 +169937,18 @@ self: {
      }) {};
 
   "one-time-password" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, cereal, cryptohash
+    ({ mkDerivation, base, bytestring, cereal, cryptonite, memory
      , tasty, tasty-hunit, time
      }:
      mkDerivation {
        pname = "one-time-password";
-       version = "1.0.0.1";
-       sha256 = "40e1c392c846dfa9b08696f38e6426c9cba9fbe9699b51d4c6c49c7929eafcce";
+       version = "2.0.0";
+       sha256 = "0a35ba546367070cbef67b80fc1e4eea3df5df3e683d3422873fa13a2b2bf9a2";
        libraryHaskellDepends = [
-         base byteable bytestring cereal cryptohash time
+         base bytestring cereal cryptonite memory time
        ];
        testHaskellDepends = [
-         base bytestring cryptohash tasty tasty-hunit time
+         base bytestring cryptonite tasty tasty-hunit time
        ];
        homepage = "https://github.com/s9gf4ult/one-time-password";
        description = "HMAC-Based and Time-Based One-Time Passwords";
@@ -169470,6 +170214,7 @@ self: {
          base containers contravariant multiset postgresql-simple
          product-profunctors profunctors QuickCheck semigroups time
        ];
+       doCheck = false;
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
@@ -169840,8 +170585,6 @@ self: {
        pname = "openid";
        version = "0.2.0.2";
        sha256 = "5a33c21ca3e2b652bcea93bd32a96dbeabd336260d7617337331693a3e140d66";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers HsOpenSSL HTTP monadLib network time xml
        ];
@@ -171846,8 +172589,7 @@ self: {
        ];
        executableHaskellDepends = [
          aeson base bytestring containers directory extensible-exceptions
-         filepath highlighting-kate HTTP network-uri old-time pandoc-types
-         text time yaml
+         filepath highlighting-kate HTTP network-uri pandoc-types text yaml
        ];
        testHaskellDepends = [
          ansi-terminal base bytestring containers Diff directory
@@ -171896,8 +172638,8 @@ self: {
        ];
        executableHaskellDepends = [
          aeson base bytestring containers directory extensible-exceptions
-         filepath highlighting-kate HTTP network network-uri old-time
-         pandoc-types text time yaml
+         filepath highlighting-kate HTTP network network-uri pandoc-types
+         text yaml
        ];
        testHaskellDepends = [
          ansi-terminal base bytestring containers Diff directory
@@ -171944,8 +172686,8 @@ self: {
        ];
        executableHaskellDepends = [
          aeson base bytestring containers directory extensible-exceptions
-         filepath highlighting-kate HTTP network network-uri old-time
-         pandoc-types text time yaml
+         filepath highlighting-kate HTTP network network-uri pandoc-types
+         text yaml
        ];
        testHaskellDepends = [
          ansi-terminal base bytestring containers Diff directory
@@ -172366,8 +173108,8 @@ self: {
          syb tagsoup text time vector xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers directory
-         filepath pandoc pandoc-types process syb temporary text vector yaml
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc-types
+         syb text yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath pandoc pandoc-types
@@ -172399,8 +173141,8 @@ self: {
          syb tagsoup text time vector xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers directory
-         filepath pandoc pandoc-types process syb temporary text vector yaml
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc-types
+         syb text yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath pandoc pandoc-types
@@ -172432,8 +173174,8 @@ self: {
          setenv split syb tagsoup text time vector xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers directory
-         filepath pandoc pandoc-types process syb temporary text vector yaml
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc-types
+         syb text yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath pandoc pandoc-types
@@ -172465,8 +173207,8 @@ self: {
          setenv split syb tagsoup text time vector xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers directory
-         filepath pandoc pandoc-types process syb temporary text vector yaml
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc-types
+         syb text yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath pandoc pandoc-types
@@ -172498,8 +173240,8 @@ self: {
          setenv split syb tagsoup text time vector xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers directory
-         filepath pandoc pandoc-types process syb temporary text vector yaml
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc-types
+         syb text yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath pandoc pandoc-types
@@ -172532,8 +173274,8 @@ self: {
          xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers directory
-         filepath pandoc pandoc-types process syb temporary text vector yaml
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc
+         pandoc-types syb text yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath pandoc pandoc-types
@@ -172566,8 +173308,8 @@ self: {
          xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers directory
-         filepath pandoc pandoc-types process syb temporary text vector yaml
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc
+         pandoc-types syb text yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath pandoc pandoc-types
@@ -172601,8 +173343,8 @@ self: {
          xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers directory
-         filepath pandoc pandoc-types process syb temporary text vector yaml
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc
+         pandoc-types syb text yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath pandoc pandoc-types
@@ -172635,8 +173377,8 @@ self: {
          xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers directory
-         filepath pandoc pandoc-types process syb temporary text vector yaml
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc
+         pandoc-types syb text yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath pandoc pandoc-types
@@ -173045,13 +173787,15 @@ self: {
      }) {inherit (pkgs.gnome) pango;};
 
   "pango" = callPackage
-    ({ mkDerivation, array, base, cairo, containers, directory, glib
-     , mtl, pango, pretty, process, text
+    ({ mkDerivation, array, base, Cabal, cairo, containers, directory
+     , filepath, glib, gtk2hs-buildtools, mtl, pango, pretty, process
+     , text
      }:
      mkDerivation {
        pname = "pango";
        version = "0.13.3.0";
        sha256 = "a2c44f889674add7c65326144420d68d47dcdcd511d5c251022fa7a97a60755c";
+       setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base cairo containers directory glib mtl pretty process text
        ];
@@ -173199,8 +173943,6 @@ self: {
        sha256 = "3a14c02b9b8b7c72577eb90a8dd72de75d99192def87d7aa79545ee4d6e80645";
        revision = "1";
        editedCabalFile = "75eeeb51593fa2771c8dbc965ca09d830d62e08135870188a10446f842178bee";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers extensible-exceptions random
        ];
@@ -173330,10 +174072,10 @@ self: {
      }) {};
 
   "parconc-examples" = callPackage
-    ({ mkDerivation, abstract-par, accelerate, accelerate-io, array
-     , async, base, binary, bytestring, containers, deepseq, directory
+    ({ mkDerivation, abstract-par, accelerate, array, async, base
+     , binary, bytestring, containers, deepseq, directory
      , distributed-process, distributed-process-simplelocalnet
-     , distributed-static, fclabels, filepath, HTTP, monad-par, network
+     , distributed-static, filepath, HTTP, monad-par, network
      , network-uri, normaldistribution, parallel, random, repa, stm
      , template-haskell, time, transformers, utf8-string, vector, xml
      }:
@@ -173344,12 +174086,11 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         abstract-par accelerate accelerate-io array async base binary
-         bytestring containers deepseq directory distributed-process
-         distributed-process-simplelocalnet distributed-static fclabels
-         filepath HTTP monad-par network network-uri normaldistribution
-         parallel random repa stm template-haskell time transformers
-         utf8-string vector xml
+         abstract-par accelerate array async base binary bytestring
+         containers deepseq directory distributed-process
+         distributed-process-simplelocalnet distributed-static filepath HTTP
+         monad-par network network-uri normaldistribution parallel random
+         repa stm template-haskell time transformers utf8-string vector xml
        ];
        jailbreak = true;
        homepage = "http://github.com/simonmar/parconc-examples";
@@ -173416,7 +174157,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "parseargs" = callPackage
+  "parseargs_0_2_0_4" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "parseargs";
@@ -173431,9 +174172,10 @@ self: {
        homepage = "http://github.com/BartMassey/parseargs";
        description = "Full-featured command-line argument parsing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "parseargs_0_2_0_7" = callPackage
+  "parseargs" = callPackage
     ({ mkDerivation, base, containers, process }:
      mkDerivation {
        pname = "parseargs";
@@ -173447,7 +174189,6 @@ self: {
        homepage = "http://github.com/BartMassey/parseargs";
        description = "Full-featured command-line argument parsing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsec_3_1_7" = callPackage
@@ -175196,13 +175937,10 @@ self: {
        pname = "peggy";
        version = "0.3.2";
        sha256 = "de689373195748a273ba224adf5eae6dd91ffeee68e4c60ce6230596d521a8ce";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base hashtables haskell-src-meta ListLike monad-control mtl
          template-haskell
        ];
-       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://tanakh.github.com/Peggy";
        description = "The Parser Generator for Haskell";
@@ -175305,7 +176043,6 @@ self: {
          base containers explicit-exception multiarg parsec penny-lib
          pretty-show semigroups text transformers
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/massysett/penny";
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
@@ -175322,14 +176059,11 @@ self: {
        pname = "penny-lib";
        version = "0.22.0.0";
        sha256 = "272c53dc6cecc0353d4a6a53a9d8e6e57babdf485b5f9e1995f3a8b87b38c63b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          action-permutations base binary bytestring cereal containers
          explicit-exception matchers multiarg ofx old-locale parsec prednote
          pretty-show rainbow semigroups split text time transformers
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/massysett/penny";
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
@@ -176507,8 +177241,6 @@ self: {
        pname = "persistent-odbc";
        version = "0.2.0.1";
        sha256 = "b751d48392f61d7b2f3b0cda149dedd04eb1a24912c2075c8640de7313956c67";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers convertible HDBC HDBC-odbc
          monad-control monad-logger persistent persistent-template resourcet
@@ -176943,13 +177675,10 @@ self: {
        pname = "persistent-sqlite";
        version = "2.1.1";
        sha256 = "3c797eb43456d159c304b174554d91e9efc31d761dbcc5dd03019bcb7b54d7c3";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          persistent resourcet text transformers
        ];
-       executableHaskellDepends = [ base ];
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using sqlite3";
        license = stdenv.lib.licenses.mit;
@@ -176966,13 +177695,10 @@ self: {
        pname = "persistent-sqlite";
        version = "2.1.1.1";
        sha256 = "2a95017f380490732773752b4e59c359373f4ee3422a202b4b2e623499daf40a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          old-locale persistent resourcet text time transformers
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base hspec persistent persistent-template time transformers
        ];
@@ -176992,13 +177718,10 @@ self: {
        pname = "persistent-sqlite";
        version = "2.1.1.2";
        sha256 = "0a4a8d10d5a15104dc1ad07c1e66802980316c7320e8fb8e3a916879f22bd74e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          old-locale persistent resourcet text time transformers
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base hspec persistent persistent-template time transformers
        ];
@@ -177018,13 +177741,10 @@ self: {
        pname = "persistent-sqlite";
        version = "2.1.3";
        sha256 = "ee9d2918a56e01978b32de53a8655d32b6149c20d6bbc5bbd9cf79a87884ceef";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          old-locale persistent resourcet text time transformers
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base hspec persistent persistent-template time transformers
        ];
@@ -177044,13 +177764,10 @@ self: {
        pname = "persistent-sqlite";
        version = "2.1.4";
        sha256 = "7c3a2d0638f208a80bc2a7dc4a3eaf92655f239d9356d0c2b89cc2bbe7e00409";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          old-locale persistent resourcet text time transformers
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base hspec persistent persistent-template time transformers
        ];
@@ -177070,13 +177787,10 @@ self: {
        pname = "persistent-sqlite";
        version = "2.1.4.1";
        sha256 = "50402b82e0f4753d9f14ab39f1238d75824fa5661c9f0b0e77fa87ff8f0c9553";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          old-locale persistent resourcet text time transformers
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base hspec persistent persistent-template time transformers
        ];
@@ -177096,13 +177810,10 @@ self: {
        pname = "persistent-sqlite";
        version = "2.1.4.2";
        sha256 = "0ac7e708c06ae1b63bb068c248fb3ccba0beb99da52702efa6c0a4bca047123c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          old-locale persistent resourcet text time transformers
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base hspec persistent persistent-template time transformers
        ];
@@ -177122,13 +177833,10 @@ self: {
        pname = "persistent-sqlite";
        version = "2.2";
        sha256 = "f11005a23df9ad0740111e675aab42f40eda7e37f4996ebae15e1fe48692c794";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          old-locale persistent resourcet text time transformers
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base hspec persistent persistent-template time transformers
        ];
@@ -177148,13 +177856,10 @@ self: {
        pname = "persistent-sqlite";
        version = "2.2.1";
        sha256 = "bac71080bb25ad20b9116e42df463bbe230bacb2d963a5b101a501cff7fffc5e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          old-locale persistent resourcet text time transformers
        ];
-       executableHaskellDepends = [ base monad-logger ];
        testHaskellDepends = [
          base hspec persistent persistent-template time transformers
        ];
@@ -177175,14 +177880,11 @@ self: {
        pname = "persistent-sqlite";
        version = "2.5.0.2";
        sha256 = "dd0f3490a9daa0b11638080f0966049ba0946d7a392808789e57f3aa24c5f54d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          old-locale persistent resource-pool resourcet text time
          transformers
        ];
-       executableHaskellDepends = [ base monad-logger ];
        testHaskellDepends = [
          base hspec persistent persistent-template temporary text time
          transformers
@@ -178283,8 +178985,6 @@ self: {
        pname = "picologic";
        version = "0.2.0";
        sha256 = "eb831c0e385a43966849d75194418ac2823d2fad54cefc0eb29771e04d6c4e03";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl parsec picosat pretty
        ];
@@ -178510,8 +179210,6 @@ self: {
        pname = "pinchot";
        version = "0.6.0.0";
        sha256 = "53cada3eace3bd2ffa297944adb1260ad71ebd8761defe0fd67053327e2d75a4";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers Earley lens template-haskell transformers
        ];
@@ -178529,8 +179227,6 @@ self: {
        pname = "pinchot";
        version = "0.18.0.0";
        sha256 = "83493be81fe847f04dccd8868f33fedb95f35e4624d99a8e40e41c6eee3a2c9a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers Earley lens ListLike semigroups template-haskell
          transformers
@@ -178549,8 +179245,6 @@ self: {
        pname = "pinchot";
        version = "0.18.0.2";
        sha256 = "bfc86c6fc6402ed490b5f7f9e7d4c0f2ffb1ff8c5a3f8612f105ce5e80612721";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers Earley lens ListLike semigroups template-haskell
          transformers
@@ -179071,8 +179765,6 @@ self: {
        pname = "pipes-cacophony";
        version = "0.1.3";
        sha256 = "166d95fe84ba7edd62b3d9861b9d3e0e16fd18ec4d99e3b0b44abaf531094e89";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring cacophony pipes ];
        testHaskellDepends = [
          async base bytestring cacophony hlint mtl pipes QuickCheck tasty
@@ -179104,8 +179796,6 @@ self: {
        pname = "pipes-cacophony";
        version = "0.3.0";
        sha256 = "1d489dccb63694e120cf53b4b313363f03f09863bd14243521328f7c5bec0e6a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring cacophony pipes ];
        testHaskellDepends = [ base hlint ];
        homepage = "https://github.com/centromere/pipes-cacophony";
@@ -179182,8 +179872,6 @@ self: {
        pname = "pipes-cliff";
        version = "0.10.0.4";
        sha256 = "3d92b54e773e98996cbc1c753892e7400540d925f913d187b940e7425dfdef33";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring pipes pipes-safe process stm
        ];
@@ -179349,8 +180037,6 @@ self: {
        pname = "pipes-extra";
        version = "0.2.0";
        sha256 = "d9ede8b4a837bdecf8fb4e87a1c0d31b5ded403d0e8d900a0e2ae9e493962b7b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring pipes-core transformers
        ];
@@ -179946,7 +180632,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pipes-text" = callPackage
+  "pipes-text_0_0_2_3" = callPackage
     ({ mkDerivation, base, bytestring, pipes, pipes-bytestring
      , pipes-group, pipes-parse, pipes-safe, streaming-commons, text
      , transformers
@@ -179962,6 +180648,25 @@ self: {
        homepage = "https://github.com/michaelt/text-pipes";
        description = "properly streaming text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pipes-text" = callPackage
+    ({ mkDerivation, base, bytestring, pipes, pipes-bytestring
+     , pipes-group, pipes-parse, pipes-safe, streaming-commons, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pipes-text";
+       version = "0.0.2.4";
+       sha256 = "0e16ad5f29c981100452f23aa6c4998cc96427d70af5be389559fd6223279fb0";
+       libraryHaskellDepends = [
+         base bytestring pipes pipes-bytestring pipes-group pipes-parse
+         pipes-safe streaming-commons text transformers
+       ];
+       homepage = "https://github.com/michaelt/text-pipes";
+       description = "properly streaming text";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "pipes-transduce" = callPackage
@@ -180062,14 +180767,9 @@ self: {
        pname = "pipes-zeromq4";
        version = "0.2.0.0";
        sha256 = "24f3ae9640eb6e2180edb8e0fc12bc420c7fa83aa32605900de1d961d93e92fe";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring pipes pipes-safe semigroups zeromq4-haskell
        ];
-       executableHaskellDepends = [
-         base bytestring pipes pipes-safe semigroups zeromq4-haskell
-       ];
        jailbreak = true;
        homepage = "https://github.com/peddie/pipes-zeromq4";
        description = "Pipes integration for ZeroMQ messaging";
@@ -181607,8 +182307,6 @@ self: {
        pname = "pooled-io";
        version = "0.0.2.1";
        sha256 = "7d405a8876d55a9c077a304dd378854bc9e6e20f643c357c82bd3f38297ff9d0";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base concurrent-split containers deepseq transformers unsafe
          utility-ht
@@ -181649,8 +182347,8 @@ self: {
      }:
      mkDerivation {
        pname = "poppler";
-       version = "0.14";
-       sha256 = "7197ab38013b978f544721fa3cbb3a6851935f04a328934904f3369bd63753ba";
+       version = "0.14.0";
+       sha256 = "fefe5a01abfe3c87f038ea35e0a4efff63e879d4872d511e916b4aeda3115317";
        libraryHaskellDepends = [
          array base bytestring cairo containers glib gtk mtl
        ];
@@ -182739,46 +183437,48 @@ self: {
 
   "postgrest" = callPackage
     ({ mkDerivation, aeson, async, base, base64-string, bytestring
-     , case-insensitive, cassava, containers, contravariant, errors
-     , hasql, hasql-pool, hasql-transaction, heredoc, hspec, hspec-wai
-     , hspec-wai-json, HTTP, http-types, interpolatedstring-perl6, jwt
-     , lens, lens-aeson, monad-control, mtl, optparse-applicative
-     , parsec, process, Ranged-sets, regex-tdfa, safe, scientific
-     , string-conversions, text, time, transformers, transformers-base
-     , unix, unordered-containers, vector, wai, wai-cors, wai-extra
-     , wai-middleware-static, warp
+     , bytestring-tree-builder, case-insensitive, cassava, containers
+     , contravariant, errors, hasql, hasql-pool, hasql-transaction
+     , heredoc, hspec, hspec-wai, hspec-wai-json, HTTP, http-types
+     , interpolatedstring-perl6, jwt, microlens, microlens-aeson
+     , monad-control, mtl, optparse-applicative, parsec
+     , postgresql-binary, process, Ranged-sets, regex-tdfa, safe
+     , scientific, string-conversions, text, time, transformers
+     , transformers-base, unix, unordered-containers, vector, wai
+     , wai-cors, wai-extra, wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "postgrest";
-       version = "0.3.1.1";
-       sha256 = "77e1446c9e123a2977faca95631410f3aee14d62751f766fe4e008b24c55cea4";
+       version = "0.3.2.0";
+       sha256 = "671b5458b373c1bf78508661eaecad6e39f4baaaa997d26ce074b100f6657184";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive cassava containers
          contravariant errors hasql hasql-pool hasql-transaction HTTP
-         http-types interpolatedstring-perl6 jwt lens lens-aeson mtl
-         optparse-applicative parsec Ranged-sets regex-tdfa safe scientific
-         string-conversions text time unordered-containers vector wai
-         wai-cors wai-extra wai-middleware-static warp
+         http-types interpolatedstring-perl6 jwt microlens microlens-aeson
+         mtl optparse-applicative parsec Ranged-sets regex-tdfa safe
+         scientific string-conversions text time unordered-containers vector
+         wai wai-cors wai-extra wai-middleware-static warp
        ];
        executableHaskellDepends = [
-         aeson base bytestring case-insensitive cassava containers
-         contravariant errors hasql hasql-pool hasql-transaction HTTP
-         http-types interpolatedstring-perl6 jwt lens lens-aeson mtl
-         optparse-applicative parsec Ranged-sets regex-tdfa safe scientific
-         string-conversions text time unix unordered-containers vector wai
-         wai-cors wai-extra wai-middleware-static warp
+         aeson base bytestring bytestring-tree-builder case-insensitive
+         cassava containers contravariant errors hasql hasql-pool
+         hasql-transaction HTTP http-types interpolatedstring-perl6 jwt
+         microlens microlens-aeson mtl optparse-applicative parsec
+         postgresql-binary Ranged-sets regex-tdfa safe scientific
+         string-conversions text time transformers unix unordered-containers
+         vector wai wai-cors wai-extra wai-middleware-static warp
        ];
        testHaskellDepends = [
          aeson async base base64-string bytestring case-insensitive cassava
          containers contravariant errors hasql hasql-pool hasql-transaction
          heredoc hspec hspec-wai hspec-wai-json HTTP http-types
-         interpolatedstring-perl6 jwt lens lens-aeson monad-control mtl
-         optparse-applicative parsec process Ranged-sets regex-tdfa safe
-         scientific string-conversions text time transformers
-         transformers-base unix unordered-containers vector wai wai-cors
-         wai-extra wai-middleware-static warp
+         interpolatedstring-perl6 jwt microlens microlens-aeson
+         monad-control mtl optparse-applicative parsec process Ranged-sets
+         regex-tdfa safe scientific string-conversions text time
+         transformers transformers-base unordered-containers vector wai
+         wai-cors wai-extra wai-middleware-static warp
        ];
        homepage = "https://github.com/begriffs/postgrest";
        description = "REST API for any Postgres database";
@@ -182787,22 +183487,17 @@ self: {
 
   "postie" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cprng-aes
-     , data-default-class, mtl, network, pipes, pipes-bytestring
-     , pipes-parse, stringsearch, tls, transformers, uuid
+     , data-default-class, mtl, network, pipes, pipes-parse
+     , stringsearch, tls, transformers, uuid
      }:
      mkDerivation {
        pname = "postie";
        version = "0.5.0.0";
        sha256 = "93e32bd30b22c7f6474958abc3f65bf467c1fea403aa130996dab396233f0fc7";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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 = [ "x86_64-darwin" ];
@@ -182816,13 +183511,10 @@ self: {
        pname = "postmark";
        version = "0.1.1";
        sha256 = "5c3d4c458d6b2683a2ec36380c216b05c297ba053cac4ede801531dba35f01ca";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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;
@@ -182933,13 +183625,12 @@ self: {
      }) {};
 
   "pqc" = callPackage
-    ({ mkDerivation, base, ChasingBottoms, QuickCheck, random, stm }:
+    ({ mkDerivation, base, QuickCheck, random, stm }:
      mkDerivation {
        pname = "pqc";
        version = "0.8";
        sha256 = "844d3c456cdfae4316cae120520690a522508f4bb861ff232b5a26db29c4e1d8";
        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;
@@ -183152,8 +183843,6 @@ self: {
        pname = "prednote";
        version = "0.32.0.6";
        sha256 = "723522808727d02d26bfc48a86e0d5e8f7c7f723334fa6847f5542d744a5b52a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers contravariant rainbow split text
          transformers
@@ -183280,25 +183969,18 @@ self: {
      }) {};
 
   "prefork" = callPackage
-    ({ 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, base, cab, containers, data-default, directory
+     , filepath, hspec, process, stm, system-argv0, system-filepath
+     , unix
      }:
      mkDerivation {
        pname = "prefork";
        version = "0.0.9";
        sha256 = "883b866c1c9b3adf2aa1b368db8ac1619666bd0506d3c3f5486e79c49eef2a7f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
        ];
@@ -183408,8 +184090,6 @@ self: {
        pname = "prelude-plus";
        version = "0.0.0.6";
        sha256 = "5b4ec409806660b7f06e51e9df2e06caf88219a78785202424fd050750012b8d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
        license = stdenv.lib.licenses.bsd3;
@@ -184779,10 +185459,7 @@ self: {
        pname = "progressbar";
        version = "0.0.1";
        sha256 = "da0e18e771284738de24858b87c96b135c591df5158b1a212b9edcc6fad5ce27";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base io-reactive ];
-       executableHaskellDepends = [ base ];
        description = "Progressbar API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
@@ -187512,12 +188189,9 @@ self: {
        pname = "questioner";
        version = "0.1.1.0";
        sha256 = "83ab4047671f59832eaa377e3fb3fce547439550f57479dd09e0ad4975250617";
-       isLibrary = true;
-       isExecutable = true;
        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;
@@ -187581,9 +188255,8 @@ self: {
 
   "quickbooks" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
-     , doctest, email-validate, fast-logger, http-client
-     , http-client-tls, http-types, interpolate, old-locale, text, thyme
-     , yaml
+     , email-validate, fast-logger, http-client, http-client-tls
+     , http-types, interpolate, old-locale, text, thyme, yaml
      }:
      mkDerivation {
        pname = "quickbooks";
@@ -187594,7 +188267,6 @@ self: {
          http-client http-client-tls http-types interpolate old-locale text
          thyme yaml
        ];
-       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        description = "QuickBooks API binding";
        license = stdenv.lib.licenses.bsd3;
@@ -187785,17 +188457,12 @@ self: {
      }) {};
 
   "quickcheck-property-monad" = callPackage
-    ({ mkDerivation, base, directory, doctest, either, filepath
-     , QuickCheck, transformers
-     }:
+    ({ mkDerivation, base, either, QuickCheck, transformers }:
      mkDerivation {
        pname = "quickcheck-property-monad";
        version = "0.2.4";
        sha256 = "2ce59041850673d8125078e36b5d29e7daab17da54d0e97547d14027452ae76a";
        libraryHaskellDepends = [ base either QuickCheck transformers ];
-       testHaskellDepends = [
-         base directory doctest filepath QuickCheck
-       ];
        jailbreak = true;
        homepage = "http://github.com/bennofs/quickcheck-property-monad/";
        description = "A monad for generating QuickCheck properties without Arbitrary instances";
@@ -187945,8 +188612,7 @@ self: {
      }) {};
 
   "quickpull_0_4_0_0" = callPackage
-    ({ mkDerivation, barecheck, base, directory, filepath, QuickCheck
-     }:
+    ({ mkDerivation, base, directory, filepath, QuickCheck }:
      mkDerivation {
        pname = "quickpull";
        version = "0.4.0.0";
@@ -187954,9 +188620,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath QuickCheck ];
-       executableHaskellDepends = [
-         barecheck base directory filepath QuickCheck
-       ];
+       executableHaskellDepends = [ base directory filepath QuickCheck ];
        testHaskellDepends = [ base directory filepath QuickCheck ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/quickpull";
@@ -187966,8 +188630,7 @@ self: {
      }) {};
 
   "quickpull" = callPackage
-    ({ mkDerivation, barecheck, base, directory, filepath, QuickCheck
-     }:
+    ({ mkDerivation, base, directory, filepath, QuickCheck }:
      mkDerivation {
        pname = "quickpull";
        version = "0.4.2.2";
@@ -187975,9 +188638,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath QuickCheck ];
-       executableHaskellDepends = [
-         barecheck base directory filepath QuickCheck
-       ];
+       executableHaskellDepends = [ base directory filepath QuickCheck ];
        testHaskellDepends = [ base directory filepath QuickCheck ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/quickpull";
@@ -188441,8 +189102,6 @@ self: {
        pname = "rainbow";
        version = "0.22.0.2";
        sha256 = "49e7a5265eb594f89b5d44f2e9f3390f22010f0df126b15cddbf4d06e481f22f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring process text ];
        testHaskellDepends = [ base bytestring process QuickCheck text ];
        jailbreak = true;
@@ -189648,13 +190307,10 @@ self: {
        pname = "react-flux";
        version = "1.1.0";
        sha256 = "0b8f5ffd4699ae584c89717f320cfc0ddc040481198ca9c7828c7c1e74ec4be9";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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;
@@ -189827,8 +190483,6 @@ self: {
        pname = "reactive-banana-threepenny";
        version = "0.7.1.3";
        sha256 = "2a51bbecf637916ac67cd8803fd08072927bb38024c10e857a5677960f5e60b9";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
        jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
@@ -189844,8 +190498,6 @@ self: {
        version = "1.1.1.0";
        sha256 = "790e671d7eadfeacd7a21e4e415e7e79b1e885ef3b01aa1c6848ca8b0dabfefb";
        configureFlags = [ "-f-buildexamples" ];
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base cabal-macosx reactive-banana wx wxcore
        ];
@@ -190007,8 +190659,6 @@ self: {
        pname = "read-editor";
        version = "0.1.0.2";
        sha256 = "ed8aeca86823fbaf11a0a543fd106c9c3abe65216ea974ed56050cbebf777085";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base directory process ];
        homepage = "https://github.com/yamadapc/haskell-read-editor";
        description = "Opens a temporary file on the system's EDITOR and returns the resulting edits";
@@ -190678,8 +191328,6 @@ self: {
        pname = "reedsolomon";
        version = "0.0.4.0";
        sha256 = "40498e946a71155b078d307d11803800f1a4df0777dd1ba8c3cf6e6c5689b7e9";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring exceptions gitrev loop mtl primitive profunctors
          vector
@@ -192305,22 +192953,17 @@ self: {
   "relational-record-examples" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3
      , persistable-record, relational-query, relational-query-HDBC
-     , relational-schemas, template-haskell, time
+     , relational-schemas, template-haskell
      }:
      mkDerivation {
        pname = "relational-record-examples";
        version = "0.3.1.1";
        sha256 = "56d726b946e454390b4efbda9e7effe11343c88aeb6390f9516b51445e96a242";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base HDBC HDBC-session HDBC-sqlite3 persistable-record
          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 = [ "x86_64-darwin" ];
@@ -192965,12 +193608,7 @@ self: {
        pname = "repa-sndfile";
        version = "3.2.3.3";
        sha256 = "68bee7a0b5fb4afefc77235987b2bff74b8e60c0d0b46aa3ba8a057d226cf95d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base hsndfile repa ];
-       executableHaskellDepends = [
-         base hsndfile hsndfile-vector repa vector
-       ];
        testHaskellDepends = [
          base directory filepath hsndfile hsndfile-vector repa vector
        ];
@@ -195040,22 +195678,19 @@ self: {
      }) {};
 
   "rethinkdb_2_2_0_2" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
-     , bytestring, containers, data-default, doctest, mtl, network
-     , scientific, text, time, unordered-containers, utf8-string, vector
+    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+     , containers, data-default, doctest, mtl, network, scientific, text
+     , time, unordered-containers, utf8-string, vector
      }:
      mkDerivation {
        pname = "rethinkdb";
        version = "2.2.0.2";
        sha256 = "91c1ea290efa7f9336ef824832545cce401466cc773cde38ea2a8e0a763d0eb5";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring containers
          data-default mtl network scientific text time unordered-containers
          utf8-string vector
        ];
-       executableHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base doctest ];
        jailbreak = true;
        doCheck = false;
@@ -195066,22 +195701,19 @@ self: {
      }) {};
 
   "rethinkdb_2_2_0_3" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
-     , bytestring, containers, data-default, doctest, mtl, network
-     , scientific, text, time, unordered-containers, utf8-string, vector
+    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+     , containers, data-default, doctest, mtl, network, scientific, text
+     , time, unordered-containers, utf8-string, vector
      }:
      mkDerivation {
        pname = "rethinkdb";
        version = "2.2.0.3";
        sha256 = "c5499076552d6fa07972e7597b6c8c04c0f2a0dcdb9b9e630c2fb48cc06f1183";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring containers
          data-default mtl network scientific text time unordered-containers
          utf8-string vector
        ];
-       executableHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base doctest ];
        jailbreak = true;
        doCheck = false;
@@ -195092,22 +195724,19 @@ self: {
      }) {};
 
   "rethinkdb_2_2_0_4" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
-     , bytestring, containers, data-default, doctest, mtl, network
-     , scientific, text, time, unordered-containers, utf8-string, vector
+    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+     , containers, data-default, doctest, mtl, network, scientific, text
+     , time, unordered-containers, utf8-string, vector
      }:
      mkDerivation {
        pname = "rethinkdb";
        version = "2.2.0.4";
        sha256 = "e1f700f1cdbe9e7b96d529f29725ec13be86ae164c3c99a03b1d502ac9416f9c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring containers
          data-default mtl network scientific text time unordered-containers
          utf8-string vector
        ];
-       executableHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base doctest ];
        jailbreak = true;
        doCheck = false;
@@ -195118,22 +195747,19 @@ self: {
      }) {};
 
   "rethinkdb" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
-     , bytestring, containers, data-default, doctest, mtl, network
-     , scientific, text, time, unordered-containers, utf8-string, vector
+    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+     , containers, data-default, doctest, mtl, network, scientific, text
+     , time, unordered-containers, utf8-string, vector
      }:
      mkDerivation {
        pname = "rethinkdb";
        version = "2.2.0.5";
        sha256 = "0756db7984ea0a9085eccadad78cac31e1324ed2bc9c580b6177e18826ccc78f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring containers
          data-default mtl network scientific text time unordered-containers
          utf8-string vector
        ];
-       executableHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base doctest ];
        doCheck = false;
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
@@ -195728,10 +196354,7 @@ self: {
        pname = "rfc5051";
        version = "0.1.0.3";
        sha256 = "e38dab28a5625774be60545c8c99e647b79bbc0ac0bc9c65fe6b2ebef160642b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
-       executableHaskellDepends = [ base bytestring containers ];
        description = "Simple unicode collation as per RFC5051";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -196491,6 +197114,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rose-trees_0_0_4_1" = callPackage
+    ({ mkDerivation, base, containers, deepseq, hashable, mtl
+     , QuickCheck, quickcheck-instances, semigroupoids, semigroups, sets
+     , tasty, tasty-quickcheck, unordered-containers, witherable
+     }:
+     mkDerivation {
+       pname = "rose-trees";
+       version = "0.0.4.1";
+       sha256 = "69e4c450588697b5f100a715257aaee8f72ce362c199e3a33cdc43336cf70d29";
+       libraryHaskellDepends = [
+         base containers deepseq hashable mtl QuickCheck
+         quickcheck-instances semigroupoids semigroups sets
+         unordered-containers witherable
+       ];
+       testHaskellDepends = [
+         base containers deepseq QuickCheck quickcheck-instances
+         semigroupoids semigroups sets tasty tasty-quickcheck witherable
+       ];
+       description = "A collection of rose tree structures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rose-trie" = callPackage
     ({ mkDerivation, base, containers, deepseq, minilens, mtl
      , transformers
@@ -196679,8 +197325,6 @@ self: {
        pname = "roundtrip-xml";
        version = "0.3.0.5";
        sha256 = "35599e1f8ed46f1583dbcfd53caab4c3956dd7ad9c18d5705c41aaa8742286be";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-builder blaze-builder-enumerator bytestring containers
          enumerator mtl pretty reference roundtrip roundtrip-string safe
@@ -196803,8 +197447,6 @@ self: {
        pname = "rpm";
        version = "0.0.1";
        sha256 = "9f2c95adfa873b55e56516ebb2a3c320914931d300b50ad1659d704669706af3";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base directory filepath HaXml process ];
        description = "Cozy little project to question unruly rpm packages";
        license = stdenv.lib.licenses.bsd3;
@@ -197266,10 +197908,7 @@ self: {
        pname = "s-cargot";
        version = "0.1.1.1";
        sha256 = "5ac3d9e1a58763943249b3d7ac174ff3f17dec7a7508f984b8c1efc2a1c51c60";
-       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";
@@ -197879,8 +198518,6 @@ self: {
        pname = "sample-frame";
        version = "0.0.3";
        sha256 = "5baf301a4f7b2d52e6b9b9c06b10afd3938de0be6d09736d0188616cd9027247";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck storable-record ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Handling of samples in an (audio) signal";
@@ -197915,23 +198552,14 @@ self: {
      }) {};
 
   "samtools" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, filepath, process, seqloc
-     , vector, zlib
-     }:
+    ({ mkDerivation, base, bytestring, c2hs, seqloc, vector, zlib }:
      mkDerivation {
        pname = "samtools";
        version = "0.2.4.3";
        sha256 = "da91b82c0ce87b1f1f2775f7b1dd05352ceb918e79a926fc32ede324a9582086";
-       isLibrary = true;
-       isExecutable = true;
        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";
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
@@ -197975,21 +198603,15 @@ self: {
      }) {};
 
   "samtools-iteratee" = callPackage
-    ({ mkDerivation, base, bytestring, iteratee, monads-tf, samtools
-     , transformers
+    ({ mkDerivation, base, bytestring, iteratee, samtools, transformers
      }:
      mkDerivation {
        pname = "samtools-iteratee";
        version = "0.2.2.1";
        sha256 = "d4807605be6092c876ca779b2e74beb1ea4c8f8d0338fdcc28ba804a07b82c8d";
-       isLibrary = true;
-       isExecutable = true;
        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;
@@ -198918,9 +199540,8 @@ self: {
          split syb tagsoup text time vector xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers directory
-         filepath process scholdoc scholdoc-types syb temporary text vector
-         yaml
+         aeson aeson-pretty attoparsec base bytestring filepath
+         scholdoc-types syb text yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath process scholdoc
@@ -198935,19 +199556,16 @@ self: {
 
   "scholdoc-texmath" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, parsec, process, scholdoc-types, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, parsec, process, scholdoc-types, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "scholdoc-texmath";
        version = "0.1.0.1";
        sha256 = "2939f906890eb13f488013f787f09ef1e35ee12b29cf06e729638fe15a29cb17";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl parsec scholdoc-types syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -199226,6 +199844,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scientific_0_3_4_7" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , ghc-prim, hashable, integer-gmp, QuickCheck, smallcheck, tasty
+     , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     , text, vector
+     }:
+     mkDerivation {
+       pname = "scientific";
+       version = "0.3.4.7";
+       sha256 = "fb9b96c29525ee61b1681d6c83805aaeef3e40da9b2ed4295fb047501bc007cb";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq ghc-prim hashable
+         integer-gmp text vector
+       ];
+       testHaskellDepends = [
+         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
+         tasty-hunit tasty-quickcheck tasty-smallcheck text
+       ];
+       homepage = "https://github.com/basvandijk/scientific";
+       description = "Numbers represented using scientific notation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scion" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset
@@ -199939,8 +200581,6 @@ self: {
        pname = "sdl2";
        version = "2.1.1";
        sha256 = "6c38f02842fdda0be25359cc1d2579c09a66a2f80687943cebe0fe14b1d7efad";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring exceptions linear StateVar text transformers vector
        ];
@@ -199957,8 +200597,6 @@ self: {
        pname = "sdl2-cairo";
        version = "0.1.0.2";
        sha256 = "e536adc0c2439267d3496cb5d33899c83d2e6d8debf2d56c69abd3c947704a86";
-       isLibrary = true;
-       isExecutable = true;
        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;
@@ -199987,8 +200625,6 @@ self: {
        pname = "sdl2-compositor";
        version = "1.2.0.5";
        sha256 = "233b6fa622703849d4f7d69ac2202a0787b4e1048341b09767a3b5fa2e3ee255";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base lens linear lrucache QuickCheck sdl2 StateVar stm text
          transformers
@@ -200891,21 +201527,12 @@ self: {
      }) {};
 
   "semiring" = callPackage
-    ({ mkDerivation, base, Boolean, containers, HUnit, monoids
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
+    ({ mkDerivation, base, Boolean, containers, monoids }:
      mkDerivation {
        pname = "semiring";
        version = "0.3";
        sha256 = "befab81cfef9ae6499f44fdd93a2bc892f118b335462bcf2010aba4254f1a6ac";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base Boolean containers monoids ];
-       executableHaskellDepends = [
-         base Boolean containers HUnit monoids QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
        jailbreak = true;
        homepage = "http://github.com/srush/SemiRings/tree/master";
        description = "Semirings, ring-like structures used for dynamic programming applications";
@@ -201269,7 +201896,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 vector
+         unordered-containers
        ];
        testHaskellDepends = [
          attoparsec base biocore bytestring conduit conduit-extra directory
@@ -201300,12 +201927,9 @@ self: {
        pname = "sequent-core";
        version = "0.5.0.1";
        sha256 = "cd0a56a9fad3b7b0f53fd2e913f16a7d3c9472d0925f2ec56ed0da6c41ce39e1";
-       isLibrary = true;
-       isExecutable = true;
        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;
@@ -202472,19 +203096,12 @@ self: {
      }) {};
 
   "servant-jquery_0_2_2_1" = callPackage
-    ({ mkDerivation, aeson, base, filepath, hspec, language-ecmascript
-     , lens, servant, servant-server, stm, transformers, warp
-     }:
+    ({ mkDerivation, base, hspec, language-ecmascript, lens, servant }:
      mkDerivation {
        pname = "servant-jquery";
        version = "0.2.2.1";
        sha256 = "f1235f1ad45c5e04b9b1ced1c22f4321cf85c6fe9403fcad5b60187f65416c68";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base lens servant ];
-       executableHaskellDepends = [
-         aeson base filepath servant servant-server stm transformers warp
-       ];
        testHaskellDepends = [ base hspec language-ecmascript servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
@@ -202493,20 +203110,14 @@ self: {
      }) {};
 
   "servant-jquery_0_4_4" = callPackage
-    ({ mkDerivation, aeson, base, charset, filepath, hspec
-     , hspec-expectations, language-ecmascript, lens, servant
-     , servant-server, stm, text, transformers, warp
+    ({ mkDerivation, base, charset, hspec, hspec-expectations
+     , language-ecmascript, lens, servant, text
      }:
      mkDerivation {
        pname = "servant-jquery";
        version = "0.4.4";
        sha256 = "6d5726b74ee4b83d84ab62d8f3af1afc0743715d9624056d97148a9ebb654212";
-       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
        ];
@@ -202518,20 +203129,14 @@ self: {
      }) {};
 
   "servant-jquery_0_4_4_2" = callPackage
-    ({ mkDerivation, aeson, base, charset, filepath, hspec
-     , hspec-expectations, language-ecmascript, lens, servant
-     , servant-server, stm, text, transformers, warp
+    ({ mkDerivation, base, charset, hspec, hspec-expectations
+     , language-ecmascript, lens, servant, text
      }:
      mkDerivation {
        pname = "servant-jquery";
        version = "0.4.4.2";
        sha256 = "c807d103b47b4f7c31708deb92786171a9b7fce2314232400caf2be74b7225ad";
-       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
        ];
@@ -202543,20 +203148,14 @@ self: {
      }) {};
 
   "servant-jquery_0_4_4_4" = callPackage
-    ({ mkDerivation, aeson, base, charset, filepath, hspec
-     , hspec-expectations, language-ecmascript, lens, servant
-     , servant-server, stm, text, transformers, warp
+    ({ mkDerivation, base, charset, hspec, hspec-expectations
+     , language-ecmascript, lens, servant, text
      }:
      mkDerivation {
        pname = "servant-jquery";
        version = "0.4.4.4";
        sha256 = "66fbe8414ac6bf6e17fd12b31d6a1fa766ea91f3a2932c22c3accf048e8f7076";
-       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
        ];
@@ -202568,20 +203167,14 @@ self: {
      }) {};
 
   "servant-jquery_0_4_4_5" = callPackage
-    ({ mkDerivation, aeson, base, charset, filepath, hspec
-     , hspec-expectations, language-ecmascript, lens, servant
-     , servant-server, stm, text, transformers, warp
+    ({ mkDerivation, base, charset, hspec, hspec-expectations
+     , language-ecmascript, lens, servant, text
      }:
      mkDerivation {
        pname = "servant-jquery";
        version = "0.4.4.5";
        sha256 = "33059d2a707bfad6fcd3f92cdaac69da9767dce1f2e11f7c4c9b2ad9df1d1b3c";
-       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
        ];
@@ -202593,20 +203186,14 @@ self: {
      }) {};
 
   "servant-jquery_0_4_4_6" = callPackage
-    ({ mkDerivation, aeson, base, charset, filepath, hspec
-     , hspec-expectations, language-ecmascript, lens, servant
-     , servant-server, stm, text, transformers, warp
+    ({ mkDerivation, base, charset, hspec, hspec-expectations
+     , language-ecmascript, lens, servant, text
      }:
      mkDerivation {
        pname = "servant-jquery";
        version = "0.4.4.6";
        sha256 = "6d144efd7d8a267e88ea9b94da766cae8373614673e58e38ff17a95b0e827e7d";
-       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
        ];
@@ -202618,20 +203205,14 @@ self: {
      }) {};
 
   "servant-jquery" = callPackage
-    ({ mkDerivation, aeson, base, charset, filepath, hspec
-     , hspec-expectations, language-ecmascript, lens, servant
-     , servant-server, stm, text, transformers, warp
+    ({ mkDerivation, base, charset, hspec, hspec-expectations
+     , language-ecmascript, lens, servant, text
      }:
      mkDerivation {
        pname = "servant-jquery";
        version = "0.4.4.7";
        sha256 = "f3e7ba3e47ab318fc448f0539b4e58e8d82a5e9b32e3a6a6b5dea849dd7d11b1";
-       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
        ];
@@ -202643,23 +203224,17 @@ self: {
      }) {};
 
   "servant-js" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, charset, filepath, hspec
+    ({ mkDerivation, base, base-compat, charset, hspec
      , hspec-expectations, language-ecmascript, lens, servant
-     , servant-foreign, servant-server, stm, text, transformers, warp
+     , servant-foreign, text
      }:
      mkDerivation {
        pname = "servant-js";
        version = "0.7.1";
        sha256 = "15f4f26ffe2e9613defe30c028c43bc685f1582a6a0d97186dea5867c5cd5e89";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base base-compat charset lens servant-foreign text
        ];
-       executableHaskellDepends = [
-         aeson base filepath lens servant servant-server stm transformers
-         warp
-       ];
        testHaskellDepends = [
          base base-compat hspec hspec-expectations language-ecmascript lens
          servant text
@@ -202780,6 +203355,29 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "servant-purescript" = callPackage
+    ({ mkDerivation, aeson, base, containers, directory, filepath
+     , http-types, lens, mainland-pretty, purescript-bridge, servant
+     , servant-foreign, servant-subscriber, text
+     }:
+     mkDerivation {
+       pname = "servant-purescript";
+       version = "0.1.0.2";
+       sha256 = "d6852c19120c1bae8bc94997bfcd75594f7d5dcbb327eb7e1f412bae70e48086";
+       libraryHaskellDepends = [
+         aeson base containers directory filepath http-types lens
+         mainland-pretty purescript-bridge servant servant-foreign
+         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;
+     }) {};
+
   "servant-quickcheck" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring
      , case-insensitive, data-default-class, hspec, http-client
@@ -203158,6 +203756,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-subscriber" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, async, attoparsec, base
+     , base-compat, blaze-builder, blaze-html, blaze-markup, bytestring
+     , case-insensitive, containers, directory, filepath, hspec
+     , http-media, http-types, lens, lifted-base, lucid, monad-control
+     , monad-logger, mtl, network-uri, purescript-bridge, servant
+     , servant-foreign, servant-server, stm, string-conversions, text
+     , time, transformers, wai, wai-websockets, warp, websockets
+     }:
+     mkDerivation {
+       pname = "servant-subscriber";
+       version = "0.1.0.2";
+       sha256 = "c575bc3afe97433e8fbb450afb5a6c63ac692f8a95e4a6f34960b8faf083ae48";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async attoparsec base blaze-builder bytestring
+         case-insensitive containers directory filepath http-types lens
+         lifted-base monad-control monad-logger network-uri servant
+         servant-foreign servant-server stm text time transformers wai
+         wai-websockets warp websockets
+       ];
+       executableHaskellDepends = [ base purescript-bridge ];
+       testHaskellDepends = [
+         aeson aeson-compat attoparsec base base-compat blaze-html
+         blaze-markup bytestring directory hspec http-media lucid mtl
+         servant-foreign servant-server string-conversions time wai warp
+       ];
+       homepage = "http://github.com/eskimor/servant-subscriber#readme";
+       description = "When REST is not enough ...";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-swagger_0_1_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
      , http-media, lens, servant, swagger2, text, time
@@ -203657,8 +204288,6 @@ self: {
        pname = "set-cover";
        version = "0.0.8";
        sha256 = "186d3a1b6e824e3bd1d479347d8310dba9f1cba98e90bc03d885c42558ea95d1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers enummapset psqueues utility-ht
        ];
@@ -203894,20 +204523,23 @@ self: {
      }) {};
 
   "sexp-grammar" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, QuickCheck
-     , scientific, semigroups, split, stack-prism, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, wl-pprint-text
+    ({ mkDerivation, alex, array, base, bytestring, containers, happy
+     , mtl, profunctors, QuickCheck, scientific, semigroups, split
+     , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , text, transformers, wl-pprint-text
      }:
      mkDerivation {
        pname = "sexp-grammar";
-       version = "1.1.1";
-       sha256 = "4737183b0201c27d4c0824418644abff466bdfe653c411cb8da8c53899d6dbd6";
+       version = "1.2.0";
+       sha256 = "0489eced12a79d7ee1fe022a58645c4c7381ecff6ab8e9c402751eaebf24c024";
        libraryHaskellDepends = [
-         array base containers mtl scientific semigroups split stack-prism
-         template-haskell text wl-pprint-text
+         array base bytestring containers mtl profunctors scientific
+         semigroups split tagged template-haskell text transformers
+         wl-pprint-text
        ];
+       libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
-         base QuickCheck scientific semigroups stack-prism tasty tasty-hunit
+         base bytestring QuickCheck scientific semigroups tasty tasty-hunit
          tasty-quickcheck
        ];
        homepage = "https://github.com/esmolanka/sexp-grammar";
@@ -203932,19 +204564,14 @@ self: {
      }) {};
 
   "sexpr" = callPackage
-    ({ mkDerivation, base, base64-string, binary, bytestring, pretty
-     , QuickCheck, random
-     }:
+    ({ mkDerivation, base, base64-string, binary, bytestring, pretty }:
      mkDerivation {
        pname = "sexpr";
        version = "0.2.1";
        sha256 = "7724dc079ba390c8302079483ddf5f12bb425c2461133f94be71fe62402edab9";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base base64-string binary bytestring pretty
        ];
-       executableHaskellDepends = [ QuickCheck random ];
        description = "S-expression printer and parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
@@ -205511,8 +206138,6 @@ self: {
        pname = "shelly";
        version = "1.6.3.3";
        sha256 = "1a6624db16198b7af4d06d2b79f46346c1c459bcccbdf2958533b396dcf56a9c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
@@ -205544,8 +206169,6 @@ self: {
        pname = "shelly";
        version = "1.6.3.4";
        sha256 = "57abc8d9605c67bedc9d294bf9898a9ccd80e5e098f2351fbdcdf6dc716875d5";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
@@ -205577,8 +206200,6 @@ self: {
        pname = "shelly";
        version = "1.6.4";
        sha256 = "e723b4b93b8b5507e965e80ba912128166296b5a7a79e106af7a16cd4312fd8b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
@@ -205610,8 +206231,6 @@ self: {
        pname = "shelly";
        version = "1.6.4.1";
        sha256 = "99548d6a33ea7a8ed2c12f625c923ee14d9c2d04ecb9b46bef2c1e6c8ff567ab";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
@@ -205643,8 +206262,6 @@ self: {
        pname = "shelly";
        version = "1.6.5";
        sha256 = "bdfd09b01f3de8e7e58e98591ab1a42ad5a74308ff29f19acd16d7cc85b71cdc";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
@@ -205678,8 +206295,6 @@ self: {
        sha256 = "9c89e1ed25de9ede0ee6d6a4094ff72ca6af5b1a1f67503ea40a87beb796e1c5";
        revision = "1";
        editedCabalFile = "cfea5fb2615eb1f4833a368d051db2065d02aa4a5ff7578c5323f65ba9298894";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
@@ -206757,10 +207372,7 @@ self: {
        pname = "simple-sql-parser";
        version = "0.4.1";
        sha256 = "18fd27a8b274ab74a4949a1738498c0903e9e74645f40b113324263b1753e543";
-       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
        ];
@@ -207278,8 +207890,7 @@ self: {
      }) {};
 
   "sized-types" = callPackage
-    ({ mkDerivation, array, base, base-compat, containers, QuickCheck
-     , singletons
+    ({ mkDerivation, array, base, base-compat, containers, singletons
      }:
      mkDerivation {
        pname = "sized-types";
@@ -207287,13 +207898,9 @@ self: {
        sha256 = "c76772fc89028f5407906bc699e7dd98e02328d0fe98c151706100e49f4899db";
        revision = "2";
        editedCabalFile = "5fb95524f6e6156ba969609e60f55ded8817bbad8c26ce610002e02b8d987152";
-       isLibrary = true;
-       isExecutable = true;
        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;
@@ -209010,8 +209617,6 @@ self: {
        pname = "snap-extras";
        version = "0.11.0.2";
        sha256 = "15e8ab812bf53b3f7ab0377e945b3e3448d5b8d4b89404751f83d51d722deb5e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring case-insensitive
          configurator containers data-default digestive-functors
@@ -211132,8 +211737,6 @@ self: {
        pname = "soxlib";
        version = "0.0.2.1";
        sha256 = "91e25a3919149abce1956e46d831c01c6875ad23cb9be79420792e52f9690a0a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers explicit-exception extensible-exceptions
          sample-frame storablevector transformers utility-ht
@@ -212007,8 +212610,6 @@ self: {
        pname = "spreadsheet";
        version = "0.1.3.3";
        sha256 = "41b2b7329840fc67dd870f559ddcca0a5836f8f567889697f9cdb815ec6bcce0";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base explicit-exception transformers utility-ht
        ];
@@ -212711,10 +213312,10 @@ self: {
          unordered-containers
        ];
        testHaskellDepends = [
-         async base bytestring Cabal conduit conduit-extra containers
-         cryptohash directory exceptions filepath hspec http-conduit
-         monad-logger optparse-applicative path process QuickCheck resourcet
-         retry temporary text transformers unix-compat
+         base bytestring Cabal conduit conduit-extra containers cryptohash
+         directory exceptions filepath hspec http-conduit monad-logger
+         optparse-applicative path QuickCheck resourcet retry temporary text
+         transformers
        ];
        jailbreak = true;
        doCheck = false;
@@ -212780,10 +213381,10 @@ self: {
          unordered-containers
        ];
        testHaskellDepends = [
-         async base bytestring Cabal conduit conduit-extra containers
-         cryptohash directory exceptions filepath hspec http-conduit
-         monad-logger optparse-applicative path process QuickCheck resourcet
-         retry temporary text transformers unix-compat
+         base bytestring Cabal conduit conduit-extra containers cryptohash
+         directory exceptions filepath hspec http-conduit monad-logger
+         optparse-applicative path QuickCheck resourcet retry temporary text
+         transformers
        ];
        jailbreak = true;
        doCheck = false;
@@ -212850,10 +213451,10 @@ self: {
          text transformers unordered-containers
        ];
        testHaskellDepends = [
-         async base bytestring Cabal conduit conduit-extra containers
-         cryptohash directory exceptions filepath hspec http-conduit
-         monad-logger optparse-applicative path process QuickCheck resourcet
-         retry temporary text transformers unix-compat
+         base bytestring Cabal conduit conduit-extra containers cryptohash
+         directory exceptions filepath hspec http-conduit monad-logger
+         optparse-applicative path QuickCheck resourcet retry temporary text
+         transformers
        ];
        jailbreak = true;
        doCheck = false;
@@ -212920,10 +213521,10 @@ self: {
          text transformers unordered-containers
        ];
        testHaskellDepends = [
-         async base bytestring Cabal conduit conduit-extra containers
-         cryptohash directory exceptions filepath hspec http-conduit
-         monad-logger optparse-applicative path process QuickCheck resourcet
-         retry temporary text transformers unix-compat
+         base bytestring Cabal conduit conduit-extra containers cryptohash
+         directory exceptions filepath hspec http-conduit monad-logger
+         optparse-applicative path QuickCheck resourcet retry temporary text
+         transformers
        ];
        jailbreak = true;
        doCheck = false;
@@ -212990,10 +213591,10 @@ self: {
          text transformers unordered-containers
        ];
        testHaskellDepends = [
-         async base bytestring Cabal conduit conduit-extra containers
-         cryptohash directory exceptions filepath hspec http-conduit
-         monad-logger optparse-applicative path process QuickCheck resourcet
-         retry temporary text transformers unix-compat
+         base bytestring Cabal conduit conduit-extra containers cryptohash
+         directory exceptions filepath hspec http-conduit monad-logger
+         optparse-applicative path QuickCheck resourcet retry temporary text
+         transformers
        ];
        jailbreak = true;
        doCheck = false;
@@ -213060,10 +213661,10 @@ self: {
          text transformers unordered-containers
        ];
        testHaskellDepends = [
-         async base bytestring Cabal conduit conduit-extra containers
-         cryptohash directory exceptions filepath hspec http-conduit
-         monad-logger optparse-applicative path process QuickCheck resourcet
-         retry temporary text transformers unix-compat
+         base bytestring Cabal conduit conduit-extra containers cryptohash
+         directory exceptions filepath hspec http-conduit monad-logger
+         optparse-applicative path QuickCheck resourcet retry temporary text
+         transformers
        ];
        jailbreak = true;
        doCheck = false;
@@ -213131,10 +213732,10 @@ self: {
          text transformers unordered-containers
        ];
        testHaskellDepends = [
-         async base bytestring Cabal conduit conduit-extra containers
-         cryptohash directory exceptions filepath hspec http-conduit
-         monad-logger optparse-applicative path process QuickCheck resourcet
-         retry temporary text transformers unix-compat
+         base bytestring Cabal conduit conduit-extra containers cryptohash
+         directory exceptions filepath hspec http-conduit monad-logger
+         optparse-applicative path QuickCheck resourcet retry temporary text
+         transformers
        ];
        jailbreak = true;
        doCheck = false;
@@ -213202,10 +213803,10 @@ self: {
          text transformers unordered-containers
        ];
        testHaskellDepends = [
-         async base bytestring Cabal conduit conduit-extra containers
-         cryptohash directory exceptions filepath hspec http-conduit
-         monad-logger optparse-applicative path process QuickCheck resourcet
-         retry temporary text transformers unix-compat
+         base bytestring Cabal conduit conduit-extra containers cryptohash
+         directory exceptions filepath hspec http-conduit monad-logger
+         optparse-applicative path QuickCheck resourcet retry temporary text
+         transformers
        ];
        jailbreak = true;
        doCheck = false;
@@ -213273,10 +213874,10 @@ self: {
          text transformers unordered-containers
        ];
        testHaskellDepends = [
-         async attoparsec base bytestring Cabal conduit conduit-extra
-         containers cryptohash directory exceptions filepath hspec
-         http-conduit monad-logger optparse-applicative path process
-         QuickCheck resourcet retry temporary text transformers unix-compat
+         attoparsec base bytestring Cabal conduit conduit-extra containers
+         cryptohash directory exceptions filepath hspec http-conduit
+         monad-logger optparse-applicative path QuickCheck resourcet retry
+         temporary text transformers
        ];
        doHaddock = false;
        jailbreak = true;
@@ -213345,10 +213946,10 @@ self: {
          text transformers unordered-containers
        ];
        testHaskellDepends = [
-         async attoparsec base bytestring Cabal conduit conduit-extra
-         containers cryptohash directory exceptions filepath hspec
-         http-conduit monad-logger optparse-applicative path process
-         QuickCheck resourcet retry temporary text transformers unix-compat
+         attoparsec base bytestring Cabal conduit conduit-extra containers
+         cryptohash directory exceptions filepath hspec http-conduit
+         monad-logger optparse-applicative path QuickCheck resourcet retry
+         temporary text transformers
        ];
        doHaddock = false;
        jailbreak = true;
@@ -213390,8 +213991,8 @@ self: {
        pname = "stack";
        version = "1.1.2";
        sha256 = "fc836b24fdeac54244fc79b6775d5edee146b7e552ad8e69596c7cc2f2b10625";
-       revision = "4";
-       editedCabalFile = "7460e2f3e7ca1bf3841b855d6e0d33106b4993de271687b41aad153a34bcd00d";
+       revision = "5";
+       editedCabalFile = "ae5ee2b2bf908224580455dd2ba16b1814fbf611465e9b949dcd99e78ec6722d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -213417,12 +214018,10 @@ self: {
          optparse-applicative optparse-simple path path-io text transformers
        ];
        testHaskellDepends = [
-         async attoparsec base bytestring Cabal conduit conduit-extra
-         containers cryptohash directory exceptions filepath hspec
-         http-conduit monad-logger path path-io process QuickCheck resourcet
-         retry temporary text transformers unix-compat
+         attoparsec base Cabal conduit conduit-extra containers cryptohash
+         directory exceptions hspec http-conduit monad-logger path path-io
+         QuickCheck resourcet retry temporary text transformers
        ];
-       jailbreak = true;
        doCheck = false;
        preCheck = "export HOME=$TMPDIR";
        postInstall = ''
@@ -215977,8 +216576,6 @@ self: {
        pname = "storable-record";
        version = "0.0.3.1";
        sha256 = "74e5ceee49e0b7625d13759597d21e714843406b8b80e9168a0bb1199ffdadba";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base transformers utility-ht ];
        homepage = "http://code.haskell.org/~thielema/storable-record/";
        description = "Elegant definition of Storable instances for records";
@@ -216047,22 +216644,14 @@ self: {
      }) {};
 
   "storablevector-streamfusion" = callPackage
-    ({ mkDerivation, base, binary, bytestring, old-time, storablevector
-     , stream-fusion, utility-ht
-     }:
+    ({ mkDerivation, base, storablevector, stream-fusion, utility-ht }:
      mkDerivation {
        pname = "storablevector-streamfusion";
        version = "0.0";
        sha256 = "d52cd96003f494733840cba6e0f83fd2a5900ceaa5e180b38a48b800f254f6e1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base storablevector stream-fusion utility-ht
        ];
-       executableHaskellDepends = [
-         base binary bytestring old-time stream-fusion
-       ];
-       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Conversion between storablevector and stream-fusion lists with fusion";
        license = stdenv.lib.licenses.bsd3;
@@ -216180,8 +216769,8 @@ self: {
      }:
      mkDerivation {
        pname = "stratux";
-       version = "0.0.5";
-       sha256 = "ff2386fdbd47ad6bfbd56e970d551ae12277beeacb870432997cd89685263994";
+       version = "0.0.7";
+       sha256 = "5c63f47454c179667ec894234cc64fbceda6831f91e6fcfb0a99847988f8f8bb";
        libraryHaskellDepends = [
          base stratux-http stratux-types stratux-websockets
        ];
@@ -216197,13 +216786,14 @@ self: {
   "stratux-http" = callPackage
     ({ mkDerivation, aeson, base, directory, doctest, either, filepath
      , HTTP, network-uri, QuickCheck, stratux-types, template-haskell
+     , utf8-string
      }:
      mkDerivation {
        pname = "stratux-http";
-       version = "0.0.5";
-       sha256 = "5d9e9cac0854cb65e12136ac5aee32c77e659a855e9d0f0c513509479ea84901";
+       version = "0.0.7";
+       sha256 = "273ac4ad4f62a68ebe7b3e9b933747d4fae6db84b985851436f38a4cdeb59764";
        libraryHaskellDepends = [
-         aeson base either HTTP network-uri stratux-types
+         aeson base either HTTP network-uri stratux-types utf8-string
        ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -216215,14 +216805,15 @@ self: {
 
   "stratux-types" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
-     , filepath, lens, QuickCheck, scientific, template-haskell, time
+     , filepath, lens, QuickCheck, scientific, template-haskell, text
+     , time
      }:
      mkDerivation {
        pname = "stratux-types";
-       version = "0.0.5";
-       sha256 = "a710cb04c9b5e471ba3350c18ab98bf4a2a50a047c6c5e9c5096d45adf8e6266";
+       version = "0.0.7";
+       sha256 = "81fe1f2620cb8ac112045b4b22c2f897cce9b21ad63463f2e4310729b2784c75";
        libraryHaskellDepends = [
-         aeson base bytestring lens scientific time
+         aeson base bytestring lens scientific text time
        ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -216240,8 +216831,8 @@ self: {
      }:
      mkDerivation {
        pname = "stratux-websockets";
-       version = "0.0.4";
-       sha256 = "1b3e73f423aa4415607a59a31b3cdb1c512475b3db2f0b0a99d4b18f31e89516";
+       version = "0.0.7";
+       sha256 = "61d622b976902215e0405c3183c71ed25fc07ec66294b4f58234af235c55b94e";
        libraryHaskellDepends = [
          aeson base either network stratux-types text transformers
          websockets
@@ -216291,8 +216882,6 @@ self: {
        pname = "stream-monad";
        version = "0.4.0.2";
        sha256 = "86cd5770f903184b47113c42978cc409a483a5bdd2619c9e11f5a2339491210c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base logict ];
        jailbreak = true;
        homepage = "http://github.com/sebfisch/stream-monad";
@@ -216849,8 +217438,6 @@ self: {
        pname = "streaming-png";
        version = "0.1.0.0";
        sha256 = "ecb3509c29481d7deb3b65c976cc08fb9a859cff9f52ad48c16402d9439420ca";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal exceptions JuicyPixels mmorph mtl resourcet
          streaming streaming-bytestring streaming-commons transformers
@@ -218052,7 +218639,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stylish-haskell" = callPackage
+  "stylish-haskell_0_5_16_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
      , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
      , test-framework, test-framework-hunit, yaml
@@ -218079,6 +218666,36 @@ self: {
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "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.5.17.0";
+       sha256 = "374ad1e8206ae9b41b94b95fef55ad8d439c006fa650e6315ef04eca38e53b78";
+       isLibrary = true;
+       isExecutable = 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;
      }) {};
 
   "stylized" = callPackage
@@ -218473,8 +219090,6 @@ self: {
        pname = "supercollider-ht";
        version = "0.3";
        sha256 = "3cceb4e622bf1d6d7887cbefcd8d68e277c0d638de522276d4aa09db1cc316ed";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base hosc hsc3 opensoundcontrol-ht process random transformers
        ];
@@ -218747,16 +219362,16 @@ self: {
      }) {};
 
   "svgcairo" = callPackage
-    ({ mkDerivation, base, cairo, glib, gtk2hs-buildtools, librsvg, mtl
-     , text
+    ({ mkDerivation, base, Cabal, cairo, glib, gtk2hs-buildtools
+     , librsvg, mtl, text
      }:
      mkDerivation {
        pname = "svgcairo";
        version = "0.13.1.0";
        sha256 = "055adbb80d21091be3703215f1d210f5b40c762adc8450a45a9a39bdc20315a5";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base cairo glib mtl text ];
        libraryPkgconfigDepends = [ librsvg ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the libsvg-cairo library";
        license = stdenv.lib.licenses.bsd3;
@@ -219291,6 +219906,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "symengine" = callPackage
+    ({ mkDerivation, base, gmp, gmpxx, symengine, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "symengine";
+       version = "0.1.2.0";
+       sha256 = "0a59f76a924686ae84b1873c8783eb80f6e4092c90f3c971340053c1e6ca82f4";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       testSystemDepends = [ gmp gmpxx symengine ];
+       doCheck = false;
+       homepage = "http://github.com/symengine/symengine.hs#readme";
+       description = "SymEngine symbolic mathematics engine for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;};
+
   "symengine-hs" = callPackage
     ({ mkDerivation, base, gmp, gmpxx, symengine }:
      mkDerivation {
@@ -219599,23 +220231,19 @@ self: {
 
   "synthesizer" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, event-list, filepath, gnuplot, non-negative
-     , numeric-prelude, numeric-quest, old-time, process, QuickCheck
-     , random, sox, storable-record, storablevector, transformers
-     , utility-ht
+     , event-list, filepath, gnuplot, non-negative, numeric-prelude
+     , numeric-quest, process, QuickCheck, random, sox, storable-record
+     , storablevector, transformers, utility-ht
      }:
      mkDerivation {
        pname = "synthesizer";
        version = "0.2.0.1";
        sha256 = "6dfc0790c370fe8743052ee4ead7eb341d8ac44b126cc7911241a01e0c38b9d8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
        ];
-       executableHaskellDepends = [ directory old-time ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell";
@@ -219633,8 +220261,6 @@ self: {
        pname = "synthesizer-alsa";
        version = "0.5.0.2";
        sha256 = "c3db1a0d422a7348b4dbbae321faba688b564460b9901bd2f85de2dc28b4904c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          alsa-core alsa-pcm alsa-seq base event-list midi midi-alsa
          non-negative numeric-prelude old-time random sox storablevector
@@ -219686,8 +220312,6 @@ self: {
        pname = "synthesizer-dimensional";
        version = "0.7.0.2";
        sha256 = "ebef455e1c0e188b55cbb15f5d88f933303b184ab1aae2b62016e8773fb572f8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring event-list non-negative numeric-prelude random sox
          storable-record storablevector synthesizer-core transformers
@@ -219727,8 +220351,6 @@ self: {
        pname = "synthesizer-inference";
        version = "0.2";
        sha256 = "2ba794a3c1331a8f5c6e7927c6a4f06ea389d1692d1bac4cdf14e63d4e6b501e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base event-list non-negative numeric-prelude random
          synthesizer-core transformers UniqueLogicNP utility-ht
@@ -219751,8 +220373,6 @@ self: {
        pname = "synthesizer-llvm";
        version = "0.7.0.1";
        sha256 = "626e02e30dcb6e197dc01265d3a7637057623af53e9f4d25b66158e478d3bf12";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers event-list filepath llvm-extra llvm-tf midi
          non-empty non-negative numeric-prelude random sox storable-record
@@ -219781,8 +220401,6 @@ self: {
        pname = "synthesizer-midi";
        version = "0.6.0.2";
        sha256 = "5dc040c8315bafb042e3efaec5caea4c10a97eef12527a61e6b75b81e0934e77";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          array base containers data-accessor data-accessor-transformers
          deepseq event-list midi non-negative numeric-prelude sox
@@ -220296,18 +220914,11 @@ self: {
        pname = "system-uuid";
        version = "2.1.1";
        sha256 = "8b911863eab0109f0030282af3b94fa233988de78ef2050bd30ebbfeb02a8089";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers murmur-hash parsec
          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";
        license = stdenv.lib.licenses.bsd3;
@@ -220660,13 +221271,10 @@ self: {
        pname = "tagchup";
        version = "0.4.0.5";
        sha256 = "c0c12eeec562a7769deb165c7edae8a8dbc0087d5788655b72864df122a0fa35";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers data-accessor explicit-exception
          transformers utility-ht xml-basic
        ];
-       executableHaskellDepends = [ base xml-basic ];
        testHaskellDepends = [ base xml-basic ];
        homepage = "http://code.haskell.org/~thielema/tagchup/";
        description = "alternative package for processing of tag soups";
@@ -220822,11 +221430,12 @@ self: {
        pname = "tagged-transformer";
        version = "0.8";
        sha256 = "c7fef845dfdec30c520d8c2e827c61850a8922ca086cadf17803aec77e765f8e";
+       revision = "1";
+       editedCabalFile = "8fe26562f4cde452d9db30a1bb466be684a82ee3fb43ed7632ecb732b0d8011a";
        libraryHaskellDepends = [
          base comonad contravariant distributive exceptions mtl reflection
          semigroupoids tagged
        ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/tagged-transformer";
        description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments";
        license = stdenv.lib.licenses.bsd3;
@@ -220954,8 +221563,6 @@ self: {
        pname = "tagsoup";
        version = "0.13.3";
        sha256 = "32a862118d7836e9beb25fe4b317472fab6e1d41daefa86067231b328cff668d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "http://community.haskell.org/~ndm/tagsoup/";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
@@ -220969,8 +221576,6 @@ self: {
        pname = "tagsoup";
        version = "0.13.5";
        sha256 = "9997aec735e54657ab03c34ac5ca95110703cb07eed6fa3989ad22832853bebe";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "http://community.haskell.org/~ndm/tagsoup/";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
@@ -220984,8 +221589,6 @@ self: {
        pname = "tagsoup";
        version = "0.13.6";
        sha256 = "a8358c8c09b73912c4e832248d7543e4fddaf4ac9305f5f27d0854b9410d6ac8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "http://community.haskell.org/~ndm/tagsoup/";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
@@ -220999,8 +221602,6 @@ self: {
        pname = "tagsoup";
        version = "0.13.7";
        sha256 = "6fd72e0d42e686f2af3bfcff30a1abe673530f86dfebf8cf2b02fd1667366d37";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "https://github.com/ndmitchell/tagsoup#readme";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
@@ -221014,8 +221615,6 @@ self: {
        pname = "tagsoup";
        version = "0.13.8";
        sha256 = "cff171695c5c559565eff8296bd44442ffff6bc8972e81f3a6c27eb1f13e1c2e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "https://github.com/ndmitchell/tagsoup#readme";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
@@ -221029,8 +221628,6 @@ self: {
        pname = "tagsoup";
        version = "0.13.9";
        sha256 = "9369bacfa156a96985c7b06180b4aacf73635ae356e617eb9f72af9757569721";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "https://github.com/ndmitchell/tagsoup#readme";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
@@ -221044,14 +221641,25 @@ self: {
        pname = "tagsoup";
        version = "0.13.10";
        sha256 = "ac838eeed18118423220716855c2bfd71dcc4a7a455893d8c4ad627828f57d58";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "https://github.com/ndmitchell/tagsoup#readme";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tagsoup_0_14" = callPackage
+    ({ mkDerivation, base, bytestring, containers, text }:
+     mkDerivation {
+       pname = "tagsoup";
+       version = "0.14";
+       sha256 = "90822d8bb9d3a40d070a1f282fb2f7f6beec13f01f958f716de9d005e2e9ea1e";
+       libraryHaskellDepends = [ base bytestring containers text ];
+       homepage = "https://github.com/ndmitchell/tagsoup#readme";
+       description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tagsoup-ht" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , explicit-exception, old-time, tagsoup, transformers, utility-ht
@@ -221181,21 +221789,14 @@ self: {
      }) {};
 
   "takusen-oracle" = callPackage
-    ({ mkDerivation, base, clntsh, mtl, old-time, QuickCheck, random
-     , sqlplus, time
-     }:
+    ({ mkDerivation, base, clntsh, mtl, old-time, sqlplus, time }:
      mkDerivation {
        pname = "takusen-oracle";
        version = "0.9.3";
        sha256 = "4d290f84c6f35cc447df478c6afddb38633ed2442c58f4b1e1a3254036fba7b4";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
        librarySystemDepends = [ clntsh ];
        libraryToolDepends = [ sqlplus ];
-       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;
@@ -221330,13 +221931,13 @@ self: {
      }) {};
 
   "tar_0_4_1_0" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, time }:
+    ({ mkDerivation, base, bytestring, directory, filepath, old-time }:
      mkDerivation {
        pname = "tar";
        version = "0.4.1.0";
        sha256 = "7521310c34bb3b457e529a5f2037ac84f62420d6283f9ce8d22e685bd82d0715";
        libraryHaskellDepends = [
-         base bytestring directory filepath time
+         base bytestring directory filepath old-time
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
@@ -221378,7 +221979,7 @@ self: {
        revision = "1";
        editedCabalFile = "fcb87aaed6a22fef908468f008f39507fa1d22282c23dfb6ddb6837b794c2a30";
        libraryHaskellDepends = [
-         array base bytestring directory filepath time
+         array base bytestring directory filepath old-time
        ];
        testHaskellDepends = [
          array base bytestring bytestring-handle directory filepath old-time
@@ -223342,8 +223943,6 @@ self: {
        sha256 = "5915bebf20a36f524241d1b85c45be2f767a9f9caeddc06d96e3ebab5ae1d68c";
        revision = "1";
        editedCabalFile = "b637576c9a1a313fa1274485a9af7745b21ff4ff7814feba6a2f4a0ab0b87f4a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers hostname old-locale
          random regex-posix time xml
@@ -223363,8 +223962,6 @@ self: {
        pname = "test-framework";
        version = "0.8.1.0";
        sha256 = "15ceb6f4ba48a45c4c8938d4eaa7cc431f41783dd00fc5a8bc3276c0db9247cb";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers hostname old-locale
          random regex-posix time xml
@@ -223386,8 +223983,6 @@ self: {
        sha256 = "7883626a5aebb1df327bf26dbd382208946250a79f9cc3bf9a9eb0b0767bb273";
        revision = "1";
        editedCabalFile = "a6d9dbedbb574271e85c6e5ef9a9f935d87501a9b99b473bf306e3dcd36bdd9e";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers hostname old-locale
          random regex-posix time xml
@@ -223778,21 +224373,16 @@ self: {
      }) {};
 
   "testbench" = callPackage
-    ({ mkDerivation, base, boxes, bytestring, containers, criterion
-     , deepseq, HUnit, statistics, transformers
+    ({ mkDerivation, base, boxes, criterion, deepseq, HUnit, statistics
+     , transformers
      }:
      mkDerivation {
        pname = "testbench";
        version = "0.1.0.0";
        sha256 = "66592406ff6e1a03d3ae994560e0bf04e500398fd0a9c9be6bca34a3b86f3e83";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base boxes criterion deepseq HUnit statistics transformers
        ];
-       executableHaskellDepends = [
-         base bytestring containers criterion HUnit
-       ];
        description = "Create tests and benchmarks together";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -223950,8 +224540,6 @@ self: {
        pname = "texmath";
        version = "0.8";
        sha256 = "eb9d558a67ac429055ebf70484b36a58ddbc9df1be59dfbf13146247524911c8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
@@ -223967,19 +224555,16 @@ self: {
 
   "texmath_0_8_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.0.1";
        sha256 = "9625e7106c76199f1228777569a49900bf300e1f4880c69c22986358d5d5c8cc";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -223992,19 +224577,16 @@ self: {
 
   "texmath_0_8_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.0.2";
        sha256 = "47b9c3fdceed63c5d63987db7e511a38ea8ddf8591786ef56efea734a3c31f86";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -224017,19 +224599,16 @@ self: {
 
   "texmath_0_8_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.1";
        sha256 = "d8e043a7d78e16f4775173d8642d8ce0e5735163b3f22b5f2a36dc452759604c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -224043,19 +224622,16 @@ self: {
 
   "texmath_0_8_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.2";
        sha256 = "f9b7dd4ca3f8b1e868f0cd22db8432b85d26553464f20b60ccfb311215001db7";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -224069,19 +224645,16 @@ self: {
 
   "texmath_0_8_2_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.2.2";
        sha256 = "a1f492d8bfdd9a28f9bbb546fd335e285b7da15ab1e7ac0cc0c96a8e42cec2f3";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -224095,19 +224668,16 @@ self: {
 
   "texmath_0_8_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.3";
        sha256 = "553d4e8785caf97370aa8d1b626c0e310fe0a1dec15abf2b146dc2ee219e1d34";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -224121,19 +224691,16 @@ self: {
 
   "texmath_0_8_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.4";
        sha256 = "318b8d640e6badd1ccc5b4cbb9c3c7186103959ee5d2a778267939629e0c0295";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -224147,19 +224714,16 @@ self: {
 
   "texmath_0_8_4_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.4.1";
        sha256 = "45a9c779775e4e6effd7606bef5c179524b4fb88dca952c2decd3fa82e6c94f5";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -224172,19 +224736,16 @@ self: {
 
   "texmath_0_8_4_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.4.2";
        sha256 = "ee18da2835eba8ec388d15b4fa08cb72d789bb345be3abc4eac1713f0052b17d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -224197,19 +224758,16 @@ self: {
 
   "texmath_0_8_5" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.5";
        sha256 = "6a1897f0ea4f24246425d12e3ed80a790a1677160199b2ea7ecfab787cc61db5";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -224222,19 +224780,16 @@ self: {
 
   "texmath_0_8_5_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.5.1";
        sha256 = "dc31828d57eefdc9292e8008c6b22543b2b75d3d51fefdeb29ba318fc8e2aac8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -224247,19 +224802,16 @@ self: {
 
   "texmath_0_8_6_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.6.1";
        sha256 = "2c3b7650c43c6b43275abffb1769a1fd5948d1a77938b43702c54c2ac1a18de1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -224272,19 +224824,16 @@ self: {
 
   "texmath_0_8_6_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.6.2";
        sha256 = "a9aabd507733c80ae86bcaa7129cf43056904047e27571c65606f158fe0f3b05";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -224297,19 +224846,16 @@ self: {
 
   "texmath" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, network-uri, pandoc-types, parsec, process, split, syb
-     , temporary, text, utf8-string, xml
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
        version = "0.8.6.3";
        sha256 = "74f600a77a5ce2d88aa1aa81b0bea5f5e79da6b64b51e50656f7bbf27debc22b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -224588,14 +225134,16 @@ self: {
      }) {};
 
   "text-conversions" = callPackage
-    ({ mkDerivation, base, bytestring, errors, hspec, hspec-discover
-     , text
+    ({ mkDerivation, base, base16-bytestring, base64-bytestring
+     , bytestring, errors, hspec, hspec-discover, text
      }:
      mkDerivation {
        pname = "text-conversions";
-       version = "0.2.0";
-       sha256 = "65735a9ad91cf3f7f17f6c91b963018665d356f27e08089e6b18934b45fe49c4";
-       libraryHaskellDepends = [ base bytestring errors text ];
+       version = "0.3.0";
+       sha256 = "1756be2f6b515fea9e00b383c00d1ee851f8b25ddbc2901dd6be27d9b6292c21";
+       libraryHaskellDepends = [
+         base base16-bytestring base64-bytestring bytestring errors text
+       ];
        testHaskellDepends = [ base bytestring hspec hspec-discover text ];
        homepage = "https://github.com/cjdev/text-conversions#readme";
        description = "Safe conversions between textual types";
@@ -224750,6 +225298,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-ldap_0_1_1_7" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
+     , containers, dlist, QuickCheck, quickcheck-simple, random
+     , semigroups, transformers
+     }:
+     mkDerivation {
+       pname = "text-ldap";
+       version = "0.1.1.7";
+       sha256 = "905e853c518595e428f0a666caa336669e37289b43c32cd32dbe9df7b4370e50";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring bytestring containers dlist
+         semigroups transformers
+       ];
+       executableHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base bytestring QuickCheck quickcheck-simple random semigroups
+       ];
+       description = "Parser and Printer for LDAP text data stream";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-locale-encoding" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-handle, text }:
      mkDerivation {
@@ -225374,8 +225946,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "th-data-compat";
-       version = "0.0.1.0";
-       sha256 = "2788c2425a4b9d945ae69469e60fd4b977b43ba8a0508382a21a40659337dbee";
+       version = "0.0.2.1";
+       sha256 = "e516e7d347e5f9a92b9a092450695efae67039aae5e1d8383b5270faa79208d3";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility for data definition template of TH";
        license = stdenv.lib.licenses.bsd3;
@@ -225938,6 +226510,18 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "th-reify-compat" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "th-reify-compat";
+       version = "0.0.1.0";
+       sha256 = "adb18ee4ab0df0008c7a4b3978d0eaf7a8821c076edb0c32012dfbf69ffa3b45";
+       libraryHaskellDepends = [ base template-haskell ];
+       homepage = "http://github.com/khibino/haskell-th-reify-compat/";
+       description = "Compatibility for the result type of TH reify";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "th-reify-many_0_1_2" = callPackage
     ({ mkDerivation, base, containers, mtl, safe, template-haskell
      , th-expand-syns
@@ -226397,7 +226981,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "threads" = callPackage
+  "threads_0_5_1_3" = callPackage
     ({ mkDerivation, base, concurrent-extra, HUnit, stm, test-framework
      , test-framework-hunit
      }:
@@ -226414,6 +226998,24 @@ 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" = callPackage
+    ({ mkDerivation, base, concurrent-extra, HUnit, stm, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "threads";
+       version = "0.5.1.4";
+       sha256 = "d3b805b743cc7c0bce2a9b142f45bb1ad07e7bd6c2bd97a5fc442c007276febd";
+       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-pool" = callPackage
@@ -226497,8 +227099,6 @@ self: {
        pname = "threepenny-gui";
        version = "0.6.0.6";
        sha256 = "f275e22d52d419f97feacbc0dbd4a99b32992910bf6427a0a1798b6146a2f94d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson async base bytestring containers data-default deepseq
          filepath hashable network-uri safe snap-core snap-server stm
@@ -227085,12 +227685,12 @@ self: {
      }) {};
 
   "time-locale-compat_0_1_0_1" = callPackage
-    ({ mkDerivation, base, time }:
+    ({ mkDerivation, base, old-locale, time }:
      mkDerivation {
        pname = "time-locale-compat";
        version = "0.1.0.1";
        sha256 = "ac24cdf39f86a6520bc942cdf437bed8e21e31b6ca8d433285c7b3cdc808ad60";
-       libraryHaskellDepends = [ base time ];
+       libraryHaskellDepends = [ base old-locale time ];
        homepage = "http://twitter.com/khibino/";
        description = "Compatibility of TimeLocale between old-locale and time-1.5";
        license = stdenv.lib.licenses.bsd3;
@@ -227098,12 +227698,12 @@ self: {
      }) {};
 
   "time-locale-compat_0_1_1_0" = callPackage
-    ({ mkDerivation, base, time }:
+    ({ mkDerivation, base, old-locale, time }:
      mkDerivation {
        pname = "time-locale-compat";
        version = "0.1.1.0";
        sha256 = "25a04d0099482c2f367fb80e557ab59ba09c99aec6061c2b52733178420cb455";
-       libraryHaskellDepends = [ base time ];
+       libraryHaskellDepends = [ base old-locale time ];
        homepage = "http://twitter.com/khibino/";
        description = "Compatibility of TimeLocale between old-locale and time-1.5";
        license = stdenv.lib.licenses.bsd3;
@@ -227111,17 +227711,30 @@ self: {
      }) {};
 
   "time-locale-compat" = callPackage
-    ({ mkDerivation, base, time }:
+    ({ mkDerivation, base, old-locale, time }:
      mkDerivation {
        pname = "time-locale-compat";
        version = "0.1.1.1";
        sha256 = "ced6a61e81671f266cc3daf7eee798e5355df8d82163e7e44dc0a51a47c50670";
-       libraryHaskellDepends = [ base time ];
+       libraryHaskellDepends = [ base old-locale time ];
        homepage = "https://github.com/khibino/haskell-time-locale-compat";
        description = "Compatibility of TimeLocale between old-locale and time-1.5";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "time-locale-compat_0_1_1_2" = callPackage
+    ({ mkDerivation, base, old-locale, time }:
+     mkDerivation {
+       pname = "time-locale-compat";
+       version = "0.1.1.2";
+       sha256 = "5ea13fb98403c14524007439c06bc0ea4b5f5d8b7b0c63db3be11063546f089d";
+       libraryHaskellDepends = [ base old-locale time ];
+       homepage = "https://github.com/khibino/haskell-time-locale-compat";
+       description = "Compatibility of TimeLocale between old-locale and time-1.5";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "time-out" = callPackage
     ({ mkDerivation, base, data-default-class, exceptions
      , time-interval, time-units, transformers
@@ -227244,8 +227857,6 @@ self: {
        pname = "time-w3c";
        version = "0.1.0.1";
        sha256 = "6fb9bd6dcaf5d95093d7d24b6d37edfae71c22dab8158b650b7ba2b019dc168a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base convertible parsec time ];
        jailbreak = true;
        homepage = "http://cielonegro.org/W3CDateTime.html";
@@ -227352,16 +227963,10 @@ self: {
        pname = "timemap";
        version = "0.0.2";
        sha256 = "089ec15bb8c6a4da17ef7619fa1b42dc4288ce630a261270f2ac6752a8387be4";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
@@ -227381,16 +227986,10 @@ self: {
        pname = "timemap";
        version = "0.0.3";
        sha256 = "4a88aa0f9c7f13390bf842fd93d0d22cbf92aed0f7a7c6cec06eca38a45ed89f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
@@ -227400,6 +227999,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timemap_0_0_4" = callPackage
+    ({ mkDerivation, base, containers, focus, hashable, list-t
+     , QuickCheck, quickcheck-instances, stm, stm-containers, tasty
+     , tasty-hunit, tasty-quickcheck, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "timemap";
+       version = "0.0.4";
+       sha256 = "6e7c85c727fd9152db635c33ddb72cab5dca9ae240d41fcb653883f1bcd1d9e3";
+       libraryHaskellDepends = [
+         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
+         tasty-quickcheck time unordered-containers
+       ];
+       description = "A mutable hashmap, implicitly indexed by UTCTime";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "timeout" = callPackage
     ({ mkDerivation, base, exceptions, mtl, QuickCheck, tasty
      , tasty-quickcheck, time
@@ -227848,28 +228470,26 @@ self: {
      }) {};
 
   "tkyprof" = callPackage
-    ({ 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, 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 {
        pname = "tkyprof";
        version = "0.2.2.2";
        sha256 = "ea40c354d37843757b76152cbde1d9612000593fae4a515ad2d2cbf5940adef7";
-       isLibrary = true;
+       isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         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
+         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
        ];
-       jailbreak = true;
        homepage = "https://github.com/maoe/tkyprof";
        description = "A web-based visualizer for GHC Profiling Reports";
        license = stdenv.lib.licenses.bsd3;
@@ -228294,8 +228914,6 @@ self: {
        pname = "tls-extra";
        version = "0.6.6";
        sha256 = "dbf782edbb82321b6484105518fe8e2ff6d51992b20a545a5d3bd380ed901a4c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring certificate cipher-aes cipher-rc4 crypto-pubkey
          crypto-random cryptohash mtl network pem time tls vector
@@ -228387,12 +229005,12 @@ self: {
      }) {};
 
   "to-string-instances" = callPackage
-    ({ mkDerivation, to-string-class }:
+    ({ mkDerivation, bytestring, pretty, text, to-string-class }:
      mkDerivation {
        pname = "to-string-instances";
        version = "0.2";
        sha256 = "89f68da09117a2c88428ada452650b1bcf9c45dc542f8d6480ef3f05f5c0aac0";
-       libraryHaskellDepends = [ to-string-class ];
+       libraryHaskellDepends = [ bytestring pretty text to-string-class ];
        description = "Instances for the ToString class";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
@@ -228505,8 +229123,7 @@ self: {
      }) {};
 
   "toktok" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, filepath
-     , gf, haskell98, HUnit, iconv, progression, QuickCheck
+    ({ mkDerivation, base, bytestring, containers, gf, haskell98, iconv
      }:
      mkDerivation {
        pname = "toktok";
@@ -228515,10 +229132,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers haskell98 ];
-       executableHaskellDepends = [
-         base bytestring criterion filepath gf HUnit iconv progression
-         QuickCheck
-       ];
+       executableHaskellDepends = [ base bytestring gf iconv ];
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -228742,11 +229356,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
-     , 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
+     , 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
      }:
      mkDerivation {
        pname = "toysolver";
@@ -228766,7 +229380,7 @@ self: {
        executableHaskellDepends = [
          array base bytestring containers data-default-class filepath
          haskeline mtl mwc-random OptDir parse-dimacs parsec process
-         pseudo-boolean split time transformers transformers-compat
+         pseudo-boolean time transformers transformers-compat
          unbounded-delays vector vector-space
        ];
        testHaskellDepends = [
@@ -228872,8 +229486,6 @@ self: {
        pname = "tracetree";
        version = "0.1.0.1";
        sha256 = "12d0eb7923a905fff4b92c7f4f187a4715ba95883ac1df5e0a7efb59427f5115";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bifunctors containers json mtl transformers
        ];
@@ -229313,8 +229925,6 @@ self: {
        pname = "translatable-intset";
        version = "0.1";
        sha256 = "7556dd009fa229c94ad47dfc7ef86b1e5e5bf76feee8db9b704419820b0d685f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base fingertree ];
        jailbreak = true;
        description = "Integer sets with a constant time translate operation";
@@ -229531,13 +230141,7 @@ self: {
        pname = "treeviz";
        version = "2.0.3";
        sha256 = "dab7dd9935cde4259dab1604b732292a0076e1e8a277476abf822ea2819f26a9";
-       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;
@@ -229932,21 +230536,16 @@ self: {
      }) {};
 
   "tsparse" = callPackage
-    ({ mkDerivation, base, Decimal, parsec, pretty, process, random
-     , split, time
+    ({ mkDerivation, base, Decimal, parsec, pretty, process, split
+     , time
      }:
      mkDerivation {
        pname = "tsparse";
        version = "0.4.0.0";
        sha256 = "511b4bca012747f7fc97a78f620ea3d9dca4e1a6d7a0b2fb17d8f010f7a5bb68";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base Decimal parsec pretty process split time
        ];
-       executableHaskellDepends = [
-         base Decimal parsec pretty process random split time
-       ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/tsparse";
        description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements";
@@ -229986,16 +230585,19 @@ self: {
      }) {};
 
   "ttask" = callPackage
-    ({ mkDerivation, base, directory, extra, optparse-declarative, safe
-     , time, transformers
+    ({ mkDerivation, base, directory, either, extra, filepath, lens
+     , optparse-declarative, safe, strict, time, transformers
      }:
      mkDerivation {
        pname = "ttask";
-       version = "0.0.0.2";
-       sha256 = "e68f8ca2858895b46926febd356f0376cff004ed422950276d48b1cdcc8a1227";
+       version = "0.0.1.0";
+       sha256 = "ff154926e93531ee69d23d9f611cad82be1fe02bc52e64c057d92a363e16707c";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base directory extra safe time ];
+       libraryHaskellDepends = [
+         base directory either extra filepath lens safe strict time
+         transformers
+       ];
        executableHaskellDepends = [
          base optparse-declarative time transformers
        ];
@@ -231052,15 +231654,12 @@ self: {
        pname = "twitter-conduit";
        version = "0.1.1.1";
        sha256 = "904b9413e8f729c52f16f6251c5edd641a938f5740392cc0e7a53ab24ce0e593";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring conduit
          conduit-extra containers data-default http-client http-conduit
          http-types lens lens-aeson resourcet template-haskell text time
          transformers twitter-types twitter-types-lens
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring
          case-insensitive conduit conduit-extra containers data-default
@@ -231087,15 +231686,12 @@ self: {
        pname = "twitter-conduit";
        version = "0.1.2";
        sha256 = "e8c3c2f2ae2042d5fd88f39ff643b8693bb52b008a3c49dbc7673a604e0e95e8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring conduit
          conduit-extra containers data-default http-client http-conduit
          http-types lens lens-aeson resourcet template-haskell text time
          transformers twitter-types twitter-types-lens
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring
          case-insensitive conduit conduit-extra containers data-default
@@ -231122,15 +231718,12 @@ self: {
        pname = "twitter-conduit";
        version = "0.1.3";
        sha256 = "f880730c8e0219db7e24b58db4c21a1a12bd2f5a0cb28fbc72372cec4f139a02";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring conduit
          conduit-extra containers data-default http-client http-conduit
          http-types lens lens-aeson resourcet template-haskell text time
          transformers twitter-types twitter-types-lens
        ];
-       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring
          case-insensitive conduit conduit-extra containers data-default
@@ -231696,11 +232289,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "type-fun";
-       version = "0.1.0";
-       sha256 = "8ad17ecf12c7034eefe1e22d0cff29a4c52cf9b326dd1ccb2b87d18a6240c101";
+       version = "0.1.1";
+       sha256 = "df5ec7428a101235df46c0b819a9ab3562d1d27991cc3b04303643952c555da1";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       jailbreak = true;
        homepage = "https://github.com/s9gf4ult/type-fun";
        description = "Collection of widely reimplemented type families";
        license = stdenv.lib.licenses.bsd3;
@@ -232451,16 +233043,17 @@ self: {
   "tz_0_1_1_0" = callPackage
     ({ mkDerivation, base, binary, bindings-posix, bytestring
      , containers, data-default, deepseq, HUnit, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, time, tzdata, unix, vector
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-th, time, tzdata, unix
+     , vector
      }:
      mkDerivation {
        pname = "tz";
        version = "0.1.1.0";
        sha256 = "a9fbbf3979e8a46cddbbaf4f1c1d58c3d8ceefb664a628b74420c3d4d1cdc177";
        libraryHaskellDepends = [
-         base binary bytestring containers data-default deepseq time tzdata
-         vector
+         base binary bytestring containers data-default deepseq
+         template-haskell time tzdata vector
        ];
        testHaskellDepends = [
          base bindings-posix HUnit QuickCheck test-framework
@@ -232631,12 +233224,12 @@ self: {
      }) {};
 
   "uconv" = callPackage
-    ({ mkDerivation, base, bytestring, icu }:
+    ({ mkDerivation, base, icu }:
      mkDerivation {
        pname = "uconv";
        version = "0.0.3";
        sha256 = "7b9973c5dcf5cab35255b00fe46312e6d8793a3fb76194d5809e4e9208c7e16c";
-       libraryHaskellDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base ];
        librarySystemDepends = [ icu ];
        description = "String encoding conversion with ICU";
        license = stdenv.lib.licenses.bsd3;
@@ -232651,8 +233244,6 @@ self: {
        pname = "udbus";
        version = "0.2.1";
        sha256 = "d325b0c1f2a7b1eabde17d85734175f622c6597e9dfc40704894da94a09ef328";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring cereal containers ghc-prim mtl network unix
          utf8-string
@@ -232669,8 +233260,6 @@ self: {
        pname = "udbus-model";
        version = "0.2.1";
        sha256 = "517ea7b540848f782f3dd6890a5cf41747eca445952649827c2addd3c11f3f76";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring udbus xml ];
        homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Model API for udbus introspection and definitions";
@@ -232690,18 +233279,13 @@ self: {
      }) {};
 
   "udev" = callPackage
-    ({ mkDerivation, base, bytestring, libudev, posix-paths, select
-     , unix
-     }:
+    ({ mkDerivation, base, bytestring, libudev, posix-paths, unix }:
      mkDerivation {
        pname = "udev";
        version = "0.1.0.0";
        sha256 = "a2bb00c7c75ff9beb1951dfec706c628f5354a6a9d58abcb5e9d6950dc29b1a8";
-       isLibrary = true;
-       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;
@@ -232884,8 +233468,6 @@ self: {
        pname = "unamb";
        version = "0.2.5";
        sha256 = "3359f05602ae61095c13f8db1df9222030b60ce83ad64faa705a387c18c58b89";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/unamb";
        description = "Unambiguous choice";
@@ -233298,8 +233880,6 @@ self: {
        pname = "unicode";
        version = "0.0";
        sha256 = "d41708f5800a83a2b7f44d10f74371625fbc50dd4a9520dd6fc53762904cc83b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers utility-ht ];
        homepage = "http://code.haskell.org/~thielema/unicode/";
@@ -233885,15 +234465,12 @@ self: {
      }) {};
 
   "unix-fcntl" = callPackage
-    ({ mkDerivation, base, foreign-var, unix }:
+    ({ mkDerivation, base, foreign-var }:
      mkDerivation {
        pname = "unix-fcntl";
        version = "0.0.0";
        sha256 = "69c1852fa11e98c99e0f61052bd642e66f2e491ffba1e0ee6d7cd5d049f832a3";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base foreign-var ];
-       executableHaskellDepends = [ base foreign-var unix ];
        jailbreak = true;
        homepage = "https://github.com/maoe/unix-fcntl";
        description = "Comprehensive bindings to fcntl(2)";
@@ -234112,7 +234689,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "unordered-containers" = callPackage
+  "unordered-containers_0_2_7_0" = callPackage
     ({ mkDerivation, base, ChasingBottoms, containers, deepseq
      , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -234129,9 +234706,10 @@ self: {
        homepage = "https://github.com/tibbe/unordered-containers";
        description = "Efficient hashing-based container types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "unordered-containers_0_2_7_1" = callPackage
+  "unordered-containers" = callPackage
     ({ mkDerivation, base, ChasingBottoms, containers, deepseq
      , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -234148,7 +234726,6 @@ self: {
        homepage = "https://github.com/tibbe/unordered-containers";
        description = "Efficient hashing-based container types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unordered-containers-rematch" = callPackage
@@ -234247,10 +234824,7 @@ self: {
        pname = "unsafely";
        version = "0.2.0.0";
        sha256 = "19341a7d3d2e4d4ae3a4a232c566edb071c895a17e5f1d1ad092b1d3fe026583";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/konn/unsafely";
        description = "Flexible access control for unsafe operations and instances";
@@ -234679,8 +235253,6 @@ self: {
        sha256 = "f6d7b0d25a86f7bbc1944914320c204e58e07960e4aba23e3ea5bfd30fb3bc84";
        revision = "1";
        editedCabalFile = "455f71a45ce8ec3646f1215bf1476828fd01bb5fc1e228a6da6657c57b5f53be";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring network-uri text utf8-string
        ];
@@ -234697,8 +235269,6 @@ self: {
        pname = "uri-encode";
        version = "1.5.0.4";
        sha256 = "f7ca380f88a3cc815cdffeb7cc714fbed4b9bd8da1a4ac3139e4ab001179f582";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring network-uri text utf8-string
        ];
@@ -234859,8 +235429,6 @@ self: {
        pname = "urlencoded";
        version = "0.4.1";
        sha256 = "91431808fc26a7a9d2d18100c93c8b0a815de519e33547e8f60da9ed66976799";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base mtl network network-uri split ];
        homepage = "https://github.com/pheaver/urlencoded";
        description = "Generate or process x-www-urlencoded data";
@@ -235000,8 +235568,6 @@ self: {
        pname = "usb-id-database";
        version = "0.4.0.9";
        sha256 = "4187f776f53c50423e1064753c0bf5446db871a6a4113ec8d970d24a5ffe26ca";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring containers
          containers-unicode-symbols parsimony
@@ -236872,17 +237438,14 @@ self: {
      }) {};
 
   "vector-algorithms_0_6_0_3" = callPackage
-    ({ mkDerivation, base, bytestring, containers, mtl, mwc-random
-     , primitive, QuickCheck, vector
+    ({ mkDerivation, base, bytestring, containers, primitive
+     , QuickCheck, vector
      }:
      mkDerivation {
        pname = "vector-algorithms";
        version = "0.6.0.3";
        sha256 = "c42eaddf416b37c7c281eadb3ce845aa628a5853e381beaa698aebe30359e4cf";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring primitive vector ];
-       executableHaskellDepends = [ base mtl mwc-random vector ];
        testHaskellDepends = [
          base bytestring containers QuickCheck vector
        ];
@@ -236894,17 +237457,14 @@ self: {
      }) {};
 
   "vector-algorithms_0_6_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, containers, mtl, mwc-random
-     , primitive, QuickCheck, vector
+    ({ mkDerivation, base, bytestring, containers, primitive
+     , QuickCheck, vector
      }:
      mkDerivation {
        pname = "vector-algorithms";
        version = "0.6.0.4";
        sha256 = "5b8922154baa62c9239ed3efed94e890eeaf7e56f89d81a8c8407550749bc025";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring primitive vector ];
-       executableHaskellDepends = [ base mtl mwc-random vector ];
        testHaskellDepends = [
          base bytestring containers QuickCheck vector
        ];
@@ -236916,8 +237476,8 @@ self: {
      }) {};
 
   "vector-algorithms_0_7" = callPackage
-    ({ mkDerivation, base, bytestring, containers, mtl, mwc-random
-     , primitive, QuickCheck, vector
+    ({ mkDerivation, base, bytestring, containers, primitive
+     , QuickCheck, vector
      }:
      mkDerivation {
        pname = "vector-algorithms";
@@ -236925,10 +237485,7 @@ self: {
        sha256 = "9dfded48c97f4ff765b18ae5acd264361e1299736111ac73895848d8f6ab56c6";
        revision = "1";
        editedCabalFile = "ba3ba4dbfe97dc45be68d13c51ba4425900b186a46cdf3eceaafb746030c1b95";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring primitive vector ];
-       executableHaskellDepends = [ base mtl mwc-random vector ];
        testHaskellDepends = [
          base bytestring containers QuickCheck vector
        ];
@@ -236940,17 +237497,14 @@ self: {
      }) {};
 
   "vector-algorithms" = callPackage
-    ({ mkDerivation, base, bytestring, containers, mtl, mwc-random
-     , primitive, QuickCheck, vector
+    ({ mkDerivation, base, bytestring, containers, primitive
+     , QuickCheck, vector
      }:
      mkDerivation {
        pname = "vector-algorithms";
        version = "0.7.0.1";
        sha256 = "ed460a41ca068f568bc2027579ab14185fbb72c7ac469b5179ae5f8a52719070";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring primitive vector ];
-       executableHaskellDepends = [ base mtl mwc-random vector ];
        testHaskellDepends = [
          base bytestring containers QuickCheck vector
        ];
@@ -237049,19 +237603,16 @@ self: {
      }) {};
 
   "vector-bytestring" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, directory
-     , ghc-prim, primitive, QuickCheck, random, vector
+    ({ mkDerivation, base, bytestring, deepseq, directory, ghc-prim
+     , primitive, QuickCheck, random, vector
      }:
      mkDerivation {
        pname = "vector-bytestring";
        version = "0.0.0.1";
        sha256 = "641eef86c91a0c742d74c1ea0f29ca69d9105379296ad622cb5f991142d53376";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim primitive vector
        ];
-       executableHaskellDepends = [ base bytestring criterion deepseq ];
        testHaskellDepends = [ base directory QuickCheck random ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/vector-bytestring";
@@ -237583,12 +238134,9 @@ self: {
        pname = "verdict-json";
        version = "0.0.0.0";
        sha256 = "7b64ab1ec3ae42db778f8adc52219a472af76ea0dd4d91d9376ad57dc9abaf4a";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base containers text unordered-containers vector verdict
        ];
-       executableHaskellDepends = [ aeson base containers verdict ];
        testHaskellDepends = [
          aeson base containers hspec unordered-containers vector verdict
        ];
@@ -237656,8 +238204,6 @@ self: {
        pname = "vhd";
        version = "0.2.2";
        sha256 = "7c678f076395f44d853f87a4538635bc83d7a10319933dec9e06b40ce409ea7c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base byteable bytestring cereal cipher-aes cryptohash directory
          filepath mmap random storable-endian text time
@@ -237746,8 +238292,8 @@ self: {
      }:
      mkDerivation {
        pname = "vimeta";
-       version = "0.2.1.0";
-       sha256 = "38cb637b241ed59a4b149f57f1b3bfcdc67c846d6d1099cd7e59a74636ad8569";
+       version = "0.2.2.0";
+       sha256 = "ce63a34e2c7fd31b2ad2a9f1e9b8c3d2c10c70e1ba5ccf2b06e8dc99770b065d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -237934,8 +238480,6 @@ self: {
        pname = "vinyl-vectors";
        version = "0.2.0";
        sha256 = "6f9b6b8772937c967ad2b51e062cab27cb94fdbfb6d5e35eaae7c396e42362d7";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring constraints data-default primitive template-haskell
          text vector vinyl
@@ -238207,14 +238751,16 @@ self: {
      }) {inherit (pkgs) vrpn;};
 
   "vte" = callPackage
-    ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, pango, vte }:
+    ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools, pango
+     , vte
+     }:
      mkDerivation {
        pname = "vte";
        version = "0.13.1.0";
        sha256 = "6dc78551c75c393f2c8b9c463539293214ee788ad73c0623adc69f10b36f4a9d";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk pango ];
        libraryPkgconfigDepends = [ vte ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
@@ -238222,14 +238768,16 @@ self: {
      }) {inherit (pkgs.gnome) vte;};
 
   "vtegtk3" = callPackage
-    ({ mkDerivation, base, glib, gtk2hs-buildtools, gtk3, pango, vte }:
+    ({ mkDerivation, base, Cabal, glib, gtk2hs-buildtools, gtk3, pango
+     , vte
+     }:
      mkDerivation {
        pname = "vtegtk3";
        version = "0.13.1.0";
        sha256 = "9da47c606db50183e1d9c19dc6626864a50c2838623836e65084951416452dfe";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk3 pango ];
        libraryPkgconfigDepends = [ vte ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
@@ -238343,9 +238891,9 @@ self: {
      }) {};
 
   "vty-ui" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, data-default
-     , directory, filepath, mtl, QuickCheck, random, regex-base, stm
-     , text, time, unix, vector, vty
+    ({ mkDerivation, array, base, containers, data-default, directory
+     , filepath, mtl, QuickCheck, random, regex-base, stm, text, unix
+     , vector, vty
      }:
      mkDerivation {
        pname = "vty-ui";
@@ -238357,10 +238905,7 @@ self: {
          array base containers data-default directory filepath mtl
          regex-base stm text unix vector vty
        ];
-       executableHaskellDepends = [
-         base bytestring mtl QuickCheck random text time vty
-       ];
-       jailbreak = true;
+       executableHaskellDepends = [ base QuickCheck random text vty ];
        homepage = "http://jtdaugherty.github.com/vty-ui/";
        description = "An interactive terminal user interface library for Vty";
        license = stdenv.lib.licenses.bsd3;
@@ -240589,25 +241134,18 @@ 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-app-static
-     , wai-conduit, wai-extra, warp
+     , resourcet, text, transformers, void, wai, wai-conduit
      }:
      mkDerivation {
        pname = "wai-middleware-consul";
        version = "0.1.0.2";
        sha256 = "d89d5a5bf0b08cf4fcd300d9e16c351a146119c34a9f31949498a874699c0763";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
        ];
-       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;
@@ -240878,16 +241416,11 @@ self: {
        pname = "wai-middleware-hmac-client";
        version = "0.1.0.2";
        sha256 = "ba419c0e9a6d00e7ab03150219012128908bc3018b43d7d4cb46cbb01babaeca";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base base64-bytestring byteable bytestring case-insensitive
          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 = [ "x86_64-darwin" ];
@@ -241144,25 +241677,17 @@ self: {
 
   "wai-middleware-verbs_0_2_0" = callPackage
     ({ mkDerivation, base, errors, exceptions, hashable, http-types
-     , mmorph, monad-logger, mtl, resourcet, text, transformers
+     , mmorph, monad-logger, mtl, resourcet, transformers
      , transformers-base, unordered-containers, wai
-     , wai-middleware-content-type, wai-transformers, warp
      }:
      mkDerivation {
        pname = "wai-middleware-verbs";
        version = "0.2.0";
        sha256 = "5e88a38e8e838be9334b72a4dcec70874fe02c8b128dc7a64e682cacfb6ffbf3";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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;
@@ -241170,25 +241695,17 @@ self: {
 
   "wai-middleware-verbs" = callPackage
     ({ mkDerivation, base, errors, exceptions, hashable, http-types
-     , mmorph, monad-logger, mtl, resourcet, text, transformers
+     , mmorph, monad-logger, mtl, resourcet, transformers
      , transformers-base, unordered-containers, wai
-     , wai-middleware-content-type, wai-transformers, warp
      }:
      mkDerivation {
        pname = "wai-middleware-verbs";
        version = "0.3.0";
        sha256 = "cfc8b80412a6fe3e4ee4e4828be478d28cdb8aadc063c7c229a44a74a4aa9806";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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;
@@ -242138,7 +242655,7 @@ self: {
   "waitra" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
      , http-types, regex-applicative, tasty, tasty-hunit
-     , template-haskell, text, wai, wai-app-static, wai-extra, warp
+     , template-haskell, text, wai, wai-extra
      }:
      mkDerivation {
        pname = "waitra";
@@ -242146,13 +242663,10 @@ self: {
        sha256 = "5610c69eb377e2714c3e502cf47fff7e116e356890aefb1f4144d3e6c1b16c12";
        revision = "2";
        editedCabalFile = "7b2f9d4fe0358eb303c3993233b05c1505f4021ebee41fccfad0b6badbf8bd8f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
        ];
@@ -243336,23 +243850,17 @@ self: {
 
   "warp-tls-uid" = callPackage
     ({ mkDerivation, base, bytestring, certificate, conduit
-     , crypto-random, http-types, network, network-conduit, pem, tls
-     , tls-extra, unix, wai, warp
+     , crypto-random, network, network-conduit, pem, tls, tls-extra
+     , unix, wai, warp
      }:
      mkDerivation {
        pname = "warp-tls-uid";
        version = "0.1.0.4";
        sha256 = "beacad56f701aa913e0912a7a319a8b95d8e5100dddbf1f8655d7ce4a64c5b85";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
-       ];
        jailbreak = true;
        description = "set group and user id before running server";
        license = stdenv.lib.licenses.bsd3;
@@ -243492,19 +244000,12 @@ self: {
      }) {};
 
   "wcwidth" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , setlocale, utf8-string
-     }:
+    ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "wcwidth";
        version = "0.0.2";
        sha256 = "ffc68736a3bbde3e8157710f29f4a99c0ca593c41194579c54a92c62f6c12ed8";
-       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;
@@ -243560,8 +244061,6 @@ self: {
        pname = "web-encodings";
        version = "0.3.0.9";
        sha256 = "a30b0e0c596a1e9953fb1d5a5aa2ebe1710561d662294088d0cea657f5dae951";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring directory failure old-locale text time
        ];
@@ -243639,8 +244138,6 @@ self: {
        pname = "web-page";
        version = "0.2.0";
        sha256 = "143301e4a9ff9f01507ef2b4548aebce01811090b176d52adc3dc87bcce5f8c3";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-builder blaze-html bytestring clay containers jmacro
          lens mtl Stream text vector wl-pprint-text
@@ -243650,7 +244147,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "web-plugins" = callPackage
+  "web-plugins_0_2_8" = callPackage
     ({ mkDerivation, base, containers, mtl, stm, text }:
      mkDerivation {
        pname = "web-plugins";
@@ -243660,9 +244157,10 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "dynamic plugin system for web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "web-plugins_0_2_9" = callPackage
+  "web-plugins" = callPackage
     ({ mkDerivation, base, containers, mtl, stm, text }:
      mkDerivation {
        pname = "web-plugins";
@@ -243672,7 +244170,6 @@ self: {
        homepage = "https://github.com/clckwrks/web-plugins";
        description = "dynamic plugin system for web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes" = callPackage
@@ -243766,8 +244263,6 @@ self: {
        pname = "web-routes-quasi";
        version = "0.7.1.1";
        sha256 = "aeb63d0670b2229a246530cb05666957bfa15387d2617104856d1e0b62f50be7";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base path-pieces template-haskell text ];
        jailbreak = true;
        homepage = "http://docs.yesodweb.com/web-routes-quasi/";
@@ -244440,32 +244935,32 @@ self: {
      }) {};
 
   "webkit" = callPackage
-    ({ mkDerivation, base, bytestring, cairo, glib, gtk
+    ({ mkDerivation, base, bytestring, Cabal, cairo, glib, gtk
      , gtk2hs-buildtools, mtl, pango, text, transformers, webkit
      }:
      mkDerivation {
        pname = "webkit";
        version = "0.14.2.0";
        sha256 = "3fdfe31a039f6168b0a694963fcdf2014e8928955b6fb88f0ef8f2c403473f51";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          base bytestring cairo glib gtk mtl pango text transformers
        ];
        libraryPkgconfigDepends = [ webkit ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) webkit;};
 
   "webkit-javascriptcore" = callPackage
-    ({ mkDerivation, base, gtk2hs-buildtools, webkit }:
+    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }:
      mkDerivation {
        pname = "webkit-javascriptcore";
        version = "0.14.1.0";
        sha256 = "d3049d1ea5f9a8a7bc9b0d5e85507acfe8af9fa6344bab82443299c17f18ee72";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkit ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
@@ -244491,18 +244986,18 @@ self: {
      }) {inherit (pkgs) webkit;};
 
   "webkitgtk3" = callPackage
-    ({ mkDerivation, base, bytestring, cairo, glib, gtk2hs-buildtools
-     , gtk3, mtl, pango, text, transformers, webkit
+    ({ mkDerivation, base, bytestring, Cabal, cairo, glib
+     , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers, webkit
      }:
      mkDerivation {
        pname = "webkitgtk3";
        version = "0.14.2.0";
        sha256 = "dd3e3bc62b31616681ffcee07df11b30155433a2cc7eea0560af53c7560f1a86";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          base bytestring cairo glib gtk3 mtl pango text transformers
        ];
        libraryPkgconfigDepends = [ webkit ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
@@ -244526,14 +245021,14 @@ self: {
      }) {inherit (pkgs) webkit;};
 
   "webkitgtk3-javascriptcore" = callPackage
-    ({ mkDerivation, base, gtk2hs-buildtools, webkit }:
+    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }:
      mkDerivation {
        pname = "webkitgtk3-javascriptcore";
        version = "0.14.1.0";
        sha256 = "8d75032979d34ac811a06a5d3c7596b0cc176e24304a3834067896b4df0e5d6d";
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkit ];
-       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) webkit;};
@@ -244803,16 +245298,10 @@ self: {
        sha256 = "1740d6de660570328239aeb718911d51d27eaf6eb5880fe622b7ac2a4b1dfe1c";
        revision = "1";
        editedCabalFile = "76ec170f979b99dfa75768ee22fdea7a3a733267add8422a77f2e9bcefd424e1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
@@ -244839,16 +245328,10 @@ self: {
        sha256 = "3c75cb59585710862c57277c8be718903ba727452d5f662288abb8b59eb57cd4";
        revision = "1";
        editedCabalFile = "73e886d1f0fa4e8b0e291c84861dc99ba630ab86e9b360650924457c9dff460f";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
@@ -244875,16 +245358,10 @@ self: {
        sha256 = "d772478ca85b4723cadbf7d73a16c15dea466fd1524d6fe323a2675106c93353";
        revision = "1";
        editedCabalFile = "fcc1f199941e5ee4a5047a74a550877c5e8e6abe1e104f27478324d9112ecd19";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
@@ -244970,8 +245447,8 @@ self: {
      }) {};
 
   "weigh_0_0_2" = callPackage
-    ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl
-     , process, random, split, template-haskell, unordered-containers
+    ({ mkDerivation, base, deepseq, mtl, process, split
+     , template-haskell
      }:
      mkDerivation {
        pname = "weigh";
@@ -244980,9 +245457,7 @@ self: {
        libraryHaskellDepends = [
          base deepseq mtl process split template-haskell
        ];
-       testHaskellDepends = [
-         base bytestring-trie containers deepseq random unordered-containers
-       ];
+       testHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/fpco/weigh#readme";
        description = "Measure allocations of a Haskell functions/values";
        license = stdenv.lib.licenses.bsd3;
@@ -244990,8 +245465,8 @@ self: {
      }) {};
 
   "weigh" = callPackage
-    ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl
-     , process, random, split, template-haskell, unordered-containers
+    ({ mkDerivation, base, deepseq, mtl, process, split
+     , template-haskell
      }:
      mkDerivation {
        pname = "weigh";
@@ -245000,9 +245475,7 @@ self: {
        libraryHaskellDepends = [
          base deepseq mtl process split template-haskell
        ];
-       testHaskellDepends = [
-         base bytestring-trie containers deepseq random unordered-containers
-       ];
+       testHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/fpco/weigh#readme";
        description = "Measure allocations of a Haskell functions/values";
        license = stdenv.lib.licenses.bsd3;
@@ -245014,8 +245487,6 @@ self: {
        pname = "weighted-regexp";
        version = "0.3.1.2";
        sha256 = "f963773841854c56d36f329dae51ec08b9028832eee53b62a9ba7df5ef2de664";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ happy ];
        jailbreak = true;
@@ -245346,8 +245817,6 @@ self: {
        pname = "windowslive";
        version = "0.3";
        sha256 = "7fc9617306ccbe99a8f910ca442bfeabd8e78b8668db773defefa5b41b1fb395";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base Crypto dataenc mtl network parsec pretty split time urlencoded
        ];
@@ -245364,7 +245833,8 @@ self: {
        pname = "winerror";
        version = "1.0.1";
        sha256 = "0d527e4024967909171d3aea30d43abb0fd84306f77aa26625466c0f3de95575";
-       doHaddock = false;
+       isLibrary = false;
+       isExecutable = false;
        description = "Error handling for foreign calls to the Windows API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
@@ -246230,8 +246700,6 @@ self: {
        pname = "wraxml";
        version = "0.4.4";
        sha256 = "2347454654a07e8865c14986db9df95b323ba0170310933d52731b0cb6c214c1";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers data-accessor explicit-exception HaXml hxt
          hxt-filter polyparse tagchup tagsoup transformers utility-ht
@@ -246261,8 +246729,6 @@ self: {
        sha256 = "842a8539e3670732c7f48fe91429d6e940865fcd17374ad2895b74a751c6578d";
        revision = "1";
        editedCabalFile = "b69dc65ef23cfd21ff24b08c2703871b2acff2d23ebb30ed8cb7519f5e42bcf6";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring byteable bytestring
          case-insensitive containers cryptohash exceptions ghc-prim hashable
@@ -246300,8 +246766,6 @@ self: {
        pname = "wreq";
        version = "0.4.0.0";
        sha256 = "4ae67fcd133a9738f7f73b66c8cc5a6bfc0cbc93e041fc1a43362a3d72557297";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring byteable bytestring
          case-insensitive containers cryptohash exceptions ghc-prim hashable
@@ -246339,8 +246803,6 @@ self: {
        pname = "wreq";
        version = "0.4.1.0";
        sha256 = "3b8409e2fb7670d7060fdaa780008eeecb08e9b65bdab9d9690d8d26e5cb8e6d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base base16-bytestring byteable
          bytestring case-insensitive containers cryptohash exceptions
@@ -246378,8 +246840,6 @@ self: {
        pname = "wreq-sb";
        version = "0.4.0.0";
        sha256 = "dfc9c0a13696bbe2521a9d440bd9c8a57b8dccef270bdffb011bf320a7971b54";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base base16-bytestring byteable
          bytestring case-insensitive containers cryptohash exceptions
@@ -247425,8 +247885,6 @@ self: {
        pname = "xenstore";
        version = "0.1.1";
        sha256 = "c2b538c9ce6716f4a1b4c0cb63ed5c6e5ee3e69e80dbb7826ee7f5392f45e874";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal mtl network ];
        description = "Xenstore client access";
        license = stdenv.lib.licenses.bsd3;
@@ -247438,13 +247896,9 @@ self: {
        pname = "xfconf";
        version = "4.8.0.0";
        sha256 = "9febbf8349f27fa184c56959a01db2f78176bd534f103f6b1be0bb01b7fac360";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base glib ];
        libraryPkgconfigDepends = [ libxfconf-0 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       executablePkgconfigDepends = [ libxfconf-0 ];
-       executableToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://patch-tag.com/r/obbele/xfconf/home";
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
@@ -247606,8 +248060,6 @@ self: {
        pname = "xing-api";
        version = "0.1.3";
        sha256 = "b3e21b098ef46e9d496efa4257172fa5a872149e708f694cd0ea60ef192d23fc";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring containers http-conduit
          http-types lifted-base monad-control resourcet text time
@@ -248549,8 +249001,6 @@ self: {
        pname = "xml-enumerator-combinators";
        version = "0.1";
        sha256 = "63c9e2548ef8c83116fff84160b48494974b1cf34852fe2e6377cab53ef754d8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base containers enumerator xml-enumerator xml-types
        ];
@@ -249268,9 +249718,9 @@ self: {
      }) {};
 
   "xmonad-extras" = callPackage
-    ({ mkDerivation, base, containers, directory, mtl, old-locale
-     , old-time, parsec, process, random, regex-posix, split, unix, X11
-     , xmonad, xmonad-contrib
+    ({ mkDerivation, base, bytestring, containers, directory, hint
+     , libmpd, mtl, network, old-locale, old-time, parsec, process
+     , random, regex-posix, split, unix, X11, xmonad, xmonad-contrib
      }:
      mkDerivation {
        pname = "xmonad-extras";
@@ -249280,8 +249730,9 @@ self: {
          "-f-with_hlist" "-fwith_parsec" "-fwith_split"
        ];
        libraryHaskellDepends = [
-         base containers directory mtl old-locale old-time parsec process
-         random regex-posix split unix X11 xmonad xmonad-contrib
+         base bytestring containers directory hint libmpd mtl network
+         old-locale old-time parsec process random regex-posix split unix
+         X11 xmonad xmonad-contrib
        ];
        homepage = "http://projects.haskell.org/xmonad-extras";
        description = "Third party extensions for xmonad with wacky dependencies";
@@ -250235,7 +250686,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
-  "yaml" = callPackage
+  "yaml_0_8_17_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
      , bytestring, conduit, containers, directory, enclosed-exceptions
      , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
@@ -250262,9 +250713,10 @@ self: {
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
-  "yaml_0_8_17_2" = callPackage
+  "yaml" = callPackage
     ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
      , bytestring, conduit, containers, directory, enclosed-exceptions
      , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
@@ -250291,7 +250743,6 @@ self: {
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
   "yaml-config" = callPackage
@@ -250456,17 +250907,14 @@ self: {
      }) {};
 
   "yampa-canvas" = callPackage
-    ({ mkDerivation, base, blank-canvas, stm, text, time, Yampa }:
+    ({ mkDerivation, base, blank-canvas, stm, time, Yampa }:
      mkDerivation {
        pname = "yampa-canvas";
        version = "0.2.2";
        sha256 = "167c8dc3992d98d879eb281b27a0dbf6fde21ca69992e384df4b5babcdda3e3c";
        revision = "1";
        editedCabalFile = "98e99a555170a8b7281116b4e9c829c011b2401f21589f55ae80333ff2d6f34a";
-       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 = [ "x86_64-darwin" "x86_64-linux" ];
@@ -250494,21 +250942,15 @@ self: {
 
   "yampa-glut" = callPackage
     ({ mkDerivation, base, GLUT, newtype, OpenGL, vector-space
-     , vector-space-opengl, Yampa-core
+     , Yampa-core
      }:
      mkDerivation {
        pname = "yampa-glut";
        version = "0.1.1.1";
        sha256 = "f7c2b8aec210261341310f0c63f2eed3f80952077ad907ebff4427902ce4c304";
-       isLibrary = true;
-       isExecutable = true;
        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;
@@ -252199,25 +252641,20 @@ self: {
      }) {};
 
   "yesod-auth-oauth2_0_1_7" = callPackage
-    ({ 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, 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 {
        pname = "yesod-auth-oauth2";
        version = "0.1.7";
        sha256 = "272ebc701f55b955f2eae69acca68a2344f8ec99988a5eff94853b3b0382b7d4";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson authenticate base bytestring hoauth2 http-client http-conduit
          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 ];
        jailbreak = true;
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
@@ -252227,25 +252664,20 @@ self: {
      }) {};
 
   "yesod-auth-oauth2_0_1_8" = callPackage
-    ({ 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, 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 {
        pname = "yesod-auth-oauth2";
        version = "0.1.8";
        sha256 = "13ae292984fcb93702df78a92526d2cd14573e707ceeff7ad8cecbd102596e11";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson authenticate base bytestring hoauth2 http-client http-conduit
          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 ];
        jailbreak = true;
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
@@ -252255,25 +252687,20 @@ self: {
      }) {};
 
   "yesod-auth-oauth2" = callPackage
-    ({ 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, 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 {
        pname = "yesod-auth-oauth2";
        version = "0.1.9";
        sha256 = "719152c20799024acf4c1ec9c91cb97cf44a2d371223672a75c705a06d12081c";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson authenticate base bytestring hoauth2 http-client http-conduit
          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";
@@ -255156,23 +255583,16 @@ self: {
   "yesod-job-queue" = callPackage
     ({ mkDerivation, aeson, api-field-json-th, base, bytestring
      , classy-prelude-yesod, cron, file-embed, hedis, lens, monad-logger
-     , persistent-sqlite, resourcet, stm, text, time, uuid, yesod
-     , yesod-core
+     , stm, text, time, uuid, yesod
      }:
      mkDerivation {
        pname = "yesod-job-queue";
        version = "0.3.0.0";
        sha256 = "34da4826fd12624cf0d93f72e16a7722cc7510dcf37381bed89cc8bfabe42912";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson api-field-json-th base bytestring classy-prelude-yesod cron
          file-embed hedis lens monad-logger stm text time uuid yesod
        ];
-       executableHaskellDepends = [
-         base classy-prelude-yesod hedis monad-logger persistent-sqlite
-         resourcet yesod yesod-core
-       ];
        testHaskellDepends = [ base ];
        doHaddock = false;
        homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme";
@@ -255218,34 +255638,18 @@ self: {
      }) {};
 
   "yesod-mangopay_1_11_4" = callPackage
-    ({ 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, base, containers, http-conduit, http-types
+     , lifted-base, mangopay, persistent-template, text, time, yesod
+     , yesod-core
      }:
      mkDerivation {
        pname = "yesod-mangopay";
        version = "1.11.4";
        sha256 = "c785351be1d7d149f772a0bc60db3f51424a8d7bf8adac295b2dc3d8812acf6b";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
-       ];
        jailbreak = true;
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
@@ -255254,34 +255658,18 @@ self: {
      }) {};
 
   "yesod-mangopay_1_11_5" = callPackage
-    ({ 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, base, containers, http-conduit, http-types
+     , lifted-base, mangopay, persistent-template, text, time, yesod
+     , yesod-core
      }:
      mkDerivation {
        pname = "yesod-mangopay";
        version = "1.11.5";
        sha256 = "7a02a34fc1e8e3ae320f1f07f66ac672c0c240b1eb39fabfb0befa8e893282c8";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
-       ];
        jailbreak = true;
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
@@ -255290,35 +255678,18 @@ self: {
      }) {};
 
   "yesod-mangopay" = callPackage
-    ({ 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, base, containers, http-conduit, http-types
+     , lifted-base, mangopay, persistent-template, text, time, yesod
+     , yesod-core
      }:
      mkDerivation {
        pname = "yesod-mangopay";
        version = "1.12";
        sha256 = "a53c0d1e8e1654a4c251b1830264f581a1ed668fffb303c05993e10e20932754";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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
-       ];
-       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;
@@ -256160,23 +256531,17 @@ self: {
     ({ mkDerivation, aeson, base, blaze-builder, blaze-markup
      , bytestring, data-default, directory, filepath, hamlet, hspec
      , HUnit, language-javascript, mime-types, shakespeare
-     , template-haskell, text, yesod, yesod-core, yesod-static
-     , yesod-test
+     , template-haskell, text, yesod-core, yesod-static, yesod-test
      }:
      mkDerivation {
        pname = "yesod-static-angular";
        version = "0.1.6";
        sha256 = "c16af2c227bc51da843e8032218939d804e5d36b7619492c318a9a038099b89d";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-markup bytestring data-default
          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
@@ -256192,23 +256557,17 @@ self: {
     ({ mkDerivation, aeson, base, blaze-builder, blaze-markup
      , bytestring, data-default, directory, filepath, hamlet, hspec
      , HUnit, language-javascript, mime-types, shakespeare
-     , template-haskell, text, yesod, yesod-core, yesod-static
-     , yesod-test
+     , template-haskell, text, yesod-core, yesod-static, yesod-test
      }:
      mkDerivation {
        pname = "yesod-static-angular";
        version = "0.1.7";
        sha256 = "73278c6d5a4c5dce23f0c20de08f7f98f3069b4443d16d027f09a0653a203e73";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-markup bytestring data-default
          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
@@ -256224,23 +256583,17 @@ self: {
     ({ mkDerivation, aeson, base, blaze-builder, blaze-markup
      , bytestring, data-default, directory, filepath, hamlet, hspec
      , HUnit, language-javascript, mime-types, shakespeare
-     , template-haskell, text, yesod, yesod-core, yesod-static
-     , yesod-test
+     , template-haskell, text, yesod-core, yesod-static, yesod-test
      }:
      mkDerivation {
        pname = "yesod-static-angular";
        version = "0.1.8";
        sha256 = "97b3ef260a7e6c70b811cbf3b2b3532a003c5028bd6a0df52fc14bd45ce03beb";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-markup bytestring data-default
          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
@@ -257530,8 +257883,6 @@ self: {
        pname = "z3";
        version = "4.1.0";
        sha256 = "096f9f4b92f5c9591d3098022b0b4047d1d6c4b970dc7d3ead6129d67fe4f5ee";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [ base containers mtl ];
        librarySystemDepends = [ gomp z3 ];
        testHaskellDepends = [ base hspec QuickCheck ];
@@ -257999,13 +258350,10 @@ self: {
        pname = "zip-archive";
        version = "0.2.3.5";
        sha256 = "286896bb3dff58534fa5d78bf40cc516fa59db9ad9247d3826707620d5c64361";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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 time
        ];
@@ -258024,13 +258372,10 @@ self: {
        pname = "zip-archive";
        version = "0.2.3.7";
        sha256 = "41623b3831795e785329b017f42af3116f6332a690361f7eac7ed15f729f3699";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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 time
        ];
@@ -258050,13 +258395,10 @@ self: {
        pname = "zip-archive";
        version = "0.3.0.2";
        sha256 = "c5367d9bc72d3ceace0508800bab08a120e308ea1f4f5c8d5843fcca36b15313";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          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 time unix
        ];
@@ -258232,8 +258574,6 @@ self: {
        pname = "zlib-enum";
        version = "0.2.3.1";
        sha256 = "e43dc9ea85ceea02c4f4204c95e8d8540205839c58079f9399dfa96e63fdccd9";
-       isLibrary = true;
-       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring enumerator transformers zlib-bindings
        ];

From 8ffcd238c35a26813dfb83b3420d0db5228419cd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 9 Jun 2016 23:27:57 +0200
Subject: [PATCH 222/436] haskell-generic-builder: add support for
 setupHaskellDepends

---
 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 2700caa1a5ba..866c8b002990 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -7,7 +7,7 @@
 , version, revision ? null
 , sha256 ? null
 , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; }
-, buildDepends ? [], libraryHaskellDepends ? [], executableHaskellDepends ? []
+, buildDepends ? [], setupHaskellDepends ? [], libraryHaskellDepends ? [], executableHaskellDepends ? []
 , buildTarget ? ""
 , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? []
 , configureFlags ? []
@@ -119,7 +119,7 @@ let
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
                         optionals doCheck testPkgconfigDepends;
 
-  propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
+  propagatedBuildInputs = buildDepends ++ setupHaskellDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
   otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      buildTools ++ libraryToolDepends ++ executableToolDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++

From 71f00921435ebdb3e3437b605e8616f3fc3a2579 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 10 Jun 2016 19:14:08 +0200
Subject: [PATCH 223/436] haskell-lhc: drop obsolete override

---
 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 5d9d08af110b..25596bdd0a82 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -563,9 +563,6 @@ self: super: {
   HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; };
   test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; };
 
-  # Doesn't support "this system". Linux? Needs investigation.
-  lhc = markBroken (super.lhc.override { QuickCheck = self.QuickCheck_1_2_0_1; });
-
   # Depends on broken test-framework-quickcheck.
   apiary = dontCheck super.apiary;
   apiary-authenticate = dontCheck super.apiary-authenticate;

From cc09d421f2bb3269b59949050e81772c6451be5c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 11 Jun 2016 15:40:43 +0200
Subject: [PATCH 224/436] haskell-hslogger: fix LTS build

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 ++
 1 file changed, 2 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 2e7ac52c8de6..101277c1c998 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -207,9 +207,11 @@ self: super: {
   aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
   case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
   bytes = addBuildDepend super.bytes self.doctest;
+  hslogger = addBuildDepend super.hslogger self.HUnit;
   semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
   intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
 
   # 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; };
+
 }

From 00bebe798c2c1ebe02d3d191fb7c33e1f23b11d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 11 Jun 2016 19:35:29 +0200
Subject: [PATCH 225/436] haskell-http2: remove obsolete override

---
 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 25596bdd0a82..a473930e080c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -420,7 +420,6 @@ self: super: {
   HTF_0_13_0_0 = dontCheck super.HTF_0_13_0_0;
   htsn = dontCheck super.htsn;
   htsn-import = dontCheck super.htsn-import;
-  http2 = dontCheck super.http2;
   http-client-openssl = dontCheck super.http-client-openssl;
   http-client-tls = dontCheck super.http-client-tls;
   ihaskell = dontCheck super.ihaskell;

From 52aad6c77de84daed8fb52534154d1008e0df2bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 11 Jun 2016 22:02:47 +0200
Subject: [PATCH 226/436] haskell.lib.withHoogle: remove obsolete function

---
 pkgs/development/haskell-modules/lib.nix | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index a4db98f2e618..b92bf304723b 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -85,6 +85,25 @@ rec {
 
   triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
 
-  #FIXME: throw this away sometime in the future. added 2015-08-18
-  withHoogle = throw "withHoogle is no longer supported, use ghcWithHoogle instead";
+  allCabalFiles = pkgs.fetchFromGitHub {
+     owner = "commercialhaskell";
+     repo = "all-cabal-hashes";
+     rev = "461610ab6f0cf581e186643c037f1981755792d9";
+     sha256 = "0x2577lfd5cbbaivl72273kw93gcmxvbjybk7w4h2ic3zvs1fnvm";
+   };
+
+   hackage2nix = name: version: pkgs.stdenv.mkDerivation {
+     name = "cabal2nix-${name}-${version}";
+     buildInputs = [ pkgs.cabal2nix ];
+     phases = ["installPhase"];
+     LANG = "en_US.UTF-8";
+     LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive";
+     installPhase = ''
+       export HOME="$TMP"
+       mkdir $out
+       hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${allCabalFiles}/${name}/${version}/${name}.json)
+       cabal2nix --sha256=$hash ${allCabalFiles}/${name}/${version}/${name}.cabal >$out/default.nix
+     '';
+   };
+
 }

From 2862d272a606c6188c4c33dab60de4e0066ee194 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 11 Jun 2016 19:21:19 +0200
Subject: [PATCH 227/436] haskell: add support for all of Hackage

The function "callHackage <name> <version>" generates build instructions for
the requested library version on-the-fly. All of Hackage is available. Note:
this code is brand-new, experimental, and it might change in the future. Don't
base production code on this feature yet.

Example usage:

  $ nix-shell -p 'haskellPackages.callHackage "cpphs" "1.19.3" {}' --run "cpphs --version"
  cpphs 1.19.3

  $ nix-shell -p 'haskellPackages.ghcWithPackages (self: [(self.callHackage "hsdns" "1.6.1" {})])' --run "ghc-pkg list hsdns"
  /nix/store/p6r81k2vb2pzy4wcvri6z9m492i0hg63-ghc-8.0.1/lib/ghc-8.0.1/package.conf.d
      hsdns-1.6.1
---
 pkgs/development/haskell-modules/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 27f3ccd97328..7a51a1de1471 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -8,6 +8,8 @@ let
 
   inherit (stdenv.lib) fix' extends;
 
+  inherit (import ./lib.nix { inherit pkgs; }) hackage2nix;
+
   haskellPackages = self:
     let
 
@@ -57,6 +59,8 @@ let
 
         inherit mkDerivation callPackage;
 
+        callHackage = name: version: self.callPackage (hackage2nix name version);
+
         ghcWithPackages = selectFrom: withPackages (selectFrom self);
 
         ghcWithHoogle = selectFrom:

From 22ae90ae90c1cf9da2d838e6194b253a27f916ef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 11 Jun 2016 22:34:32 +0200
Subject: [PATCH 228/436] cabal2nix: update to version 20160611

---
 pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix        | 4 ++--
 .../tools/haskell/cabal2nix/distribution-nixpkgs.nix          | 4 ++--
 pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
index e2996b030ef8..58471d9b9601 100644
--- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
@@ -6,12 +6,12 @@
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20160406";
+  version = "20160611";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "02dn2zllanf3rl16ny17j80h7p6gcdqkhadh3ypkr38gd9w16pc6";
+    sha256 = "1zmrqs09zfnwy9cclp78p5nfpg5520p0lnz1myg5q4p6i2251mp3";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;
diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
index edaec9c257a8..caa3db746fda 100644
--- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
@@ -11,8 +11,8 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
-    rev = "v20160406";
-    sha256 = "02dn2zllanf3rl16ny17j80h7p6gcdqkhadh3ypkr38gd9w16pc6";
+    rev = "v20160611";
+    sha256 = "1zmrqs09zfnwy9cclp78p5nfpg5520p0lnz1myg5q4p6i2251mp3";
   };
   postUnpack = "sourceRoot+=/${pname}";
   libraryHaskellDepends = [
diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
index 56cd1d29dde4..68165b5926cd 100644
--- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
@@ -7,12 +7,12 @@
 
 mkDerivation rec {
   pname = "hackage2nix";
-  version = "20160406";
+  version = "20160611";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "02dn2zllanf3rl16ny17j80h7p6gcdqkhadh3ypkr38gd9w16pc6";
+    sha256 = "1zmrqs09zfnwy9cclp78p5nfpg5520p0lnz1myg5q4p6i2251mp3";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;

From 2b520ff4f6b7ab36063278c3bb198e7f09c4bcab Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Sat, 11 Jun 2016 21:31:42 +0200
Subject: [PATCH 229/436] rethinkdb: 2.3.0 -> 2.3.4

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

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index e61a94e7f07b..3277f8e9be35 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "rethinkdb-${version}";
-  version = "2.3.0";
+  version = "2.3.4";
 
   src = fetchurl {
-    url = "http://download.rethinkdb.com/dist/${name}.tgz";
-    sha256 = "0b787ibnrmziypiw86yx4gpmlj4ima6j6g9hzshbpilxy7lrq1cb";
+    url = "https://download.rethinkdb.com/dist/${name}.tgz";
+    sha256 = "19z1m4r1mqnbia207q0nvs39rn7jk8zsr2rvps2d11fp3ryr59wk";
   };
 
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''

From eacc13a3e626fc4c2059613797f305f39ead5a09 Mon Sep 17 00:00:00 2001
From: Tal Walter <talw10@gmail.com>
Date: Sun, 12 Jun 2016 12:22:57 +0300
Subject: [PATCH 230/436] uif2iso: init at 0.1.7

a program for converting UIF files (Universal Image Format, used by MagicISO)
to uncompressed images depending on the input file type:
ISO, BIN/CUE, MDS/MDF, CCD/IMG/SUB and NRG.
---
 pkgs/tools/cd-dvd/uif2iso/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/cd-dvd/uif2iso/default.nix

diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/tools/cd-dvd/uif2iso/default.nix
new file mode 100644
index 000000000000..4e3a2daafe81
--- /dev/null
+++ b/pkgs/tools/cd-dvd/uif2iso/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, unzip, zlib }:
+
+stdenv.mkDerivation rec {
+  nameNoVer = "uif2iso";
+  name = "${nameNoVer}-0.1.7";
+
+  src = fetchurl {
+    url = "http://aluigi.altervista.org/mytoolz/${nameNoVer}.zip";
+    sha256 = "1v18fmlzhkkhv8xdc9dyvl8vamwg3ka4dsrg7vvmk1f2iczdx3dp";
+  };
+
+  buildInputs = [unzip zlib];
+
+  installPhase = ''
+    make -C . prefix="$out" install;
+  '';
+
+  meta = {
+    description = "Tool for converting single/multi part UIF image files to ISO";
+    homepage = "http://aluigi.org/mytoolz.htm#uif2iso";
+    license = stdenv.lib.licenses.gpl1Plus;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f6b40dc92f5..a59ad573be8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3608,6 +3608,8 @@ in
 
   uget = callPackage ../tools/networking/uget { };
 
+  uif2iso = callPackage ../tools/cd-dvd/uif2iso { };
+
   umlet = callPackage ../tools/misc/umlet { };
 
   unetbootin = callPackage ../tools/cd-dvd/unetbootin { };

From f771bf9239e42d1bcd19cc3991f5e66b3c4f453f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 08:00:31 -0300
Subject: [PATCH 231/436] font-manager: git-2016-03-02 -> 2016-06-04

---
 .../misc/font-manager/default.nix             | 31 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index a71e9c7ff92d..4269a116085d 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -1,39 +1,43 @@
 { stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool,
   pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,
-  vala, gnome3
+  vala, gnome3, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
   name = "font-manager-${version}";
-  version = "git-2016-03-02";
+  version = "2016-06-04";
 
   src = fetchFromGitHub {
     owner  = "FontManager";
     repo   = "master";
-    rev    = "743fb83558c86bfbbec898106072f84422c175d6";
-    sha256 = "1sakss6irfr3d8k39x1rf72fmnpq47akhyrv3g45a3l6v6xfqp3k";
+    rev    = "07b47c153494f19ced291c84437349253c5bde4d";
+    sha256 = "13pjmvx31fr8fqhl5qwawhawfl7as9c50qshzzig8n5g7vb5v1i0";
     };
 
-  enableParallelBuilding = true;
-
-  buildInputs = [
+  nativeBuildInputs = [
     makeWrapper
     pkgconfig
     automake autoconf libtool
     file
     intltool
+    vala
+    gnome3.yelp_tools
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
     libxml2
     json_glib
     sqlite
     itstool
-    vala
     gnome3.gtk
     gnome3.gucharmap
     gnome3.libgee
     gnome3.file-roller
-    gnome3.yelp_tools
   ];
 
+  enableParallelBuilding = true;
+
   preConfigure = ''
     NOCONFIGURE=true ./autogen.sh
     chmod +x configure;
@@ -42,13 +46,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-pycompile";
 
-  preFixup = ''
-    for prog in "$out/bin/"* "$out/libexec/font-manager/"*; do
-      wrapProgram "$prog" \
-        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
   meta = {
     homepage = https://fontmanager.github.io/;
     description = "Simple font management for GTK+ desktop environments";
@@ -62,8 +59,8 @@ stdenv.mkDerivation rec {
       Font Manager is NOT a professional-grade font management solution.
     '';
     license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
     repositories.git = https://github.com/FontManager/master;
     platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f6b40dc92f5..0a4228eb1ed6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12562,7 +12562,7 @@ in
   focuswriter = callPackage ../applications/editors/focuswriter { };
 
   font-manager = callPackage ../applications/misc/font-manager {
-    vala = vala_0_28;
+    vala = vala_0_32;
   };
 
   foo-yc20 = callPackage ../applications/audio/foo-yc20 { };

From 2089dd4ab6be089bda12a942846ab7954b28b459 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Sun, 12 Jun 2016 14:03:43 +0300
Subject: [PATCH 232/436] GHC: Split docs

---
 pkgs/development/compilers/ghc/7.10.2.nix | 3 +++
 pkgs/development/compilers/ghc/7.10.3.nix | 3 +++
 pkgs/development/compilers/ghc/8.0.1.nix  | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index aaf76d2ae40c..4f13954d1db5 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  outputs = [ "out" "doc" ];
+
   preConfigure = ''
     echo >mk/build.mk "${buildMK}"
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
@@ -43,6 +45,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+    "--datadir=$doc/share/doc/ghc"
   ];
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 2bed6d1487ad..b8e9082f0617 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  outputs = [ "out" "doc" ];
+
   preConfigure = ''
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
@@ -42,6 +44,7 @@ stdenv.mkDerivation rec {
     "--with-gcc=${stdenv.cc}/bin/cc"
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+    "--datadir=$doc/share/doc/ghc"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ];
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index 612c237735c3..fceade0741f9 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  outputs = [ "out" "doc" ];
+
   preConfigure = ''
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
@@ -35,6 +37,7 @@ stdenv.mkDerivation rec {
     "--with-gcc=${stdenv.cc}/bin/cc"
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+    "--datadir=$doc/share/doc/ghc"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ];

From 55326305438ffe0623856f6ccb685bed2185a565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 08:06:27 -0300
Subject: [PATCH 233/436] jwm: 1532 -> 1535

---
 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 2da76eabe937..460096cf16c8 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "jwm-${version}";
-  version = "1532";
+  version = "1535";
   
   src = fetchurl {
      url = "https://github.com/joewing/jwm/archive/s${version}.tar.gz";
-     sha256 = "02g3n72rmyy5l9hn6jdb7kzhsn1c0padazxfn0sv6s95w6r8hcvr";
+     sha256 = "1v593v1n9p9nvlhz1m9vc94wj21a6rbk7hcja30421h5mwa2b6gb";
   };
 
   nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];

From e6e465334d83038803f8d342774acebdd0c95abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 08:20:10 -0300
Subject: [PATCH 234/436] libgksu: use nativeBuildInputs and wrapGAppsHook

---
 .../development/libraries/libgksu/default.nix | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 521e780a9200..249997d430f1 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk, gnome, gnome3,
+{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk, gnome, gnome3,
   libstartup_notification, libgtop, perl, perlXMLParser,
   autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo
 }:
@@ -13,6 +13,17 @@ stdenv.mkDerivation rec {
     sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92";
   };
 
+  nativeBuildInputs = [
+    pkgconfig autoreconfHook intltool gtk_doc docbook_xsl wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk gnome.GConf libstartup_notification
+    gnome3.libgnome_keyring libgtop gnome.libglade perl perlXMLParser
+  ];
+
+  enableParallelBuilding = true;
+
   patches = [
         # Patches from the gentoo ebuild
 
@@ -54,19 +65,6 @@ stdenv.mkDerivation rec {
     intltoolize --force --copy --automake
   '';
 
-  buildInputs = [
-    pkgconfig makeWrapper gtk gnome.GConf libstartup_notification
-    gnome3.libgnome_keyring libgtop gnome.libglade perl perlXMLParser
-    autoreconfHook intltool gtk_doc docbook_xsl
-  ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gksu-properties" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
-  '';
-
-  enableParallelBuilding = true;
-
   meta = {
     description = "A library for integration of su into applications";
     longDescription = ''

From 106c5b58f105f67c76b91b1b1da64977529b99e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 08:27:19 -0300
Subject: [PATCH 235/436] gksu: use nativeBuildInputs and wrapGAppsHook

---
 pkgs/applications/misc/gksu/default.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix
index 61fd44925b71..2f19f830282c 100644
--- a/pkgs/applications/misc/gksu/default.nix
+++ b/pkgs/applications/misc/gksu/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk, gnome3, libgksu,
-  intltool, libstartup_notification, gtk_doc
+{ stdenv, fetchurl, pkgconfig, gtk, gnome3, libgksu,
+  intltool, libstartup_notification, gtk_doc, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -12,6 +12,18 @@ stdenv.mkDerivation rec {
     sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1";
   };
 
+  nativeBuildInputs = [
+    pkgconfig intltool gtk_doc wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk gnome3.gconf libstartup_notification gnome3.libgnome_keyring
+  ];
+
+  propagatedBuildInputs = [
+    libgksu
+  ];
+
   patches = [
     # https://savannah.nongnu.org/bugs/index.php?36127
     ./gksu-2.0.2-glib-2.31.patch
@@ -23,15 +35,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-nautilus-extension";
 
-  buildInputs = [
-    pkgconfig makeWrapper gtk gnome3.gconf intltool
-    libstartup_notification gnome3.libgnome_keyring gtk_doc
-  ];
-
-  propagatedBuildInputs = [
-    libgksu
-  ];
-
   meta = {
     description = "A graphical frontend for libgksu";
     longDescription = ''

From 3086250ceb14d648cd7542b201d9d9a84f6dd901 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 12 Jun 2016 13:35:15 +0100
Subject: [PATCH 236/436] bundler: 1.11.2 -> 1.12.5

---
 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 718da20b0068..50b8725a0af3 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,7 +4,7 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "1.11.2";
-  sha256 = "0s37j1hyngc4shq0in8f9y1knjdqkisdg3dd1mfwgq7n1bz8zan7";
+  version = "1.12.5";
+  sha256 = "1q84xiwm9j771lpmiply0ls9l2bpvl5axn3jblxjvrldh8di2pkc";
   dontPatchShebangs = true;
 }

From a42b7faaecccca497fd25e93bca22c467915b668 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 18 Mar 2016 19:42:52 +0000
Subject: [PATCH 237/436] nix-prefetch-git: shellcheck fixes

Used shellcheck (https://github.com/koalaman/shellcheck) to validate
the script and fixed any resulting escaping and ambiguity issues.
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 73 +++++++++++---------
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 21359e060eca..a15c1850d822 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -12,6 +12,10 @@ fetchSubmodules=
 builder=
 branchName=$NIX_PREFETCH_GIT_BRANCH_NAME
 
+# ENV params
+out=${out:-}
+http_proxy=${http_proxy:-}
+
 # populated by clone_user_rev()
 fullRev=
 humanReadableRev=
@@ -64,7 +68,7 @@ for arg; do
             --builder) builder=true;;
             --help) usage; exit;;
             *)
-                argi=$(($argi + 1))
+                argi=$((argi++))
                 case $argi in
                     1) url=$arg;;
                     2) rev=$arg;;
@@ -76,7 +80,7 @@ for arg; do
     else
         case $argfun in
             set_*)
-                var=$(echo $argfun | sed 's,^set_,,')
+                var=${argfun#set_}
                 eval $var=$arg
                 ;;
         esac
@@ -92,8 +96,8 @@ fi
 init_remote(){
     local url=$1
     git init
-    git remote add origin $url
-    ( [ -n "$http_proxy" ] && git config http.proxy $http_proxy ) || true
+    git remote add origin "$url"
+    ( [ -n "$http_proxy" ] && git config http.proxy "$http_proxy" ) || true
 }
 
 # Return the reference of an hash if it exists on the remote repository.
@@ -116,12 +120,13 @@ url_to_name(){
     local url=$1
     local ref=$2
     # basename removes the / and .git suffixes
-    local base=$(basename "$url" .git)
+    local base
+    base=$(basename "$url" .git)
 
     if [[ $ref =~ ^[a-z0-9]+$ ]]; then
         echo "$base-${ref:0:7}"
     else
-        echo $base
+        echo "$base"
     fi
 }
 
@@ -131,11 +136,11 @@ checkout_hash(){
     local ref="$2"
 
     if test -z "$hash"; then
-        hash=$(hash_from_ref $ref)
+        hash=$(hash_from_ref "$ref")
     fi
 
     git fetch -t ${builder:+--progress} origin || return 1
-    git checkout -b $branchName $hash || return 1
+    git checkout -b "$branchName" "$hash" || return 1
 }
 
 # Fetch only a branch/tag and checkout it.
@@ -152,13 +157,13 @@ checkout_ref(){
     fi
 
     if test -z "$ref"; then
-        ref=$(ref_from_hash $hash)
+        ref=$(ref_from_hash "$hash")
     fi
 
     if test -n "$ref"; then
         # --depth option is ignored on http repository.
         git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1
-        git checkout -b $branchName FETCH_HEAD || return 1
+        git checkout -b "$branchName" FETCH_HEAD || return 1
     else
         return 1
     fi
@@ -171,27 +176,32 @@ init_submodules(){
 
     # list submodule directories and their hashes
     git submodule status |
-    while read l; do
+    while read -r l; do
+        local hash
+        local dir
+        local name
+        local url
+
         # checkout each submodule
-        local hash=$(echo $l | awk '{print substr($1,2)}')
-        local dir=$(echo $l | awk '{print $2}')
-        local name=$(
+        hash=$(echo "$l" | awk '{print substr($1,2)}')
+        dir=$(echo "$l" | awk '{print $2}')
+        name=$(
             git config -f .gitmodules --get-regexp submodule\..*\.path |
             sed -n "s,^\(.*\)\.path $dir\$,\\1,p")
-        local url=$(git config --get ${name}.url)
+        url=$(git config --get "${name}.url")
 
         clone "$dir" "$url" "$hash" ""
     done
 }
 
 clone(){
-    local top=$(pwd)
+    local top=$PWD
     local dir="$1"
     local url="$2"
     local hash="$3"
     local ref="$4"
 
-    cd $dir
+    cd "$dir"
 
     # Initialize the repository.
     init_remote "$url"
@@ -208,9 +218,8 @@ clone(){
         init_submodules
     fi
 
-    if [ -z "$builder" -a -f .topdeps ]; then
-        if tg help 2>&1 > /dev/null
-        then
+    if [ -z "$builder" ] && [ -f .topdeps ]; then
+        if tg help &>/dev/null; then
             echo "populating TopGit branches..."
             tg remote --populate origin
         else
@@ -219,7 +228,7 @@ clone(){
         fi
     fi
 
-    cd $top
+    cd "$top"
 }
 
 # Remove all remote branches, remove tags not reachable from HEAD, do a full
@@ -236,14 +245,14 @@ make_deterministic_repo(){
         .git/refs/remotes/origin/HEAD .git/config
 
     # Remove all remote branches.
-    git branch -r | while read branch; do
+    git branch -r | while read -r branch; do
         git branch -rD "$branch" >&2
     done
 
     # Remove tags not reachable from HEAD. If we're exactly on a tag, don't
     # delete it.
     maybe_tag=$(git tag --points-at HEAD)
-    git tag --contains HEAD | while read tag; do
+    git tag --contains HEAD | while read -r tag; do
         if [ "$tag" != "$maybe_tag" ]; then
             git tag -d "$tag" >&2
         fi
@@ -270,7 +279,7 @@ _clone_user_rev() {
         HEAD|refs/*)
             clone "$dir" "$url" "" "$rev" 1>&2;;
         *)
-            if test -z "$(echo $rev | tr -d 0123456789abcdef)"; then
+            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."
@@ -278,9 +287,9 @@ _clone_user_rev() {
             fi;;
     esac
 
-    fullRev="$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/$branchName) | tail -n1)"
-    humanReadableRev="$(cd $dir && (git describe $fullRev 2> /dev/null || git describe --tags $fullRev 2> /dev/null || echo -- none --))"
-    commitDate="$(cd $dir && git show --no-patch --pretty=%ci $fullRev)"
+    fullRev="$(cd "$dir" && (git rev-parse "$rev" 2> /dev/null || git rev-parse "refs/heads/$branchName") | tail -n1)"
+    humanReadableRev="$(cd "$dir" && (git describe "$fullRev" 2> /dev/null || git describe --tags "$fullRev" 2> /dev/null || echo -- none --))"
+    commitDate="$(cd "$dir" && git show --no-patch --pretty=%ci "$fullRev")"
 
     # Allow doing additional processing before .git removal
     eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"
@@ -288,7 +297,7 @@ _clone_user_rev() {
         echo "removing \`.git'..." >&2
         find "$dir" -name .git -print0 | xargs -0 rm -rf
     else
-        find "$dir" -name .git | while read gitdir; do
+        find "$dir" -name .git | while read -r gitdir; do
             make_deterministic_repo "$(readlink -f "$gitdir/..")"
         done
     fi
@@ -299,6 +308,7 @@ clone_user_rev() {
         _clone_user_rev "$@"
     else
         errfile="$(mktemp "${TMPDIR:-/tmp}/git-checkout-err-XXXXXXXX")"
+        # shellcheck disable=SC2064
         trap "rm -rf \"$errfile\"" EXIT
         _clone_user_rev "$@" 2> "$errfile" || (
             status="$?"
@@ -343,7 +353,7 @@ fi
 
 if test -n "$builder"; then
     test -n "$out" -a -n "$url" -a -n "$rev" || usage
-    mkdir -p $out
+    mkdir -p "$out"
     clone_user_rev "$out" "$url" "$rev"
 else
     if test -z "$hashType"; then
@@ -365,6 +375,7 @@ else
     if test -z "$finalPath"; then
 
         tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
+        # shellcheck disable=SC2064
         trap "rm -rf \"$tmpPath\"" EXIT
 
         tmpFile="$tmpPath/$(url_to_name "$url" "$rev")"
@@ -374,7 +385,7 @@ else
         clone_user_rev "$tmpFile" "$url" "$rev"
 
         # Compute the hash.
-        hash=$(nix-hash --type $hashType --base32 $tmpFile)
+        hash=$(nix-hash --type $hashType --base32 "$tmpFile")
 
         # Add the downloaded file to the Nix store.
         finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpFile")
@@ -389,6 +400,6 @@ else
     print_results "$hash"
 
     if test -n "$PRINT_PATH"; then
-        echo $finalPath
+        echo "$finalPath"
     fi
 fi

From b0ff10ada2c7938adbe1d558005a8507550d767a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Jun 2016 22:26:16 +0300
Subject: [PATCH 238/436] clojure: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 27870e753a69..05d896db3831 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, ant, jdk, makeWrapper }:
 
-let version = "1.7.0"; in
+let version = "1.8.0"; in
 
 stdenv.mkDerivation {
   name = "clojure-${version}";
 
   src = fetchurl {
     url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
-    sha256 = "14yg0g6vpzxjwlvs5anq9jfz9zdbd3rsl6qsgxa6qxm19mwh7qsd";
+    sha256 = "1nip095fz5c492sw15skril60i1vd21ibg6szin4jcvyy3xr6cym";
   };
 
   buildInputs = [ unzip ant jdk makeWrapper ];

From a7815995bfe8791bc123b5f283c78d81467dd51e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 12 Jun 2016 15:56:42 +0300
Subject: [PATCH 239/436] cython: 0.23.4 -> 0.24

---
 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 fc342922fe8e..cb12e63bfafc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3821,21 +3821,22 @@ in modules // {
 
   cython = buildPythonPackage rec {
     name = "Cython-${version}";
-    version = "0.23.4";
+    version = "0.24";
 
     src = pkgs.fetchurl {
       url = "http://www.cython.org/release/${name}.tar.gz";
-      sha256 = "13hdffhd37mx3gjby018xl179jaj957fy7kzi01crmimxvn2zi7y";
+      sha256 = "1wd3q97gia3zhsgcdlvxh26hkrf3m53i6r1l4g0yya119264vr3d";
     };
 
     buildInputs = with self; [ pkgs.pkgconfig pkgs.gdb ];
+    # For testing
+    nativeBuildInputs = with self; [ numpy pkgs.ncurses ];
 
     checkPhase = ''
+      export HOME="$NIX_BUILD_TOP"
       ${python.interpreter} runtests.py
     '';
 
-    doCheck = false; # Lots of weird compiler errors
-
     meta = {
       description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";
       platforms = platforms.all;

From 8a1ebe98f3cbf2229db13d6cc6100c0a89753e42 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 12 Jun 2016 14:38:11 +0100
Subject: [PATCH 240/436] influxdb: 0.9.4 -> 0.13.0

---
 pkgs/servers/nosql/influxdb/default.nix |  17 +-
 pkgs/servers/nosql/influxdb/deps.json   | 215 ++++++++++++++++++++++--
 pkgs/servers/nosql/influxdb/gdm2nix.rb  |  33 ++++
 3 files changed, 240 insertions(+), 25 deletions(-)
 create mode 100755 pkgs/servers/nosql/influxdb/gdm2nix.rb

diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 1372b6a3fc36..9f119b3f1389 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -1,26 +1,29 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "influxdb-${rev}";
-  rev = "v0.9.4";
-  goPackagePath = "github.com/influxdb/influxdb";
+  name = "influxdb-${version}";
+  version = "0.13.0";
+
+  goPackagePath = "github.com/influxdata/influxdb";
 
   src = fetchFromGitHub {
-    inherit rev;
-    owner = "influxdb";
+    owner = "influxdata";
     repo = "influxdb";
-    sha256 = "0yarymppnlpf2xab57i8jx595v47s5mdwnf13719mc1fv3q84yqn";
+    rev = "v${version}";
+    sha256 = "0f7af5jb1f65qnslhc7zccml1qvk6xx5naczqfsf4s1zc556fdi4";
   };
 
   excludedPackages = "test";
 
+  # Generated with the `gdm2nix.rb` script and the `Godeps` file from the
+  # influxdb repo root.
   goDeps = ./deps.json;
 
   meta = with lib; {
     description = "An open-source distributed time series database";
     license = licenses.mit;
     homepage = https://influxdb.com/;
-    maintainers = with maintainers; [ offline ];
+    maintainers = with maintainers; [ offline zimbatm ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/nosql/influxdb/deps.json b/pkgs/servers/nosql/influxdb/deps.json
index f091b58e8dc4..33388cc0fb79 100644
--- a/pkgs/servers/nosql/influxdb/deps.json
+++ b/pkgs/servers/nosql/influxdb/deps.json
@@ -1,21 +1,200 @@
 [
   {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/peterh/liner",
-      "github.com/BurntSushi/toml",
-      "github.com/kimor79/gollectd",
-      "github.com/bmizerany/pat",
-      "gopkg.in/fatih/pool.v2",
-      "github.com/rakyll/statik",
-      "github.com/armon/go-metrics",
-      "github.com/boltdb/bolt",
-      "github.com/golang/snappy",
-      "github.com/hashicorp/go-msgpack",
-      "github.com/hashicorp/raft-boltdb",
-      "golang.org/x/crypto",
-      "github.com/gogo/protobuf",
-      "github.com/hashicorp/raft"
-    ]
+    "goPackagePath": "collectd.org",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/collectd/go-collectd.git",
+      "rev": "9fc824c70f713ea0f058a07b49a4c563ef2a3b98",
+      "sha256": "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w"
+    }
+  },
+  {
+    "goPackagePath": "github.com/BurntSushi/toml",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/BurntSushi/toml.git",
+      "rev": "a4eecd407cf4129fc902ece859a0114e4cf1a7f4",
+      "sha256": "1l74zvd534k2fs73gmaq4mgl48p1i9559k1gwq4vakca727z5sgf"
+    }
+  },
+  {
+    "goPackagePath": "github.com/armon/go-metrics",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/armon/go-metrics.git",
+      "rev": "345426c77237ece5dab0e1605c3e4b35c3f54757",
+      "sha256": "13bp2ykqhnhzif7wzrwsg54c2b0czhgs9csbvzbvc93n72s59jh5"
+    }
+  },
+  {
+    "goPackagePath": "github.com/bmizerany/pat",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/bmizerany/pat.git",
+      "rev": "b8a35001b773c267eb260a691f4e5499a3531600",
+      "sha256": "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz"
+    }
+  },
+  {
+    "goPackagePath": "github.com/boltdb/bolt",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/boltdb/bolt.git",
+      "rev": "2f846c3551b76d7710f159be840d66c3d064abbe",
+      "sha256": "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5"
+    }
+  },
+  {
+    "goPackagePath": "github.com/davecgh/go-spew",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/davecgh/go-spew.git",
+      "rev": "fc32781af5e85e548d3f1abaf0fa3dbe8a72495c",
+      "sha256": "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232"
+    }
+  },
+  {
+    "goPackagePath": "github.com/dgryski/go-bits",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/dgryski/go-bits.git",
+      "rev": "86c69b3c986f9d40065df5bd8f765796549eef2e",
+      "sha256": "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b"
+    }
+  },
+  {
+    "goPackagePath": "github.com/dgryski/go-bitstream",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/dgryski/go-bitstream.git",
+      "rev": "27cd5973303fde7d914860be1ea4b927a6be0c92",
+      "sha256": "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gogo/protobuf",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gogo/protobuf.git",
+      "rev": "74b6e9deaff6ba6da1389ec97351d337f0d08b06",
+      "sha256": "0045fz4bx72rikm2ggx9j1h3yrq518299qwaizrgy5jvxzj1707b"
+    }
+  },
+  {
+    "goPackagePath": "github.com/golang/snappy",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/golang/snappy.git",
+      "rev": "5979233c5d6225d4a8e438cdd0b411888449ddab",
+      "sha256": "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/go-msgpack",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/go-msgpack.git",
+      "rev": "fa3f63826f7c23912c15263591e65d54d080b458",
+      "sha256": "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/raft",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/raft.git",
+      "rev": "8fd9a2fdfd154f4b393aa24cff91e3c317efe839",
+      "sha256": "04k03x6r6h2xwxfvbzicfdblifdjn35agw9kwla6akw6l54ygy0f"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/raft-boltdb",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/raft-boltdb.git",
+      "rev": "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee",
+      "sha256": "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia"
+    }
+  },
+  {
+    "goPackagePath": "github.com/influxdata/usage-client",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/influxdata/usage-client.git",
+      "rev": "475977e68d79883d9c8d67131c84e4241523f452",
+      "sha256": "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jwilder/encoding",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jwilder/encoding.git",
+      "rev": "b421ab402545ef5a119f4f827784c6551d9bfc37",
+      "sha256": "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq"
+    }
+  },
+  {
+    "goPackagePath": "github.com/kimor79/gollectd",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/kimor79/gollectd.git",
+      "rev": "61d0deeb4ffcc167b2a1baa8efd72365692811bc",
+      "sha256": "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs"
+    }
+  },
+  {
+    "goPackagePath": "github.com/paulbellamy/ratecounter",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/paulbellamy/ratecounter.git",
+      "rev": "5a11f585a31379765c190c033b6ad39956584447",
+      "sha256": "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0"
+    }
+  },
+  {
+    "goPackagePath": "github.com/peterh/liner",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/peterh/liner.git",
+      "rev": "82a939e738b0ee23e84ec7a12d8e216f4d95c53f",
+      "sha256": "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04"
+    }
+  },
+  {
+    "goPackagePath": "github.com/rakyll/statik",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/rakyll/statik.git",
+      "rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465",
+      "sha256": "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/crypto",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/golang/crypto.git",
+      "rev": "1f22c0103821b9390939b6776727195525381532",
+      "sha256": "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/tools",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/golang/tools.git",
+      "rev": "8b178a93c1f5b5c8f4e36cd6bd64e0d5bf0ee180",
+      "sha256": "0rqm56c4acrvyqsp53dkzr34pkz922x4rwknaslwlbkyc4gyg2c8"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/fatih/pool.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/fatih/pool.git",
+      "rev": "cba550ebf9bce999a02e963296d4bc7a486cb715",
+      "sha256": "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0"
+    }
   }
-]
+]
\ No newline at end of file
diff --git a/pkgs/servers/nosql/influxdb/gdm2nix.rb b/pkgs/servers/nosql/influxdb/gdm2nix.rb
new file mode 100755
index 000000000000..4c49c8a538ff
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb/gdm2nix.rb
@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+#
+#
+require "json"
+
+redirects = {
+  "collectd.org" => "github.com/collectd/go-collectd",
+  "golang.org/x/crypto" => "github.com/golang/crypto",
+  "golang.org/x/tools" => "github.com/golang/tools",
+  "gopkg.in/fatih/pool.v2" => "github.com/fatih/pool",
+}
+
+deps = File.read("Godeps").lines.map do |line|
+  (name, rev) = line.split(" ")
+
+  host = redirects.fetch(name, name)
+
+  url = "https://#{host}.git"
+
+  xxx = JSON.load(`nix-prefetch-git #{url} #{rev}`)
+  
+  {
+    goPackagePath: name,
+    fetch: {
+      type: "git",
+      url: url,
+      rev: rev,
+      sha256: xxx['sha256'],
+    }
+  }
+end
+
+File.write("deps.json", JSON.pretty_generate(deps))

From 08770cd2429467c468b64a41a91ce2f04daa1357 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 12 Jun 2016 15:08:44 +0100
Subject: [PATCH 241/436] influxdb: merge deps with the common go-modules

---
 pkgs/development/go-modules/libs.json |  56 ++++++++-
 pkgs/servers/nosql/influxdb/deps.json | 175 ++++++++------------------
 2 files changed, 105 insertions(+), 126 deletions(-)

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index c3bb2eb7ea3d..1c25758dfbcd 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1537,5 +1537,59 @@
       "rev": "772320464101e904cd51198160eb4d489be9cc49",
       "sha256": "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j"
     }
+  },
+  {
+    "goPackagePath": "github.com/influxdata/usage-client",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/influxdata/usage-client.git",
+      "rev": "475977e68d79883d9c8d67131c84e4241523f452",
+      "sha256": "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jwilder/encoding",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jwilder/encoding.git",
+      "rev": "b421ab402545ef5a119f4f827784c6551d9bfc37",
+      "sha256": "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq"
+    }
+  },
+  {
+    "goPackagePath": "collectd.org",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/collectd/go-collectd.git",
+      "rev": "9fc824c70f713ea0f058a07b49a4c563ef2a3b98",
+      "sha256": "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w"
+    }
+  },
+  {
+    "goPackagePath": "github.com/dgryski/go-bits",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/dgryski/go-bits.git",
+      "rev": "86c69b3c986f9d40065df5bd8f765796549eef2e",
+      "sha256": "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b"
+    }
+  },
+  {
+    "goPackagePath": "github.com/dgryski/go-bitstream",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/dgryski/go-bitstream.git",
+      "rev": "27cd5973303fde7d914860be1ea4b927a6be0c92",
+      "sha256": "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6"
+    }
+  },
+  {
+    "goPackagePath": "github.com/paulbellamy/ratecounter",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/paulbellamy/ratecounter.git",
+      "rev": "5a11f585a31379765c190c033b6ad39956584447",
+      "sha256": "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0"
+    }
   }
-]
+]
\ No newline at end of file
diff --git a/pkgs/servers/nosql/influxdb/deps.json b/pkgs/servers/nosql/influxdb/deps.json
index 33388cc0fb79..71b3bfb032f9 100644
--- a/pkgs/servers/nosql/influxdb/deps.json
+++ b/pkgs/servers/nosql/influxdb/deps.json
@@ -1,11 +1,11 @@
 [
   {
-    "goPackagePath": "collectd.org",
+    "goPackagePath": "github.com/hashicorp/raft",
     "fetch": {
       "type": "git",
-      "url": "https://github.com/collectd/go-collectd.git",
-      "rev": "9fc824c70f713ea0f058a07b49a4c563ef2a3b98",
-      "sha256": "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w"
+      "url": "https://github.com/hashicorp/raft.git",
+      "rev": "8fd9a2fdfd154f4b393aa24cff91e3c317efe839",
+      "sha256": "04k03x6r6h2xwxfvbzicfdblifdjn35agw9kwla6akw6l54ygy0f"
     }
   },
   {
@@ -26,24 +26,6 @@
       "sha256": "13bp2ykqhnhzif7wzrwsg54c2b0czhgs9csbvzbvc93n72s59jh5"
     }
   },
-  {
-    "goPackagePath": "github.com/bmizerany/pat",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/bmizerany/pat.git",
-      "rev": "b8a35001b773c267eb260a691f4e5499a3531600",
-      "sha256": "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz"
-    }
-  },
-  {
-    "goPackagePath": "github.com/boltdb/bolt",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/boltdb/bolt.git",
-      "rev": "2f846c3551b76d7710f159be840d66c3d064abbe",
-      "sha256": "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5"
-    }
-  },
   {
     "goPackagePath": "github.com/davecgh/go-spew",
     "fetch": {
@@ -53,24 +35,6 @@
       "sha256": "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232"
     }
   },
-  {
-    "goPackagePath": "github.com/dgryski/go-bits",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/dgryski/go-bits.git",
-      "rev": "86c69b3c986f9d40065df5bd8f765796549eef2e",
-      "sha256": "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b"
-    }
-  },
-  {
-    "goPackagePath": "github.com/dgryski/go-bitstream",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/dgryski/go-bitstream.git",
-      "rev": "27cd5973303fde7d914860be1ea4b927a6be0c92",
-      "sha256": "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6"
-    }
-  },
   {
     "goPackagePath": "github.com/gogo/protobuf",
     "fetch": {
@@ -89,6 +53,15 @@
       "sha256": "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s"
     }
   },
+  {
+    "goPackagePath": "github.com/boltdb/bolt",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/boltdb/bolt.git",
+      "rev": "2f846c3551b76d7710f159be840d66c3d064abbe",
+      "sha256": "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5"
+    }
+  },
   {
     "goPackagePath": "github.com/hashicorp/go-msgpack",
     "fetch": {
@@ -98,87 +71,6 @@
       "sha256": "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k"
     }
   },
-  {
-    "goPackagePath": "github.com/hashicorp/raft",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/hashicorp/raft.git",
-      "rev": "8fd9a2fdfd154f4b393aa24cff91e3c317efe839",
-      "sha256": "04k03x6r6h2xwxfvbzicfdblifdjn35agw9kwla6akw6l54ygy0f"
-    }
-  },
-  {
-    "goPackagePath": "github.com/hashicorp/raft-boltdb",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/hashicorp/raft-boltdb.git",
-      "rev": "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee",
-      "sha256": "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia"
-    }
-  },
-  {
-    "goPackagePath": "github.com/influxdata/usage-client",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/influxdata/usage-client.git",
-      "rev": "475977e68d79883d9c8d67131c84e4241523f452",
-      "sha256": "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy"
-    }
-  },
-  {
-    "goPackagePath": "github.com/jwilder/encoding",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/jwilder/encoding.git",
-      "rev": "b421ab402545ef5a119f4f827784c6551d9bfc37",
-      "sha256": "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq"
-    }
-  },
-  {
-    "goPackagePath": "github.com/kimor79/gollectd",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/kimor79/gollectd.git",
-      "rev": "61d0deeb4ffcc167b2a1baa8efd72365692811bc",
-      "sha256": "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs"
-    }
-  },
-  {
-    "goPackagePath": "github.com/paulbellamy/ratecounter",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/paulbellamy/ratecounter.git",
-      "rev": "5a11f585a31379765c190c033b6ad39956584447",
-      "sha256": "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0"
-    }
-  },
-  {
-    "goPackagePath": "github.com/peterh/liner",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/peterh/liner.git",
-      "rev": "82a939e738b0ee23e84ec7a12d8e216f4d95c53f",
-      "sha256": "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04"
-    }
-  },
-  {
-    "goPackagePath": "github.com/rakyll/statik",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/rakyll/statik.git",
-      "rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465",
-      "sha256": "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp"
-    }
-  },
-  {
-    "goPackagePath": "golang.org/x/crypto",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/golang/crypto.git",
-      "rev": "1f22c0103821b9390939b6776727195525381532",
-      "sha256": "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"
-    }
-  },
   {
     "goPackagePath": "golang.org/x/tools",
     "fetch": {
@@ -189,12 +81,45 @@
     }
   },
   {
-    "goPackagePath": "gopkg.in/fatih/pool.v2",
+    "goPackagePath": "github.com/kimor79/gollectd",
     "fetch": {
       "type": "git",
-      "url": "https://github.com/fatih/pool.git",
-      "rev": "cba550ebf9bce999a02e963296d4bc7a486cb715",
-      "sha256": "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0"
+      "url": "https://github.com/kimor79/gollectd.git",
+      "rev": "61d0deeb4ffcc167b2a1baa8efd72365692811bc",
+      "sha256": "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs"
     }
+  },
+  {
+    "goPackagePath": "github.com/peterh/liner",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/peterh/liner.git",
+      "rev": "82a939e738b0ee23e84ec7a12d8e216f4d95c53f",
+      "sha256": "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/crypto",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/golang/crypto.git",
+      "rev": "1f22c0103821b9390939b6776727195525381532",
+      "sha256": "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"
+    }
+  },
+  {
+    "include": "../../../development/go-modules/libs.json",
+    "packages": [
+      "github.com/influxdata/usage-client",
+      "github.com/jwilder/encoding",
+      "collectd.org",
+      "github.com/dgryski/go-bits",
+      "github.com/dgryski/go-bitstream",
+      "gopkg.in/fatih/pool.v2",
+      "github.com/bmizerany/pat",
+      "github.com/rakyll/statik",
+      "github.com/hashicorp/raft-boltdb",
+      "github.com/paulbellamy/ratecounter"
+    ]
   }
 ]
\ No newline at end of file

From 887c316b7ded27954488f29f1e25b0aaa76b16a6 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 12 Jun 2016 16:58:43 +0200
Subject: [PATCH 242/436] melpa(-unstable)-packages 2016-06-12

---
 .../editors/emacs-modes/melpa-generated.nix   | 7740 +++++++++--------
 .../emacs-modes/melpa-stable-generated.nix    | 3289 +++----
 2 files changed, 5819 insertions(+), 5210 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 6ebe16171964..2e657b69b501 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -10,7 +10,7 @@
           sha256 = "1xigpz2aswlmpcsc1f7gfakyw7041pbyl9zfd8nz38iq036n5b96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/0blayout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/0blayout";
           sha256 = "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92";
           name = "_0blayout";
         };
@@ -30,7 +30,7 @@
           sha256 = "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/2048-game";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/2048-game";
           sha256 = "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0";
           name = "_2048-game";
         };
@@ -51,7 +51,7 @@
           sha256 = "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/4clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/4clojure";
           sha256 = "09bmdxkkp676sn1sbbly44k99i47w83yznq950nkxv6x8753ifgk";
           name = "_4clojure";
         };
@@ -72,7 +72,7 @@
           sha256 = "0d7q0fhcw4cvy9140hwxp8zdh0g37zhfsq6kmsdngxdx7lw3wryi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aa-edit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aa-edit-mode";
           sha256 = "00b99ik04xx4b2a1cm1z8dl42hjnb5r32qypjyyx8924n1dhxzgn";
           name = "aa-edit-mode";
         };
@@ -93,7 +93,7 @@
           sha256 = "1h4gwp2gyd4jhbkb8ai1zbzhhmlhmihbwzr0wsxg5yq074n72ifs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/abc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/abc-mode";
           sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
           name = "abc-mode";
         };
@@ -114,7 +114,7 @@
           sha256 = "09hy7rj27h7xbvasd87146di4vhpg5cmqc9f39fy0ihmv9gy56za";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/abl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/abl-mode";
           sha256 = "0h25lc87pa8irgxflnmnmkr9dcv4kz841nfc45fcz4awrn75kkzb";
           name = "abl-mode";
         };
@@ -135,7 +135,7 @@
           sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/abyss-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/abyss-theme";
           sha256 = "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c";
           name = "abyss-theme";
         };
@@ -156,7 +156,7 @@
           sha256 = "19msfx3f3px1maj41bzh139s6sv2pjk9vm3bphn7758fqhzyin0f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-alchemist";
           sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
           name = "ac-alchemist";
         };
@@ -177,7 +177,7 @@
           sha256 = "092m8y38h4irh2ig6n6510gw2scjjxah37zim6mk92jzn1xv06d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-anaconda";
           sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
           name = "ac-anaconda";
         };
@@ -198,7 +198,7 @@
           sha256 = "1z6rj15p5gjv0jwnnck8789n9csf1pwxfvsz37graihgfy2khj0y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-c-headers";
           sha256 = "1cq5rz2w79bj185va7y13x7bciihrpsvyxwk6msmcxb4g86s9phv";
           name = "ac-c-headers";
         };
@@ -219,7 +219,7 @@
           sha256 = "1llpnb9vy612sg214i76rxnzcl3qx8pqnixczc5pik9kd3fdaz5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-cake";
           sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl";
           name = "ac-cake";
         };
@@ -240,7 +240,7 @@
           sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-cake2";
           sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy";
           name = "ac-cake2";
         };
@@ -261,7 +261,7 @@
           sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-capf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-capf";
           sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
           name = "ac-capf";
         };
@@ -274,15 +274,15 @@
     ac-cider = callPackage ({ auto-complete, cider, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ac-cider";
-        version = "20160530.1358";
+        version = "20160611.1204";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "ac-cider";
-          rev = "4be034e5f82421b0a836ec7ff45815c67caffcee";
-          sha256 = "12s7wy7fyk5z9q287j871gcsrvj90f4c81h39p66d99jw0cl93qj";
+          rev = "cb3a758690faa12e9a8542897a92db9cc55e10e7";
+          sha256 = "13vv6k81zjmj14220yhc11il5s222hj83imh307xs4k6qyslpnav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-cider";
           sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
           name = "ac-cider";
         };
@@ -303,7 +303,7 @@
           sha256 = "0n9zagwh3rz7b76irj4ya8wskffns9v1c1pivsdqgpd76spvl7n5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-clang";
           sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
           name = "ac-clang";
         };
@@ -321,7 +321,7 @@
           sha256 = "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-dabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-dabbrev";
           sha256 = "03lndw7y55bzz4rckl80j0kh66qa82xxxhfakzs1dh1h9f1f0azh";
           name = "ac-dabbrev";
         };
@@ -342,7 +342,7 @@
           sha256 = "1hlijh415wgl450ry16a1072jjrkqqqkk862hfhswfr2l6rjfw98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-dcd";
           sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
           name = "ac-dcd";
         };
@@ -363,7 +363,7 @@
           sha256 = "1lkhqmfkjga7qi4r1m7mjax3pyf9m6minsn57cbzm2z2kvkhq22g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-emmet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-emmet";
           sha256 = "09ycjllfpdgqaf5iis5bkkhal1vxvl3qkxrn2759p67s97c49f3x";
           name = "ac-emmet";
         };
@@ -384,7 +384,7 @@
           sha256 = "19981mzxnqqdb8dsdizy2i8byb8sx9138x3nrvi6ap2qbcsabjmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-emoji";
           sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
           name = "ac-emoji";
         };
@@ -405,7 +405,7 @@
           sha256 = "140i02b2ipyfmki945l1xd1nsqdpganhmi3bmwj1h9w8cg078bd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-etags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-etags";
           sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
           name = "ac-etags";
         };
@@ -426,7 +426,7 @@
           sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-geiser";
           sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
           name = "ac-geiser";
         };
@@ -447,7 +447,7 @@
           sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-haskell-process";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-haskell-process";
           sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
           name = "ac-haskell-process";
         };
@@ -468,7 +468,7 @@
           sha256 = "1fyikdwn0gzng7pbmfg7zb7jphjv228776vsjc12j7g1aqz92n4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-helm";
           sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
           name = "ac-helm";
         };
@@ -489,7 +489,7 @@
           sha256 = "0lz1a8a4bqxiw20jh65r7cg7jnid3vz4h8b7dkfcrzwn0agx8frw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-html";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-html";
           sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
           name = "ac-html";
         };
@@ -510,7 +510,7 @@
           sha256 = "1v3ia439h4n2i204n0sazzbwwm0l5k6j31gq58iv2rqrq2ysikny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-html-angular";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-html-angular";
           sha256 = "05rbxf5kbr4jlskrhvfvhf82qvb55zl5cb6z1ymfh9l3h9j9xk3s";
           name = "ac-html-angular";
         };
@@ -531,7 +531,7 @@
           sha256 = "0ry398awbsyswc87v275x4mdyv64kr0s647y6nagqg1h3n3jhvsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-html-bootstrap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-html-bootstrap";
           sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
           name = "ac-html-bootstrap";
         };
@@ -552,7 +552,7 @@
           sha256 = "0swbw62zh5rjjf73pvmp8brrrmk6bp061k793z4z83v7ic0cicrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-html-csswatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-html-csswatcher";
           sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
           name = "ac-html-csswatcher";
         };
@@ -573,7 +573,7 @@
           sha256 = "0xdqk0qr1mmm5q3049ldwlmrcfgz6rzk4yxc8qgz6kll27kciia0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-inf-ruby";
           sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
           name = "ac-inf-ruby";
         };
@@ -594,7 +594,7 @@
           sha256 = "1cq73bdv3lkn8v3nx6aznygqaac9s5i7pvirl8wz9ib31hsgwpbk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-ispell";
           sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
           name = "ac-ispell";
         };
@@ -615,7 +615,7 @@
           sha256 = "0yn9333rjs2pzb1wk1japclsqagdcl28j0yjl3q5b70g5gi5vx7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-js2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-js2";
           sha256 = "0gcr0xdi89nj3854v2z3nndfgazmcdzmd6wdndl0i4s7pdfl96fa";
           name = "ac-js2";
         };
@@ -636,7 +636,7 @@
           sha256 = "0p5cdaw9v8jgnmjqpb95bxy4khwbdgg19wzg8jkr2j2p55dpfbd6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-math";
           sha256 = "02c821zabxp9qkwx252pxjmssdbmas0iwanw09r03bmiby9d4nsl";
           name = "ac-math";
         };
@@ -657,7 +657,7 @@
           sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-mozc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-mozc";
           sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
           name = "ac-mozc";
         };
@@ -678,7 +678,7 @@
           sha256 = "16bg2zg08223x7q54rmfjziaccgm64h9vc8z59sjljkw1bgx9m7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-octave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-octave";
           sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
           name = "ac-octave";
         };
@@ -699,7 +699,7 @@
           sha256 = "02mpyzc7w14f3xgj4snkqh54537892a4bz98dl0fac65fk268xzy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-php";
           sha256 = "1dlz4cv54ynl4ql5l2sa5lazlzq6rrlbz61k20l5lcljjwvj5xja";
           name = "ac-php";
         };
@@ -730,7 +730,7 @@
           sha256 = "0p0220axf7c0ga4bkd8d2lcwdgwz08xqglw56lnwzdlksgqhsgyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
           name = "ac-racer";
         };
@@ -751,7 +751,7 @@
           sha256 = "1nvz0jfz4x99xc5ywspl8fdpyqns5zd0j7i4bwzlwplmy3qakjwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-skk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-skk";
           sha256 = "0iycyfgv8v15ygngvyx66m3w3sv8p9h6q6j1hbpzwd8azl8fzj5z";
           name = "ac-skk";
         };
@@ -772,7 +772,7 @@
           sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-slime";
           sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
           name = "ac-slime";
         };
@@ -793,7 +793,7 @@
           sha256 = "0mif35chyj4ai1bj4gq8qi38dyfsp72yi1xchhzy9zi2plpvqa7a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-sly";
           sha256 = "1ng81b5f8w2s9mm9s7h5kwyx8fdwndnlsbzx50slmqyaz2ad15mx";
           name = "ac-sly";
         };
@@ -814,7 +814,7 @@
           sha256 = "1msj0dbzfan0jax5wh5rmv4l7cp5zhrp5wy5k1n9s7xdgz2dprzj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-flyspell";
           sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
           name = "ace-flyspell";
         };
@@ -835,7 +835,7 @@
           sha256 = "02i3gxk7kfv3a0pcc82z69hgvjw8bvn40y8h7d59chg8bixcwbyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
           name = "ace-isearch";
         };
@@ -856,7 +856,7 @@
           sha256 = "1y2rl4faj1nfjqbh393yp460cbv24simllak31ag1ischpcbqjy4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-jump-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-jump-buffer";
           sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
           name = "ace-jump-buffer";
         };
@@ -877,7 +877,7 @@
           sha256 = "1d4bxxcnjbdr6cjr3jmz2zrnzjv5pwrypbp4xqgqyv9rz02n7ac1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-jump-helm-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-jump-helm-line";
           sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
           name = "ace-jump-helm-line";
         };
@@ -898,7 +898,7 @@
           sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-jump-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-jump-mode";
           sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
           name = "ace-jump-mode";
         };
@@ -919,7 +919,7 @@
           sha256 = "0z0rblr41r94l4b2gh9fcw50nk82ifxrr3ilxqzbb8wmvil54gh4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-jump-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-jump-zap";
           sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
           name = "ace-jump-zap";
         };
@@ -940,7 +940,7 @@
           sha256 = "1mrlwkls80blispg5hdgnif42rck3iqhcm1f3khq14nm09yqwdk9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-link";
           sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
           name = "ace-link";
         };
@@ -961,7 +961,7 @@
           sha256 = "1zgmqgh5dff914dw7i8s142znd849gv4xh86f8q8agx5r7almx14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-mc";
           sha256 = "1kca6ha2glhv7lkamqx3sxp7dy05c7f6xxy3lr3v2bik8r50jss8";
           name = "ace-mc";
         };
@@ -974,15 +974,15 @@
     ace-pinyin = callPackage ({ ace-jump-mode, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }:
     melpaBuild {
         pname = "ace-pinyin";
-        version = "20160516.637";
+        version = "20160612.255";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "ace-pinyin";
-          rev = "72c8ea30cd52397a10b94dbe2cb32ee6ad09b4c1";
-          sha256 = "0q91f52v57qgfn245z3xsskqj9p9lpmxpj3py0vcx8r9br0ykagq";
+          rev = "8f7d7fdf3912730076d30b0a3ba17d05da1db9ee";
+          sha256 = "06bsrnhhpncmk6jpcnvmjdb0ccz6z34ksf2ywp00l1c343p90v38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-pinyin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-pinyin";
           sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
           name = "ace-pinyin";
         };
@@ -1003,7 +1003,7 @@
           sha256 = "1afw9nxxd0shlg62w9ifc1wlf8vsw5ss8r52h5a5s8m3pnswlx2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-popup-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-popup-menu";
           sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
           name = "ace-popup-menu";
         };
@@ -1024,7 +1024,7 @@
           sha256 = "1afc0f8ax334gv644zdrrp55754gxa353iijvmfzxmlr67v23j96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-window";
           sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
           name = "ace-window";
         };
@@ -1044,7 +1044,7 @@
           sha256 = "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/achievements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/achievements";
           sha256 = "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr";
           name = "achievements";
         };
@@ -1065,7 +1065,7 @@
           sha256 = "02ba4d8qkvgy52g0zcbyfvsnhr9685gq569nkwa2as30xdcq3khm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ack-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ack-menu";
           sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
           name = "ack-menu";
         };
@@ -1086,7 +1086,7 @@
           sha256 = "1rxx2j7kkzjdsk06zgisiydg8dc18vqll4wl6q9mfhrg2y12lq94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/actionscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/actionscript-mode";
           sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
           name = "actionscript-mode";
         };
@@ -1107,7 +1107,7 @@
           sha256 = "0dk7hyp7cs0ws4w7i32g7di5aqkkxlxkvmrllg43bi5ivlji7pvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/addressbook-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/addressbook-bookmark";
           sha256 = "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r";
           name = "addressbook-bookmark";
         };
@@ -1128,7 +1128,7 @@
           sha256 = "199da15f6p84809z33w3m35lrk9bgx8qpgnxsxgisli373mpzvd8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/adoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/adoc-mode";
           sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
           name = "adoc-mode";
         };
@@ -1149,7 +1149,7 @@
           sha256 = "1p90yv2xl1hhpjm0mmhdjyf1jagf79610hkzhw8nycy2p1y4gvl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aes";
           sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
           name = "aes";
         };
@@ -1170,7 +1170,7 @@
           sha256 = "19d5d6qs5nwmpf26rsb86ranb5p4236qp7p2b4i88cimcmzspylb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/afternoon-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/afternoon-theme";
           sha256 = "13xgdw8px58sxpl7nyhkcdxwqdpp13i8wghvlb3l4471plw3vqgj";
           name = "afternoon-theme";
         };
@@ -1191,7 +1191,7 @@
           sha256 = "1hwjd1ln99595xwakynhgr3azs4h8rziy75kfz8k5b7i3hns7z08";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ag";
           sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
           name = "ag";
         };
@@ -1212,7 +1212,7 @@
           sha256 = "05lci7hpla4f0z124zr58aj282pgmabqkzgcqadf0hbnqbz2jwcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aggressive-fill-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aggressive-fill-paragraph";
           sha256 = "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja";
           name = "aggressive-fill-paragraph";
         };
@@ -1225,15 +1225,15 @@
     aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-indent";
-        version = "20160519.114";
+        version = "20160609.125";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "e49252fcb56982fd9b1d215d5477c80fc2a98ec9";
-          sha256 = "1mymm68126nhv7fss1vlkyy20qw7f2mdsz2cskcjiv1crzpvkz4i";
+          rev = "6c3842eb4501bf6f39ea9b21c50aadd0339c4e6e";
+          sha256 = "168p898flmvczqqh1ql46lgm8cw5y0ydzg5mxpylfiqa26gq3f20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aggressive-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aggressive-indent";
           sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
           name = "aggressive-indent";
         };
@@ -1252,7 +1252,7 @@
           sha256 = "0w5wqanw2spxxhmlxgxyp4rb9i1y6kqhfb8cyv5fz01i8b8p5faw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ahg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ahg";
           sha256 = "0kw138lfzwp54fmly3jzzml11y7fhcjp3w0irmwdzr68lc206lr4";
           name = "ahg";
         };
@@ -1273,7 +1273,7 @@
           sha256 = "07qpwa990bgs9028rqqk344c3z4hnr1jkfzcx9fi4z5k756zmw3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ahk-mode";
           sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
           name = "ahk-mode";
         };
@@ -1294,7 +1294,7 @@
           sha256 = "0y17ilvpqivzrd1hvdwi6w0j5bb2d87v54c54ibnf92aryndvyqy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ahungry-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ahungry-theme";
           sha256 = "0fhim0qscpqx9siprp3ax1azxzmqkzvrjx517d9bnd68z7xxbpqy";
           name = "ahungry-theme";
         };
@@ -1315,7 +1315,7 @@
           sha256 = "0blrpqn8wy9pwzikgzb0v6x4hk7axv93j4byfci62fh1905zfkkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/airline-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/airline-themes";
           sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
           name = "airline-themes";
         };
@@ -1336,7 +1336,7 @@
           sha256 = "1lxpfswp1bjrz192px79f155dycf2kazpr7dfrcr1gyshlgxkpf7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/airplay";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/airplay";
           sha256 = "095nibgs197iplphk6csvkgsrgh1fcfyy33py860v6qmihvk538f";
           name = "airplay";
         };
@@ -1357,7 +1357,7 @@
           sha256 = "1pfmpwma9k6l386v4m884gb5p2apl4k5m2vaxhmb7hnf9p27yrwl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/alchemist";
           sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
           name = "alchemist";
         };
@@ -1378,7 +1378,7 @@
           sha256 = "1bzw713rvih6p2h7c6vw6iyjyiqrrgwr46p5r0l57zklj279m37r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/alda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/alda-mode";
           sha256 = "0vpxiw3k0qxp6s19n93qkkyrr44rbw38ygriqdrfpp84pa09wprh";
           name = "alda-mode";
         };
@@ -1399,7 +1399,7 @@
           sha256 = "1g9fai2i8izswiih4ba0l2wamhfl6pvmkq7is8x0wr45waldcga9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/alect-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/alect-themes";
           sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
           name = "alect-themes";
         };
@@ -1420,7 +1420,7 @@
           sha256 = "1p6969wq2n26jvbh8p2gwc0hw38h4xq4rs299i7yzviq2hwvg8r1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/alert";
           sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
           name = "alert";
         };
@@ -1441,7 +1441,7 @@
           sha256 = "0l2rgs0rd4nmv4v7m10zhf2znzfvdifv1vlhpa3zbppg0fj8zph1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/align-cljlet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/align-cljlet";
           sha256 = "0pnhhv33rvlmb3823xpy9v5h6q99fa7fn38djbwry4rymi4jmlih";
           name = "align-cljlet";
         };
@@ -1454,15 +1454,15 @@
     all-ext = callPackage ({ all, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "all-ext";
-        version = "20160530.328";
+        version = "20160605.1";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "all-ext";
-          rev = "ccee331b96f58c62d9bbc8790d82e6b4eaebc6a1";
-          sha256 = "0fj8426a6sraflk4vr2qb9frfqvaj5fczl8ibn67s6wnnyhhknjc";
+          rev = "2639955833132451679feae8a54ca157c1d864ce";
+          sha256 = "0g5g0nhq76v8jbhs38si6abwn4zv9qh7jl87qhhy3in8s1inswzf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/all-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/all-ext";
           sha256 = "0vmpa5p7likg2xgck18sa0jvmvnhjs9v1fbl82sxx7qy2f3cggql";
           name = "all-ext";
         };
@@ -1483,7 +1483,7 @@
           sha256 = "1q49gfs98djwjxw2sr8q08jf5glf9d3ks9014gjjwa1dpf98mpy3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/amd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/amd-mode";
           sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
           name = "amd-mode";
         };
@@ -1513,7 +1513,7 @@
           sha256 = "17kdv4447dyjaz2chi1f8hlrry8pgvjgxivvk48r9yzi1crjd1zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ample-regexps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ample-regexps";
           sha256 = "00y07pd438v7ldkn5f1w84cpxa1mvcnzjkj6sf5l5pm97xqiz7j2";
           name = "ample-regexps";
         };
@@ -1534,7 +1534,7 @@
           sha256 = "0x72czw5rmz89w5fa27z54bz8qirrr882g0r37pb8li04j1hk7kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ample-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ample-theme";
           sha256 = "055c6jy2q761za4cl1vlqdskcd3mc1j58k8b4418q7h2lv2zc0ry";
           name = "ample-theme";
         };
@@ -1555,7 +1555,7 @@
           sha256 = "18z9jl5d19a132k6g1dvwqfbbdh5cx66b2qxlcjsfiqxlxglc2sa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ample-zen-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ample-zen-theme";
           sha256 = "0xygk80mh05qssrbfj4h6k50pg557dyj6kzc2pdlmnr5r4gnzdn3";
           name = "ample-zen-theme";
         };
@@ -1576,7 +1576,7 @@
           sha256 = "0931yd46dfmaagmgvjx8f4a584a4faaw7krwmhnmhdbc3cqjvy39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anaconda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anaconda-mode";
           sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
           name = "anaconda-mode";
         };
@@ -1597,7 +1597,7 @@
           sha256 = "1ym43y0wqifkzpkm7ayf8cq2wz8pc2wgg9zvdyi0cn9lr9mwpbav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anaphora";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anaphora";
           sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
           name = "anaphora";
         };
@@ -1616,7 +1616,7 @@
           sha256 = "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anchored-transpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anchored-transpose";
           sha256 = "19dgj1605qxc2znvzj0cj6x29zyrh00qnzk2rlwpn9hvzypg9v7w";
           name = "anchored-transpose";
         };
@@ -1637,7 +1637,7 @@
           sha256 = "1cg35nb4hhibsk9d6daszs2khadqb3gzyzaxjsykxsgmpfh27ikv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/android-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/android-mode";
           sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
           name = "android-mode";
         };
@@ -1658,7 +1658,7 @@
           sha256 = "1m0c7ns7aiycg86cgglir8bkw730fslyg1n15m9ki0da4cnmm97a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/angry-police-captain";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/angry-police-captain";
           sha256 = "00r3dx33h0wjxj0687ln8nbl1ff2badm3mk3r3bplfrd61z2qzld";
           name = "angry-police-captain";
         };
@@ -1679,7 +1679,7 @@
           sha256 = "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/angular-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/angular-mode";
           sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
           name = "angular-mode";
         };
@@ -1700,7 +1700,7 @@
           sha256 = "0hdm1a323mzxjfdply8ri3addk146f21d8cmpd18r7dw3j3cdfrn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/angular-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/angular-snippets";
           sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
           name = "angular-snippets";
         };
@@ -1721,7 +1721,7 @@
           sha256 = "08gs96r9mbdg0s5l504yp6i5nmi9qr4nwxq3xprsbx9bdzv5l2dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/annotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/annotate";
           sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
           name = "annotate";
         };
@@ -1742,7 +1742,7 @@
           sha256 = "18cav5wl3d0yq15273rqmdwvrgw96lmqiq9x5fxhf3wjb543mifl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/annotate-depth";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/annotate-depth";
           sha256 = "1j1pwnj7k6gl1p4npxsgrib0j1rzisq40pkm2wchjh86j3ybv2l4";
           name = "annotate-depth";
         };
@@ -1763,7 +1763,7 @@
           sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/annoying-arrows-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/annoying-arrows-mode";
           sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
           name = "annoying-arrows-mode";
         };
@@ -1784,7 +1784,7 @@
           sha256 = "19k71dj83kvc8mks6zhl45vsrsb61via53dqxjv9bny1ybh2av85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ansi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ansi";
           sha256 = "0b5xnv6z471jm53g37njxin6l8yflsgm80y4wxahfgy8apipcq89";
           name = "ansi";
         };
@@ -1805,7 +1805,7 @@
           sha256 = "0k927pwhmn1cfl6jqs7ww1g6f64nq5i8f6a732d4q2rbl3aqzbdi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ansible";
           sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
           name = "ansible";
         };
@@ -1826,7 +1826,7 @@
           sha256 = "1h3rqrjrl8wx7xvvd631jkbbczq3srd4mgz7y9wh3cvz1njdpy62";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ansible-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ansible-doc";
           sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
           name = "ansible-doc";
         };
@@ -1847,7 +1847,7 @@
           sha256 = "0jb5vl3cq5m3r23fjhcxgxl4g011zkjkkyn5mqqxx22a1sydsvab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ant";
           sha256 = "06028xjic14yv3rfqyc3k6jyjgm6fqfrf1mv8lvbh2sri2d5ifqa";
           name = "ant";
         };
@@ -1868,7 +1868,7 @@
           sha256 = "06xa29hq2qgg8hx1igj5hq7c16yj674mlnd3sgj40pwk88j5jp88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anti-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anti-zenburn-theme";
           sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
           name = "anti-zenburn-theme";
         };
@@ -1889,7 +1889,7 @@
           sha256 = "0fzxzar8m9qznfxv3wr7vfj9y2110wf6mm5cj55k3sd5djdjhmf1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anx-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anx-api";
           sha256 = "1vzg3wsqyfb9rsfxrpz8k2gazjlz2nwnf4gnn1dypsjspjnzcb8r";
           name = "anx-api";
         };
@@ -1910,7 +1910,7 @@
           sha256 = "0qy5q4rq68nb21k7w3xpil8k8k5awcpjrjlxjwnhcklwb83w3dhf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anybar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anybar";
           sha256 = "0prnr8wjhishpf2zmn4b7054vfahk10w05nzsg2p6whaxywcachm";
           name = "anybar";
         };
@@ -1931,7 +1931,7 @@
           sha256 = "05lq0bllgn44zs85mgnfdcyjasm6j8m70jdcxksf798i0qdqnk7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anyins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anyins";
           sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
           name = "anyins";
         };
@@ -1948,10 +1948,10 @@
         src = fetchgit {
           url = "http://repo.or.cz/r/anything-config.git";
           rev = "2d7e0450e13ab04b20f4dff08f32936e78677e58";
-          sha256 = "0sc64kmykfkcxfs4zd4anxvvdiiyajd9vz9byb7a8ncyc22fs3g9";
+          sha256 = "077gdqd6vhnfryf21mbgs2bdp8k7bdgaiajdw72rq4rlcg4xpjv9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anything";
           sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj";
           name = "anything";
         };
@@ -1972,7 +1972,7 @@
           sha256 = "0dbf510gcd0m191samih0r4lx6d7sgk0ls0sx2jrdkyacy82ridy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anything-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anything-exuberant-ctags";
           sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk";
           name = "anything-exuberant-ctags";
         };
@@ -1993,7 +1993,7 @@
           sha256 = "0gj0p7420wx5c186kdccjb9icn656sg5b0zwnwy3fjvhsbbvrb2r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anything-git-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anything-git-files";
           sha256 = "13giasg8lh5968plva449ki9nc3478a63700f8c0yghnwjb77asw";
           name = "anything-git-files";
         };
@@ -2014,7 +2014,7 @@
           sha256 = "06fyvk7cjz1aag6fj52qraqmr23b0fqwml41yyid8gjxl4ygmkpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anything-git-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anything-git-grep";
           sha256 = "1kw88fvxil9l80w8zn16az7avqplyf2m0l7kp431wb5b1b1508jl";
           name = "anything-git-grep";
         };
@@ -2035,7 +2035,7 @@
           sha256 = "1jw6gqwcl3fx1m7w0a15w2pnzzlqyr1fbg0m81ay358s4w3jn6v7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anything-milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anything-milkode";
           sha256 = "1apc865a01jyx602ldzj32rrjk6xmgnxdccpjpcfgh24h2aqpdan";
           name = "anything-milkode";
         };
@@ -2056,7 +2056,7 @@
           sha256 = "16a7i01q8qqkgph1s3jnwdr2arjq3cm3jpv5bk5sqs29c003q0pp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anything-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anything-project";
           sha256 = "10crwm34igb4kjh97alni15xzhsb2s0d4ghva86f2gpjidka9fhr";
           name = "anything-project";
         };
@@ -2077,7 +2077,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anything-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anything-prosjekt";
           sha256 = "15kgn0wrnbh666kchijdlssf2gp7spgbymr2nwgv6k730cb4mfa8";
           name = "anything-prosjekt";
         };
@@ -2098,7 +2098,7 @@
           sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anything-replace-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anything-replace-string";
           sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71";
           name = "anything-replace-string";
         };
@@ -2119,7 +2119,7 @@
           sha256 = "08xr6fkk1r4r5jqh349d4dfal9nbs2a8y2fp8zn3zlrj2cd0g80k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anything-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anything-sage";
           sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3";
           name = "anything-sage";
         };
@@ -2132,15 +2132,15 @@
     anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anzu";
-        version = "20160405.718";
+        version = "20160612.1519";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-anzu";
-          rev = "174b940c7e53e9e8180abc718d61dd200f7748be";
-          sha256 = "1l0frc62i542avx8mmirdbwp6x3iy2ysdpwycpradmx4hsriin2c";
+          rev = "72e86131a23b27ff0304727edf4ed1bdce83f299";
+          sha256 = "04vgajihv5dgg9kpxwsqvcvx0hcx5ff7lrvin6gy2kshf9fd81fq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anzu";
           sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
           name = "anzu";
         };
@@ -2158,7 +2158,7 @@
           sha256 = "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aok";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aok";
           sha256 = "1nkkbfwqp5r44wjwl902gm0xc8p3d2qj5mk1cchilr2rib52zd46";
           name = "aok";
         };
@@ -2179,7 +2179,7 @@
           sha256 = "0528z3axjmplg2fdbv4jxgy1p39vr4rnsm4a3ps2fanf8bwsyx3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aozora-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aozora-view";
           sha256 = "0pd2574a6dkhrfr0jf5gvv34ganp6ddylyb6cfpg2d4znwbc2r2w";
           name = "aozora-view";
         };
@@ -2197,7 +2197,7 @@
           sha256 = "1jndhcjvj6s1clmyyphl5ss5267c7b5a58fz8gbp1ffk1d9ylfik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/apache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/apache-mode";
           sha256 = "1a1pj3bk0gplfx217yd6qdn7qrhfbkx2bhkk33k0gq5sia6rzs44";
           name = "apache-mode";
         };
@@ -2218,8 +2218,8 @@
           sha256 = "1aywxk77vfgr1mk7j4pygy9hl4q7lbbx4iik1rs9frkmw6sb8qni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/apel";
-          sha256 = "0zhlm8lfri3zkhj62cycvdhkkgrn72lqb0dalh8qgr049bdv816y";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/apel";
+          sha256 = "0zrm8m66p3aqr0108s3cj6z4xqbg2hx37z1pam4c65bqlhh74s8y";
           name = "apel";
         };
         packageRequires = [];
@@ -2239,7 +2239,7 @@
           sha256 = "0br0jl6xnajdx37s5cvs13srn9lldg58y9587a11s3s651xjdq0z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/apples-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/apples-mode";
           sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
           name = "apples-mode";
         };
@@ -2259,7 +2259,7 @@
           sha256 = "0n3y0314ajqhn5hzih09gl72110ifw4vzcgdxm8n6npjbx7irbml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/applescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/applescript-mode";
           sha256 = "1ya0dh7gz7qfflhn6dq43rapb2zg7djvxwn7p4jajyjnwbxmk611";
           name = "applescript-mode";
         };
@@ -2280,7 +2280,7 @@
           sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aproject";
           sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
           name = "aproject";
         };
@@ -2299,7 +2299,7 @@
           sha256 = "0wc9zg30a48cj2ssfj9wc7ga0ip9igcxcdbn1wr0qmndzxxa7x5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/apropos-fn+var";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/apropos-fn+var";
           sha256 = "1s5gnsipsj7dhc8ca806grg32i6vlwm78hcxhrbs830vx9k84g5x";
           name = "apropos-fn-plus-var";
         };
@@ -2312,15 +2312,15 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20160212.1830";
+        version = "20160608.309";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "bdd9deddd78df2e8dda0030de5d3e86003bf2f4e";
-          sha256 = "0j0k5ak5pzh3n2grf7b6b7ajxsp4ssv2l5gmg08kmbdwscavzc4r";
+          rev = "45c1bd36934eb93d758f085c422714ddc0ffa751";
+          sha256 = "1ff9lvl5pqay4jd8iapva3y6w2riv9sgdvzfr1bwllrk8i6rrlfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/apropospriate-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/apropospriate-theme";
           sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9";
           name = "apropospriate-theme";
         };
@@ -2338,7 +2338,7 @@
           sha256 = "1xbvky0mspmbi8ghqhqhgbjn70acipwf0qwn6s5zdarwch10nljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/apu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/apu";
           sha256 = "0399rmjwcs7fykj10s9m0lm2wb1cr2bzw2bkgm5rp4n3va0rzaa2";
           name = "apu";
         };
@@ -2359,7 +2359,7 @@
           sha256 = "03pmwgvlxxlp4wh0sg5czpx1i88i43lz8lwdbfa6l28g1sv0f264";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/archive-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/archive-region";
           sha256 = "1aiz6a0vdc2zm2q5r80cj5xixqfhsgmr7ldj9ff40k4sf3z5xny3";
           name = "archive-region";
         };
@@ -2380,7 +2380,7 @@
           sha256 = "1yvaqjc9hadbnnay5fprnh890xsp53kidad1zpb4a5z4a5z61n3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/arduino-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/arduino-mode";
           sha256 = "1lpsjpc7par12zsmg9sf4r1h039kxa4n68anjr3mhpp3d6rapjcx";
           name = "arduino-mode";
         };
@@ -2397,10 +2397,10 @@
         src = fetchgit {
           url = "https://bitbucket.org/ukaszg/aria2.git";
           rev = "3c54254e424c6c8b4eb0d8e7c4907b094c27a3f0";
-          sha256 = "1z6smlc5cpf6kswbibhwwx3h5khsbj38a371lsjjhgmharg7a4r7";
+          sha256 = "1xkgz3l7idw5bk1xlffdaddf5v1q6fm3grbryl4xvssrbwgnyisf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aria2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aria2";
           sha256 = "10x2k99m3kl6y0k0mw590gq1ac162nmdwk58i8i7a4mb72zmsmhc";
           name = "aria2";
         };
@@ -2421,7 +2421,7 @@
           sha256 = "0vh9wfc3657sd12ybjcrxpg6f757x2ghkcl1lw01szmyy5vmj27h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ariadne";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ariadne";
           sha256 = "0lfhving19wcfr40gjb2gnginiz8cncixiyyxhwx08lm84qb3a7p";
           name = "ariadne";
         };
@@ -2442,7 +2442,7 @@
           sha256 = "0p8k6sxmvmf535sawis6rn6lfyl5ph263i1phf2d5wl3dzs0xj5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/arjen-grey-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/arjen-grey-theme";
           sha256 = "18q66f7hhys2ab9ljsdp9013mp7d6v6d1lrb0d1bb035r1b4pfj7";
           name = "arjen-grey-theme";
         };
@@ -2463,7 +2463,7 @@
           sha256 = "063j7q2i3701fmh44m77d572ppq0fd60hznh8jcwqa1ljbzynzkn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/artbollocks-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/artbollocks-mode";
           sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
           name = "artbollocks-mode";
         };
@@ -2484,7 +2484,7 @@
           sha256 = "1yvirfmvf6v5khl7zhx2ddv9bbxnx1qhwfzi0gy2nmbxlykb6s2j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/arview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/arview";
           sha256 = "0d935lj0x3rbar94l7288xrgbcp1wmz6r2l0b7i89r5piczyiy1y";
           name = "arview";
         };
@@ -2502,7 +2502,7 @@
           sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ascii";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ascii";
           sha256 = "0jb63f7qwhfbz0n4yrvnvx03cjqly3mqsc3rq9mgf4svy2zw702r";
           name = "ascii";
         };
@@ -2523,7 +2523,7 @@
           sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/asilea";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/asilea";
           sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
           name = "asilea";
         };
@@ -2536,15 +2536,15 @@
     asn1-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "asn1-mode";
-        version = "20151124.728";
+        version = "20160609.1424";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "asn1-mode";
-          rev = "f8acc7e79306ca416f28ff4dc308d8ec47af51a5";
-          sha256 = "0h18x9nh152dnyqjv5b1zjksl8wb75s8zmx3v8vvmwqyy6ql8gcj";
+          rev = "18ae8857f339d93792a46853ff43b98648bca451";
+          sha256 = "0v6slxscp1b0p8ds9psglqmav2b8hm4rfcldvr9m4phc4jyzksz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/asn1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/asn1-mode";
           sha256 = "0iswisb08dqz7jc5ra4wcdhbmglildgyrb547dm5362xmvm9ifmy";
           name = "asn1-mode";
         };
@@ -2557,15 +2557,15 @@
     assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
     melpaBuild {
         pname = "assess";
-        version = "20160523.2222";
+        version = "20160611.2247";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "assess";
-          rev = "e1b7740df50771b8eec5742f6910988e4a08b88f";
-          sha256 = "1lng956z7cc73b0sn1zp433cl9hgya8x7drnaf0v122hg9qhf5c4";
+          rev = "4a5eee8ba9db3e61b860b8b70236e385d3cf344a";
+          sha256 = "0255sa5fzg069n1pf09sn5nypqw0ll5rmxfigw30xhh95w40nx8y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/assess";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/assess";
           sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr";
           name = "assess";
         };
@@ -2586,7 +2586,7 @@
           sha256 = "0w1cf78074is9n7wyfnyf1xjyydpyrbppf2xbvs9f1knmdajsph3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/async";
           sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
           name = "async";
         };
@@ -2607,7 +2607,7 @@
           sha256 = "0rnnvr8x1czphbinby2z2dga7ikwgd13d7zhgmp3ggamzyaz6nf1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/@";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/@";
           sha256 = "0w91qx955z67w2yh8kf86b58bb3b6s6490mmbky8467knf2q83qz";
           name = "at";
         };
@@ -2628,7 +2628,7 @@
           sha256 = "0jfpzv8dmvl4nr6kvq5aii830s5h632bq2q3jbnfc4zdql7id464";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/atom-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/atom-dark-theme";
           sha256 = "1ci61blm7wc83wm2iyax017ai4jljyag5j1mvw86rimmmjzr0v8f";
           name = "atom-dark-theme";
         };
@@ -2649,7 +2649,7 @@
           sha256 = "07gbnm0bbgbqvmzhwmfpnxfkirrldr4dvvvq5plv923hbqzayiih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/atom-one-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/atom-one-dark-theme";
           sha256 = "0wwnkhq7vyysqiqcxc1jsn98155ri4mf4w03k7inl1f8ffpwahvw";
           name = "atom-one-dark-theme";
         };
@@ -2670,7 +2670,7 @@
           sha256 = "0myf7y4ayz79875vaqmms7ps9wk8p5sj4bd4vgxmzgfwi3vqdql4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auctex-latexmk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auctex-latexmk";
           sha256 = "1rdlgkiwlgm06i1gjxcfciz6wgdskfhln8qhixyfxk7pnz0ax327";
           name = "auctex-latexmk";
         };
@@ -2691,7 +2691,7 @@
           sha256 = "0lgfgvnaln5rhhwgcrzwrhbj0gz8sgaf6xxdl7njf3sa6bfgngsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auctex-lua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auctex-lua";
           sha256 = "0v999jvinljkvhbn205p36a6jfzppn0xvflvzr8mid1hnqlrpjhf";
           name = "auctex-lua";
         };
@@ -2712,7 +2712,7 @@
           sha256 = "0q79kblcbz5vlzj0f49vpc1902767ydmvkmwwjs60x3w2f3aq3cm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/audio-notes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/audio-notes-mode";
           sha256 = "0q88xmi7jbrx47nvbbmwggbm6i7agzpnv5y7cpdh73lg165xsz2h";
           name = "audio-notes-mode";
         };
@@ -2733,7 +2733,7 @@
           sha256 = "0dqr1yrzf7a8655dsbcch4622rc75j9yjbn9zhkyikqjicddnlda";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aurel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aurel";
           sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
           name = "aurel";
         };
@@ -2754,7 +2754,7 @@
           sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aurora-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aurora-config-mode";
           sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
           name = "aurora-config-mode";
         };
@@ -2775,7 +2775,7 @@
           sha256 = "1z2n6gd63mgj2wj45n6g1gmfrk0iwzlrzb6g1rdd9r9a03c03qi6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aurora-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aurora-theme";
           sha256 = "1fhlng30v25ycr502vfvajl70vimscqkipva6ghr670j35ac5vz5";
           name = "aurora-theme";
         };
@@ -2796,7 +2796,7 @@
           sha256 = "1b6g7qvrxv6gkl4izq1y7k0x0l7izyfnpki10di5vdv3jp6xg9b2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auth-password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auth-password-store";
           sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
           name = "auth-password-store";
         };
@@ -2817,7 +2817,7 @@
           sha256 = "17nv8rqjh3ynbk1r0njwjb5hd7sgii0vncsa1q19jyp3h30rj4in";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-async-byte-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-async-byte-compile";
           sha256 = "0ks6xsxzayiyd0jl8m36xlc5p57p21qbhgq2mmz50a2lhpxxfiyg";
           name = "auto-async-byte-compile";
         };
@@ -2838,7 +2838,7 @@
           sha256 = "1whbvqylwnxg8d8gn55kcky39rgyc49rakyxlbkplh813lk6lxb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-auto-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-auto-indent";
           sha256 = "08s73pnyrmklb660jl5rshncpq31z3m9fl55v7453ch8syp7gzh7";
           name = "auto-auto-indent";
         };
@@ -2856,7 +2856,7 @@
           sha256 = "0xywyfpsi64g9lihm5ncmjrj06iq9s6pp9fmsgj1hdf9y0z65lg0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-capitalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-capitalize";
           sha256 = "18fygc71n9bc0vrpymz2f7sw9hzkpqxzfglh53shmbm1zns3wkw0";
           name = "auto-capitalize";
         };
@@ -2877,7 +2877,7 @@
           sha256 = "05crb8cm7s1nggrqq0xcs2xiabjw3vh44fnkdiilq1c5cnajdcrj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-compile";
           sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
           name = "auto-compile";
         };
@@ -2898,7 +2898,7 @@
           sha256 = "19sdjwnjryzaq1rpjkvr3mjz9mg7cqzrrx5mqzic3aklgg71d53j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete";
           sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
           name = "auto-complete";
         };
@@ -2919,7 +2919,7 @@
           sha256 = "1wri8q5llpy1q1h4ac4kjnnkgj6fby8i9vrpr6mrb13d4gnk4gr2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-auctex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-auctex";
           sha256 = "00npvryds5wd3d5a13r9prlvw6vvjlag8d32x5xf9bfmmvs0fgqh";
           name = "auto-complete-auctex";
         };
@@ -2940,7 +2940,7 @@
           sha256 = "12mzi6bwg702sp0f0wd1ag555blbpk252rr9rqs03bn8pkw89h4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-c-headers";
           sha256 = "02pkrxvzrpyjrr2fkxnl1qw06aspzv8jlp2c1piln6zcjd92l3j7";
           name = "auto-complete-c-headers";
         };
@@ -2961,7 +2961,7 @@
           sha256 = "1zhbpxpl443ghpkl9i68jcjfcw1vnf8ky06pf5qjjmqbxlcyd9li";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-chunk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-chunk";
           sha256 = "1937j1xm20vfcqm9ig4nvciqfkz7rpw0nsfhlg69gkmv0nqszdr3";
           name = "auto-complete-chunk";
         };
@@ -2982,7 +2982,7 @@
           sha256 = "12y6f47xbjl4gy14j2f5wlisy5vl6rhx74n27w61pjv38m0a7mi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-clang";
           sha256 = "1rnmphl7ml5ryjl5ka2l58hddir8b34iz1rm905wdwh164piljva";
           name = "auto-complete-clang";
         };
@@ -3003,7 +3003,7 @@
           sha256 = "1sw0wxrjcjqk0w1llfj376g6axa5bnk2lq2vv66746bkz14h0s8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-clang-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-clang-async";
           sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
           name = "auto-complete-clang-async";
         };
@@ -3024,7 +3024,7 @@
           sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-exuberant-ctags";
           sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
           name = "auto-complete-exuberant-ctags";
         };
@@ -3045,7 +3045,7 @@
           sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-nxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-nxml";
           sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
           name = "auto-complete-nxml";
         };
@@ -3066,7 +3066,7 @@
           sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-pcmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-pcmp";
           sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
           name = "auto-complete-pcmp";
         };
@@ -3087,7 +3087,7 @@
           sha256 = "107svb82cgfns9kcrmy3hh56cab81782jkbz5i9959ms81xizfb8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-rst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-rst";
           sha256 = "0dazkpnzzr0imb2a01qq8l60jxhhlknzjx7wccnbm7d2rk3338m6";
           name = "auto-complete-rst";
         };
@@ -3108,7 +3108,7 @@
           sha256 = "139in1jgxg43v7ji4i1qmxbgspr71h95lzlz0fvdk78vkxc5842b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-sage";
           sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
           name = "auto-complete-sage";
         };
@@ -3129,7 +3129,7 @@
           sha256 = "0rfjx0x2an28821shgb4v5djza4kwn5nnrsl2cvh3px4wrvw3izp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-dictionary";
           sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
           name = "auto-dictionary";
         };
@@ -3150,7 +3150,7 @@
           sha256 = "0lqfnv8wqnbb5ddwmh9svphc3bgmwdpwx40qw9sgqdzpj3xh7v8g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-dim-other-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-dim-other-buffers";
           sha256 = "0n9d23sfcmkjfqlm80vrgf856wy08ak4n4rk0z7vadq07yj46zxh";
           name = "auto-dim-other-buffers";
         };
@@ -3171,7 +3171,7 @@
           sha256 = "0jfiax1qqnyznhlnqkjsr9nnv7fpjywvfhj9jq59460j0nbrgs5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-highlight-symbol";
           sha256 = "02mkji4sxym07jf5ww5kgv1c18x0xdfn8cmvgns5h4gij64lnr66";
           name = "auto-highlight-symbol";
         };
@@ -3192,7 +3192,7 @@
           sha256 = "1ya7lnlgrxwrbaxlkl0bbz2m8pic6yjln0dm1mcmr9mjglp8kh6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-indent-mode";
           sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
           name = "auto-indent-mode";
         };
@@ -3210,7 +3210,7 @@
           sha256 = "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-install";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-install";
           sha256 = "1gaxc2ya4r903k0jf3319wg7wg5kzq7k8rfy8ac9b0wfzv247ixk";
           name = "auto-install";
         };
@@ -3231,7 +3231,7 @@
           sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-package-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-package-update";
           sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
           name = "auto-package-update";
         };
@@ -3252,7 +3252,7 @@
           sha256 = "1pxhqwvg059pslin6z87jd8d0q44ljwvdn6y23ffrz9kfpn3m5m2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-pause";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-pause";
           sha256 = "0cdak2kicxylj5f161kia0bzzqad426y8cj4zf04gcl0nndijyrc";
           name = "auto-pause";
         };
@@ -3273,7 +3273,7 @@
           sha256 = "10aw3bpvawkqj1l8brvzq057wx3mkzpxs4zc3yhppkhq2cpvx7i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-save-buffers-enhanced";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-save-buffers-enhanced";
           sha256 = "123vf6nnvdhrrfjn8n8h8a11mkqmy2zm3w3yn99np0zj31x8z7bb";
           name = "auto-save-buffers-enhanced";
         };
@@ -3294,7 +3294,7 @@
           sha256 = "0ahiy5cv3a632wfiar28186l0dgibafx5jaw9nrp4h5sqkbyvmjn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-shell-command";
           sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
           name = "auto-shell-command";
         };
@@ -3315,7 +3315,7 @@
           sha256 = "1ya5rn55sclh2w5bjy4b2b75gd6bgavfqmhdisz6afp8w4l4a2bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-virtualenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-virtualenv";
           sha256 = "0xv51g74l5pxa3s185867dpc98m6y26xbj5wgz7f9177qchvdbhk";
           name = "auto-virtualenv";
         };
@@ -3336,7 +3336,7 @@
           sha256 = "0xp9yixv853bcyqyb1yy9sq5b8xdmad68z38wylrn0m971p722dd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-yasnippet";
           sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
           name = "auto-yasnippet";
         };
@@ -3357,7 +3357,7 @@
           sha256 = "1kb6h37qlhzxk3v45bn0m38bp244c3fpxr3lzr7f6rsy8bpc8w67";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/autobookmarks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/autobookmarks";
           sha256 = "11zhg3y9fb5mq67fwsnjrql9mnwkp3hwib7fpllb3yyf2yywc8zp";
           name = "autobookmarks";
         };
@@ -3378,7 +3378,7 @@
           sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/autodisass-java-bytecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/autodisass-java-bytecode";
           sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
           name = "autodisass-java-bytecode";
         };
@@ -3399,7 +3399,7 @@
           sha256 = "1fq4h5fmamyh7z8nq6pigx74p5v8k3qfm64k66vwsm8bl5jdkw17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/autodisass-llvm-bitcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/autodisass-llvm-bitcode";
           sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
           name = "autodisass-llvm-bitcode";
         };
@@ -3418,7 +3418,7 @@
           sha256 = "1af45z1w69dkdk4mzjphwn420m9rrkc3djv5kpp6lzbxxnmswbqw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/autofit-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/autofit-frame";
           sha256 = "0p24qqnfa1vfn5pgnpvbxwi11zjkd6f3cv5igwg6h0pr5s7spnvw";
           name = "autofit-frame";
         };
@@ -3439,7 +3439,7 @@
           sha256 = "02nnyncfh6g0xizy7wa8721ahpnwk451kngd6n0y0249f50p3962";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/automargin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/automargin";
           sha256 = "0llqz01wmacc0f8j3h7r0j57vkmzksl9vj1h0igfxzpm347mm9q8";
           name = "automargin";
         };
@@ -3460,7 +3460,7 @@
           sha256 = "09p56vi5zgm2djglimwyhv4n4gyydjndzn46vg9qzzlxvvmw66i1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/autopair";
           sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
           name = "autopair";
         };
@@ -3477,11 +3477,11 @@
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "elisp";
-          rev = "df58c83a5f1e0b9889858407eae0e383bd759473";
-          sha256 = "184ghdi2m4hagddi71c1pmc408fad1cmw0q2n4k737w6j8537hph";
+          rev = "164ae0f8302c1e1938a9e30597901b1164b43f96";
+          sha256 = "1mgkwaa0q672r3lmw267ax54z4bvc3v3zji3q9asygni9bymkfyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/autotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/autotest";
           sha256 = "0f46m5pc40i531dzfnhkcn192dcs1q20y083c1c0wg2zhjcdr5iy";
           name = "autotest";
         };
@@ -3502,7 +3502,7 @@
           sha256 = "162zay36mmkkpbfvp0lagv2js4cr1z75dc1z5l2505814m5sx3az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/autotetris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/autotetris-mode";
           sha256 = "0k4yq4pvrs1zaf9aqxmlb6l2v4k774zbxj4zcx49w3l1h8gwxpbb";
           name = "autotetris-mode";
         };
@@ -3523,7 +3523,7 @@
           sha256 = "1lip7282g41ghn64dvx2ab437s83cj9l8ps1rd8rbhqyz4bx5wb9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/autumn-light-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/autumn-light-theme";
           sha256 = "0g3wqv1yw3jycq30mcj3w4sn9nj6i6gyd2ljzimf547ggcai536a";
           name = "autumn-light-theme";
         };
@@ -3544,7 +3544,7 @@
           sha256 = "01mcp4q8qsbcz2nfsfd5wndpnka7qfiqfn2f35y0pm56di7a49v5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/avandu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/avandu";
           sha256 = "00fhc3mw7ihfil8fbnibgs8bch9712fya2d1k7k3ll2aln25jjxw";
           name = "avandu";
         };
@@ -3565,7 +3565,7 @@
           sha256 = "10hc3b1cvsnajbrxdmanc2apcrb01sgmrrfvfhkwaffnmck75z99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/avy";
           sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
           name = "avy";
         };
@@ -3586,7 +3586,7 @@
           sha256 = "0bjx6fsrnx373fzndhwq4k6nbrvq4q2pxrmgd9lpi4fpdwxq635c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/avy-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/avy-menu";
           sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw";
           name = "avy-menu";
         };
@@ -3599,15 +3599,15 @@
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
-        version = "20160521.1526";
+        version = "20160604.1602";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "dbff540eddd2eb2e64c43eec346cc64db2b1bcbe";
-          sha256 = "0akllwdn1qn4v4b7hj5if11v87ppx6dr8spzmlmkav8ls4z8zhgf";
+          rev = "b71345bc4db6afed70e337b10fc5d6bf867cc039";
+          sha256 = "145mw16wlpcfr9dssr67s6fa9yk68qxkf3xmpndkajn84y16pdbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/avy-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/avy-migemo";
           sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
           name = "avy-migemo";
         };
@@ -3628,7 +3628,7 @@
           sha256 = "0nv6y9jwy2z4rlnd6qklhqww367kaqjc5id7yr4hsmxmxw2jj43p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/avy-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/avy-zap";
           sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
           name = "avy-zap";
         };
@@ -3646,7 +3646,7 @@
           sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/awk-it";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/awk-it";
           sha256 = "1rnrm9jf9wvfrwyylhj0bfrz9140945lc87lrh21caf7q88fpvkw";
           name = "awk-it";
         };
@@ -3667,7 +3667,7 @@
           sha256 = "1gxwd4w09mp7kymcppfvi971d8cv9dqzvayxk69ijazszibxw8hm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aws-ec2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aws-ec2";
           sha256 = "040c69g8rhpcmrdjjg4avdmqarxx3dfzylmz62yxhfpn02qh48xd";
           name = "aws-ec2";
         };
@@ -3687,7 +3687,7 @@
           sha256 = "0z15n7cpprbhiamq26240g5bqsiw5mgyzdisi7j6hpybyk2zyl9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/axiom-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/axiom-environment";
           sha256 = "1d3h1fn5zfbh7kpm2i02kza3bq9s6if4yd2vvfjdhgrykvl86h66";
           name = "axiom-environment";
         };
@@ -3708,7 +3708,7 @@
           sha256 = "140lbpqq4qz45ykycdn8nvcn8pv0xqfwpapgprvyg8z5fjkyc4sg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/babel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/babel";
           sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
           name = "babel";
         };
@@ -3729,7 +3729,7 @@
           sha256 = "0sp0ja0346k401q5zpx3zl4pnxp4ml2jqkgk7z8i08rhdbp0c4nr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/babel-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/babel-repl";
           sha256 = "0h11i8w8s4ia1x0lm5n7bnc3db4bv0a7f7hzl27qrg38m3c7dl6x";
           name = "babel-repl";
         };
@@ -3750,7 +3750,7 @@
           sha256 = "0rj6a8rdwa0h2ckz7h4d91hnxqcin98l4ikbfyak2whfb47z909l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/back-button";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/back-button";
           sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
           name = "back-button";
         };
@@ -3775,7 +3775,7 @@
           sha256 = "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/backup-each-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/backup-each-save";
           sha256 = "1fv9sf6vkjyv93vil4l9hjm2fg73zlxbnif0xfm3kpmva9xin337";
           name = "backup-each-save";
         };
@@ -3796,7 +3796,7 @@
           sha256 = "0z4d8x9lkad50720lgvr8f85p1ligv07865i30lgr9ck0q04w68v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/backup-walker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/backup-walker";
           sha256 = "0hfr27yiiblrd0p3zhpapbj4vijfdk7wqh406xnlwf2yvnfsqycd";
           name = "backup-walker";
         };
@@ -3817,7 +3817,7 @@
           sha256 = "0g8smx6pi2wqv78mhxfgwg51mx5msqsgcc55xcz29aq0q3naw4z1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/badger-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/badger-theme";
           sha256 = "01h5bsqllgn6gs0wpl0y2h041007mn3ldjswkz6f3mayrgl4c6yf";
           name = "badger-theme";
         };
@@ -3838,7 +3838,7 @@
           sha256 = "06l5b1dnz8gggqf1lsmw8x4mlra9pvpxzykjw06qaassfjjhaql2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/badwolf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/badwolf-theme";
           sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
           name = "badwolf-theme";
         };
@@ -3859,7 +3859,7 @@
           sha256 = "024gpdjr1lbqjg6md526g4wz2shpgfpdrrd2m1bn4fissbzj70i1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/baidu-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/baidu-life";
           sha256 = "0rib50hja33qk8dmw5i62gaxhx7mscj2y0n25jmnds7k88ms8z19";
           name = "baidu-life";
         };
@@ -3880,7 +3880,7 @@
           sha256 = "16240dj0hvxkljas9973wjdgkbx213sqws77j167yr5xf761dlsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/base16-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/base16-theme";
           sha256 = "1zxbvfj6gvz1ynhj6i9q9y65hq7aq41qx4vnx738cjizcq0rc8bs";
           name = "base16-theme";
         };
@@ -3901,7 +3901,7 @@
           sha256 = "06c42531dy5ngscwfvg8rksg6jcsakfn7104hmlg1jp4kvfiy1kg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bash-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bash-completion";
           sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
           name = "bash-completion";
         };
@@ -3922,7 +3922,7 @@
           sha256 = "1pbnw6ccphxynbhnc4g687jfcg33p1sa7a0mfxc2ai0i3z59gn78";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/basic-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/basic-theme";
           sha256 = "16rgff1d0s65alh328lr93zc06zmgbzgwx1rf3k3l4d10ki4cc27";
           name = "basic-theme";
         };
@@ -3940,7 +3940,7 @@
           sha256 = "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/batch-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/batch-mode";
           sha256 = "1p0rh5r8w00jag64sbjy8xb9g6lqhm2fz476v201kbrj9ggp643x";
           name = "batch-mode";
         };
@@ -3961,7 +3961,7 @@
           sha256 = "1ikb4rb20ng1yq95g3ydwpk37axmiw38rjzn1av9m4cs81qby4jv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bats-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bats-mode";
           sha256 = "1l5winy30w8fs3f5cylc3a3j3mfkvchwanlgsin7q76jivn87h7w";
           name = "bats-mode";
         };
@@ -3982,7 +3982,7 @@
           sha256 = "17ip24fk13aj9zldn2qsr4naa8anqhm484m1an5l5i9m9awfiyn7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbcode-mode";
           sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
           name = "bbcode-mode";
         };
@@ -3998,10 +3998,10 @@
         src = fetchgit {
           url = "git://git.savannah.nongnu.org/bbdb.git";
           rev = "8fce6df3ab09250d545a2ed373ae64e68d12ff4c";
-          sha256 = "09ib71b669sccp0x5lf2ic4gzdqcmmdx918n870lhabqhn0gw3g2";
+          sha256 = "1nglakzpcy2pizg80ny1w972vq74v5jgzdvgqp69jkb7312cqzvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbdb";
           sha256 = "0zhs4psa9b9yf9hxm19q5znsny11cdp23pya3rrlmj39j4jfn73j";
           name = "bbdb";
         };
@@ -4022,7 +4022,7 @@
           sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbdb-";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbdb-";
           sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
           name = "bbdb-";
         };
@@ -4043,7 +4043,7 @@
           sha256 = "0m80k87dahzdpfa4snbl4p9zm5d5anc8s91535mwzsnfbr98qmhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbdb-android";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbdb-android";
           sha256 = "0v3njygqkcrwjkf7jrqmza6bwk2jp3956cx1qvf9ph7dfxsq7rn3";
           name = "bbdb-android";
         };
@@ -4064,7 +4064,7 @@
           sha256 = "07plwm5nh58qya03l8z0iaqh8bmyhywx7qiffkf803n8wwjb3kdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbdb-china";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbdb-china";
           sha256 = "111lf256zxlnylfmwis0pngbpj73p59s520v8abbm7pn82k2m72b";
           name = "bbdb-china";
         };
@@ -4085,7 +4085,7 @@
           sha256 = "1h9vi9wb3dzzjrw5zfypk60afzzshxa3qmnbc24ypby5dr7qy91l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbdb-csv-import";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbdb-csv-import";
           sha256 = "0r7pc2ypd1ydqrnvcqmsg69rm047by7k0zhm563538ra82597wnm";
           name = "bbdb-csv-import";
         };
@@ -4106,7 +4106,7 @@
           sha256 = "1ydf89mmp3zjfqdymnrwg18wclyf7psarz9f2k82pl58h0khh71g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbdb-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbdb-ext";
           sha256 = "0fnxcvzdyh0602rdfz3lz3vmvza4s0syz1vn2fgsn2lg3afqq7li";
           name = "bbdb-ext";
         };
@@ -4127,7 +4127,7 @@
           sha256 = "04yxky7qxh0s4y4addry85qd1074l97frhp0hw77xd1bc7n5zzg0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbdb-handy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbdb-handy";
           sha256 = "0qv1lw4fv9w9c1ypzpbnvkm6ypqrzqpwyw5gpi7n9almxpd8d68z";
           name = "bbdb-handy";
         };
@@ -4148,7 +4148,7 @@
           sha256 = "1zlf9xhpirln72xr7v6kgndkg5wyz5ipsl4gpq9lbmp92jlgbwlj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbdb-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbdb-vcard";
           sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
           name = "bbdb-vcard";
         };
@@ -4169,7 +4169,7 @@
           sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbdb2erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbdb2erc";
           sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
           name = "bbdb2erc";
         };
@@ -4190,7 +4190,7 @@
           sha256 = "1cdm4d6fjf3m495phynq0dzvv0wc0gfsw6fdq4d47iyxs0p4q2dl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbyac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbyac";
           sha256 = "19s9fqcdyqz22m981vr0p8jwghbs267yrlxsv9xkfzd7fccnx170";
           name = "bbyac";
         };
@@ -4211,7 +4211,7 @@
           sha256 = "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bdo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bdo";
           sha256 = "0vp8am2x11abxganw90025w9qxnqjdkj015592glbbzpa6338nfl";
           name = "bdo";
         };
@@ -4232,7 +4232,7 @@
           sha256 = "0hjzh5dgwzr4sq9pj22g0cfkqdcd01aq5dcpg96c8xq8b8ga81g6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/beacon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/beacon";
           sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq";
           name = "beacon";
         };
@@ -4253,7 +4253,7 @@
           sha256 = "0ki9q3ylssjabh15dr49k7dxv88snpj4564g0myp3c61qzyy82lk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/beeminder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/beeminder";
           sha256 = "1cb8xmgsv23b464hpchm9f9i64p3fyf7aillrwk1aa2l1008kyww";
           name = "beeminder";
         };
@@ -4274,7 +4274,7 @@
           sha256 = "1hyiz7iwnzbg1616q0w7fndllbnx4m98kakgxn04bsqib5fqk78p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/beginend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/beginend";
           sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
           name = "beginend";
         };
@@ -4295,7 +4295,7 @@
           sha256 = "058mic9jkwiqvmp3k9sfd6gb70ysdphnb1iynlszhixbrz5w7zs2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/benchmark-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/benchmark-init";
           sha256 = "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal";
           name = "benchmark-init";
         };
@@ -4316,7 +4316,7 @@
           sha256 = "06izbc0ksyhgh4gsjiifhj11v0gx9x5xjx9aqci5mc4kc6mg05sf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bert";
           sha256 = "1zhz1dcy1nf84p244x6lc4ajancv5fgmqmbrm080yhb2ral1z8x7";
           name = "bert";
         };
@@ -4337,7 +4337,7 @@
           sha256 = "10aq52vrp2sxj713si6m0bpz9s3c0yxjr2qqw29731hb1s2hvznp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/better-defaults";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/better-defaults";
           sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
           name = "better-defaults";
         };
@@ -4355,7 +4355,7 @@
           sha256 = "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/better-registers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/better-registers";
           sha256 = "01i0qjrwsc5way2h9z3pmsgccsbdifsq1dh6zhka4h6qfgrmn3bx";
           name = "better-registers";
         };
@@ -4376,7 +4376,7 @@
           sha256 = "02b2m0cq04ynjcmr4j8gpdzjv9mpf1fysn736xv724xgaymj396n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bf-mode";
           sha256 = "0b1yf9bx1ldkzry7v5qvcnl059rq62a50dvpa10i2f5v0y96n1q9";
           name = "bf-mode";
         };
@@ -4397,7 +4397,7 @@
           sha256 = "1y9fxs1nbf0xsn8mw45m9ghmji3h64wdbfnyr1npmf5fb27rmd17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bfbuilder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bfbuilder";
           sha256 = "16ckybqd0a8l75ascm3k4cdzp969lzq7m050aymdyjhwif6ld2r7";
           name = "bfbuilder";
         };
@@ -4410,15 +4410,15 @@
     biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "biblio";
-        version = "20160407.1127";
+        version = "20160611.48";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "biblio.el";
-          rev = "0985aff28a2a105d6cee1b9a89b3c4e66780bd3c";
-          sha256 = "12i4ha6cncni0159n6i8qy2kfrn4ixdwni71gbwqmi9fbcyj4rls";
+          rev = "298cbda81c1e3773e8223b6d7ffb652cc19dea3c";
+          sha256 = "0z6q7xhwrp549yfqpjjg9d1mmn6a4lsxnjmsxpkm7gfscr5z2hfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/biblio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/biblio";
           sha256 = "0ym7xvcfd7hh3qdpfb8zpa7w8s4lpg0vngh9d0ns3s3lnhz4mi0g";
           name = "biblio";
         };
@@ -4435,11 +4435,11 @@
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "biblio.el";
-          rev = "0985aff28a2a105d6cee1b9a89b3c4e66780bd3c";
-          sha256 = "12i4ha6cncni0159n6i8qy2kfrn4ixdwni71gbwqmi9fbcyj4rls";
+          rev = "298cbda81c1e3773e8223b6d7ffb652cc19dea3c";
+          sha256 = "0z6q7xhwrp549yfqpjjg9d1mmn6a4lsxnjmsxpkm7gfscr5z2hfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/biblio-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/biblio-core";
           sha256 = "0zpfamrb2gka41h834a05hxdbw4h55777kh6rhjikjfmy765nl97";
           name = "biblio-core";
         };
@@ -4460,7 +4460,7 @@
           sha256 = "0rwy4k06nd9a31hpyqs0fxp45dpddbvbhwcw1gzx4f73qmgawq9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bibretrieve";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bibretrieve";
           sha256 = "1mf884c6adx7rq5c2z5wrnjpb6znljy30mscxskwqiyfs8c62mii";
           name = "bibretrieve";
         };
@@ -4481,7 +4481,7 @@
           sha256 = "077shjz9sd0k0akvxzzgjd8a626ck650xxlhp2ws4gs7rjd7a823";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bibslurp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bibslurp";
           sha256 = "178nhng87bdi8s0r2bdh2gk31w9mmjkyi6ncnddk3v7p8fsh4jjp";
           name = "bibslurp";
         };
@@ -4502,7 +4502,7 @@
           sha256 = "1qf45s53vcbd90v2d2brynv3xmp8sy9w9jp611cf0dzfl1k7x8p8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bibtex-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bibtex-utils";
           sha256 = "13llsyyvy0xc9s51cqqc1rz13m3qdqh8jw07gwywfbixlma59z8l";
           name = "bibtex-utils";
         };
@@ -4523,7 +4523,7 @@
           sha256 = "0d69hckz6xbll1x2mll385kcw7mwx8cwxg1wdhphnww0s810isgp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bind-chord";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bind-chord";
           sha256 = "01a3c298kq8cfsxsscpic0shkjm77adiamgbgk8laqkbrlsrrcsb";
           name = "bind-chord";
         };
@@ -4544,7 +4544,7 @@
           sha256 = "19vc1hblbqlns2c28aqwjpmj8k35ih7akqi04wrqv1b6pljfy3jg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bind-key";
           sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
           name = "bind-key";
         };
@@ -4557,15 +4557,15 @@
     bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-map";
-        version = "20160510.1948";
+        version = "20160606.2243";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-bind-map";
-          rev = "4ceb7deb3add0716afaa2a5d658b81469ee2879b";
-          sha256 = "126pjiiwhz500l60dvf6a9ixgda2sqv0rbj5f2a7g3pssh5yjh12";
+          rev = "ffe5e636178ab9878fa8213fd1a1d4862ccb3d5f";
+          sha256 = "1h07s8g4vpq6c8sl5m6vxvd598iks160bksv0wn51680gh05f0pa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bind-map";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bind-map";
           sha256 = "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358";
           name = "bind-map";
         };
@@ -4586,7 +4586,7 @@
           sha256 = "1cv2gx3wpk360a0s80pnd2h2xnbfz5cgsln2kij36dvjbxkrzjz8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bing-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bing-dict";
           sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
           name = "bing-dict";
         };
@@ -4607,7 +4607,7 @@
           sha256 = "1n5icy29ks5rxrxp7v4sf0523z7wxn0fh9lx4y6jb7ppdjnff12s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/birds-of-paradise-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/birds-of-paradise-plus-theme";
           sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
           name = "birds-of-paradise-plus-theme";
         };
@@ -4628,7 +4628,7 @@
           sha256 = "0iccafawm9ah62f7qq1k77kjpafhcpjcaiqh5xjig1wxnpc43ck7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bison-mode";
           sha256 = "097gimlzmyrsfnl76cbzyyi9dm0d2y3f9107672h56ncri35mh66";
           name = "bison-mode";
         };
@@ -4649,7 +4649,7 @@
           sha256 = "14dsjbw4ss3i6ydynm121v5j3idvy85sk1vqbr5r871d32179xan";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bitbake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bitbake";
           sha256 = "1k2n1i8g0jc78sp1icm64rlhi1q0vqar2a889nldp134a1l7bfah";
           name = "bitbake";
         };
@@ -4670,7 +4670,7 @@
           sha256 = "0mccvpf8f87i7rqga3s4slrqz80rp3kyj071rrimhzpx8pnsrxx9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bitlbee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bitlbee";
           sha256 = "1lmbmlshr8b645qsb88rswmbbcbbawzl04xdjlygq4dnpkxc8w0f";
           name = "bitlbee";
         };
@@ -4691,7 +4691,7 @@
           sha256 = "09blh9cbcbqr3pdaiwm9fmh5kzqm1v9mffy623z3jn87g5wadrmb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bitly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bitly";
           sha256 = "032s7ax8qp3qzcj1njbyyxiyadjirphswqdlr45zj6hzajfsr247";
           name = "bitly";
         };
@@ -4709,7 +4709,7 @@
           sha256 = "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/blank-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/blank-mode";
           sha256 = "1pyx5xwflnni9my5aqpgf8xz4q4rvmj67pwb4zxx1lghrca97z87";
           name = "blank-mode";
         };
@@ -4730,7 +4730,7 @@
           sha256 = "1pslwyaq18d1z7fay2ih3n27i6b49ss62drqqb095l1jxk42xxm0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/blgrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/blgrep";
           sha256 = "0w7453vh9c73hdfgr06693kwvhznn9xr1hqa65izlsx2fjhqc9gm";
           name = "blgrep";
         };
@@ -4751,7 +4751,7 @@
           sha256 = "0dn0i3nxrqd82b9d17p1v0ddlpxnlfclkc8sqzrwq6cf19wcrmdr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bliss-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bliss-theme";
           sha256 = "1kzvi6zymfgirr41l8r2kazfz1y4xkigbp5qa1fafcdmw81anmdh";
           name = "bliss-theme";
         };
@@ -4772,7 +4772,7 @@
           sha256 = "111i897dnkbx4xq62jfkqq4li4gm16lxbgkgg2gn13zv0f0lzgvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/blockdiag-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/blockdiag-mode";
           sha256 = "0v48w4slzx8baxrf10jrzcpqmcv9d3z2pz0xqn8czlzm2f6id3ya";
           name = "blockdiag-mode";
         };
@@ -4785,15 +4785,15 @@
     blog-admin = callPackage ({ ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }:
     melpaBuild {
         pname = "blog-admin";
-        version = "20160531.850";
+        version = "20160610.435";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "blog-admin";
-          rev = "09e077da0ba1cbf2242b49e913bb1746c172eaaa";
-          sha256 = "1ssjd2k7fkxk09f2cm56kjjlil9vrv28y2v80gd8xgylm17523bn";
+          rev = "fd97d405a5cd06b6246a433f31fc5af2077bb255";
+          sha256 = "0fia93kxmw5xkzyf434n3j4f0d6gijkli2mqi82j32z8wayrf307";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/blog-admin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/blog-admin";
           sha256 = "03wnci5903c6jikkvlzc2vfma9h9qk673cc3wm756rx94jxinmyk";
           name = "blog-admin";
         };
@@ -4814,7 +4814,7 @@
           sha256 = "1ggqg0lgvxg2adq91damvh55m36qsa23n3z6zyf5z6855ilzaa4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bm";
           sha256 = "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g";
           name = "bm";
         };
@@ -4824,6 +4824,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    bnfc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bnfc";
+        version = "20160605.2127";
+        src = fetchFromGitHub {
+          owner = "jmitchell";
+          repo = "bnfc-mode";
+          rev = "1b58df1dd0cb9b81900632fb2843a03b94f56fdb";
+          sha256 = "0lmqrcy80nw6vmf81kh6q39x8pwhzrj6lbk31xpl8mvwnpqaykmn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bnfc";
+          sha256 = "0h6qhyi7vcikg7zhv8lywdz033kp27a8z1ymq5wgs4aqs184igm6";
+          name = "bnfc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/bnfc";
+          license = lib.licenses.free;
+        };
+      }) {};
     bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bog";
@@ -4835,7 +4856,7 @@
           sha256 = "0lj2xxyjkrvwh2hfqa086l39c419afsg2rxacbmk6rqvbi8cc4wl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bog";
           sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
           name = "bog";
         };
@@ -4856,7 +4877,7 @@
           sha256 = "109r51flzhva8npch6ykqkcd2j5jpffhw6ziq3rmlqb7yc04wghb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bongo";
           sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
           name = "bongo";
         };
@@ -4877,7 +4898,7 @@
           sha256 = "06cpbjbv8ysz81szwgglgy5r1aay8rrzw5k86wyqg9jdzwpmilpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bonjourmadame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bonjourmadame";
           sha256 = "0d36yradh37359fjk59s54hxkbh4qcc17sblj2ylcdyw7181iwfn";
           name = "bonjourmadame";
         };
@@ -4898,7 +4919,7 @@
           sha256 = "128xs1qznhbzicv0k7k80mwb68amjdgigm7qzqln5nfg8p1rwz50";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/boogie-friends";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/boogie-friends";
           sha256 = "0cfs7gvjxsx2027dbzh4yypz500nmk503ikiiprbww8jyvc8grk7";
           name = "boogie-friends";
         };
@@ -4910,13 +4931,13 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20160530.2300";
+        version = "20160611.1703";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bookmark+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bookmark+";
           sha256 = "0121xx7dp2pakk9g7sg6par4mkxd9ky746yk4wh2wrhprc9dqzni";
           name = "bookmark-plus";
         };
@@ -4937,7 +4958,7 @@
           sha256 = "16mlhc00wd1vakzfwda4zhp5q9xvd34xyb9ibwy6fayd06brfaad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/boon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/boon";
           sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
           name = "boon";
         };
@@ -4958,7 +4979,7 @@
           sha256 = "0yzfxxv2bw4x320268bixfc7yf97851804bz3829vbdhnr4kp6y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/borland-blue-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/borland-blue-theme";
           sha256 = "1sc8qngm40bwdym8k1dgbahg48i73c00zxd99kqqwm9fnd6nm7qx";
           name = "borland-blue-theme";
         };
@@ -4979,7 +5000,7 @@
           sha256 = "1gys5ri56s2s525wdji3m72sxzswmb8cmhmw5iha84v7hlqkrahb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/boron-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/boron-theme";
           sha256 = "1rrqlq08jnh9ihb99ji1vvmamj742assnm4a7xqz6gp7f248nb81";
           name = "boron-theme";
         };
@@ -5000,7 +5021,7 @@
           sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/boxquote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
           name = "boxquote";
         };
@@ -5021,7 +5042,7 @@
           sha256 = "0chmarbpqingdma54d6chbr6v6jg8lapbw56cpvcpbl04fz980r0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bpe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bpe";
           sha256 = "08zfqcgs7i2ram2qpy8vrzksx5722aahr66vdi4d9bcxm03s19fm";
           name = "bpe";
         };
@@ -5042,7 +5063,7 @@
           sha256 = "10178l56ryfxsrxysy9qb6vg71q1xavfw1sbchh0mrb90x12vilz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bpr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bpr";
           sha256 = "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2";
           name = "bpr";
         };
@@ -5063,7 +5084,7 @@
           sha256 = "1l6j2zs12psc15cfhqq6hm1bg012jr49zd2i36cmappbsiax1l8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bracketed-paste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bracketed-paste";
           sha256 = "1v7zwi29as0218vy6ch21iqqcxfhyh373m3dbcdzm2pb8bpcg58j";
           name = "bracketed-paste";
         };
@@ -5084,7 +5105,7 @@
           sha256 = "1nzgjgzidyrplfs4jl8nikd5wwvb4rmrnm51qxmw9y2if0hpq0jd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/brainfuck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/brainfuck-mode";
           sha256 = "08jzx329mrr3c2pifs3hb4i79dsw606b0iviagaaja8s808m40cd";
           name = "brainfuck-mode";
         };
@@ -5105,7 +5126,7 @@
           sha256 = "0w6b9rxdciy1365kgf6fh3vgrjr8xd5ar6xcn0g4h56f2zg9hdmj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/broadcast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/broadcast";
           sha256 = "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib";
           name = "broadcast";
         };
@@ -5126,7 +5147,7 @@
           sha256 = "12m24n9yif9km4b2sw6am1bdfhxg05wdrq2jnp56jy1i7cgjrm1c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/browse-at-remote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/browse-at-remote";
           sha256 = "1d40b9j3pc6iy3l25062k7f52aq0vk9sizdwd7wii3v5nciczv6w";
           name = "browse-at-remote";
         };
@@ -5147,7 +5168,7 @@
           sha256 = "0sndzhza9k4vcf70fzxsyzrfryaz92lm1y7bbb0dx10m65qljpbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/browse-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/browse-kill-ring";
           sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
           name = "browse-kill-ring";
         };
@@ -5166,7 +5187,7 @@
           sha256 = "1z6pix1ml3s97jh34fwjj008ihlrz4hkipdh5yzcvc6nhrimjw2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/browse-kill-ring+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/browse-kill-ring+";
           sha256 = "1flw7vmqgsjjvr2zlgz2909gvpq9mhz8qkg6hvsrzwg95f4l548w";
           name = "browse-kill-ring-plus";
         };
@@ -5187,7 +5208,7 @@
           sha256 = "1rcihwdxrzhgcz573rh1yp3770ihkwqjqvd39yhic1d3sgwxz2hy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/browse-url-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/browse-url-dwim";
           sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
           name = "browse-url-dwim";
         };
@@ -5205,7 +5226,7 @@
           sha256 = "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bs-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bs-ext";
           sha256 = "0dddligqr71qdakgfkx0r45k9py85qlym7y5f204bxppyw5jmwb6";
           name = "bs-ext";
         };
@@ -5226,7 +5247,7 @@
           sha256 = "022j0gw5qkxjz8f70vqjxysifv2mz6cigf9n5z03zmpvwwvxmx2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/btc-ticker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/btc-ticker";
           sha256 = "1vfnx114bvnly1k3fmcpkqq4m9558wqr5c9k9yj8f046dgfh8dp1";
           name = "btc-ticker";
         };
@@ -5247,7 +5268,7 @@
           sha256 = "1qgasaqhqm0birjmb6k6isd2f5pn58hva8db8qfhva9g5kg1f38w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bts";
           sha256 = "1i1lbjracrgdxr52agxhxxgkra4w291dmz85s195lcx38rva7ib3";
           name = "bts";
         };
@@ -5268,7 +5289,7 @@
           sha256 = "1sfr3j11jz4k9jnfa9i05bp4v5vkil38iyrgsp3kxf15797b9dg9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bts-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bts-github";
           sha256 = "03lz12bbkjqbs82alc97k6s1pmk721qip3h9cifq8a5ww5cbq9ln";
           name = "bts-github";
         };
@@ -5289,7 +5310,7 @@
           sha256 = "1aha8rzilv4k300rr4l9qjfygydfwllkbw17lhm8jz0kh9w6bd28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bubbleberry-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bubbleberry-theme";
           sha256 = "056pcr9ynsl34wqa2pw6sh4bdl5kpp1r0pl1vvw15p4866l9bdz3";
           name = "bubbleberry-theme";
         };
@@ -5310,7 +5331,7 @@
           sha256 = "1p5a29bpjqr1gs6sb6rr7y0j06nlva23wxkwfskap25zvjpgwbvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/buffer-buttons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/buffer-buttons";
           sha256 = "1p0ydbrff9197sann3s0d7hpav7r9g461w4llncafmy31w7m1dn6";
           name = "buffer-buttons";
         };
@@ -5331,7 +5352,7 @@
           sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/buffer-flip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/buffer-flip";
           sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
           name = "buffer-flip";
         };
@@ -5352,7 +5373,7 @@
           sha256 = "1yzga2zs9flbarsh704hh7k4l3w09g4li9a7r3fsvl4kll80x393";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/buffer-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/buffer-move";
           sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
           name = "buffer-move";
         };
@@ -5370,7 +5391,7 @@
           sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/buffer-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/buffer-stack";
           sha256 = "00vxfd4ki5pqf9n9vbmn1441vn2y14bdr1v05h46hswf13b4hzrn";
           name = "buffer-stack";
         };
@@ -5391,7 +5412,7 @@
           sha256 = "1mnf0dgr6g58k0jyia7985jsinrla04vm5sjl2iajwphbhadjk8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/buffer-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/buffer-utils";
           sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
           name = "buffer-utils";
         };
@@ -5412,7 +5433,7 @@
           sha256 = "1plh77xzpbhgmjdagm5rhqx6nkhc0g39ir0b6s5yh003wmx6r1hh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bufshow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bufshow";
           sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
           name = "bufshow";
         };
@@ -5433,7 +5454,7 @@
           sha256 = "0zr1raf0q5wi3vr66kglxcfxswlm8g2l501adm8c27clvqizpnrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bug-reference-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bug-reference-github";
           sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
           name = "bug-reference-github";
         };
@@ -5454,7 +5475,7 @@
           sha256 = "0gr4v6fmg0im17f6i3pw6h8l401n5l5lzxz0hgi8lrisvx73iqa5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bundler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bundler";
           sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
           name = "bundler";
         };
@@ -5475,7 +5496,7 @@
           sha256 = "0mirb3yvs4aq6n53lx690k06zllyzr29ms0888v5svjirxjazvh8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bury-successful-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bury-successful-compilation";
           sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
           name = "bury-successful-compilation";
         };
@@ -5496,7 +5517,7 @@
           sha256 = "1viq7cb41r8klr8i38c5zjrhdnww31gh4j51xdgy4v2lc3z321zi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/buster-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/buster-mode";
           sha256 = "1qndhchc8y27x49znhnc4rny1ynfcplr64rczrlbj53qmkxn5am7";
           name = "buster-mode";
         };
@@ -5517,7 +5538,7 @@
           sha256 = "11djqlw4qf3qs2rwiz7dn5q2zw5i8sykwdf4hg4awsgv8g0bbxn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/buster-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/buster-snippets";
           sha256 = "0k36c2k7wwix10rgmjxipc77fkn9jahjyvl191af6w41wla47x4x";
           name = "buster-snippets";
         };
@@ -5538,7 +5559,7 @@
           sha256 = "11z987frzswnsym8g3l0s9wwdly1zn5inl2l558m6kcvfy7g59cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/busybee-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/busybee-theme";
           sha256 = "0w0z5x2fbnalv404av3mapfkqbfgyk81a1mzvngll8x0pirbyi10";
           name = "busybee-theme";
         };
@@ -5559,7 +5580,7 @@
           sha256 = "0pp604r2gzzdpfajw920607pklwflk842difdyl4hy9w87fgc0jg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/butler";
           sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
           name = "butler";
         };
@@ -5580,7 +5601,7 @@
           sha256 = "16r3qfva20blfxh54l4p85m2x4fq7hwj71rlblp5ipicna7zs4dn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/buttercup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/buttercup";
           sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
           name = "buttercup";
         };
@@ -5601,7 +5622,7 @@
           sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/button-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/button-lock";
           sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
           name = "button-lock";
         };
@@ -5622,7 +5643,7 @@
           sha256 = "040mcq2cwzbrf96f9mghb4314cd8xwp7ki2ix9fxpmbwiy323ld5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/c-c-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/c-c-combo";
           sha256 = "09rvh6n2hqls7qki5dc34s2hmcmlvdsbgzcxgglhcmrhwx5w4vxn";
           name = "c-c-combo";
         };
@@ -5643,7 +5664,7 @@
           sha256 = "0mlm5f66541namqn04vx6csf14mxhsiknbm36yqdnp1lxb7knv7a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/c-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/c-eldoc";
           sha256 = "13grkww14w39y2x6mrbfa9nzljsnl5l7il8dnj6sjdyv0hz9x8vm";
           name = "c-eldoc";
         };
@@ -5664,7 +5685,7 @@
           sha256 = "10k90r4ckkkdjn9pqcbfyp6ynvrd5k0ngqcn5d0v1qvkn6jifxjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/c0-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/c0-mode";
           sha256 = "0s3h4b3lpz4jsk222yyfdxh780dvykhaqgyv6r3ambz95vrmmpl4";
           name = "c0-mode";
         };
@@ -5685,7 +5706,7 @@
           sha256 = "1h395hvia7r76zlgr10qdr9q2159qyrs89znhkp2czikwm8kjiqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cabledolphin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cabledolphin";
           sha256 = "04slrx0vkcm66q59158limn0cpxn18ghlqyx7z8nrn7frrc03z03";
           name = "cabledolphin";
         };
@@ -5706,7 +5727,7 @@
           sha256 = "1hp6dk84vvgkmj5lzghvqlpq3axwzgx9c7gly2yx6497fgf9jlby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cache";
           sha256 = "0lzj0h23g6alqcmd20ack53p72g9i09dp9x0bp3rdw5izcfkvhh3";
           name = "cache";
         };
@@ -5727,7 +5748,7 @@
           sha256 = "07kzhyqr8ycjvkknijqhsfr26zd5jc8wxm9sl8bp6pzn4jbs1dmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cacoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cacoo";
           sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
           name = "cacoo";
         };
@@ -5748,7 +5769,7 @@
           sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cake";
           sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr";
           name = "cake";
         };
@@ -5769,7 +5790,7 @@
           sha256 = "0xq10jkbk3crdhbh4lab39xhfw6vvcqz3if5q3yy4gzhx7zp94i4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cake-inflector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cake-inflector";
           sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
           name = "cake-inflector";
         };
@@ -5790,7 +5811,7 @@
           sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cake2";
           sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x";
           name = "cake2";
         };
@@ -5811,7 +5832,7 @@
           sha256 = "03hi0ggq81nm1kd0mcf8fwnya4axzd80vfdjdbhgpxbkvnxldzpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cal-china-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cal-china-x";
           sha256 = "06mh2p14m2axci8vy1hr7jpy53jj215z0djyn8h7zpr0k62ajhka";
           name = "cal-china-x";
         };
@@ -5832,7 +5853,7 @@
           sha256 = "0rhasr818qijd2pcgifi0j3q4fkbiw2ck1nivajk7m810p53bxbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/calfw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/calfw";
           sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
           name = "calfw";
         };
@@ -5853,7 +5874,7 @@
           sha256 = "14n5rci4bkbl7037xvkd69gfxnjlgvd2j1xzciqcgz92f06ir3xi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/calfw-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/calfw-gcal";
           sha256 = "182p56wiycrm2cjzmlqabksyshpk7nga68jf80vjjmaavp5xqsq8";
           name = "calfw-gcal";
         };
@@ -5874,7 +5895,7 @@
           sha256 = "0n6y4z3qg04qnlsrjysf8ldxl2f2bk7n8crijydwabyy672qxd9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/calmer-forest-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/calmer-forest-theme";
           sha256 = "0riz5n8fzvxdnzgg650xqc2zwc4xvhwjlrrzls5h0pl5adaxz96p";
           name = "calmer-forest-theme";
         };
@@ -5895,7 +5916,7 @@
           sha256 = "0am8asrzjs3iwak9c86fxb4zwgx5smbb9ywp0zn4y7j37blygswj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/camcorder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/camcorder";
           sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
           name = "camcorder";
         };
@@ -5907,14 +5928,14 @@
       }) {};
     caml = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "caml";
-        version = "20150911.758";
+        version = "20151009.1745";
         src = fetchsvn {
           url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/";
-          rev = "16550";
+          rev = "16551";
           sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/50e8d089f4e163eb459fc602cb90440b110b489f/recipes/caml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/caml";
           sha256 = "0kxrn9s1h2l05akcdcj6fd3g6x5wbi511mf14g9glcn8azyfs698";
           name = "caml";
         };
@@ -5935,7 +5956,7 @@
           sha256 = "08cp45snhyir5w8gyp6xws1q7c54pz06q099l0m3zmwn9277g68z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/capture";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/capture";
           sha256 = "1hxrvyq8my5886q7wj5w3mhyja7d6cf19gyclap492ci7kmrkdk2";
           name = "capture";
         };
@@ -5956,7 +5977,7 @@
           sha256 = "030glbfdybjnkpraa37x6i34hpm1pjqssxf2dgwbp0l0phvfbv5z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cargo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cargo";
           sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
           name = "cargo";
         };
@@ -5977,7 +5998,7 @@
           sha256 = "055w1spba0q9rqqg4rjds0iakr9d8xg66959xahxq8268mq5446n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/caroline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/caroline-theme";
           sha256 = "07flxggnf0lb1fnvprac1daplgx4bi5fnnkgfc58wnw805s12k32";
           name = "caroline-theme";
         };
@@ -5998,7 +6019,7 @@
           sha256 = "1cp9i69npvyn72fqv0w8q1hlkcawkhbah4jblc341ycxwxb48mkl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/caseformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/caseformat";
           sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
           name = "caseformat";
         };
@@ -6019,7 +6040,7 @@
           sha256 = "1xhnh9zjlsycwx4fa83pn70zvrv538a7lmlgmq9vmn8i6jrwj63g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cask";
           sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
           name = "cask";
         };
@@ -6040,7 +6061,7 @@
           sha256 = "0gywc2mzdzq3ny0jjffa3151vi7zb9i8ddy5d63x4yhicf5sxlh1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cask-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cask-mode";
           sha256 = "0fs9zyihipr3klnh3w22h43qz0wnxplm62x4kx7pm1chq9bc9kz6";
           name = "cask-mode";
         };
@@ -6061,7 +6082,7 @@
           sha256 = "1m40s9q00l06fz525m3zrvwd6s60lggdqls5k5njkn671aa3h71s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cask-package-toolset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cask-package-toolset";
           sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
           name = "cask-package-toolset";
         };
@@ -6082,7 +6103,7 @@
           sha256 = "15sq5vrkhb7c5j6ny6wy4bkyl5pggch4l7zw46an29rzni3pffr3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/caskxy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/caskxy";
           sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
           name = "caskxy";
         };
@@ -6103,7 +6124,7 @@
           sha256 = "125d5i7ycdn2hgffc1l3jqcfzvk70m1ciywj4h53qakkl15r9m38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cbm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cbm";
           sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn";
           name = "cbm";
         };
@@ -6124,7 +6145,7 @@
           sha256 = "1mqz83yqgad7p5ssjil10w0bw0vm642xp18ms4id8pzcbxz8ygsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ccc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ccc";
           sha256 = "0fckhmz4svcg059v4acbn13yf3ijs09fxmq1axc1b9bm3xxig2cq";
           name = "ccc";
         };
@@ -6145,7 +6166,7 @@
           sha256 = "1a93cim1w96aaj81clhjv25r7v9bwqm9a818mn8lk4aj1bmhgc4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cd-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cd-compile";
           sha256 = "1a24rv1jbb883vwhjkw6qxv3h3qy039iqkhkx3jkq1ydidr9f0hv";
           name = "cd-compile";
         };
@@ -6166,7 +6187,7 @@
           sha256 = "1mqz83yqgad7p5ssjil10w0bw0vm642xp18ms4id8pzcbxz8ygsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cdb";
           sha256 = "1gx34062h25gqsl3j1fjlklha19snvmfaw068q6bv6x9r92niqnf";
           name = "cdb";
         };
@@ -6187,7 +6208,7 @@
           sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cdlatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cdlatex";
           sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
           name = "cdlatex";
         };
@@ -6208,7 +6229,7 @@
           sha256 = "0aspci0zg8waa3l234l0f8fjfzm67z2gydfdwwpxksz49sm2s1jk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cdnjs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cdnjs";
           sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7";
           name = "cdnjs";
         };
@@ -6229,7 +6250,7 @@
           sha256 = "1f8gdj3p54q3410c66716y3l7i7nnkmq6hqz0dg1a1sc6jwdij3v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cedit";
           sha256 = "169sy7a1bgczwfxkkzjiggb7vdjxhrx7i3a39g6zv9f1zs6byk6m";
           name = "cedit";
         };
@@ -6250,7 +6271,7 @@
           sha256 = "0974bxy85rcxia6dkfryas2g46nanjdf8fv90adbc7kyj07xsf7c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/celery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/celery";
           sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
           name = "celery";
         };
@@ -6269,7 +6290,7 @@
           sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/centered-cursor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/centered-cursor-mode";
           sha256 = "0a5mymnkwjvpra8iffxjwa5fq3kq4vc8fw7pr7gmrwq8ml7il5zl";
           name = "centered-cursor-mode";
         };
@@ -6290,7 +6311,7 @@
           sha256 = "1i5ipll7jlrxqb0kcwq0rlrpfaxsyp663bwjdnhj84c50wlv052f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/centered-window-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/centered-window-mode";
           sha256 = "08pmk3rqgbk5fzhxx1kd8rp2k5r5vd2jc9k2phrqg75pf89h3zf4";
           name = "centered-window-mode";
         };
@@ -6311,7 +6332,7 @@
           sha256 = "0zqrpaq9c3lm12jxnvysh8f3m3193k22zaj0ycscdqd1jpq4wcgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/centimacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/centimacro";
           sha256 = "1qbyfi6s4hdp5sv394w3sib8g2kx06i06q8gh6hdv5pis5kq9fx6";
           name = "centimacro";
         };
@@ -6332,7 +6353,7 @@
           sha256 = "17jg5d5afh9zpnjx8wkys8bjllxq99j0yhz8j3fvkskisvhkz1im";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cerbere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cerbere";
           sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
           name = "cerbere";
         };
@@ -6349,11 +6370,11 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "613159b4a6fe10c400f33f5b887c508216570f12";
-          sha256 = "1iphq7kysksf2bldy22q3vdr1z4jqj22maba0i00r725y2wpswzk";
+          rev = "11194dff59a8af944ed2845f8944e285aa903eaf";
+          sha256 = "03jm6fzcizxqkn2ws56ski3iwqbandgmqrvxk3z1vsmicvk7dnk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cfengine-code-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cfengine-code-style";
           sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
           name = "cfengine-code-style";
         };
@@ -6374,7 +6395,7 @@
           sha256 = "019vqjmq6hb2f5lddqy0ya5q0fd47xix29cashlchz0r034rc32r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cff";
           sha256 = "04b2ck1jkhsrka6dbyn6rpsmmc2bn13kpyhzibd781hj73d93jgc";
           name = "cff";
         };
@@ -6389,11 +6410,11 @@
         version = "20160414.1609";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11624";
+          rev = "11635";
           sha256 = "1ninfjra12s9agrzb115wrcphkb38flacnjgw1czw6sdqjjxcnp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cg";
           sha256 = "0ra6mxf8l9fjn1vszjj71fs6f6l08hwypka8zsb3si96fzb6sgjh";
           name = "cg";
         };
@@ -6414,7 +6435,7 @@
           sha256 = "1m9sq93bwajbld3lnlzkjbsby5zlm9sxjzqynryyvsb9zr1d0a9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/change-inner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/change-inner";
           sha256 = "0r693056wykg4bs7inbfzfniyawmb91igk6kjjpq3njk0v84y1sj";
           name = "change-inner";
         };
@@ -6435,7 +6456,7 @@
           sha256 = "0r3yja2ak3z62lav2s8vimmjyi4rd5s82fbs8r6p2k0shm6lj7hz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chapel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chapel-mode";
           sha256 = "0hmnsv8xf85fc4jqkaqz5j3sf56hgib4jp530vvyc2dl2sps6vzz";
           name = "chapel-mode";
         };
@@ -6456,7 +6477,7 @@
           sha256 = "0jdjf8mg0as90hb01kgwgcbng4cqaq4h9gd2v5pfl250c1mdq13g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/char-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/char-menu";
           sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l";
           name = "char-menu";
         };
@@ -6475,7 +6496,7 @@
           sha256 = "0xvgxjyl6s6hds7m9brzly6vxj06m47hxkw5h2riscq6l4nwc9vz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/character-fold+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/character-fold+";
           sha256 = "01ibdwd7vap9m64w0bhyknxa3iank3wfss49gsgg4xbbxibyrjh3";
           name = "character-fold-plus";
         };
@@ -6496,7 +6517,7 @@
           sha256 = "05k19q7iihvhi0gflmkpsg5q3ydkdlvf0xh7kjk4lx9yvi0am7m2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/charmap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/charmap";
           sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
           name = "charmap";
         };
@@ -6517,7 +6538,7 @@
           sha256 = "1r2s3fszblk5wa6v3hnbzsri550gi5qsmp2w1spvmf1726n900cb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chatwork";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chatwork";
           sha256 = "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p";
           name = "chatwork";
         };
@@ -6538,7 +6559,7 @@
           sha256 = "15kam5hf2f4nwp29nvxqm5bs8nyhqf5m44fdb21qljgbmjdlh38y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cheatsheet";
           sha256 = "11z3svlzvmhdy0pkxbx9qz9bnq056cgkbfyw9z34aq1yxazi2cpq";
           name = "cheatsheet";
         };
@@ -6559,7 +6580,7 @@
           sha256 = "0660ix17ksxy5a5v8yqy7adr9d4bs6p1mnkc6lpyw96k4pn62h45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/checkbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/checkbox";
           sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
           name = "checkbox";
         };
@@ -6572,15 +6593,15 @@
     chee = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "chee";
-        version = "20160531.2236";
+        version = "20160612.215";
         src = fetchFromGitHub {
           owner = "eikek";
           repo = "chee";
-          rev = "625868451e1cd6cc8cad6bda20c879e59b714542";
-          sha256 = "080zh5qz6smw6ynmigi559b9na3ln3bvbn3q7596wmzranpqwbkg";
+          rev = "d4414ee16902f0b93637cdea2f5121924cf3dfd0";
+          sha256 = "1fn358s4fqfcafckghrifmx1jmbd8abc1zxp0hhqxzwi8wm20y4g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chee";
           sha256 = "1njldlp9bnwq7izmdlz5a97kfgxxnycv43djrvx4b01j4v2yz4zv";
           name = "chee";
         };
@@ -6601,7 +6622,7 @@
           sha256 = "1jdlp5cnsiza55vx4kxacqgk7yqg9fvd9swhwdxkczadb2d5l9p1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cheerilee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cheerilee";
           sha256 = "15igjlnq35cg9nslyqa63i1inqipx3y8g7zg4r26m69k25simqrv";
           name = "cheerilee";
         };
@@ -6622,7 +6643,7 @@
           sha256 = "1mnskri5r1lyzzcag60x7amn00613jyl7by7hd4sqm2a7zd4r5aa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chef-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chef-mode";
           sha256 = "1pz82s82d4z3vkm8mpmwdxb9pd11kq09g23mg461lzqxjjw734rr";
           name = "chef-mode";
         };
@@ -6643,7 +6664,7 @@
           sha256 = "0m97xr6lddy2jdmd4bl4kbp2568p4n110yfa9k7fqc20ihq8jkyd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cherry-blossom-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cherry-blossom-theme";
           sha256 = "1i3kafj3m7iij5mr0vhg45zdnkl9pg9ndrq0b0i3k3mw7d5siq7w";
           name = "cherry-blossom-theme";
         };
@@ -6664,7 +6685,7 @@
           sha256 = "0j61lvr99viaharg4553whcppp7lxhimkk5lps0izz9mnd8y2wm5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chicken-scheme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chicken-scheme";
           sha256 = "0ns49p7nsifpi7wrzr02ljrr0p6hxanrg54zaixakvjkxwcgfabr";
           name = "chicken-scheme";
         };
@@ -6685,7 +6706,7 @@
           sha256 = "1vfyb8gfrvfrvaaw0p7c6xji2kz6cqm6km2cmjixw0qjikxxlkv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chinese-conv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chinese-conv";
           sha256 = "1lqpq7pg0nqqqj29f8is6c724vl75wscmm1v08j480pfks3l8cnr";
           name = "chinese-conv";
         };
@@ -6706,7 +6727,7 @@
           sha256 = "0hsyjlfvpj7hv08fwq41gp636sng3k5fi6gmxwi3wzxqxfhq7h4y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chinese-fonts-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chinese-fonts-setup";
           sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5";
           name = "chinese-fonts-setup";
         };
@@ -6716,22 +6737,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-pyim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
+    chinese-pyim = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20160603.16";
+        version = "20160612.439";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "092a8d4a07209114d2ba85f708fd0460797f6938";
-          sha256 = "12p3yg3j60r745k8mh79f1ncaqmfwq59gkwagkvgkck3snb6x9xh";
+          rev = "e9855f20b9431974d54e58cc816d2f20c8fb2b6a";
+          sha256 = "1m5yz2mc8ziypa6vwak5ishvxqsy8x2p1bik8xzkz0zzxlla0nhb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chinese-pyim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chinese-pyim";
           sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l";
           name = "chinese-pyim";
         };
-        packageRequires = [ cl-lib popup pos-tip ];
+        packageRequires = [ async cl-lib popup pos-tip ];
         meta = {
           homepage = "https://melpa.org/#/chinese-pyim";
           license = lib.licenses.free;
@@ -6748,7 +6769,7 @@
           sha256 = "06k13wk659qw40aczq3i9gj0nyz6vb9z1nwsz7c1bgjbl2lh6hcv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chinese-remote-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chinese-remote-input";
           sha256 = "0nnccm6w9i0qsgiif22hi1asr0xqdivk8fgg76mp26a2fv8d3dag";
           name = "chinese-remote-input";
         };
@@ -6769,7 +6790,7 @@
           sha256 = "0cx1g6drkr8gyqqdxjf7j4wprxcbq30gam2racgnvdicgij0apwg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chinese-wbim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chinese-wbim";
           sha256 = "1pax3kpmvg170mpvfrjbpj9czq0xykmfbany2f7vbn96jb5xfmsb";
           name = "chinese-wbim";
         };
@@ -6790,7 +6811,7 @@
           sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chinese-word-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chinese-word-at-point";
           sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
           name = "chinese-word-at-point";
         };
@@ -6811,7 +6832,7 @@
           sha256 = "14yzmyzkf846yjrwnqrbzmvyhfav39qa5fr8jnb7lyz8rm7y9pnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chinese-yasdcv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chinese-yasdcv";
           sha256 = "1y2qywldf8b8b0km1lcf74p0w6rd8gr86qcj7ikwhhbvd19dfglm";
           name = "chinese-yasdcv";
         };
@@ -6829,7 +6850,7 @@
           sha256 = "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chm-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chm-view";
           sha256 = "1acz0fvl3inn7g4himq680yf64bgm7n61hsv2zpm1k6smrdl78nz";
           name = "chm-view";
         };
@@ -6850,7 +6871,7 @@
           sha256 = "1mqdz3rvx0jm80fgzw3s3lqn448kqrlrifdwcg36cqq4qmkpalq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chronos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chronos";
           sha256 = "1fwpll0mk6pc37qagbq3b3z32d2qwz993nxp9pjw4qbmlnq6sy9d";
           name = "chronos";
         };
@@ -6871,7 +6892,7 @@
           sha256 = "0gx0bd7j71rlniq64vw8k59yzl070mdia05ry18br8kpsbk3bhrl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chruby";
           sha256 = "0pk6vdvmifiq52n452lbrkklxa69c40bfyzra9qhrghxr2q5v3mk";
           name = "chruby";
         };
@@ -6884,15 +6905,15 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20160602.1709";
+        version = "20160610.947";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "dd07f59cbfbe49caaa9c9058a9b32ead4ca7d7ab";
-          sha256 = "0pwv93bp982z95shn0s0vifi24gmj88yz4swmrfy07a3p9nfq4xk";
+          rev = "f98034498f19e4ea6b8cf52b4f8286552534753f";
+          sha256 = "052jj3bpzzvcnfyma134yhs9bj3rqdhgah0x60zqfx7liawgq6sy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cider";
           sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
           name = "cider";
         };
@@ -6913,7 +6934,7 @@
           sha256 = "1w4y65s3m2irga4iqfqqkcmvl6ss24zmaxqzbfib8jmi84r4lpac";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cider-decompile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cider-decompile";
           sha256 = "0jhsm31zcfwkbpsdh1lvmjm1fv2m7y849930sjvf5nxv3ffhx3b4";
           name = "cider-decompile";
         };
@@ -6934,7 +6955,7 @@
           sha256 = "0g8yzfpaz1glxd0dxrd19bvk469pdjkr4b11xifcvamxa2slryij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cider-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cider-eval-sexp-fu";
           sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
           name = "cider-eval-sexp-fu";
         };
@@ -6955,7 +6976,7 @@
           sha256 = "0lgq4p7rs4prqfqd83v1l36xxacrd65jsfzbp7q62b2pjqikpgk0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cider-profile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cider-profile";
           sha256 = "14jc98h4r9rb7pxfb60ps4ss8p0bm66wdl6n8z1357hk93h9kmfs";
           name = "cider-profile";
         };
@@ -6976,7 +6997,7 @@
           sha256 = "1x96f5wc916dcwb75a34b6x1mas20gdgy34c7rg59n91ydn1mfaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cider-spy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cider-spy";
           sha256 = "0478jlg76h0mrjwk2b1kdj16s1q1b03b7ygacai45jh89bc025fh";
           name = "cider-spy";
         };
@@ -6997,7 +7018,7 @@
           sha256 = "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cil-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cil-mode";
           sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
           name = "cil-mode";
         };
@@ -7018,7 +7039,7 @@
           sha256 = "190n4kdcqdwglhnawnj9mqjarmcaqylxipc07whmrii0jv279kjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cinspect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cinspect";
           sha256 = "0djh61mrfgcm3767ll1l5apw6646j4fdcaripksrmvn5aqfn8rjj";
           name = "cinspect";
         };
@@ -7031,15 +7052,15 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20160527.1522";
+        version = "20160608.2215";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "9a4f3c9a554f99de0eb9e5f2b3e545b3e6390918";
-          sha256 = "008fz7829mvjlid93hvs5xwwvigh5lnq2fxf2w9ghnw9lygkv5bq";
+          rev = "0564dfae13590d183889950724a7ef2e8df5b1df";
+          sha256 = "1nwdbm9dnybghcv2rjw9c8783k5r060cmxzklsn9by4l7i1x9k2r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/circe";
           sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
           name = "circe";
         };
@@ -7049,6 +7070,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "circe-notifications";
+        version = "20160605.1704";
+        src = fetchFromGitHub {
+          owner = "eqyiel";
+          repo = "circe-notifications";
+          rev = "32c0a2b3acf4bdf22dc45528def5d78ea77cebf6";
+          sha256 = "0ahk9w0nxmh8c27s63iizvk1yddf1bpz62b61niwi8nn6g6fx6m2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/circe-notifications";
+          sha256 = "06y525x5yc0xgbw0cf16mc72ca9bv8j8z4gpgznbad2qp7psf53c";
+          name = "circe-notifications";
+        };
+        packageRequires = [ alert circe emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/circe-notifications";
+          license = lib.licenses.free;
+        };
+      }) {};
     cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cl-format";
@@ -7060,7 +7102,7 @@
           sha256 = "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cl-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cl-format";
           sha256 = "1259ykj6z6m6gaqhkmj5f3q9vyk7idpvlvlma5likpknxj5f444v";
           name = "cl-format";
         };
@@ -7081,7 +7123,7 @@
           sha256 = "1mc8kayw8fmvpl0z09v6i68s2lharlwpzff0cvcsfn0an2imj2d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cl-lib-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cl-lib-highlight";
           sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
           name = "cl-lib-highlight";
         };
@@ -7097,11 +7139,11 @@
         version = "20151116.1338";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "271788";
-          sha256 = "1miz9ycxk0vvvnfi0hn0jl3sipvsyibc7j4cf59l4drz34zi8y5x";
+          rev = "272508";
+          sha256 = "1nx3lbjl2kykxdjry36hq4mc7kbh3dp0i1dc6pr3lgpc0w8hg55z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clang-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clang-format";
           sha256 = "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah";
           name = "clang-format";
         };
@@ -7122,7 +7164,7 @@
           sha256 = "1h6k6kzim1zb87y1kzpqjzk3ip9bmfxyg54kdh2sfp4xy0g5h3p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clean-aindent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clean-aindent-mode";
           sha256 = "1whzbs2gg2ar24kw29ffv94dgvrlfy2v4zdn0g7ksjjmmdr8ahh4";
           name = "clean-aindent-mode";
         };
@@ -7143,7 +7185,7 @@
           sha256 = "1h7kmj53fqwfzam3ywz3yn4abl2n94v0lxnyv7x4qzwi2ggizc3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clean-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clean-buffers";
           sha256 = "025sxrqxm24yg1wpfncrjw1nm91h0h7jy2xd5g20xqlinqqvdihj";
           name = "clean-buffers";
         };
@@ -7164,7 +7206,7 @@
           sha256 = "0y5z2pfhzpv67w2lnw1q06mflww90sfcilj89kqx2jhhrnrnn2ka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clear-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clear-text";
           sha256 = "1cx2lbcbhd024pq9njan7xrlvj3k4c3wdsvgbz5qyna0k06ix8dv";
           name = "clear-text";
         };
@@ -7185,7 +7227,7 @@
           sha256 = "19q6zbnl9fg4cwgi56d7p4qp6y3g0fdyihinpakby49xv2n2k8dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clevercss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clevercss";
           sha256 = "189f2l4za1j9ds0bhxrzyp7da9p6svh5dx2vnzf4vql7qhjk3gf0";
           name = "clevercss";
         };
@@ -7206,7 +7248,7 @@
           sha256 = "0hbdk1xdh753g59dgyqjj6wgjkf3crsd6pzaq7p5ifbfhrph0qjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/click-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/click-mode";
           sha256 = "1p5dz4a74w5zxdlw17h5z9dglapia4p29880liw3bif2c7dzkg0r";
           name = "click-mode";
         };
@@ -7227,7 +7269,7 @@
           sha256 = "0h856l6rslawf3vg37xhsaw5w56r9qlwzbqapg751qg0v7wf0860";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cliphist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cliphist";
           sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
           name = "cliphist";
         };
@@ -7248,7 +7290,7 @@
           sha256 = "07a55q97j2vsqpha0akri2kq90v1l97mc1mgr97pq39gc1bbc5d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clipmon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clipmon";
           sha256 = "1gvy1722px4fh88jyb8xx7k1dgyjgq7zjadr5fghdir42l0byw7i";
           name = "clipmon";
         };
@@ -7269,7 +7311,7 @@
           sha256 = "0msmigzip7hpjxwkz0khhlc2lj9wgb2919i4k0kv8ppi9j2f9hjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clippy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clippy";
           sha256 = "0nqmc8f2qrsp25vzc66xw6b232n7fyw6g06mwn2cdpm3d2pgb7rg";
           name = "clippy";
         };
@@ -7290,7 +7332,7 @@
           sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clips-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clips-mode";
           sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
           name = "clips-mode";
         };
@@ -7311,7 +7353,7 @@
           sha256 = "1yl1vldc2zsmc1hlslgvb9xr87fa0kya2f9phmmc96yqanvmh69g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clj-refactor";
           sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
           name = "clj-refactor";
         };
@@ -7344,7 +7386,7 @@
           sha256 = "0ydv2prnw1j3m5nk23fqn4iv202kjswr8z0ip4zacdm8bl0q25ln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cljr-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
           name = "cljr-helm";
         };
@@ -7365,7 +7407,7 @@
           sha256 = "0flnfivz6w3pkham3g08m3xzy3jg1rzvxfa00vkr7ll8iyv4ypqc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cljsbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cljsbuild-mode";
           sha256 = "0qvb990dgq4v75lwnd661wxszbdbhlgxpsyv4zaj6h10gp1vi214";
           name = "cljsbuild-mode";
         };
@@ -7386,7 +7428,7 @@
           sha256 = "152qf7i5bf7xvr35gyawl8abkh7v5dsz957zxslrbbnc8bb1k6bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clmemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clmemo";
           sha256 = "03qa79ip0gqinj1kk898lcvixk98hf6gknz0yc2fnqcrm642k2vs";
           name = "clmemo";
         };
@@ -7407,7 +7449,7 @@
           sha256 = "1rflc00yrbb7xzfh8c54ajf4qnhsp3mq07gkr257gjyrwsdw762v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cloc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cloc";
           sha256 = "1ny5wixa9x4fq5jvhs01jmyvwkfvwwi9aamrcqsl42s9sx6ygz7a";
           name = "cloc";
         };
@@ -7428,7 +7470,7 @@
           sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clocker";
           sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
           name = "clocker";
         };
@@ -7449,7 +7491,7 @@
           sha256 = "15hnjxc7xczidn3fl88zkb8868r0v1892pvhgzpwkh3biailfq5h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clojars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clojars";
           sha256 = "1skvd29347hwapgdqznbzwfcp2nf077qkdzknxc8ylmqa32yf5w1";
           name = "clojars";
         };
@@ -7470,7 +7512,7 @@
           sha256 = "0943fh8309mvg73paf97i2mfkrnl04x11gy8iz73c9622bkkmpcb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clojure-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clojure-cheatsheet";
           sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
           name = "clojure-cheatsheet";
         };
@@ -7483,15 +7525,15 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20160521.2009";
+        version = "20160604.1948";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "173b67dcc4a547844361ab93265c3b529e6fb6b2";
-          sha256 = "10czk5fnq4blksl9m8c5b2mp8wkicsjrifdfig9yn3gnpg4rmwbq";
+          rev = "2fa46e668b8e9eda8464c477df90e27472f627c2";
+          sha256 = "0wdbv0kldl1jrfiwd9jj66rklycsy1r8l4xap0h2z8kap1qnhbmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clojure-mode";
           sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
           name = "clojure-mode";
         };
@@ -7508,11 +7550,11 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "173b67dcc4a547844361ab93265c3b529e6fb6b2";
-          sha256 = "10czk5fnq4blksl9m8c5b2mp8wkicsjrifdfig9yn3gnpg4rmwbq";
+          rev = "2fa46e668b8e9eda8464c477df90e27472f627c2";
+          sha256 = "0wdbv0kldl1jrfiwd9jj66rklycsy1r8l4xap0h2z8kap1qnhbmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clojure-mode-extra-font-locking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clojure-mode-extra-font-locking";
           sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
           name = "clojure-mode-extra-font-locking";
         };
@@ -7533,7 +7575,7 @@
           sha256 = "1vgahik2q2sn6vqm9wg5b9jc74mkbc1md8pl69apz4cg397kjkzr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clojure-quick-repls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clojure-quick-repls";
           sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
           name = "clojure-quick-repls";
         };
@@ -7554,7 +7596,7 @@
           sha256 = "08sswxmrb94an95cjxxcppn3f8gvy99jdr4cbwlwk2yswdrxdlg0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clojure-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clojure-snippets";
           sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
           name = "clojure-snippets";
         };
@@ -7575,7 +7617,7 @@
           sha256 = "0wc2zv4xirw3whpgrdhw156mz0m6had3nwk1xm1zswzblkgv754w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clomacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clomacs";
           sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh";
           name = "clomacs";
         };
@@ -7596,7 +7638,7 @@
           sha256 = "1p251vyh8fc6xzaf0v7yvf4wkrvcfjdb3qr88ll4xcb61gj3vi3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/closql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/closql";
           sha256 = "0a8fqw8n03x9mygvzb95m8mmfqp3j8hynwafvryjsl0np0695b6l";
           name = "closql";
         };
@@ -7617,7 +7659,7 @@
           sha256 = "0v0wdq0b5jz4x0d7dl3ilgf3aqp2hk375db366ij6gxwd0b9i3na";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/closure-lint-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/closure-lint-mode";
           sha256 = "1xmi1gjgayd5xbm3xx721xv57ns3x56r8ps94zpwyf2znpdchqfy";
           name = "closure-lint-mode";
         };
@@ -7638,7 +7680,7 @@
           sha256 = "07kvnb6p35swkyj92c4wymsqq4r2885wdpqhv7nhicvi6n658kpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cloud-to-butt-erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cloud-to-butt-erc";
           sha256 = "061mmw39dq8sqzi2589lf7svy15n2iyiwbfiram48r2yhma5dd0f";
           name = "cloud-to-butt-erc";
         };
@@ -7659,7 +7701,7 @@
           sha256 = "0fnl3b62clg9llcs2l511sxp4yishan4pqk45sqp8ih4rdzvy7ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clues-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clues-theme";
           sha256 = "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy";
           name = "clues-theme";
         };
@@ -7680,7 +7722,7 @@
           sha256 = "1rwln3ms71fys3rdv3sx8w706aqn874im3kqcfrkxz86wiazm2d5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cm-mode";
           sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
           name = "cm-mode";
         };
@@ -7701,7 +7743,7 @@
           sha256 = "030kg3m546gcm6cf1k928ld51znsfrzhlpm005dvqap3gkcrg4sf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cmake-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cmake-font-lock";
           sha256 = "0ws4kd94m8fh55d7whsf3rj9qrxjp1wsgxh0valsjxyp2ck9zrz0";
           name = "cmake-font-lock";
         };
@@ -7714,15 +7756,15 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20160531.918";
+        version = "20160610.1453";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "e693fd876cc9063c45485cd0fbf6de0a188533a9";
-          sha256 = "1d2qlx7fqhiwnxlf5sy4331brcv9m1g29pwcylpw627b7jp0xhm0";
+          rev = "3e16f8857ed5ca1b88b2955c650efcf2d0b9981e";
+          sha256 = "1sfrnnp6lv26cr5877v5vdynnw41kq85c51j32770dwa23qw3f65";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cmake-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cmake-ide";
           sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
           name = "cmake-ide";
         };
@@ -7739,11 +7781,11 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "6a22a7cf71c0f564a150717a31651f9730c808fc";
-          sha256 = "1rdparszanp9c4041d3q9naaa2mghqsqqr42lm8l3k4fvzbjrmia";
+          rev = "acf0c0f4446e6d3cee8b00a7ebc39d5d8040e42d";
+          sha256 = "0rb55xcyxd28yb83k5d3q65chd112890vmbhvv701pkq5inl9fd8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cmake-mode";
           sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
           name = "cmake-mode";
         };
@@ -7764,7 +7806,7 @@
           sha256 = "0fyzi8xac80wnhnwwm1j6yxpvpg1n4diq2lcl3qkj8klvk5gpxr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cmake-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cmake-project";
           sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
           name = "cmake-project";
         };
@@ -7782,7 +7824,7 @@
           sha256 = "13r8pjxknsfd6ywzlgcy4bm7fvr768ba34k6b7y365y3c1asz6y3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cmds-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cmds-menu";
           sha256 = "12s75y9d75cxqgg3hj0s4w0d10zy8y230b5gy09685ab5lcajfks";
           name = "cmds-menu";
         };
@@ -7803,7 +7845,7 @@
           sha256 = "0xdcw329d2gssx86iajwrgpr7yv69b9nflmzjgb4jvg4pskj4pgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cmm-mode";
           sha256 = "184b8x19cnvx8z4dr9alv62wchzc7vr7crzz8jiyqw9d544zs50h";
           name = "cmm-mode";
         };
@@ -7824,7 +7866,7 @@
           sha256 = "1635k51ppivq6v2702fihq8dvi33445smds9zhqm0drnpv9rv5cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cn-outline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cn-outline";
           sha256 = "0cw1rr56hdngvhmx59j76hvkfzgybasn0fwhd6vwm709jqiiiwiz";
           name = "cn-outline";
         };
@@ -7845,7 +7887,7 @@
           sha256 = "1sx8grp3j7zcma3nb7zj6kijkdqx166vw1qgmm29hvx48bys6vlp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cobra-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cobra-mode";
           sha256 = "11jscpbclxlq2xqy2nsfa4y575bp8h0kpkp8cfjqb05lm5ybcp89";
           name = "cobra-mode";
         };
@@ -7866,7 +7908,7 @@
           sha256 = "0gc56pdyzcnv3q1a82c79i8w58q9r6ccfix9s1s6msjxzxkznap5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/code-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/code-library";
           sha256 = "0gi8lz2q0vis4nyziykq15jp3m3vykfwycbk6amhf1ybkn9k3ywj";
           name = "code-library";
         };
@@ -7887,7 +7929,7 @@
           sha256 = "11v671c4338bsizbmm7ypp4x9s5hiwyddsg2ig6h157gfv2597pp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/codebug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/codebug";
           sha256 = "1cb2wvawp3wqslhgbmbw9xwcqgwfscqg0jfgqzi3nr42mjp9zgqj";
           name = "codebug";
         };
@@ -7908,7 +7950,7 @@
           sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/codesearch";
           sha256 = "0z7zvain9n0rm6bvrh3j7z275l32fmp46p4b33mizqd1y86w89nx";
           name = "codesearch";
         };
@@ -7929,7 +7971,7 @@
           sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/codic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/codic";
           sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
           name = "codic";
         };
@@ -7950,7 +7992,7 @@
           sha256 = "010v886ak0rbbhqwxwj6m0mkgh19s232igy7wwbv07l2pdqszf3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/coffee-fof";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/coffee-fof";
           sha256 = "02cqza46qp8y69jd33cg4nmcgvrpwz23vyxqnmzwwvlmnbky96yc";
           name = "coffee-fof";
         };
@@ -7971,7 +8013,7 @@
           sha256 = "10l7as2z903y5bgqb4zr203rx254l62wrn9zx9863p7vzw1yhbpd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/coffee-mode";
           sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
           name = "coffee-mode";
         };
@@ -7990,7 +8032,7 @@
           sha256 = "1fpkymmgv58b734d2rr7cfj2j2if1qkwgrpk3yp2ibw2n2567y0s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/col-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/col-highlight";
           sha256 = "1kycjdlrg7a5x37b0pzqhg56yn7kaisryrk303qx1084kwq9464i";
           name = "col-highlight";
         };
@@ -8011,7 +8053,7 @@
           sha256 = "0jjj1miwc7hw2fbb1fnmfnydim81djswla8iy4waam9014yraqci";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/colemak-evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/colemak-evil";
           sha256 = "1bfzs5px1k6g3cnwjdaq2m78bbnfy3lxhjzkcch7zdv3nyacwl5z";
           name = "colemak-evil";
         };
@@ -8032,7 +8074,7 @@
           sha256 = "1k3sd07ffgpfhzg7d9mb1gc3n02zsvilxc30bgiycbjrbjgqq0i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/colonoscopy-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/colonoscopy-theme";
           sha256 = "0x9bfr4j0sp41jkgnyjlaxnnjjrc102x6sznn6cgcmqk5qhswl4q";
           name = "colonoscopy-theme";
         };
@@ -8053,7 +8095,7 @@
           sha256 = "1zwgyp65jivds9zvbp5k5q3gazffh3w0mvs739ddq93lkf165rwh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/color-identifiers-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/color-identifiers-mode";
           sha256 = "1hxp8lzn7kfckn5ngxic6qiz3nbynilqlxhlq9k1n1llfg216gfq";
           name = "color-identifiers-mode";
         };
@@ -8074,7 +8116,7 @@
           sha256 = "1p1f30qz4nd5a8ym2iwrgp6vhws0dls2qlc0apblj9nj3b0ziv0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/color-moccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/color-moccur";
           sha256 = "17b9walfc5c9qfdvl9pcwb2gjikc3wxk1d3v878ckypmxd38vciq";
           name = "color-moccur";
         };
@@ -8094,7 +8136,7 @@
           sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/color-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/color-theme";
           sha256 = "1p4bjh8a9f6ixmwwnyjb520myk3bww1v9w6427za07v68m9cdh79";
           name = "color-theme";
         };
@@ -8115,7 +8157,7 @@
           sha256 = "1b0ymwszqsjcihcbfp7s4fjam983ixh3yb7sdc0rmqlyric1zwxq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/color-theme-approximate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/color-theme-approximate";
           sha256 = "1wdnia9q42x7vky3ks555iic5s50g4mx7ss5ppaljvgxvbxyxqh1";
           name = "color-theme-approximate";
         };
@@ -8136,7 +8178,7 @@
           sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/color-theme-buffer-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/color-theme-buffer-local";
           sha256 = "1448rffyzn5k5mr31hwd28wlj7if7rp5sjlqcsvbxd2mnbgkgjz0";
           name = "color-theme-buffer-local";
         };
@@ -8157,7 +8199,7 @@
           sha256 = "0apvqrva3f7valjrxpslln8460kpr82z4zazj3lg3j82k102zla9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/color-theme-modern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/color-theme-modern";
           sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
           name = "color-theme-modern";
         };
@@ -8178,7 +8220,7 @@
           sha256 = "0cw1al8dan7vglkm33wkznvmyma903ckd95l1ns6qmf1d55lnpig";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/color-theme-sanityinc-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/color-theme-sanityinc-solarized";
           sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
           name = "color-theme-sanityinc-solarized";
         };
@@ -8195,11 +8237,11 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "58128341c05b1d7183e659c0a4c9b32d5905b05e";
-          sha256 = "00clabn9sckvrj0lnpmc5iarqzl34048b3w1qmmlhkgzc0qb4isx";
+          rev = "67efc9c4363a171498bd9fc44361c4f8e23031b1";
+          sha256 = "1cnr8rkyibba1y3lf4fhldh429nnfx14s5qnx839ybzffk666mgq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/color-theme-sanityinc-tomorrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/color-theme-sanityinc-tomorrow";
           sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
           name = "color-theme-sanityinc-tomorrow";
         };
@@ -8220,7 +8262,7 @@
           sha256 = "1yn0wacicf218212d9qgn67pf16i7x6bih67zdfcplq4i9lqbpg3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/color-theme-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/color-theme-solarized";
           sha256 = "011rzq38ffmq7f2nzwrq96wwz67p82p1f0p5nib4nwqa47xlx7kf";
           name = "color-theme-solarized";
         };
@@ -8241,7 +8283,7 @@
           sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/colorsarenice-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/colorsarenice-theme";
           sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
           name = "colorsarenice-theme";
         };
@@ -8262,7 +8304,7 @@
           sha256 = "0ay4wrnyrdp4v3vjxr99hy8fpq6zsyh246c0gbp7bh63l5fx8nwr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/column-enforce-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/column-enforce-mode";
           sha256 = "1qh7kwr65spbbnzvq744gkksx50x04zs0nwn5ly60swc05d05lcg";
           name = "column-enforce-mode";
         };
@@ -8280,7 +8322,7 @@
           sha256 = "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/column-marker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/column-marker";
           sha256 = "1xgfsiw46aib2vb9bbjlgnhcgfnlfhdcxd0cl0jqj4fjfxzbz0bq";
           name = "column-marker";
         };
@@ -8301,7 +8343,7 @@
           sha256 = "06hll2frlx4sg9fj13a7ipq9y24isbjkjm6034xswhak40m7g1ii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/command-log-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/command-log-mode";
           sha256 = "11jq6055bvpwvrm0b8cgab25wa2mcyylpz4j56h1nqj7cnhb6ppj";
           name = "command-log-mode";
         };
@@ -8322,7 +8364,7 @@
           sha256 = "0216hzdl4h1jssw5g2y95z4yx7abqsaxpk1s78r35w5cnx7kplrc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/command-queue";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/command-queue";
           sha256 = "1jaywdg8vcf1v6ayy1zd5mjs0x3s96845ig9ssb08397lfqasx1k";
           name = "command-queue";
         };
@@ -8343,7 +8385,7 @@
           sha256 = "06y7ika4781gkh94ygdaz7a760s7ahrma6af6n7cqhgjyikz7lg1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/commander";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/commander";
           sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
           name = "commander";
         };
@@ -8364,7 +8406,7 @@
           sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/comment-dwim-2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/comment-dwim-2";
           sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
           name = "comment-dwim-2";
         };
@@ -8385,7 +8427,7 @@
           sha256 = "1jwd3whag39qhzhbsfivzdlcr6vj37dv5ychkhmilw8v6dfdnpdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/commenter";
           sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3";
           name = "commenter";
         };
@@ -8406,7 +8448,7 @@
           sha256 = "04bma9sdn7h8fjz62wlcwayzhr7lvzhidh48wc5rk195zlbgagwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/commify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/commify";
           sha256 = "1jc6iqa4hna3277hx13scfcqzkr43yv6gndbxv7qf4ydi01ysd0m";
           name = "commify";
         };
@@ -8427,7 +8469,7 @@
           sha256 = "0iz5fgcp542hx26q6vmycfrfxyn58yjkdjr6zfn3mzhmxssaf1rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/common-lisp-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/common-lisp-snippets";
           sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
           name = "common-lisp-snippets";
         };
@@ -8440,15 +8482,15 @@
     company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20160523.335";
+        version = "20160611.1339";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "2d9bf1e9ce40c7670a39fce8ee7d0ffe1ff2fbc7";
-          sha256 = "083z3ssf76bw53bimai9ziaj2g3pl2mzjc40varkyqz02jz2m2mw";
+          rev = "8cc284ee4eea8f8a1d870f91585f7a1827b40129";
+          sha256 = "0hcd00cspb7i9cgw9xgns0q0sghblvnccbkwimb376bpg1m4vgky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company";
           sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
           name = "company";
         };
@@ -8469,7 +8511,7 @@
           sha256 = "1vkh0angvi9aqfbn2n1f2kq9myq0zw0dk19hqb5x6gxxd5s8l7hb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-anaconda";
           sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
           name = "company-anaconda";
         };
@@ -8490,7 +8532,7 @@
           sha256 = "06gh33qzglv40r62dsapzhxwparw8ciblv80g7h6y6ilyazwcidn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-ansible";
           sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
           name = "company-ansible";
         };
@@ -8511,7 +8553,7 @@
           sha256 = "08766m35s0r2fyv32y0h3sns9d5jykbgg24d2z8czklnc8hay7jc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-arduino";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-arduino";
           sha256 = "1bch447lllikip1xd90kdgssgc67sl04a70fxqkqlrc1bs6gkkws";
           name = "company-arduino";
         };
@@ -8540,7 +8582,7 @@
           sha256 = "0mkyg9y1rhl6hdzhr51psnvy2q0zw4y29m9p0ivb7s643k3fjjp5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-auctex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-auctex";
           sha256 = "1jia80sqmm83kzjcf1h1d9iz2k4k9albzvfka5hx6hpa4h8nm5q4";
           name = "company-auctex";
         };
@@ -8561,7 +8603,7 @@
           sha256 = "0jh2j260x1smlm4362dvgfpfpba7kg6hqvszjirc6mpm74zdcnp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-c-headers";
           sha256 = "1715vnjr5cjiq8gjcd3idnpnijg5cg3sw3f8gr5x2ixcrip1hx3a";
           name = "company-c-headers";
         };
@@ -8582,7 +8624,7 @@
           sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-cabal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-cabal";
           sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
           name = "company-cabal";
         };
@@ -8603,7 +8645,7 @@
           sha256 = "0lnb3qf1xhb0nbqy6ry0bkz2xrzfgkvavb7a3cbllawyz5idhfg5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-coq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-coq";
           sha256 = "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa";
           name = "company-coq";
         };
@@ -8624,7 +8666,7 @@
           sha256 = "0jkshkh44cgahpz2d7lrwfyl4kmhinivlbp08yn4zz6hpcvz87x9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-dcd";
           sha256 = "03849k4jzs23iglk9ghcq6283c9asffcq4dznypcjax7y4x113vd";
           name = "company-dcd";
         };
@@ -8652,7 +8694,7 @@
           sha256 = "16ai8ljp0i75kby1knj7ldysd8s6kd6drmlh9ygyddxbi2i35x61";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-dict";
           sha256 = "1377b40f1j4rmw7lnhy1zsm6r234ds5zsn02v1ajm3bzrpkkmin0";
           name = "company-dict";
         };
@@ -8673,7 +8715,7 @@
           sha256 = "0n2hvrfbybsp57w6m9mm7ywjq30fwwx9bzc2rllfr06d2ms7naai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-edbi";
           sha256 = "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm";
           name = "company-edbi";
         };
@@ -8694,7 +8736,7 @@
           sha256 = "1ipknikwyd6h2w72s5sn32mfql4p2cmgv868n13r3wg42c619blq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-emoji";
           sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
           name = "company-emoji";
         };
@@ -8715,7 +8757,7 @@
           sha256 = "1di3nndif2gkzwvs8bvqg994z422ql308lh47hbjdjnqm182mwy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-flx";
           sha256 = "1r4jcfzrhdpclblfrmi4qbl8dnhc2d7d4c1425xnslg7bhwd2vxn";
           name = "company-flx";
         };
@@ -8736,7 +8778,7 @@
           sha256 = "1mc7y4j772x54n2wc2dskb5wjc46r7sg2jwyvmnj44cyaasxqmck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-ghc";
           sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
           name = "company-ghc";
         };
@@ -8757,7 +8799,7 @@
           sha256 = "02gq083lpbszy8pf7s5j61bjlm0hacv4md4g17n0q6448rix9yny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-ghci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-ghci";
           sha256 = "0h9hqfb8fm90h87bi3myl84nppbbminhnvv6jqg62qi9k6snn1iq";
           name = "company-ghci";
         };
@@ -8774,11 +8816,11 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "15ca134d752c32e5eb27e2597cd2ee48f3a87639";
-          sha256 = "120bdalz29b5lvl0iqg00da194ihrwwbbib8gjga8w5gnnscm6nx";
+          rev = "bb0c614120474a3519c692834afb7b69b097b465";
+          sha256 = "1lirp62ppf857rfhzm007sn1pzb8vdf7x1186mc3mqrmwhpyyw8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-go";
           sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
           name = "company-go";
         };
@@ -8799,7 +8841,7 @@
           sha256 = "0fnv4rvvs9rqzrs86g23jcrpg0rcgk25299hm6jm08ia0kjjby1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-inf-ruby";
           sha256 = "0cb1w0sxgb5jf0p2a5s2i4d511lsjjhyaqkqlwjz8nk4w14n0zxm";
           name = "company-inf-ruby";
         };
@@ -8820,7 +8862,7 @@
           sha256 = "15xv59c6pwdysr9hqvaj7jgsa9pnicy7cnn9dq53zngjh3f5mf83";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-irony";
           sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
           name = "company-irony";
         };
@@ -8841,7 +8883,7 @@
           sha256 = "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-irony-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-irony-c-headers";
           sha256 = "0kiag5ggmc2f5c3gd8nn40x16i686jpdrfrflgrz2aih8p3g6af8";
           name = "company-irony-c-headers";
         };
@@ -8862,7 +8904,7 @@
           sha256 = "0bpqswcc6a65wms0pdk9rsad9jiigmx2l1jaqr8bz4va945qdlhg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-jedi";
           sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
           name = "company-jedi";
         };
@@ -8883,7 +8925,7 @@
           sha256 = "1fwb333p4yv02msx67p0n4bgzwa73d2zh78mwx79jani32m730ci";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-lua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-lua";
           sha256 = "13sm7ya2ndqxwdjarhxbmg7fvr3413c7p3n6yf1i4rabbliqsf2c";
           name = "company-lua";
         };
@@ -8904,7 +8946,7 @@
           sha256 = "1xsk02ymgj0gfblz2f6pzwh96crgx4m524ia6m95kcxrd7y63004";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-math";
           sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
           name = "company-math";
         };
@@ -8925,7 +8967,7 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-nand2tetris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-nand2tetris";
           sha256 = "1g2i33jjh7kbpzk835kbnqicf0w4cq5rqv934bqzz5kavj9cg886";
           name = "company-nand2tetris";
         };
@@ -8946,7 +8988,7 @@
           sha256 = "172aah6vnwsij6h8c668l0jrncmd9wszbf55bv3snnw80wnqikmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-ngram";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-ngram";
           sha256 = "1y9k9s8c248m91xld4f5l75j4swml333rpwq590bsx7mrsq131xx";
           name = "company-ngram";
         };
@@ -8967,7 +9009,7 @@
           sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-nixos-options";
           sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
           name = "company-nixos-options";
         };
@@ -8988,7 +9030,7 @@
           sha256 = "0sl59b9wwnpz6p2kxsc87b3q28vvfxg7pwk67c51q8qyrl0c1klv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-qml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-qml";
           sha256 = "0sva7i93dam8mc2z3cp785vmgcg7cphrpkwyvqyqhq8w51qg8mxx";
           name = "company-qml";
         };
@@ -9009,7 +9051,7 @@
           sha256 = "1b2v84ss5k43nnbsnvabgvb19ardsacbs1prn2h9i1k2d5mb8icw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-quickhelp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-quickhelp";
           sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
           name = "company-quickhelp";
         };
@@ -9030,7 +9072,7 @@
           sha256 = "1lk3fqsgbi6mg4hrpc9gy4hbfp9snyj4yvc0zh8iqqw5nx12dab4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-racer";
           sha256 = "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4";
           name = "company-racer";
         };
@@ -9051,7 +9093,7 @@
           sha256 = "04829y7510zxjww9pq8afvnzwyyv30c0b3a71mxwf6ympfxb9rx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-restclient";
           sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
           name = "company-restclient";
         };
@@ -9078,7 +9120,7 @@
           sha256 = "0dfqc506zyljsl5xasvdq7ym5pfhd3r17kvz84mzgg34r1fd4b8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-shell";
           sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz";
           name = "company-shell";
         };
@@ -9091,15 +9133,15 @@
     company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
     melpaBuild {
         pname = "company-sourcekit";
-        version = "20160511.517";
+        version = "20160605.831";
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "fa537304a0a6f90944d797ce58bc067603b6f987";
+          rev = "0c3ccf910e108b4a69d10b56853959a6cc352018";
           sha256 = "0b0qs398kqy6jsq22hahmfrlb6v8v3bcdgi3z2kamczb0a5k0zhf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-sourcekit";
           sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
           name = "company-sourcekit";
         };
@@ -9120,7 +9162,7 @@
           sha256 = "0pdzr7sqpja3cr2mydx9b4813r1g9jilpin7n13sjbqyk8108xc6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-tern";
           sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
           name = "company-tern";
         };
@@ -9141,7 +9183,7 @@
           sha256 = "1isnk2i64kppsr23nr6qm5kwxxwcp4xazjwvm2chyzl4vbvp03p2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-try-hard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-try-hard";
           sha256 = "1rwn521dc8kxh43vcd3rf0h8jc53d4gmid3szj2msi0da1sk0mmj";
           name = "company-try-hard";
         };
@@ -9162,7 +9204,7 @@
           sha256 = "0pjxahrhvz7l45whqlgm6n4mvqqxc8zs1dv33p3b498hyb83f52j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-web";
           sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
           name = "company-web";
         };
@@ -9183,7 +9225,7 @@
           sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-ycm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-ycm";
           sha256 = "1q4d63c7nr3g7q0smd55pp636vqa9lf1pkwjn9iq265369npvina";
           name = "company-ycm";
         };
@@ -9204,7 +9246,7 @@
           sha256 = "18v546yq65sf75a46k7slqh5dz12ifh30linm0m9gv65yrjpv02j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-ycmd";
           sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
           name = "company-ycmd";
         };
@@ -9225,7 +9267,7 @@
           sha256 = "0phqphcgygy2amwy6lm96mxxhwac03p177lyklksy71gwlr3zxb5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/composable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/composable";
           sha256 = "1fs4pczjn9sv12sladf6zbkz0cmzxr0jaqkiwryydal1l5nqqxcy";
           name = "composable";
         };
@@ -9246,7 +9288,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/concurrent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/concurrent";
           sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
           name = "concurrent";
         };
@@ -9267,7 +9309,7 @@
           sha256 = "09vq7hcsw4027whn3xrnfz9hkgkakva619hyz0zfgpvppqah9n1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/config-parser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/config-parser";
           sha256 = "0wncg1v4wccb9j16rcmwz8fcmrscj7knfisq0r4qqx3skrmpccah";
           name = "config-parser";
         };
@@ -9280,14 +9322,14 @@
     confluence = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, xml-rpc }:
     melpaBuild {
         pname = "confluence";
-        version = "20130808.2250";
+        version = "20151021.328";
         src = fetchsvn {
           url = "https://svn.code.sf.net/p/confluence-el/code/trunk/";
           rev = "173";
           sha256 = "18859zi60s2y79add998vxh084znbdxxq31m12flg7makxlamyh7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/50e8d089f4e163eb459fc602cb90440b110b489f/recipes/confluence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/confluence";
           sha256 = "0hplpqaxjg34pf75p9sf97wlbq4rz9f8qvn4cfpjxf16if078ls3";
           name = "confluence";
         };
@@ -9308,7 +9350,7 @@
           sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/conkeror-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/conkeror-minor-mode";
           sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
           name = "conkeror-minor-mode";
         };
@@ -9329,7 +9371,7 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/connection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/connection";
           sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
           name = "connection";
         };
@@ -9350,7 +9392,7 @@
           sha256 = "0ykc3lzdypf543dgm7jpi70z08kz9hwhn2gvp06ylb22id8b3fai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/contextual";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/contextual";
           sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
           name = "contextual";
         };
@@ -9371,7 +9413,7 @@
           sha256 = "1qsq543rb0z2fq716a2khs8zqyh13npzmbj58f00s8b3w3andpbh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/control-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/control-mode";
           sha256 = "1biq4p2w8rqcbvr09gxbchjqlaixjf1fzv7xv8lpv81dlhi7dgz6";
           name = "control-mode";
         };
@@ -9381,6 +9423,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "copyit";
+        version = "20160607.1905";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "emacs-copyit";
+          rev = "be8dca96ef434d6658e4707b042c094e909d5141";
+          sha256 = "1058qvgl6fkz5srizny0hfbjgqfsb5l9id7zrs5fb5qkilk9s01v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/copyit";
+          sha256 = "1m28irqixzl44c683dxvc5x6l3qcqlpy6jzk6629paqkdi5mx1c0";
+          name = "copyit";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/copyit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    copyit-pandoc = callPackage ({ copyit, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pandoc }:
+    melpaBuild {
+        pname = "copyit-pandoc";
+        version = "20160607.1812";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "emacs-copyit";
+          rev = "be8dca96ef434d6658e4707b042c094e909d5141";
+          sha256 = "1058qvgl6fkz5srizny0hfbjgqfsb5l9id7zrs5fb5qkilk9s01v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/copyit-pandoc";
+          sha256 = "03v448gh6glq126r95w4y6s2p08jgjhkc6zgsplx0v9d5f2mwaqk";
+          name = "copyit-pandoc";
+        };
+        packageRequires = [ copyit emacs pandoc ];
+        meta = {
+          homepage = "https://melpa.org/#/copyit-pandoc";
+          license = lib.licenses.free;
+        };
+      }) {};
     corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "corral";
@@ -9392,7 +9476,7 @@
           sha256 = "00055gzv032xxzqm1hffipljy8fzgsm58cbv8dzajh035jvdgpv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/corral";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/corral";
           sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
           name = "corral";
         };
@@ -9405,15 +9489,15 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20160603.1812";
+        version = "20160610.1608";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "c960de51ce4e868daedb91e523ff6267a3113c3a";
-          sha256 = "0zlcfyw7wi5djg54bzxnyqnqsf5pa2c3v96bas76n08k9fazk9m8";
+          rev = "97cf30dc9cb5473a1d6b0ff67950be556eb3de31";
+          sha256 = "1yff395x7m4vdmw6qzb45dn3ksfxpmxcssmhm992zbbv33hygbjn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/counsel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/counsel";
           sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
           name = "counsel";
         };
@@ -9434,7 +9518,7 @@
           sha256 = "15caglb1pvnrsgc17sfdfahkilrqba5r61118ny5fa3vgk9cbwcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/counsel-dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/counsel-dash";
           sha256 = "0pzh8ww1p2jb859gdjr5ypya3rwhiyg3c79xhx8filxrqxgjv5fk";
           name = "counsel-dash";
         };
@@ -9455,7 +9539,7 @@
           sha256 = "1h25wy945n173rv629d3q9s9q6yl72nnfr6xg27jjbnzf6v2i8lv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/counsel-osx-app";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/counsel-osx-app";
           sha256 = "0zc74szalyazbvi0lh3zy08kb8kzlwcwnc8d1sj5n23ymvvs5nn3";
           name = "counsel-osx-app";
         };
@@ -9476,7 +9560,7 @@
           sha256 = "1jzqhbw6mid7p5s88lwk1vjb12fmmxc3zfkhdkvxiglmanqghq6f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/counsel-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/counsel-projectile";
           sha256 = "1gshphxaa902kq878rnizn3k1zycakwqkciz92z3xxb3bdyy0hnl";
           name = "counsel-projectile";
         };
@@ -9497,7 +9581,7 @@
           sha256 = "0glnvr10lwi17g44653qqswn9vnyh5r2nmpaa0y6lvfb952zn0k0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/coverage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/coverage";
           sha256 = "0ja7wsx2sj0h01sk1l3c0aidbs1ld4gj3kiwq6brs7r018sz45pm";
           name = "coverage";
         };
@@ -9518,7 +9602,7 @@
           sha256 = "1q6cx6kq68xxqcx7zd9l4szy038i5ifjb82fxs3sn5fv00q0j9vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/coverlay";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/coverlay";
           sha256 = "0p5k9254r3i247h6ll6kjsgw3naiff5lgfkmb2wkc870lzggq0m4";
           name = "coverlay";
         };
@@ -9539,7 +9623,7 @@
           sha256 = "1z67x4a0aricd9q6i2w33k74alddl6w0rijjhzyxwml7ibhbvphz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cp5022x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cp5022x";
           sha256 = "0v1jhkix01l299m67jag43rnps68m19zy83vvdglxa8dj3naz5dl";
           name = "cp5022x";
         };
@@ -9560,7 +9644,7 @@
           sha256 = "1rk0bwdvfrp24z69flh7jg3c8vgvwk6vciixmmmldnrlwhpnbh6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cpputils-cmake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cpputils-cmake";
           sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
           name = "cpputils-cmake";
         };
@@ -9581,7 +9665,7 @@
           sha256 = "18nxsd1axd3m70p7cw4ifcj33z9v5w25v6g09q38maixymlad962";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cql-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cql-mode";
           sha256 = "0wdal8w0i73xjak2g0wazs54z957f4lj4n8qdmzpcylzpl1lqd88";
           name = "cql-mode";
         };
@@ -9602,7 +9686,7 @@
           sha256 = "0y37fx4ghx8a74cp7ci6p5yfpji8g42hlah2xcwfnyw0qlpqfbnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/crab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/crab";
           sha256 = "1jz26bw2h7ahcb7y2qhpqrlfald244c92m6pvfrb0jg0z384i6aj";
           name = "crab";
         };
@@ -9623,7 +9707,7 @@
           sha256 = "12g6l6xlbs9h24q5lk8yjgk91xqd7r3v7r6czy10r09cmfjmkxbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/crappy-jsp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/crappy-jsp-mode";
           sha256 = "00wj61maib77qldzq06l9v0pbvp9jih75w1xw0ry9mij0r6ca8ii";
           name = "crappy-jsp-mode";
         };
@@ -9644,7 +9728,7 @@
           sha256 = "0l4bvk3m355b25d7pdnhczn3fckbq0rg2l4r0a0d94004ksvylqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/creds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/creds";
           sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
           name = "creds";
         };
@@ -9665,7 +9749,7 @@
           sha256 = "18c4jfjnhb7asdhwj41g06cp9rz5xd7bbx2s1xvk6gahay27rlrv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/creole";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/creole";
           sha256 = "1pqgm7m2gzkn65v3qic71c38qiira29cwx11l96qph8h8sf47zw5";
           name = "creole";
         };
@@ -9686,7 +9770,7 @@
           sha256 = "0japww5x89vd1ahjm2bc3biz6wxv94vvqq5fyyzkqsblgk5bys0h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/creole-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/creole-mode";
           sha256 = "1lj9a0bgn7lmc2wyjzzvmpaz1f1spj02l51ki2wydjbfhxq61k0s";
           name = "creole-mode";
         };
@@ -9707,7 +9791,7 @@
           sha256 = "12qs9z1cnwhmks7x7fhymg21hbpjwgbdfz20pz2jgrl48hm6mmk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cricbuzz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cricbuzz";
           sha256 = "1ad2afyn3xny3rgb8yy6w87f33idlrmis1vx0b6s8ppafv9z74j0";
           name = "cricbuzz";
         };
@@ -9728,7 +9812,7 @@
           sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/crm-custom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/crm-custom";
           sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
           name = "crm-custom";
         };
@@ -9749,7 +9833,7 @@
           sha256 = "1r9dhk8h8lq18vi0hjai8y4z42yjxg18786mcr2qs5m3q1ampf9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/crontab-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/crontab-mode";
           sha256 = "16qc2isvf6cgl5ihdbwmvv0gbhns4mkhd5lxkl6f8f6h0za054ci";
           name = "crontab-mode";
         };
@@ -9768,7 +9852,7 @@
           sha256 = "120hxk82i0r4qan4hfk9ldmw5a8bzv7p683lrnlcx9gyxgkia3am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/crosshairs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/crosshairs";
           sha256 = "1gf73li6q5rg1dimzihxq0rdxiqzbl2w78r1qzc9mxw3qj7azxqp";
           name = "crosshairs";
         };
@@ -9789,7 +9873,7 @@
           sha256 = "0809pb8626i6z1dics3i1cs30p4qd8bzqcgr20lx9k3yq2abq2k7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/crux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/crux";
           sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
           name = "crux";
         };
@@ -9810,7 +9894,7 @@
           sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cryptol-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cryptol-mode";
           sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
           name = "cryptol-mode";
         };
@@ -9831,7 +9915,7 @@
           sha256 = "0ry0087g1br3397js7a9iy6k2x6p0dgqlggxx9gaqhms7pmpq14b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cryptsy-public-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cryptsy-public-api";
           sha256 = "1331nrx57136k09a7p6imv0k9g6w8ibpwn5xmv33dxc22hsmc41j";
           name = "cryptsy-public-api";
         };
@@ -9844,15 +9928,15 @@
     csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "csharp-mode";
-        version = "20160604.909";
+        version = "20160605.859";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "csharp-mode";
-          rev = "fe3ca7e036b5df57f5387ab897a10d41d32e3961";
-          sha256 = "1rk9891nzq9biqsgfr7ykj3dm5yv7lpjhkgzk3sg384h8lix214w";
+          rev = "b56c2506c81bbd55360b82462e33fe16e3438b27";
+          sha256 = "0n56pcpx8zrjj5bi071xsaq109q4mc4pha11439mkrvcfra40pqy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/csharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/csharp-mode";
           sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
           name = "csharp-mode";
         };
@@ -9873,7 +9957,7 @@
           sha256 = "0nvl6y90p9crk12j7aw0cqdjhli7xbrx3hqckxsnvrnxy4zax7nk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/css-comb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/css-comb";
           sha256 = "1axwrvbc3xl1ixhh72bii3hhbi9d96y6i1my1rpvwqyd6f7wb2cf";
           name = "css-comb";
         };
@@ -9894,7 +9978,7 @@
           sha256 = "1mgc6bd0dzrp1dq1yj8m2qxjnpysd8ppdk2yp96d3zd07zllw4rx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/css-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/css-eldoc";
           sha256 = "1f079q3ccrr4drk2hvn4xs4vbrd3hg87xqbk3r9mmjvkagd1v7rf";
           name = "css-eldoc";
         };
@@ -9915,7 +9999,7 @@
           sha256 = "0hyf4im7b8zka065daw7yxrb3670dpp8q92vd2gcsva1jla92h9y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cssfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cssfmt";
           sha256 = "12yq4dhyv3p5gxnd2w193ilpj2d3gx5ns09w0z1zkg7ax3a4q4b8";
           name = "cssfmt";
         };
@@ -9936,7 +10020,7 @@
           sha256 = "1xf2hy077frfz8qf91c0l0qppcjxzr4bsbb622bx6fidqkpa3a1a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cssh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cssh";
           sha256 = "10yvvyzqr06jvijmzis9clb1slzp2mn80yclis8wvrmg4p8djljk";
           name = "cssh";
         };
@@ -9954,7 +10038,7 @@
           sha256 = "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/csv-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/csv-nav";
           sha256 = "0626vsm2f5zc2wi5pyx4xrwcr4ai8w9a3l7gi9883smvayr619sj";
           name = "csv-nav";
         };
@@ -9975,7 +10059,7 @@
           sha256 = "07vasdlai49qs0nsmq2cz1kcq1adqyarv8199imgwwcbh4vn7dqb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ctable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ctable";
           sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
           name = "ctable";
         };
@@ -9994,7 +10078,7 @@
           sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ctags";
           sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
           name = "ctags";
         };
@@ -10015,7 +10099,7 @@
           sha256 = "1va394nls4yi77rgm0kz5r00xiidj6lwcabhqxisz08m3h8gfkh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ctags-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ctags-update";
           sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
           name = "ctags-update";
         };
@@ -10036,7 +10120,7 @@
           sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ctl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ctl-mode";
           sha256 = "0fydq779b0y6hmh8srfdimr5rl9mk3sj08rbvlljxv3kqv5ajczj";
           name = "ctl-mode";
         };
@@ -10057,7 +10141,7 @@
           sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ctxmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ctxmenu";
           sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
           name = "ctxmenu";
         };
@@ -10078,7 +10162,7 @@
           sha256 = "184plai32sn0indvi1dma6ykz907zgnrdyxdw6f5mghwca96g5kx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cucumber-goto-step";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cucumber-goto-step";
           sha256 = "1ydsd455dvaw6a180b6570bfgg0kxn01sn6cb57smqj835am6gx8";
           name = "cucumber-goto-step";
         };
@@ -10099,7 +10183,7 @@
           sha256 = "1ms0z5zplcbdwwdbgsjsbm32i57z9i2i8j9y3wm0pwzyz4zr36zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cuda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cuda-mode";
           sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
           name = "cuda-mode";
         };
@@ -10117,7 +10201,7 @@
           sha256 = "1w0msh4mfhwglkwgb8ksqfdzbd1bvspllydnjzhc0yl3s7qrifbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cursor-chg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cursor-chg";
           sha256 = "0d1ilall8c1y4w014wks9yx4fz743hvx5lc8jqxxlrq7pmqyqdxk";
           name = "cursor-chg";
         };
@@ -10138,7 +10222,7 @@
           sha256 = "06q46hmspgq1g3dkpim3fnz1gnzpqywwqcg5yism2lc6qj4zmanm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cursor-in-brackets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cursor-in-brackets";
           sha256 = "1p4p0v7x4i4i2z56dw4xf1phckanrwjciifi0zqba36xd4zxgx8f";
           name = "cursor-in-brackets";
         };
@@ -10159,7 +10243,7 @@
           sha256 = "0wmnhizv4jfcl1w9za4ydxf6xwxgm5vwmn1zi5vn70zmv4d6r49l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cursor-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cursor-test";
           sha256 = "1c1d5xq4alamlwyqxjx557aykz5dw87acp0lyglsrzzkdynbwlb1";
           name = "cursor-test";
         };
@@ -10177,7 +10261,7 @@
           sha256 = "0d62nv8i208ysi5cg906p9ribpnrn2jvzdcwm35km4i0q0bp6yg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cus-edit+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cus-edit+";
           sha256 = "1kazcdfajcnrzvhsgsmwwx96rkry0dglprrc02hbd7ky1fppp4sz";
           name = "cus-edit-plus";
         };
@@ -10198,7 +10282,7 @@
           sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cyberpunk-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cyberpunk-theme";
           sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
           name = "cyberpunk-theme";
         };
@@ -10219,7 +10303,7 @@
           sha256 = "1d5i8sm1xrsp4v4myidfyb40hm3wp7hgva7dizg9gbb7prmn1p5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cycbuf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cycbuf";
           sha256 = "0gyj48h5wgjawqq3j4hgk5a8d23nffmhd1q53kg7b9vfsda51hbw";
           name = "cycbuf";
         };
@@ -10240,7 +10324,7 @@
           sha256 = "1bmdjr99g50dzr4y1jxixfjhqmhrzblmpiyjhh5l5gqmdhammm4k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cycle-resize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cycle-resize";
           sha256 = "0vp57plwqx4nf3pbv5g4frjriq8niiia9xc3bv6c3gzd4a0zm7xi";
           name = "cycle-resize";
         };
@@ -10261,7 +10345,7 @@
           sha256 = "125s6vwbb9zpx6h3vrxnn7nr8pb45vhxd70ba2r3f87dlxah93am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cycle-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cycle-themes";
           sha256 = "1whp9q26sgyf59wygbrvdf9gc94bn4dmhr2f2qivpajx550fjfbc";
           name = "cycle-themes";
         };
@@ -10279,7 +10363,7 @@
           sha256 = "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cygwin-mount";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cygwin-mount";
           sha256 = "0ik2c8ab9bsx58mgcv511p50h45cpv7455n4b0kri83sx9xf5abb";
           name = "cygwin-mount";
         };
@@ -10300,7 +10384,7 @@
           sha256 = "04add8i0g4x5kzi1yd49i5viq9i2f5r5gzq33k05q6rimsp2ga02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cyphejor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cyphejor";
           sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
           name = "cyphejor";
         };
@@ -10321,7 +10405,7 @@
           sha256 = "0vbcq807jpjssabmyjcdkpp6nnx1288is2c6x79dkrviw2xxw3qf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cypher-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cypher-mode";
           sha256 = "174rfbm7yzkznkfjmh9bdnm5fgqv9bjwm85h39317pv1g8c3mgv0";
           name = "cypher-mode";
         };
@@ -10338,11 +10422,11 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "2f967a63d6ce9fbf9a1b66ea3d12b59011ab473f";
-          sha256 = "04lgjp59a22jndsyvrnrnlaz78gyxzhc3jvgspmkbcdjajm4ljja";
+          rev = "f7de80547c6697667d962721fbc017c4871cf835";
+          sha256 = "1zym90b4h295xnvkv5zzs36xw9b06z9bg06g49h9nx2q7gxzzg2j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cython-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cython-mode";
           sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
           name = "cython-mode";
         };
@@ -10363,7 +10447,7 @@
           sha256 = "1ck1a61m0kjynqwzbw9hnc7y2a6gd6l1430wm7mw3qqsq959qwm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/czech-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/czech-holidays";
           sha256 = "10c0zscbn7pr9xqdqksy4kh0cxjg9bhw8p4qzlk18fd4c8rhqn84";
           name = "czech-holidays";
         };
@@ -10384,7 +10468,7 @@
           sha256 = "1568jqcrw3xks1pvvn6dyn6jiam26vmp5m53jf8q4165ic2lazi8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/d-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/d-mode";
           sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
           name = "d-mode";
         };
@@ -10405,7 +10489,7 @@
           sha256 = "0fp40cyamchc9qq5vbpxgq3yp6vs8p3ncg46mjzr54psy3fc86dm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dactyl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dactyl-mode";
           sha256 = "0ppcabddcpwshfd04x42nbrbkagbyi1bg4vslysnlxn4kaxjs7pm";
           name = "dactyl-mode";
         };
@@ -10426,7 +10510,7 @@
           sha256 = "0fd0h07m42q2h1ggsjra20kzv209rpb4apjv408h2dxqm8sy0jiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dakrone-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dakrone-theme";
           sha256 = "0ma4rfmgwd6k24jzn6pgk46b88jfix7mz0ib7c7r90h5vmpiq814";
           name = "dakrone-theme";
         };
@@ -10439,15 +10523,15 @@
     danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "danneskjold-theme";
-        version = "20160409.1917";
+        version = "20160611.2027";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "fb851230b9c0b87216a0974d038328cd44ab6d33";
-          sha256 = "1shysnf34qxd5rabad14a26m5id88g4wl4y4mwap53l2p3mcxq38";
+          rev = "7d2c58d60b797dba1c53b31a34459e6d21a65bf4";
+          sha256 = "1dfp2k5wh8g7jrmwlvwkmr9bp3s5kjb64g40iv1axy7dkn6ch6ci";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/danneskjold-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/danneskjold-theme";
           sha256 = "0cwab7qp293g92n9mjjz2vpg1pz2q3d40hfszf29rci89wsf3yxl";
           name = "danneskjold-theme";
         };
@@ -10468,7 +10552,7 @@
           sha256 = "128a9iv1vrassmk4sy4cs4nj6lggr5v4rhjj04v1xssj5nn5flxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/darcula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/darcula-theme";
           sha256 = "1n9mpkdyf5jpxc5azfs38ccp9p0b5ii87sz4c7z4khs94y0gxqh3";
           name = "darcula-theme";
         };
@@ -10489,7 +10573,7 @@
           sha256 = "07w5aycgaps904q8lk52d0g28wxq41c82xgl5mw2q56n3s5iixfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dark-krystal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dark-krystal-theme";
           sha256 = "056aql35502sgvdpbgphpqdxzbjf4ay01rra6pm11c1dya8avv0j";
           name = "dark-krystal-theme";
         };
@@ -10510,7 +10594,7 @@
           sha256 = "052k8mqxx8lkadxyz6rwa7l741rwbd1blk2ggpsj2s1g6p9l68a1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dark-mint-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dark-mint-theme";
           sha256 = "0rljpwycarbn8rnac9vz7n23j69wmx35gn5dx77v0f0ws8ni4k9m";
           name = "dark-mint-theme";
         };
@@ -10531,7 +10615,7 @@
           sha256 = "1w0y2j0j9n107dbk7ksr9bipshjfs9dk08qbs9m6h5aqh4hmwa4r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dark-souls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dark-souls";
           sha256 = "1ilsn657mpl7v8vkbzqf3gp0gmvy0dgynfsn8w4cb49qaiy337xc";
           name = "dark-souls";
         };
@@ -10552,7 +10636,7 @@
           sha256 = "19vrxfzhi0sqf7frzjx5z02d65r2jp1w2nhhf0527g7baid5hqvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/darkburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/darkburn-theme";
           sha256 = "18hwdnwmkf640vcyx8d66i424wwazbzjq3k0w0xjmwsn2mpyhm9w";
           name = "darkburn-theme";
         };
@@ -10573,7 +10657,7 @@
           sha256 = "0d2g4iyp8gyfrcc1gkvl40p1shlw1sadswzhry0m1lgbyxiiklrz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/darkmine-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/darkmine-theme";
           sha256 = "06vzldyqlmfd11g8dqrqh5x244ikfa20qwpsmbgsiry3041k8iw5";
           name = "darkmine-theme";
         };
@@ -10594,7 +10678,7 @@
           sha256 = "1603pk88mnzvwv75wdqk83s0wba4q2b7cmg5bwn2yncxmirmh3lq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/darkokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/darkokai-theme";
           sha256 = "0jw71xl4ihkyq4m0w8c35x5hr8ic07wcabmvpwmvspnj8hkfccwf";
           name = "darkokai-theme";
         };
@@ -10615,7 +10699,7 @@
           sha256 = "0z1d15dgs4iymkh744bnqpq8b32d94244m4riq07lh4180wkdglq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/darktooth-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
           name = "darktooth-theme";
         };
@@ -10636,7 +10720,7 @@
           sha256 = "0ylzgaf4g0fh16rc061iaw3jrl2sjiwpr4x1ndk2bp0j14n7hqid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dart-mode";
           sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
           name = "dart-mode";
         };
@@ -10649,15 +10733,15 @@
     dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dash";
-        version = "20160510.2027";
+        version = "20160605.1148";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "012b3bca9fef526bfe8aac73763e2c0b9622e1da";
-          sha256 = "02zj2g9wcs213kbd21n40ha3dbjqyclyr26wbayqwqq9dpm5i8kf";
+          rev = "937f8a18868cdfa988f3884abae18d21fb0fa6f6";
+          sha256 = "138n4nld1kmrlv9sgrjm2dqkaw3hl9np7ycyby4iczdpmrbycmsh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dash";
           sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
           name = "dash";
         };
@@ -10678,7 +10762,7 @@
           sha256 = "0zd50sr51mmvndjb9qfc3sn502nhc939rhd454jbkmlrzqsxvphj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dash-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dash-at-point";
           sha256 = "0x4nq42nbh2qgbg111lgbknc7w7m7lxd14mp9s8dcrpwsaxz960m";
           name = "dash-at-point";
         };
@@ -10695,11 +10779,11 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "012b3bca9fef526bfe8aac73763e2c0b9622e1da";
-          sha256 = "02zj2g9wcs213kbd21n40ha3dbjqyclyr26wbayqwqq9dpm5i8kf";
+          rev = "937f8a18868cdfa988f3884abae18d21fb0fa6f6";
+          sha256 = "138n4nld1kmrlv9sgrjm2dqkaw3hl9np7ycyby4iczdpmrbycmsh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dash-functional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dash-functional";
           sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
           name = "dash-functional";
         };
@@ -10720,7 +10804,7 @@
           sha256 = "0l4z9rjla4xvm2hmp07xil69q1cg0v8iff0ya41svaqr944qf7hf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/date-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/date-at-point";
           sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
           name = "date-at-point";
         };
@@ -10741,7 +10825,7 @@
           sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/date-field";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/date-field";
           sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
           name = "date-field";
         };
@@ -10762,7 +10846,7 @@
           sha256 = "0dz65zw7zi4kjldxs3syjxnss8kaf7hx0v6a22jplcsy35iai6xn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/datetime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/datetime";
           sha256 = "0mnkckibymc5dswmzd1glggna2fspk06ld71m7aaz6j78nfrm850";
           name = "datetime";
         };
@@ -10783,7 +10867,7 @@
           sha256 = "0pabb260d3vcr57jqqxqk90vp2qnm63sky37rgvhv508zix2hbva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/datetime-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/datetime-format";
           sha256 = "0v9jp54qxzj2scbmr35xi6bz16q8bq6hmyxdglb3a4qbf4zgvwpi";
           name = "datetime-format";
         };
@@ -10804,7 +10888,7 @@
           sha256 = "0ry7magy9x63xv2apjbpgszp0slch92g23gqwl4rd564qafajmf0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/datomic-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/datomic-snippets";
           sha256 = "0lax0pj4k9c9n0gmrvil240pc9p25535q3n5m8nb2ar4sli8dn8r";
           name = "datomic-snippets";
         };
@@ -10825,7 +10909,7 @@
           sha256 = "1j0mk8vyr6sniliq0ix77jldx8vzl73nd5yhh82klzgyymal58ms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dayone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dayone";
           sha256 = "0hi09dj00h6g5r84jxglwkgbijhfxknx4mq5gcl5jzjis5affk8l";
           name = "dayone";
         };
@@ -10846,7 +10930,7 @@
           sha256 = "0syv4kr319d34yqi4q61b8jh5yy22wvd148x1m3pc511znh2ry5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/db";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/db";
           sha256 = "05jhga9n6gh1bmj8gda14sb703gn7jgjlvy55mlr5kdb2z3rqw1n";
           name = "db";
         };
@@ -10867,7 +10951,7 @@
           sha256 = "15r0qwjkl33p8kh2k5kxz9wnbkv1k470b1h0i6svvljkx9ynk68a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/db-pg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/db-pg";
           sha256 = "06nfibw01ijv7nr0m142y80jbbpg9kk1dh19s5wq7i6fqf7g08xg";
           name = "db-pg";
         };
@@ -10888,7 +10972,7 @@
           sha256 = "1mqz83yqgad7p5ssjil10w0bw0vm642xp18ms4id8pzcbxz8ygsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ddskk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ddskk";
           sha256 = "01pb00p126q7swsl12yjrhghln2wgaj65jhjr0k7dkk64x4psyc9";
           name = "ddskk";
         };
@@ -10909,7 +10993,7 @@
           sha256 = "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/debpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/debpaste";
           sha256 = "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw";
           name = "debpaste";
         };
@@ -10930,7 +11014,7 @@
           sha256 = "1n99nrp42slmyp5228d1nz174bysjn122jgs8fn1x0qxywg7jyxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/debug-print";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/debug-print";
           sha256 = "01dsqq2qdsbxny6j9dhvg770493awxjhk1m85c14ysgh6sl199rm";
           name = "debug-print";
         };
@@ -10951,7 +11035,7 @@
           sha256 = "05n57djagbkm8im4168d5d2fr2ibfnckya7qzrca1f9rmm0ah15j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/decide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/decide";
           sha256 = "1gjkays48lhrifi9jwja5n2dpxjbl7f9rmka1nsqg9vf7s59vhhc";
           name = "decide";
         };
@@ -10964,15 +11048,15 @@
     decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "decl";
-        version = "20160101.523";
+        version = "20160609.847";
         src = fetchFromGitHub {
           owner = "preetpalS";
           repo = "decl.el";
-          rev = "95cea9e09f3ee09a174ef72df025692b6e8a296d";
-          sha256 = "01bafkc99g9vi45y95mi3sqin2lsfw885z63f7llpqvnfav86n4y";
+          rev = "84a8c4d78e83629fb3100abf5408bd108e4cfcef";
+          sha256 = "0s0zk2hy8mi46rz949i241qsiy0s4aywzb3j0ch69jf3i6qdxh59";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/decl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/decl";
           sha256 = "0wdhmp226wmrjvjgpbz8ihvhxxv3rrxh97sdqm3mgsav3n071n6k";
           name = "decl";
         };
@@ -10993,7 +11077,7 @@
           sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dedicated";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dedicated";
           sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
           name = "dedicated";
         };
@@ -11014,7 +11098,7 @@
           sha256 = "1lnvr1rxgf1i0dh1gqlkghz6r4lm1llpv3vhky313220ibxrpsvm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dedukti-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dedukti-mode";
           sha256 = "17adfmrhfks5f45ddr6ygjq870ac50vfzc5872ycv414zg0w4sa9";
           name = "dedukti-mode";
         };
@@ -11035,7 +11119,7 @@
           sha256 = "1ysv1q7n7k2l4x8x7hlzmxmawyxl5lx627sbdv3phkvjh5zccsm8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/default-text-scale";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/default-text-scale";
           sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
           name = "default-text-scale";
         };
@@ -11056,7 +11140,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/deferred";
           sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
           name = "deferred";
         };
@@ -11077,7 +11161,7 @@
           sha256 = "02i621yq2ih0zp7mna8iykj41prv77hvcadz7rx8c942zyvjzxqd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/define-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/define-word";
           sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
           name = "define-word";
         };
@@ -11098,7 +11182,7 @@
           sha256 = "07jzr571q02l0lg5d40rnmzg16hmybi1nkjgslmvlx46z3c4xvyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/defproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/defproject";
           sha256 = "1gld2fkssrjh4smpp54017549d6aw3n1zisp5s4kkb6cmszwj5gm";
           name = "defproject";
         };
@@ -11110,14 +11194,14 @@
       }) {};
     deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "deft";
-        version = "20160602.1639";
+        version = "20160611.239";
         src = fetchgit {
           url = "git://jblevins.org/git/deft.git";
-          rev = "a040f0490285410273f00e38fc7a26f0e9a9f109";
-          sha256 = "01vfxkmjbvm8nck4rapxvz6ws2kw42ll9347pn4lmp3y3pann0q9";
+          rev = "59173ba0c048ead287dd1171a5a52ce53fd9a0cb";
+          sha256 = "12h6miqn3nmyhf7r5cm57fh9japv79mm6gyvlb3p0qw1zzlwnlcg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/deft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/deft";
           sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
           name = "deft";
         };
@@ -11135,7 +11219,7 @@
           sha256 = "0lqg23mpzcbcfkn84wm8i1bma73wpyh3m5f0zjrrzbwpgsmw8fqd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/delight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/delight";
           sha256 = "1d9m5k18k73vhidwd50mcbq7mlvwdn4sb9ih8r5gri9a9whi2nkj";
           name = "delight";
         };
@@ -11156,7 +11240,7 @@
           sha256 = "06a20sd8nc273azrgha40l1fbqvv9qmxsmkjiqbf6dcf1blkwjyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/delim-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/delim-kill";
           sha256 = "1pplc456771hi52ap1p87y7pabxlvm6raszcxjvnxff3xzw56pig";
           name = "delim-kill";
         };
@@ -11177,7 +11261,7 @@
           sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/demangle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/demangle-mode";
           sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
           name = "demangle-mode";
         };
@@ -11198,7 +11282,7 @@
           sha256 = "12sdba2c2zh91cmv4p2naq9b2y6l7ygizb88l4m9g0jsvwx6brvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/demo-it";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/demo-it";
           sha256 = "063v115xy9mcga4qv16v538k12rn9maz92khzwa35wx56bwz4gg7";
           name = "demo-it";
         };
@@ -11219,7 +11303,7 @@
           sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/describe-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/describe-number";
           sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
           name = "describe-number";
         };
@@ -11240,7 +11324,7 @@
           sha256 = "10f5dkrwfd6a1ab98j2kywkh1h01pnanvj2i7fv9a9vxnmiywrcf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/desktop+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/desktop+";
           sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
           name = "desktop-plus";
         };
@@ -11261,7 +11345,7 @@
           sha256 = "11qvhbz7149vqh61fgqqn4inw0ic6ib9lz2xgr9m54pdw9a901mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/desktop-registry";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/desktop-registry";
           sha256 = "1sfj0w6hlrx37js63fn1v5xc9ngmahv07g42z68717md6w3c8g0v";
           name = "desktop-registry";
         };
@@ -11274,15 +11358,15 @@
     devdocs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "devdocs";
-        version = "20160412.2108";
+        version = "20160607.1440";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "devdocs.el";
-          rev = "502ccc623b58c75ebefc10e41b8c635fc5d0baf9";
-          sha256 = "0m4gw6jsdj8pq6wxvvczwvp8pcjnz57ybnb9zib4bq1cajny42zg";
+          rev = "1bff4bd406fc71199d9dcac503269f7aa8fcebe6";
+          sha256 = "0qxy4i9438jmbxbj980civ8csh507gri3q3bszg3s1wv966k69rz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/devdocs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/devdocs";
           sha256 = "04a1yspk3dwx0lzyg03lrbvig4g6sqmavzwicshdyr7q1bny7ikn";
           name = "devdocs";
         };
@@ -11295,14 +11379,14 @@
     dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }:
     melpaBuild {
         pname = "dic-lookup-w3m";
-        version = "20160427.1301";
+        version = "20160607.850";
         src = fetchsvn {
           url = "http://svn.osdn.jp/svnroot/dic-lookup-w3m/";
-          rev = "84";
-          sha256 = "0mv3vs91c73ybf7x9lwlfiv05cb8w42d86zzqzraivswljz2qfhk";
+          rev = "86";
+          sha256 = "1lks8wxwbri177p8ybkz5nakqpy24wqzpb3smqz04gr9ny07iagv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/50e8d089f4e163eb459fc602cb90440b110b489f/recipes/dic-lookup-w3m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dic-lookup-w3m";
           sha256 = "0zc0phym431bjqg0r8n5xsa98m52xnbhpqlh0jcvcy02nbmdc584";
           name = "dic-lookup-w3m";
         };
@@ -11323,7 +11407,7 @@
           sha256 = "0b8yg03h5arfl5rlzlg2a6q7nhx452mdyngizjzxlvkmrqnlra4v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dictcc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dictcc";
           sha256 = "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm";
           name = "dictcc";
         };
@@ -11344,7 +11428,7 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dictionary";
           sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
           name = "dictionary";
         };
@@ -11365,7 +11449,7 @@
           sha256 = "1rlgyw1c0xz0vw10pq2wnczl5r2qhm5fcilmysvlfcq0nxcsd80q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/diff-hl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/diff-hl";
           sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
           name = "diff-hl";
         };
@@ -11386,7 +11470,7 @@
           sha256 = "14ccak3cmv36pd085188lypal9gd3flyikcrxn0wi6hn60w2dgvr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/diffscuss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/diffscuss-mode";
           sha256 = "06jd7wh4yzryz0yjwa4a0xddz7srl5mif8ff1wvcpxsb66m2zbvh";
           name = "diffscuss-mode";
         };
@@ -11407,7 +11491,7 @@
           sha256 = "0diw887x4q7kbgdvxbbnxdw51z33kqwxw3v9m45fczxbywyi4cxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/diffview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/diffview";
           sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
           name = "diffview";
         };
@@ -11428,7 +11512,7 @@
           sha256 = "0qxdfv1p0140fqcxh677hhxwpx1fihvwhvh76pysn4q4pcfr6ldr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/digistar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/digistar-mode";
           sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
           name = "digistar-mode";
         };
@@ -11449,7 +11533,7 @@
           sha256 = "17jfmgyras32w9xr8fldqj924bijgng4bjg9fy6ckwb3mgihyil8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dim";
           sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
           name = "dim";
         };
@@ -11470,7 +11554,7 @@
           sha256 = "0jn3hwnqg455fz85m79mbwsiv93ps4sfr1fcfjfwj3qhhbhq7d82";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dim-autoload";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dim-autoload";
           sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
           name = "dim-autoload";
         };
@@ -11491,7 +11575,7 @@
           sha256 = "04vfc5zgcjp0pax5zk1x98ivx5g349c5g3748lb9pgsijqaprgg4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/diminish";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/diminish";
           sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
           name = "diminish";
         };
@@ -11512,7 +11596,7 @@
           sha256 = "1ldqxdwy6r0fd2vh0ckkhgpincvybghavi8c7vvyd24j91i57y2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dionysos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dionysos";
           sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
           name = "dionysos";
         };
@@ -11533,7 +11617,7 @@
           sha256 = "0mcsfsybpsxhzkd2m9bzc0np49azm6qf5x4x9h9lbxc8vfgh4z8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dircmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dircmp";
           sha256 = "0cnj7b0s8vc83sh9sai1cldw54krk5qbz1qmlvvd1whryf2pc95c";
           name = "dircmp";
         };
@@ -11554,7 +11638,7 @@
           sha256 = "06m2p5sf47ykhkl958x4k0j0rxzrq0wfwf86mvnarlgc1215dbaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-atool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-atool";
           sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w";
           name = "dired-atool";
         };
@@ -11575,7 +11659,7 @@
           sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-avfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-avfs";
           sha256 = "1q42pvrpmd525887iicd3m5gw4w2a78xb72v7fjfl30ay1kir4bm";
           name = "dired-avfs";
         };
@@ -11593,7 +11677,7 @@
           sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-details";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-details";
           sha256 = "1390vl3i4qbnl7lbia98wznhf6x887d24f8p7146fpqjsiwbm5ck";
           name = "dired-details";
         };
@@ -11612,7 +11696,7 @@
           sha256 = "07z4h5l8763ks6b6m8dcmq78jiyq4xvan1mb0z8fbasmi1bsrya4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-details+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-details+";
           sha256 = "1gzr3z4nyzip299z08mignhigxr7drak7rv9z6gmdjrika9a29lx";
           name = "dired-details-plus";
         };
@@ -11633,7 +11717,7 @@
           sha256 = "1lcmpzwj43gix2q56bh2gw3gfqh8vl5j3mqr8s7v3k0aw816j0ni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-dups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-dups";
           sha256 = "05s02gw8b339yvsr7vvka1r2140y7mbjzs8px4kn4acgb5y7rk71";
           name = "dired-dups";
         };
@@ -11654,7 +11738,7 @@
           sha256 = "0jj9da880b4zwxba140fldai1x9p2sxc6hdf3wz6lnbvz1pyn1mv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-efap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-efap";
           sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
           name = "dired-efap";
         };
@@ -11675,7 +11759,7 @@
           sha256 = "1lnqjkbzryv655n16xj1c5bxck2jb5ccy8yckz1wp5yikkr06ba8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-fdclone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-fdclone";
           sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
           name = "dired-fdclone";
         };
@@ -11696,7 +11780,7 @@
           sha256 = "06hxcxgivxds42qilraqa6q1mlrhkn21w2adb1dg70p8qyrjqfk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-filetype-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-filetype-face";
           sha256 = "1g9wzkkqmlkxlxwx43446q9mlam035zwq0wzpf7m6394rw2xlwx6";
           name = "dired-filetype-face";
         };
@@ -11717,7 +11801,7 @@
           sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-filter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-filter";
           sha256 = "1mw94210i57wrqfyif6rh689xbwbpv1qp6bgc0j7z6g4xypvd52p";
           name = "dired-filter";
         };
@@ -11738,7 +11822,7 @@
           sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-hacks-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-hacks-utils";
           sha256 = "1vgl0wqf7gc2nbiqjn0rkrdlnxfm3wrgspx5b3cixv2n8rqx8kyi";
           name = "dired-hacks-utils";
         };
@@ -11759,7 +11843,7 @@
           sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-imenu";
           sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
           name = "dired-imenu";
         };
@@ -11780,7 +11864,7 @@
           sha256 = "1bg7msz672rp2l490l3wm99i18b30r6033yfkrq6ia742nagn040";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-k";
           sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
           name = "dired-k";
         };
@@ -11801,7 +11885,7 @@
           sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-narrow";
           sha256 = "1rgqiscbizalh78jwc53zbj599dd13a6vzdgf75vzllc1w7jsg6d";
           name = "dired-narrow";
         };
@@ -11822,7 +11906,7 @@
           sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-open";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-open";
           sha256 = "0a4ksz2jkva4gvhprywjc1fzrbf95xdk8gn25nv1h1c1ckhr91qx";
           name = "dired-open";
         };
@@ -11840,7 +11924,7 @@
           sha256 = "0wi2ph2ixsk6cjw81yxlqxl9ar0wh3k0yfwijr254yn9rl4vibxc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired+";
           sha256 = "1dmp6wcynran03nsa0fd26b9q0zj9wp8ngaafx1i1ybwn2gx32g5";
           name = "dired-plus";
         };
@@ -11861,7 +11945,7 @@
           sha256 = "14mbvqb692bc5q04qb1i7z2bjrgrfny71j2laq6pr3cvf1w8lj7r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-quick-sort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-quick-sort";
           sha256 = "01vrk3wqq2zmcblyp9abi2lvrzr2a5ca8r8gjjnr5223037ppl3l";
           name = "dired-quick-sort";
         };
@@ -11882,7 +11966,7 @@
           sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-rainbow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-rainbow";
           sha256 = "1b9yh8p2x1dg7dyqhjhnqqiiymyl6bwsam65j0lpvbdx8r4iw882";
           name = "dired-rainbow";
         };
@@ -11903,7 +11987,7 @@
           sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-ranger";
           sha256 = "19lbbzqflqda5b0alqfzdhpbgqssghqb4n4viq8x4l1fac8mby6h";
           name = "dired-ranger";
         };
@@ -11924,7 +12008,7 @@
           sha256 = "01xvaqckyr31ywsn1fp9sz9wq4h4dd1hgghfqypc9s4akrxmgnf2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-single";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-single";
           sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
           name = "dired-single";
         };
@@ -11942,7 +12026,7 @@
           sha256 = "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-sort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-sort";
           sha256 = "1dzy2601yikmmbfqivf9s5xi4vd1f5g3c53f8rc74kfnxr1qn59x";
           name = "dired-sort";
         };
@@ -11960,7 +12044,7 @@
           sha256 = "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-sort-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-sort-menu";
           sha256 = "0n7zh8s3vdw3pcax8wkas9rykf917wn2dzikdlyrl5bbil9ijblb";
           name = "dired-sort-menu";
         };
@@ -11979,7 +12063,7 @@
           sha256 = "1hjci4zfzig04ji1jravxg9n67rdr4wyhmxmahbrzq9kjnql510i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-sort-menu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-sort-menu+";
           sha256 = "19ah8qgbfdvyhfszdr6hlw8l01lbdb84vf5snldw8qh3x6lw8cfq";
           name = "dired-sort-menu-plus";
         };
@@ -12000,7 +12084,7 @@
           sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-subtree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-subtree";
           sha256 = "1vqcnkh3g6dwi2hwfkb534q0j19pkqzqk3yb7ah8ck4z4ln4ppfk";
           name = "dired-subtree";
         };
@@ -12021,7 +12105,7 @@
           sha256 = "1yx20h16hc1b04knsqhrxni0j8qgwnq7i5b0dlggq3dakcvqfxma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-toggle";
           sha256 = "18v571kp440n5g1d7pj86rr8dgbbm324f9vblkdbdvn13c5dczf5";
           name = "dired-toggle";
         };
@@ -12042,7 +12126,7 @@
           sha256 = "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-toggle-sudo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-toggle-sudo";
           sha256 = "0fy05af9aq9791ij4j9pscdk5j44pbg0kmhpqli41qiazjw7v2va";
           name = "dired-toggle-sudo";
         };
@@ -12063,7 +12147,7 @@
           sha256 = "1h2hnm8r3anfbk5x7d2dnv38bdllsbwaam6ivpbgzn12r23wrsr2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/diredful";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/diredful";
           sha256 = "0y8x6q1yfsk0srxsh4g5nbsms1g9pk9d103jx7cfdac79mcigw7x";
           name = "diredful";
         };
@@ -12084,7 +12168,7 @@
           sha256 = "0mis3m6lg3vlvp8qm8iajprgx3pm3gcbhdszsm9mvrcgkahdjqnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/direx";
           sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
           name = "direx";
         };
@@ -12105,7 +12189,7 @@
           sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/direx-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/direx-grep";
           sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
           name = "direx-grep";
         };
@@ -12124,7 +12208,7 @@
           sha256 = "1q03q4j0wkbg9p2nzf1kb7l517b21mskp2v52i95jbxh09igbjjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dirtree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dirtree";
           sha256 = "0wfz9ks5iha2n0rya9yjmrb6f9lhp620iaqi92lw9smm7w83zj29";
           name = "dirtree";
         };
@@ -12145,7 +12229,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dirtree-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dirtree-prosjekt";
           sha256 = "0pyb6c0gvc16z5rc5h0kpl8021hz2hzv86cmjsd20gbhz7imrqwk";
           name = "dirtree-prosjekt";
         };
@@ -12166,7 +12250,7 @@
           sha256 = "1srlz63pncxndh1kmb6dl5sxaanspxa444wg998dld3dkdflwavq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/disaster";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/disaster";
           sha256 = "1ad8q81n0s13cwmm216wqx3s92195pda1amc4wxvpb3lq7dbd3yn";
           name = "disaster";
         };
@@ -12187,7 +12271,7 @@
           sha256 = "0f7h2rhh37lrs6xclj182li6s1fawv5m8w3hgy6qgm06dam45lka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/discover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/discover";
           sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
           name = "discover";
         };
@@ -12208,7 +12292,7 @@
           sha256 = "0l2g58f55p8zmzv2q2hf163ggm9p0wk8hg93wlkyldrgyb94dgf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/discover-clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/discover-clj-refactor";
           sha256 = "08bz60fxcgzab77690mmv0f7wdxcpygmasazcss427k37z9ysm7r";
           name = "discover-clj-refactor";
         };
@@ -12229,7 +12313,7 @@
           sha256 = "1vnbn4asz3lifscvy4shzisl6r0gkgq0qsa3kpgif3853wcd2rvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/discover-js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/discover-js2-refactor";
           sha256 = "139zq66cpcn4dnidf22h7x88p812ywrrz4c3c62w3915b75f71ki";
           name = "discover-js2-refactor";
         };
@@ -12250,7 +12334,7 @@
           sha256 = "0b73nc4jkf9bggnlp0l34jfcgx91vxbpavz6bpnf5rjvm0v1bil9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/discover-my-major";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/discover-my-major";
           sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
           name = "discover-my-major";
         };
@@ -12268,7 +12352,7 @@
           sha256 = "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/disk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/disk";
           sha256 = "0bij9gr4zv6jmc6dwsy3lb06vsxvmyzl8xrm8wzasxisk1qd2l6n";
           name = "disk";
         };
@@ -12289,7 +12373,7 @@
           sha256 = "075gj81rnhrvv061wnldixpfmlsyfbnvacnk107z6f9v3m2m3vl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dispass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dispass";
           sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
           name = "dispass";
         };
@@ -12310,7 +12394,7 @@
           sha256 = "0r560bpgw5p2pfcgkgcrlpp1bprv1f23dl4y5fjk06dg93fgaysa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/display-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/display-theme";
           sha256 = "07nqscmfa6iykll1m6gyiqca1g5ncx3rx468iyf2ahygpvqvnbxa";
           name = "display-theme";
         };
@@ -12331,7 +12415,7 @@
           sha256 = "03d8zb2is7n2y2z0k6j37cijjc3ndgasxsm9gqyq7drlq9bqwzsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/distinguished-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/distinguished-theme";
           sha256 = "0h03aqgijrmisbgqga42zlb5yz4x3jn9jgr29rq8canyhayr3rk4";
           name = "distinguished-theme";
         };
@@ -12352,7 +12436,7 @@
           sha256 = "1pvd4gf4w4jb0j6n84ak844i6dk064y2pvnm5x0z5q70c2fn9170";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dix";
           sha256 = "0c5fmknpy6kwlz7nx0csbbia1maz0szj7yha1p7wq28s3a5426xq";
           name = "dix";
         };
@@ -12373,7 +12457,7 @@
           sha256 = "1pvd4gf4w4jb0j6n84ak844i6dk064y2pvnm5x0z5q70c2fn9170";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dix-evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dix-evil";
           sha256 = "1jscaksnl5qmpqgkjkv6sx56llz0w4p5h7j73c4a1hld94gwklh3";
           name = "dix-evil";
         };
@@ -12394,7 +12478,7 @@
           sha256 = "120zgp38nz4ssid6bv0zy5rnf2claa5s880incgljqyl0vmj9nq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dizzee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dizzee";
           sha256 = "1axydags80jkyhpzp3m4gyplwr9k3a13w6vmrrzcv161nln7jhhs";
           name = "dizzee";
         };
@@ -12415,7 +12499,7 @@
           sha256 = "15i25zh54b2fqji0qmkg502051ymccih6pgqnzq02c43dpnsqhqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/django-manage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/django-manage";
           sha256 = "0j95g7fps28xhlrikkg61xgpbpf52xb56swmns2qdib6x1xzd6rh";
           name = "django-manage";
         };
@@ -12436,7 +12520,7 @@
           sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/django-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/django-mode";
           sha256 = "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara";
           name = "django-mode";
         };
@@ -12457,7 +12541,7 @@
           sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/django-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/django-snippets";
           sha256 = "1qs9fw104kidbr5zbxc1q71yy033nq3wxh98vvzk4z4fppnd29sw";
           name = "django-snippets";
         };
@@ -12478,7 +12562,7 @@
           sha256 = "1azf4p6salga7269l0kf13bqlxf9idp0ys8mm20qpyjpj79p5g9w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/django-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/django-theme";
           sha256 = "1rydl857zfpbvd7aziz6h7n3rrh584z2cbfxlss3wgfclzmbyhgf";
           name = "django-theme";
         };
@@ -12499,7 +12583,7 @@
           sha256 = "1nbvdnw9g3zbbb0n2sn2kxfzs5wichhl9qid3qjp8dsiq1wpv459";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dkdo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dkdo";
           sha256 = "0p7ybgldjs046jrkkbpli1iicfmblpxfz9lql8m8sz7lpjn7h300";
           name = "dkdo";
         };
@@ -12520,7 +12604,7 @@
           sha256 = "063nnln5m42qf190vr2z0ibacyn7n0xkxm3v5vaa4gxdvdwzhshs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dklrt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dklrt";
           sha256 = "11ss5x9sxgxp1wx2r1m0vsp5z5qm8m4ww20ybr6bqjw0a1gax561";
           name = "dklrt";
         };
@@ -12541,7 +12625,7 @@
           sha256 = "1nz71g8pb19aqjcb4s94hhn6j30cc04q05kmwvcbxpjb11qqrv49";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dkmisc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dkmisc";
           sha256 = "0nnbl272hldcmhyj47r463yvj7b06rjdkpkl5xk0gw9ikyja7w0z";
           name = "dkmisc";
         };
@@ -12562,7 +12646,7 @@
           sha256 = "1xx4ccr3mfxay2j3wgd93qw5dpjasaq9mkmmjww3ibpf86ahf7l3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dmenu";
           sha256 = "1w1pgaj2yasfhsd1ibvrwy11ykq8v17h913g298h3ycsvqv8gic0";
           name = "dmenu";
         };
@@ -12583,7 +12667,7 @@
           sha256 = "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dna-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dna-mode";
           sha256 = "0ak3g152q3xxkiz1a4pl5y2vgbigbbmbc95fggirbcrh52zkzgk9";
           name = "dna-mode";
         };
@@ -12604,7 +12688,7 @@
           sha256 = "1nbm3wzd12rsrhnwlcc6b72b1ala328mfpcp5bwlfcdshw6mfcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/docbook-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/docbook-snippets";
           sha256 = "1ipqfylgiw9iyjc1nckbay890clfkhda81nr00cq06sjmm71iniq";
           name = "docbook-snippets";
         };
@@ -12625,7 +12709,7 @@
           sha256 = "055kr0qknjgnjs7dn6gdmahrdbs8piwldbz7vg1hgq3b046x8lky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/docean";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/docean";
           sha256 = "1mqmn2i9axnv5vnkg9gwfdjpzr6gxx4ia9mcdpm200ix297dg7x9";
           name = "docean";
         };
@@ -12646,7 +12730,7 @@
           sha256 = "1x23sv11gsqfxk7dfcfxah7h3k5wjg41lqq1g9yyrkxmqnlgy7p7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/docker";
           sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
           name = "docker";
         };
@@ -12667,7 +12751,7 @@
           sha256 = "0phmpranrgdi2gi89nxr1ii9xbr7h2ccpx1mkpnfxnjlzkdzq2fb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/docker-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/docker-api";
           sha256 = "1giqiapm4hf4dhfm3x69qqpir3jg7qz3parhbx88xxqrd1z18my0";
           name = "docker-api";
         };
@@ -12688,7 +12772,7 @@
           sha256 = "0bvnvs17cbisymiqp96q4y2w2jqy5hd0zyk6rv7mihr9p97ak9kv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/docker-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/docker-tramp";
           sha256 = "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w";
           name = "docker-tramp";
         };
@@ -12709,7 +12793,7 @@
           sha256 = "0vx7lv54v4bznn4mik4i6idb9dl7fpp3gw7nyhymbkr6hx884haw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dockerfile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dockerfile-mode";
           sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
           name = "dockerfile-mode";
         };
@@ -12730,7 +12814,7 @@
           sha256 = "1qfmq8l4jqyrhfplsr1zd8bg9qqqwbh3mhipqzja0px0knjpqj85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dokuwiki-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dokuwiki-mode";
           sha256 = "1jc3sn61mipkhgr91wp74s673jk2w5991p54jlw05qqpf5gmxd7v";
           name = "dokuwiki-mode";
         };
@@ -12751,7 +12835,7 @@
           sha256 = "1xyqsnymgdd8ic3az2lgwv7s7vld6d4pcycb234bxm4in9fixgdj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dollaro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dollaro";
           sha256 = "06kaqzb0nh8sndhk7p5n4acn5nc27dyxw3ldgcbp81wj6ipii26h";
           name = "dollaro";
         };
@@ -12772,7 +12856,7 @@
           sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/doom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/doom";
           sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl";
           name = "doom";
         };
@@ -12790,7 +12874,7 @@
           sha256 = "0201clwq9nbl8336lddcbwah8d6xipr7q8135yq79szfxq2bdg6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/doremi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/doremi";
           sha256 = "11i4cdxgrspx44p44zz5py89ypji5li6p5w77wy0b07i8a5gq2gb";
           name = "doremi";
         };
@@ -12809,7 +12893,7 @@
           sha256 = "1ay8rkcyydjqi1081vphb8iw3w2zc73m5bg1dz2mkxhksqwchqvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/doremi-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/doremi-cmd";
           sha256 = "1qzspirn1abqps0dn5z8w6ymffc6b02dyki5hr8v74wfs8fhzx05";
           name = "doremi-cmd";
         };
@@ -12828,7 +12912,7 @@
           sha256 = "0v7ycmddh1ds64m1y5yai5nh34bd32q3wcm5y2pdzhj6jk7nj5wz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/doremi-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/doremi-frm";
           sha256 = "1rj3p665q32acsxxwygv1j5nbmjqrhi0b4glzrk88xki4lyz0ihz";
           name = "doremi-frm";
         };
@@ -12846,7 +12930,7 @@
           sha256 = "157kvlb4dqiyk1h7b4p0dhrr6crdakwnrxydyl6yh51w2hdnnigw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/doremi-mac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/doremi-mac";
           sha256 = "0n9fffgxnpqc7cch7aci5kxbwzk36iljdz2r8gcp5y5n1p7aamls";
           name = "doremi-mac";
         };
@@ -12864,7 +12948,7 @@
           sha256 = "0sfmcd1rq6wih9q7d9vkcfrw6gf7309mm7491jx091ij8m4p8ypp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dos";
           sha256 = "0cpijbqpci96s0d6rwqz5bbi9b0zkan1bg8vdgib1f87r7g980nc";
           name = "dos";
         };
@@ -12882,7 +12966,7 @@
           sha256 = "0xhbzq3yvfvvvl6mfihrzkd3pn5p5yxvbcyf2jhsppk7lscifsgk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dot-mode";
           sha256 = "1fik32635caq3r5f9k62qbj2dkwczz2z1v28mc7bcj7jv2p93nvh";
           name = "dot-mode";
         };
@@ -12903,7 +12987,7 @@
           sha256 = "0v52djg39b6k2snizd9x0qc009ws5y0ywqsfwhqgcbs5ymzh7dsc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/download-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/download-region";
           sha256 = "1mrl2x6j708nchyh9y5avbf2cq10kpnhfj553l6akarvl5n5pvkl";
           name = "download-region";
         };
@@ -12924,7 +13008,7 @@
           sha256 = "0s7swvfd7h8r0n3cjmkps6ary9vwg61jylfm4qrkp3idsz6is548";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/downplay-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/downplay-mode";
           sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
           name = "downplay-mode";
         };
@@ -12945,7 +13029,7 @@
           sha256 = "03n3k6a40lw9m1ycf62g6vll4gr2kr2509vjp1dkfq722xwrw7zk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dpaste";
           sha256 = "17mrdkldv4gfwm6ggc047l4a69xg2fy9f9mjbphkjl0p5nr6b4kz";
           name = "dpaste";
         };
@@ -12966,7 +13050,7 @@
           sha256 = "1avpg0cgzk8d6g1q0ryx41lkcdgkm0mkzr5xr32xm28dzrfmgd4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dpaste_de";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dpaste_de";
           sha256 = "0dql9qsl5gj51i3l2grl7nhw0ign8h4xa4jnhwn196j71c0rdwwp";
           name = "dpaste_de";
         };
@@ -12979,16 +13063,16 @@
     dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dracula-theme";
-        version = "20160508.357";
+        version = "20160531.50";
         src = fetchFromGitHub {
-          owner = "zenorocha";
-          repo = "dracula-theme";
-          rev = "8405de6a31526c56906bd90efd61055641c0b0f5";
-          sha256 = "04j83f238bpm815r3h9l6qwyfgak53d83kdn2ma048kb3wmbh817";
+          owner = "dracula";
+          repo = "emacs";
+          rev = "1fb685d969c4c1251fce89c8e76cb01a768c8d07";
+          sha256 = "1yvfqywnd4bdi0y0996n9gpv6xh0xaalxx869sn1z3ha57rm25a0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/50e8d089f4e163eb459fc602cb90440b110b489f/recipes/dracula-theme";
-          sha256 = "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dracula-theme";
+          sha256 = "1px162v7h7136rasafq875yzw0h8n6wvzbyh73c3w093kd30bmh8";
           name = "dracula-theme";
         };
         packageRequires = [ emacs ];
@@ -13008,7 +13092,7 @@
           sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/draft-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/draft-mode";
           sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
           name = "draft-mode";
         };
@@ -13029,7 +13113,7 @@
           sha256 = "0vcc1pfxsjbrslh4k6d14xv4k8pvkg09kikwf7ipis12l62df6i4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/drag-stuff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/drag-stuff";
           sha256 = "1q67q20gfhixzkmddhzp6fd8z2qfpsmyyvymmaffjcscnjaz21w4";
           name = "drag-stuff";
         };
@@ -13050,7 +13134,7 @@
           sha256 = "1z3akh0ywzihr0ghk6f8x9z38mwqy3zg29p0q69h4i6yzhxpdmxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/drawille";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/drawille";
           sha256 = "01rl21hbj3hwy072yr27jl6iql331v131d3mr9zifg9v6f3jqbil";
           name = "drawille";
         };
@@ -13071,7 +13155,7 @@
           sha256 = "0lzq0mkhhj3s5yrcbs576qxkd8h0m2ikc4iplk97ddpzh4nz4127";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/drill-instructor-AZIK-force";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/drill-instructor-AZIK-force";
           sha256 = "1bb698r11m58csd2rm17fmiw691p25npphzqgjiiqbn4vx35ja7f";
           name = "drill-instructor-AZIK-force";
         };
@@ -13092,7 +13176,7 @@
           sha256 = "1s4cz5s0mw733ak9ps62fs150y3psqmb6v5s6s88jjfsi0r03c0s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dropbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dropbox";
           sha256 = "0ak6g2d2sq026ml6cmn6v1qz7sczkplgv2j9zq9zgzafihyyzs5f";
           name = "dropbox";
         };
@@ -13110,7 +13194,7 @@
           sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dropdown-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dropdown-list";
           sha256 = "14i9w897gnb3mvnkbzhzij04bgr551r8km310mbrmzzag54w077z";
           name = "dropdown-list";
         };
@@ -13131,7 +13215,7 @@
           sha256 = "1hbm3zdmd28fjl8fky0kq4gs2bxsrn2zxk9rd1wa2wky43ycnd35";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/drupal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/drupal-mode";
           sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
           name = "drupal-mode";
         };
@@ -13152,7 +13236,7 @@
           sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/drupal-spell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/drupal-spell";
           sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
           name = "drupal-spell";
         };
@@ -13167,11 +13251,11 @@
         version = "20130120.2157";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1746801";
+          rev = "1748002";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dsvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dsvn";
           sha256 = "12cviq6v08anif762a5qav3l8ircp81kmnl9q4yl6bkh9zxv7vy6";
           name = "dsvn";
         };
@@ -13192,7 +13276,7 @@
           sha256 = "1blfx3r2xd3idbfjrx44ma3x1d83xp67il2s2bmdwa8qz92z99lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dtrace-script-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dtrace-script-mode";
           sha256 = "0v29rzlyccrc37052w2qmvjaii84jihhp736l807b0hjjfryras4";
           name = "dtrace-script-mode";
         };
@@ -13213,7 +13297,7 @@
           sha256 = "1gxz2alc95k638nxvxifrard34y2a797m9f274gqp7xqy9ps464d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dtrt-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dtrt-indent";
           sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5";
           name = "dtrt-indent";
         };
@@ -13234,7 +13318,7 @@
           sha256 = "0cafvhbpfqd8ajqg2757fs64kryrl2ckvbp5abldb4y8fa14pb9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dts-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dts-mode";
           sha256 = "1k8cbiayajbzwkm0s0kyin0qpq9yhymidz0srs4hbvsnb6hvp234";
           name = "dts-mode";
         };
@@ -13255,7 +13339,7 @@
           sha256 = "1ixb78dv66lmqlbv4zl5ysvv1xqafvqh1h5cfdv03jdkqlfk34jz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ducpel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ducpel";
           sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
           name = "ducpel";
         };
@@ -13268,15 +13352,15 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20160601.1948";
+        version = "20160610.747";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "590773bbfd3f5156d7d2231dcdb9554135fa10fe";
-          sha256 = "0qcx245wbcyr3y7bflc2dmr4nr8nsfj6sr724ylsxa0ywzd8k7yl";
+          rev = "7e256808d82d22532030e4c53197426d3e082593";
+          sha256 = "1rqhb3xysb1n0q3gzsfwf2m5bishbaz2gvzx5a30dnxcxk7x5y8z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dumb-jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dumb-jump";
           sha256 = "1pgbs2k1g8w7gr65w50fazrmcky6w37c9rvyxqfmh06yx90nj4kc";
           name = "dumb-jump";
         };
@@ -13297,7 +13381,7 @@
           sha256 = "1xkfwg1awb3ikb9i71xdbnbb94y3p2qd1fhnbx6kzfs0kmsiv5k9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dummy-h-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dummy-h-mode";
           sha256 = "10lzfzq7md6s28w2zzlhswn3d6765g4vqzyjn2q5ms8pd2i4b4in";
           name = "dummy-h-mode";
         };
@@ -13318,7 +13402,7 @@
           sha256 = "0g72nnz0j6dvllyxyrw20z1vg6p7sy46yy0fq017pa77sgqm0xzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dummyparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dummyparens";
           sha256 = "1yah8kpqkk9ygm73iy51fzwc8q5nw0xlwqir2qld1fc5y1lkb7dk";
           name = "dummyparens";
         };
@@ -13339,7 +13423,7 @@
           sha256 = "1qaiwm8mf4656gc1pdj8ivgy4abkjsypr52pvf4nrdkkln9qzfli";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/duplicate-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/duplicate-thing";
           sha256 = "1jx2b6h23dj561xhizzbpxp3av69ic8zdw4kkf0py1jm3gnrmlm4";
           name = "duplicate-thing";
         };
@@ -13359,7 +13443,7 @@
           sha256 = "19aid1rqpqj0fvln98db5imfk1griqld55xsr9plm6kwrr174syq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dyalog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
           name = "dyalog-mode";
         };
@@ -13380,7 +13464,7 @@
           sha256 = "0fxdv594k6p4kv6nc598rw51sy4x10dvbyhzn3gni2linb3v1c5h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dylan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dylan-mode";
           sha256 = "0kimvz8vmcvgxi0wvf7dqv6plj31xlksmvgip8h3bhyy7slxj3yy";
           name = "dylan-mode";
         };
@@ -13401,7 +13485,7 @@
           sha256 = "150dj1g49q9x9zx9wkymq30l5gc8c4mhsq91fm6q0yj6ip7hlfxh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dynamic-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dynamic-fonts";
           sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
           name = "dynamic-fonts";
         };
@@ -13422,7 +13506,7 @@
           sha256 = "09skp2d5likqjlrsfis3biqw59sjkgid5249fld9ahqm5f1wq296";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dynamic-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dynamic-ruler";
           sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
           name = "dynamic-ruler";
         };
@@ -13443,7 +13527,7 @@
           sha256 = "0d18kdpw4zfbq4bkqh19cf42xlinxqa71lr2d994phaxqxqq195w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2ansi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2ansi";
           sha256 = "0ns1sldipx5kyqpi0bw79kdmhi1ry5glwxfzfx8r01hbbkf0cc94";
           name = "e2ansi";
         };
@@ -13464,7 +13548,7 @@
           sha256 = "1lx0c7s810x6prf7x1lnx412gll8nn8gqpmi56n319n406cxhnhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm";
           sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
           name = "e2wm";
         };
@@ -13485,7 +13569,7 @@
           sha256 = "1g77gf24abwcvf7z52vs762s6jp978pnvza8zmzwkwfvp1mkx233";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm-R";
           sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
           name = "e2wm-R";
         };
@@ -13506,7 +13590,7 @@
           sha256 = "121vd44f42bxqvdjswmjlghf1jalbs974b6cip2i049k1n08xgh0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm-bookmark";
           sha256 = "1myaqxzrgff5gxcn3zn1bsmyf5122ql1mwr05wamd450lq8nmbw5";
           name = "e2wm-bookmark";
         };
@@ -13527,7 +13611,7 @@
           sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm-direx";
           sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
           name = "e2wm-direx";
         };
@@ -13548,7 +13632,7 @@
           sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm-pkgex4pl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm-pkgex4pl";
           sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
           name = "e2wm-pkgex4pl";
         };
@@ -13569,7 +13653,7 @@
           sha256 = "0h1fnlpvy2mqfxjv64znghmiadh9qimj9q9a60cxhyc0bq0prz6f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm-svg-clock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm-svg-clock";
           sha256 = "0q02lksrbn43s8d9rzpglqybalglpi6qi9lix0cllag6i7fzcbms";
           name = "e2wm-svg-clock";
         };
@@ -13590,7 +13674,7 @@
           sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm-sww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm-sww";
           sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
           name = "e2wm-sww";
         };
@@ -13611,7 +13695,7 @@
           sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm-term";
           sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
           name = "e2wm-term";
         };
@@ -13632,7 +13716,7 @@
           sha256 = "09ikwg5s42b50lfj0796pa2h32larkf5j6cy042dzh8c441vgih4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/easy-after-load";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/easy-after-load";
           sha256 = "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys";
           name = "easy-after-load";
         };
@@ -13653,7 +13737,7 @@
           sha256 = "1qn0givyh07w41sv5xayfzlwbpbq7p39wbhmwsgffgfqzzz5r2ys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/easy-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/easy-escape";
           sha256 = "1zspb79x6s151wwiian45j1nh0xps8y8yd98byyn5lbwbj2pp2gk";
           name = "easy-escape";
         };
@@ -13674,7 +13758,7 @@
           sha256 = "0i2plbvaalapx3svryn5lrc68m0qj1xm0z577xxzq7i9z91nanq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/easy-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/easy-kill";
           sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
           name = "easy-kill";
         };
@@ -13695,7 +13779,7 @@
           sha256 = "0mmhqid0x56m0p3b18a757147fy8km3p4kmi0y94kjq04a4ysg3k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/easy-kill-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/easy-kill-extras";
           sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
           name = "easy-kill-extras";
         };
@@ -13716,7 +13800,7 @@
           sha256 = "0sm54ngmpciqmik7y3zihyygw9g0lhphzdm4xx07wvxmhnlamxsa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/easy-lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/easy-lentic";
           sha256 = "1j141lncgcgfpa42m505xndiy6lh848xymfvb3cz4d6h73421khg";
           name = "easy-lentic";
         };
@@ -13737,7 +13821,7 @@
           sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/easy-repeat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/easy-repeat";
           sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
           name = "easy-repeat";
         };
@@ -13758,7 +13842,7 @@
           sha256 = "0fbfdhz1fmxiy9hg038qqw7r3gvhvzyk68qaww0saja9zywx8hal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ebal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
           name = "ebal";
         };
@@ -13779,7 +13863,7 @@
           sha256 = "1pgn6fcg5cnbpk93hc2vw95sna07x0s1v2i6lq9bmij2msvar611";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ebf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ebf";
           sha256 = "072w1hczzb4z0dadvqy8px9zfnfd2z0w8nwa7q2qm5njg30rrqpb";
           name = "ebf";
         };
@@ -13800,7 +13884,7 @@
           sha256 = "09qbblp3gn6zyff7j1vawmqishcilh0b0r7070x2cxg213s36d8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ebib";
           sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
           name = "ebib";
         };
@@ -13821,7 +13905,7 @@
           sha256 = "0z89gggdgy2icnc6vwwbqbpnzbixxm6njgkz37zrrpwk23jsx1pb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ebib-handy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ebib-handy";
           sha256 = "069dq4sfw4jz4cd8mw611qzcz7jyj271qwv2l54fyi3pfvd68h17";
           name = "ebib-handy";
         };
@@ -13842,7 +13926,7 @@
           sha256 = "1hs069m4m6vhb37ac2x6hzbp9mfmpd3zhp4m631lx8dlmx11rydz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ecb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ecb";
           sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
           name = "ecb";
         };
@@ -13860,7 +13944,7 @@
           sha256 = "0jk7pb2sr4qbxwcn4ipcjc9phl9zjmgg8sf91qj113112xx7vvxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/echo-bell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/echo-bell";
           sha256 = "0adhdfbcpmdhd9252rh0jik2z3v9bzf0brpzfvcjn5py2x6724ws";
           name = "echo-bell";
         };
@@ -13881,7 +13965,7 @@
           sha256 = "03yyagd37l9kgdnkqrkvrcgp5njyl4an0af7cfmcdnpyjghczf4d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eclipse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eclipse-theme";
           sha256 = "0mww0jysxqky1zkkhvhj7fn20w970n2w6501rdm5jwqfb58ivxfx";
           name = "eclipse-theme";
         };
@@ -13902,7 +13986,7 @@
           sha256 = "0h6vh719ai0cxyja6wpfi6m76d42vskj56wg666j0h6j0qw6h3i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ecukes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ecukes";
           sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
           name = "ecukes";
         };
@@ -13923,7 +14007,7 @@
           sha256 = "0x0igyvdcm4863n7zndvcv6wgzwgn7324cbfjja6xd7r0k936zdy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edbi";
           sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
           name = "edbi";
         };
@@ -13944,7 +14028,7 @@
           sha256 = "0f59s0a7zpa3dny1k7x6zrymrnzba184smq8v1vvz8hkc0ym1j1v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edbi-database-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edbi-database-url";
           sha256 = "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn";
           name = "edbi-database-url";
         };
@@ -13965,7 +14049,7 @@
           sha256 = "1029b7p1lnyqkg0jm9an6s1l7la0kb38gx42g7212wbj71s3krga";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edbi-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edbi-django";
           sha256 = "1s59hab35hwnspyklxbhi0js0sgdn0rc7y33dqjk0psjcikqymg1";
           name = "edbi-django";
         };
@@ -13986,7 +14070,7 @@
           sha256 = "176954d4agk4by5w8a5ky65iwjky1dqxxvz8vdf8fxj82r5k9fhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edbi-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edbi-minor-mode";
           sha256 = "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi";
           name = "edbi-minor-mode";
         };
@@ -14007,7 +14091,7 @@
           sha256 = "1vll81386fx90lq5sy4rlxcik6mvw7zx5cc51f0yaca9bkcckp51";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edbi-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edbi-sqlite";
           sha256 = "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y";
           name = "edbi-sqlite";
         };
@@ -14028,7 +14112,7 @@
           sha256 = "1cfjw9b1lm29s5cbh0qqmkchbq2382s71w4rpb0gyf603s0yg13m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ede-compdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ede-compdb";
           sha256 = "1ypi7rxbgg2qck1b571hcw5m4ipllb48g6sindpdf180kbfbfpn7";
           name = "ede-compdb";
         };
@@ -14049,7 +14133,7 @@
           sha256 = "1zgiifi1k2d9g8sarfpjzamk8g1yx4ilgn60mqhy2pznp30b5qb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edebug-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edebug-x";
           sha256 = "0mzrip6y346mix4ny1xj8rkji1w531ix24k3cczmlmm4hm7l29ql";
           name = "edebug-x";
         };
@@ -14070,7 +14154,7 @@
           sha256 = "0crwdgng377sy1zbq7kqkz24v697mlzgdsvkdp1m8r7ympikkj6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edit-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edit-at-point";
           sha256 = "0sn5a644zm165li44yffcpcai8bhl3yfvqcljghlwaa0w45sc9im";
           name = "edit-at-point";
         };
@@ -14091,7 +14175,7 @@
           sha256 = "0vk954f44m2bq7qb122pzlb8fibrisx47ihvn3h96m8nmx0fv32r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edit-color-stamp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edit-color-stamp";
           sha256 = "1f8v8w3w7vb8jv29w06mplah8yfcs5qfjz2w4irv0rg7dwzy3zk8";
           name = "edit-color-stamp";
         };
@@ -14112,7 +14196,7 @@
           sha256 = "145knahvvxbm8qmcdb69ilrg14w7130vav2pqjd7anr1l8n2i6gz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edit-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edit-indirect";
           sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
           name = "edit-indirect";
         };
@@ -14133,7 +14217,7 @@
           sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edit-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edit-list";
           sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
           name = "edit-list";
         };
@@ -14154,7 +14238,7 @@
           sha256 = "0ssmhwg4wfh5cxgqv8bl55449204h4zi863m7jhvas4c9zq005kd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edit-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edit-server";
           sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
           name = "edit-server";
         };
@@ -14175,7 +14259,7 @@
           sha256 = "174xq45xc632zrb916aw7q4bch96pbi6zgy3dk77qla3ky9cfpl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edit-server-htmlize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edit-server-htmlize";
           sha256 = "007lv3698a88wxan7kplz2117azxxpzzgshin9c1aabg059hszlj";
           name = "edit-server-htmlize";
         };
@@ -14188,15 +14272,15 @@
     editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20160531.1040";
+        version = "20160605.651";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "58961f515e6cfcc6fc4f4c2c3e415260a2ab8027";
-          sha256 = "0nf8m9mnm2q0vanwngwrx9m5qjrng22fk9jg6sws340z4059m1ak";
+          rev = "3c8da2260971567c9ff22a3161731293dd11b5b7";
+          sha256 = "0g87hvhwwn22sssczl25j8x7zqsijjifsis14nsswzdyr6mc1mbl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/editorconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/editorconfig";
           sha256 = "0zv96m07ml8i3k7zm7sdci4hn611n3ypna7zppfkwbdyr7d5k2gc";
           name = "editorconfig";
         };
@@ -14217,7 +14301,7 @@
           sha256 = "1xp2hjhn52k6l1g6ypva6dsklpawni7gvjafbz6404f9dyxflh7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edn";
           sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
           name = "edn";
         };
@@ -14238,7 +14322,7 @@
           sha256 = "0dn2p80pifkc5pjqqx6xhr53mjp5y0hb48imhwybf9mwbgpz16va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edts";
           sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
           name = "edts";
         };
@@ -14268,7 +14352,7 @@
           sha256 = "1c2iyv392ap35nss4j901h33d3lx9lmq5v43flf2rid1766pam6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/efire";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/efire";
           sha256 = "1c8vdc58i0k7vvanwhckfc31226d3rb5xq77lh9ydgnd4i97gq2w";
           name = "efire";
         };
@@ -14289,7 +14373,7 @@
           sha256 = "1qrblglkafwzfds8x5wp4yrn1gq8iz823iilxcp9mwycbw57ajw8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/egg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/egg";
           sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
           name = "egg";
         };
@@ -14306,11 +14390,11 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "6181c9e4e9e564b0bd2c3c2c77a868d24a9e3195";
-          sha256 = "1akmng2vip60wlv6grby8aqrn99y3xx8bbj58cd3x4n4ayfa5ax7";
+          rev = "f1d30f6495c7a90af6df9581de16d51860908d0c";
+          sha256 = "069psdd8vqglkg6hxv5y8s6yjs8dpz9wfzvv11i0y25mr3an1lvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/egison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/egison-mode";
           sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
           name = "egison-mode";
         };
@@ -14331,7 +14415,7 @@
           sha256 = "1m53zv74lqzdy78jix0a33ih2pqkmrfriwlgsgvb12lb281bfnsa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ego";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ego";
           sha256 = "02s840chz3v4gdyq01b5i5w2vxl94001jk9j1nsp5b8xm10w985j";
           name = "ego";
         };
@@ -14350,7 +14434,7 @@
           sha256 = "1qiafvx6bhliqaysyc4qv2ps44qsmls75ysjbgmzw5rndc8hf0r0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eide";
           sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
           name = "eide";
         };
@@ -14371,7 +14455,7 @@
           sha256 = "154d57yafxbcf39r89n5j43c86rp2fki3lw3gwy7ww2g6qkclcra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eimp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eimp";
           sha256 = "00g77bg49m38cjfbh17ccnmksz05qx7yvgl6i4i4hysbr2d8pgxd";
           name = "eimp";
         };
@@ -14392,7 +14476,7 @@
           sha256 = "1b20cz9grxyjpbmc91csfygkg6rnclj39cc6pnlxxy6ikcn5xywn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ein";
           sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
           name = "ein";
         };
@@ -14413,7 +14497,7 @@
           sha256 = "1w0b3giy9ca35pp2ni4afnqas64a2vriilab7jiw9anp3ryh6570";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ein-mumamo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ein-mumamo";
           sha256 = "029sk90xz9fhv2s56f5hp0aks1d6ybz517009vv4892bbzkpjv1w";
           name = "ein-mumamo";
         };
@@ -14434,7 +14518,7 @@
           sha256 = "1ll3d8ylwbznmlq0wl6nvf6sgb9y2hkkpybv17ymg016j5xbngkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eink-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eink-theme";
           sha256 = "0z437cpf1b8bqyi7bv0w0dnc52q4f5g17530lwdcxjkr38s9b1zn";
           name = "eink-theme";
         };
@@ -14455,7 +14539,7 @@
           sha256 = "0v7amrmzrmj3myikd0a3g30cmkjri84paxxi4qzldwshj1pwypn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ejc-sql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ejc-sql";
           sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx";
           name = "ejc-sql";
         };
@@ -14476,7 +14560,7 @@
           sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-autoyas";
           sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
           name = "el-autoyas";
         };
@@ -14493,11 +14577,11 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "32d9903ea77f6d63fae45a14ab97f69333d7e5fc";
-          sha256 = "1dyc8qqyj54xg6wdybysgwpyvqpsjnd87nrqfzfb49mw470wf37r";
+          rev = "cbdff5d9107189b3a87626792a639914fe9906c2";
+          sha256 = "0fyk1wns654y18ngqql7hrz3qbi6slyq1vn6hh4ix88ndcbind13";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-get";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-get";
           sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
           name = "el-get";
         };
@@ -14518,7 +14602,7 @@
           sha256 = "0qk5jk0n7ga2cxqnm69rsy5cjjn5b4l4yqgaafvmmrrp70p8drmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-init";
           sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
           name = "el-init";
         };
@@ -14539,7 +14623,7 @@
           sha256 = "0flf0pa3xwrdhfkshyr6nqrm957sgx9jkganbasqavbq1dvlw6lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-init-viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-init-viewer";
           sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
           name = "el-init-viewer";
         };
@@ -14560,7 +14644,7 @@
           sha256 = "1jiq2hpym3wpk80zsl4lffpv4kgkykc2zp08sb01wa7pl8d1knmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-mock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-mock";
           sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
           name = "el-mock";
         };
@@ -14573,15 +14657,15 @@
     el-pocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web }:
     melpaBuild {
         pname = "el-pocket";
-        version = "20150203.28";
+        version = "20160528.1851";
         src = fetchFromGitHub {
           owner = "pterygota";
           repo = "el-pocket";
-          rev = "e79b5a4c7762be4ea88f43f17203d44a5c8ad310";
-          sha256 = "1iykhicc1ic1r6h4vj3701rm0vfy41b16w3d98amf8jjypv54wv7";
+          rev = "eb356e013c71903f2e946631ff58a1d0c2372389";
+          sha256 = "01dqksnz0nbfmp10sd3wwv1gffs60rk5v9rf2j3q2z13qsh8l2yy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-pocket";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-pocket";
           sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw";
           name = "el-pocket";
         };
@@ -14602,7 +14686,7 @@
           sha256 = "1lsq7980pwcwlg7z37hrig8ddm9nyvaqrlczv1w0vy631vc5z2az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-spec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-spec";
           sha256 = "017syizs8qw5phwvpzzffzdnj6rh9q4n7s51qjvj8qfb3088igkh";
           name = "el-spec";
         };
@@ -14623,7 +14707,7 @@
           sha256 = "1sba405h1sy5vxg4ki631p4979gyaqv8wnwbgca5jp2pm8l3viri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-spice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-spice";
           sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
           name = "el-spice";
         };
@@ -14644,7 +14728,7 @@
           sha256 = "04k1fz0ypmfzgwamncp2vz0lq54bq6y7c8k9nm39csp2564vmbbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-sprunge";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-sprunge";
           sha256 = "0rb1cr7zrfl1s5prxy3xwdqgnm8ddw33pcvk049km2qbccb08v6a";
           name = "el-sprunge";
         };
@@ -14665,7 +14749,7 @@
           sha256 = "016l3inzb7dby0w58najj2pvymwk6gllsxvqj2fkz3599i36p1pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-spy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-spy";
           sha256 = "1bgv4mgsnkmjdyay7lhkqdszvnwpjy4dxxw11kq45w866ba8645n";
           name = "el-spy";
         };
@@ -14683,7 +14767,7 @@
           sha256 = "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-swank-fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-swank-fuzzy";
           sha256 = "1m7y4c0r1w8ndmr1wgc2llrbfawbbxnvcvgjpsckb3704s87yxr1";
           name = "el-swank-fuzzy";
         };
@@ -14704,7 +14788,7 @@
           sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-x";
           sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
           name = "el-x";
         };
@@ -14725,7 +14809,7 @@
           sha256 = "03xlxx57z1id9mr7afkvf77m2f9rrknrm1380p51vka84v2hl3mh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el2markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el2markdown";
           sha256 = "1a52qm0jrcvvpb01blr5l7apaxqn4bvhkgha53cr48rdkmmq318g";
           name = "el2markdown";
         };
@@ -14746,7 +14830,7 @@
           sha256 = "1wikmzl9gi72h6fxawj0h20828n4vypw9rrv35kqnl4gfrdmxzkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elang";
           sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
           name = "elang";
         };
@@ -14767,7 +14851,7 @@
           sha256 = "0vppa9xihn8777rphiw1aqp96xn16vgjwff1dwvp8z861silp8ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eldoc-eval";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eldoc-eval";
           sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
           name = "eldoc-eval";
         };
@@ -14785,7 +14869,7 @@
           sha256 = "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eldoc-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eldoc-extension";
           sha256 = "0azkdx4ncjhb7qyhyg1a5pxgqqf2z1wq9iz802j0nxxnjzh9ny24";
           name = "eldoc-extension";
         };
@@ -14806,7 +14890,7 @@
           sha256 = "0s4y1319sr4xc0k6h2zhzzxsx2kc3pc2m6saah18y4kip0hjyhr8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/electric-case";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/electric-case";
           sha256 = "11mab7799kxs3w47srmds5prmwh6ldxzial9kqbqy33vybpkprmd";
           name = "electric-case";
         };
@@ -14827,7 +14911,7 @@
           sha256 = "1fq80j0gq3x03jqdpb6lr748mbx7sj7r54lq2m3qpnxp15p2v360";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/electric-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/electric-operator";
           sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
           name = "electric-operator";
         };
@@ -14848,7 +14932,7 @@
           sha256 = "0q1pb01h48wdbjgi04a6ck2jn7yfh92wpq1vka5pg54wv2k9b5fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/electric-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/electric-spacing";
           sha256 = "0fcsz9wmibqp6ci0pa5r4gzlrsyj5klajxpgfksa0nfj3dc94cvg";
           name = "electric-spacing";
         };
@@ -14869,7 +14953,7 @@
           sha256 = "1ijrhm9vrzh5wl1rr9ayl11dwm05bh1i43fnbz3ga58l6whgkfpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elein";
           sha256 = "0af263zq4xxaxhpypn769q8h1dla0ygpnd6l8xc13zlni6jjwdsg";
           name = "elein";
         };
@@ -14890,7 +14974,7 @@
           sha256 = "0zqrh8ycrk7768mj0d5b9dkz72559a36yhddb6idhik1v4q836sw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elfeed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elfeed";
           sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
           name = "elfeed";
         };
@@ -14911,7 +14995,7 @@
           sha256 = "10dbf292l1pd6a4jchdlvpp4yf2kxmf2j6zqigh4wlg125px1drk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elfeed-goodies";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elfeed-goodies";
           sha256 = "0zpk6nx757hasgzcww90fzkcdn078my33p7yax7xslvi4msm37bi";
           name = "elfeed-goodies";
         };
@@ -14939,7 +15023,7 @@
           sha256 = "0cp8sbhym83db88ii7gyab6iqxppinjlrkzb9627gq7xgb5mqj5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elfeed-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elfeed-org";
           sha256 = "0xf2r5ca3gnx2cv9f8rr4s1hds2ggqsbllvfr229gznkcqjnglik";
           name = "elfeed-org";
         };
@@ -14960,7 +15044,7 @@
           sha256 = "0zqrh8ycrk7768mj0d5b9dkz72559a36yhddb6idhik1v4q836sw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elfeed-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elfeed-web";
           sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
           name = "elfeed-web";
         };
@@ -14981,7 +15065,7 @@
           sha256 = "0rdhnnyn0xsmnshnf289kxk974r57i6nx0vii1w36j6p6q0b7f9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elhome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elhome";
           sha256 = "1k7936wxgslr29511dz9az38i9vi35rcxk68gzv35v9lpj89lalh";
           name = "elhome";
         };
@@ -15002,7 +15086,7 @@
           sha256 = "1a73zdh4jkx8f74cq802b5j4bx8k1z7cbsp10lz40lmwwxbl3czq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elisp-depend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elisp-depend";
           sha256 = "1x3acgkpd9a8xxjg5zjw0d4nv4q9xx30ipr6v3544mn16sv4ab7c";
           name = "elisp-depend";
         };
@@ -15023,7 +15107,7 @@
           sha256 = "17l2xsixx3p93dmx9jsg0a3xqdg19nwp1di2pymlg41pw0kdf3x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elisp-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elisp-format";
           sha256 = "1l0596y4yjn3jdyy6pgws1pgz6i12fxfy27566lmxklbxp8sxgy8";
           name = "elisp-format";
         };
@@ -15044,7 +15128,7 @@
           sha256 = "1ci6nyk1vvb3wgxzarbf6448i9rjb74zzrhcmls634gfxbryxdyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elisp-lint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elisp-lint";
           sha256 = "102hrxdw72bm11a29i15g09lv7jlnd7vkv7292fm3mcxf5f4hkw9";
           name = "elisp-lint";
         };
@@ -15086,7 +15170,7 @@
           sha256 = "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elisp-slime-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elisp-slime-nav";
           sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
           name = "elisp-slime-nav";
         };
@@ -15099,15 +15183,15 @@
     elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "elixir-mode";
-        version = "20160601.931";
+        version = "20160607.959";
         src = fetchFromGitHub {
           owner = "elixir-lang";
           repo = "emacs-elixir";
-          rev = "fe313d3ba80a2ea847f2e1ed45bd11a589c5cc8c";
-          sha256 = "0d4m3q3kh6wsk4rwwgknxddmvqhdd0b367xyj9qkwra4wsbaapa2";
+          rev = "8e77a8410cb0d7e05530d46d17569ad20baf8e49";
+          sha256 = "02a4i20vz9bc65d4m63pvpc2y5lkvjg1q8rd9g3l3mlkdqkf34bg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elixir-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elixir-mode";
           sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
           name = "elixir-mode";
         };
@@ -15128,7 +15212,7 @@
           sha256 = "1sdq4372i19wdxpdp3347a1rf5zf5w6sa0da6lr511m7ri0lj6hd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elixir-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elixir-yasnippets";
           sha256 = "0vmkcd88wfafv31lyw0983p4qjj387qf258q7py1ij47fcmfp579";
           name = "elixir-yasnippets";
         };
@@ -15141,15 +15225,15 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20160604.1114";
+        version = "20160605.1101";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "5e2e70436d4e5be6725a43b1f09eb68db7400f02";
-          sha256 = "0wzxk4p9rxgv2k3z5k5zyi46mfvax658j7p29q2ii5hyj9imcjka";
+          rev = "3112ff7964b596022de94c12b4676c6ca7a69c80";
+          sha256 = "1n6gp3c4b3ryprw7hxd7447gkgjafxnlbfg75mjm96vfgxkb7abx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elm-mode";
           sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
           name = "elm-mode";
         };
@@ -15170,7 +15254,7 @@
           sha256 = "1zb5yra6znkr7yaq6wqlmlr054wkv9cy1dih8h4j2gp2wnfwg968";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elm-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elm-yasnippets";
           sha256 = "0nnr0sxkxviw2i7b5s8jgvsv7lgqxqvirmvmband84q9gxlz24zb";
           name = "elm-yasnippets";
         };
@@ -15191,7 +15275,7 @@
           sha256 = "085ab50q3jdy3vh22lz2p5ivcjlhfki3zzfsp1n0939myw6vqcsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elmacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elmacro";
           sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
           name = "elmacro";
         };
@@ -15212,7 +15296,7 @@
           sha256 = "1463y4zc6yabd30k6806yw0am18fjv0bkxm56p2siqrwn9pbsh8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elmine";
           sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
           name = "elmine";
         };
@@ -15233,7 +15317,7 @@
           sha256 = "0p3cj5vgka388i4dk9r7bx8pv8mywnfij9ahgqak5jlsddflh8hw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elnode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elnode";
           sha256 = "0piy5gy9a7c8s10b99fmdyh6glhvjvdyrz0x2bv30h7wplx5szi6";
           name = "elnode";
         };
@@ -15254,7 +15338,7 @@
           sha256 = "0z3g7jddsjf4hmhwvi8mhd90255ylaix0ysljscqsixacknzcjm9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elog";
           sha256 = "0hixsi60nf0khm9xmya3saf95ahn1gydp0l5wxawsc491qwg4vqd";
           name = "elog";
         };
@@ -15275,7 +15359,7 @@
           sha256 = "1jcr8bxffvnfs0ym6zkgs79hd6a0m81r4x4jr3v5l9zwxw04sy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elogcat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elogcat";
           sha256 = "0sqdqlpg4firswr742nrb6b8sz3bpijf6pbxvandq3ddpm0rx9ia";
           name = "elogcat";
         };
@@ -15296,7 +15380,7 @@
           sha256 = "1dadf24x6v1vk57bp6w0g2dysigy5cqjzwldc8dn129f4pfrhipy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elpa-audit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elpa-audit";
           sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
           name = "elpa-audit";
         };
@@ -15317,7 +15401,7 @@
           sha256 = "1l1wnnmz62crr2gzpf0gzqp2pwmd50xp9knpswwz7l482gvfbzl7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elpa-mirror";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elpa-mirror";
           sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
           name = "elpa-mirror";
         };
@@ -15330,15 +15414,15 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20160528.2110";
+        version = "20160605.1008";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "625434c8bd13335f165ac56017895543185c9d4a";
-          sha256 = "0q70z5hif78s3syv6ny55phz8w794fwxkjwizbmiy4kn5y7lf3q7";
+          rev = "45ad70762abfecfcf1497440d4fa0715d326655c";
+          sha256 = "081qwp9m63af6nx7y7zgd4fi5wjd8abyza37v4gpj49vl3gjl100";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elpy";
           sha256 = "0n802bh7jj9zgz84xjrxvy33jl6s3hj5dqxafyfr87fank97hb6d";
           name = "elpy";
         };
@@ -15357,15 +15441,15 @@
     elscreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elscreen";
-        version = "20151026.200";
+        version = "20160610.1154";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "elscreen";
-          rev = "249653a4a4b47c9b6306c2c29fa3753bc7342e61";
-          sha256 = "055kam18k4ni1zw3310cpsvdnrp62d579r30lq67ig2lq3yxzc1m";
+          rev = "2b141b3e5a9b3622d2b7a102b83d2d0ea1ecbe49";
+          sha256 = "03dgfgqnqlx9amdcxgnm1cnz8hsnbicdw14fjbaaz1s9sy5zbdzr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elscreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elscreen";
           sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s";
           name = "elscreen";
         };
@@ -15386,7 +15470,7 @@
           sha256 = "0bbashrqpyhs282w5i15rzravvj0fjnydbh9vfnfnfnk8a9sssxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elscreen-buffer-group";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elscreen-buffer-group";
           sha256 = "1clmhpk9zp6hsgz6a4jpmbrr9fr6k8b324s0x61n5yi4yzgdmc0v";
           name = "elscreen-buffer-group";
         };
@@ -15407,7 +15491,7 @@
           sha256 = "14hwl5jzmm43qa4jbpsyswbz4hk1l2iwqh3ank6502bz58877k6c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elscreen-mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elscreen-mew";
           sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
           name = "elscreen-mew";
         };
@@ -15428,7 +15512,7 @@
           sha256 = "1cninrbgxzg0gykkpjx0i8pk2yc7sgr2kliqd35lgcxz2q4jlr51";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elscreen-multi-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elscreen-multi-term";
           sha256 = "1zwrzblkag1d18xz450b7khsdssvsxyl1x6a682vy0dkn1y5qh1n";
           name = "elscreen-multi-term";
         };
@@ -15449,7 +15533,7 @@
           sha256 = "0p0zphl3ylrbs3mz12y40hphslxd1hlszk1pqi151xrfgc2r0pp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elscreen-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elscreen-persist";
           sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
           name = "elscreen-persist";
         };
@@ -15470,7 +15554,7 @@
           sha256 = "1w34nnl4zalxzmyfbc81qd82m7qp3zvz608dx6hfi44pjz0dp36f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elscreen-separate-buffer-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elscreen-separate-buffer-list";
           sha256 = "1d8kc137cd8i3wglir1rlvk7w8mrdhd3xvcihi2f2f2g5nh2n5jk";
           name = "elscreen-separate-buffer-list";
         };
@@ -15491,7 +15575,7 @@
           sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elwm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elwm";
           sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
           name = "elwm";
         };
@@ -15512,7 +15596,7 @@
           sha256 = "07k8kq444ki7pxbz3vnrwqgycm9hfcdxgsnvf7qihqvzs2y1qm3d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elx";
           sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
           name = "elx";
         };
@@ -15533,7 +15617,7 @@
           sha256 = "1fj84r3r0kdprjy2sbzxgx7icfn6fbhvylbzfcv4wq5g7qbn45sz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacs-eclim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacs-eclim";
           sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv";
           name = "emacs-eclim";
         };
@@ -15554,7 +15638,7 @@
           sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacs-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacs-setup";
           sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
           name = "emacs-setup";
         };
@@ -15575,7 +15659,7 @@
           sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsagist";
           sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
           name = "emacsagist";
         };
@@ -15596,7 +15680,7 @@
           sha256 = "1rqr08gj07hw37mqd0flmq4a10wn16vy7wg0msqq0ab2smwjhns7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsc";
           sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
           name = "emacsc";
         };
@@ -15617,7 +15701,7 @@
           sha256 = "1vhs9725fyl2j65lk014qz76iv4hsvyim06361h4lai634hp7ck6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsist-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsist-view";
           sha256 = "0lf280ppi3zksqvx81y8mm9479j26kd5wywfghhwk36kz410hk99";
           name = "emacsist-view";
         };
@@ -15638,7 +15722,7 @@
           sha256 = "012x6cx3rbxysvsmbx56y295ijdlpgy8z7ggcfp0cq0khki67yva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsql";
           sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
           name = "emacsql";
         };
@@ -15659,7 +15743,7 @@
           sha256 = "012x6cx3rbxysvsmbx56y295ijdlpgy8z7ggcfp0cq0khki67yva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsql-mysql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsql-mysql";
           sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
           name = "emacsql-mysql";
         };
@@ -15680,7 +15764,7 @@
           sha256 = "012x6cx3rbxysvsmbx56y295ijdlpgy8z7ggcfp0cq0khki67yva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsql-psql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsql-psql";
           sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
           name = "emacsql-psql";
         };
@@ -15701,7 +15785,7 @@
           sha256 = "012x6cx3rbxysvsmbx56y295ijdlpgy8z7ggcfp0cq0khki67yva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsql-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsql-sqlite";
           sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
           name = "emacsql-sqlite";
         };
@@ -15722,7 +15806,7 @@
           sha256 = "08j10c699r8r8xynvlkm0vwlfza1fqz11zcfk2dsrakq3y9vb4ly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsshot";
           sha256 = "08xqx017yfizdj8wz7nbh9i7qpar6398sri78abzf78inv828s9j";
           name = "emacsshot";
         };
@@ -15743,7 +15827,7 @@
           sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emagician-fix-spell-memory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emagician-fix-spell-memory";
           sha256 = "0ffjrpiph21dn8bplklsz3hrsai25l67yyr7n8qjxlwlibwqzv6j";
           name = "emagician-fix-spell-memory";
         };
@@ -15764,7 +15848,7 @@
           sha256 = "0y6f759vh1v7pficjsf3n5ks52x36y2khk123a7ppi0vp826z52r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emamux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emamux";
           sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
           name = "emamux";
         };
@@ -15785,7 +15869,7 @@
           sha256 = "1idsvilsvlxh72waalhl8vrsmh0vfvz56qcv56fc2c0pb1i90icn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emamux-ruby-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emamux-ruby-test";
           sha256 = "1l1hp2dggjlc287qkfyj21w9lri4agh91g5x707qqq8nicdlv3xm";
           name = "emamux-ruby-test";
         };
@@ -15798,15 +15882,15 @@
     ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ember-mode";
-        version = "20151103.1121";
+        version = "20160609.1439";
         src = fetchFromGitHub {
           owner = "madnificent";
           repo = "ember-mode";
-          rev = "e82d88eee1882ac104857ec42a4fed731a99c13e";
-          sha256 = "0cv8y6hr719648yxr2fbgb1hyg36m60bsbd57f2vvvqvg87si4jz";
+          rev = "9ad372808ded188b8741e7e6864f88e170232be1";
+          sha256 = "0if1h4vcajkhjy56d5zili3i2bvgxhhkhhgf6l37bnnly243zr3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ember-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ember-mode";
           sha256 = "0fwd34cim29dg802ibsfd120px9sj54d4wzp3ggmjjzwkl9ky7dx";
           name = "ember-mode";
         };
@@ -15827,7 +15911,7 @@
           sha256 = "0g7hp1aq0zznbhd234dpbblnagn34fxdasc5v4lfhm5ykw5xyb5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ember-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ember-yasnippets";
           sha256 = "1jwkzcqcpy7ykdjhsqmg8ds6qyl4jglyjbgg7v301x068dsxkja6";
           name = "ember-yasnippets";
         };
@@ -15848,7 +15932,7 @@
           sha256 = "0arxgq1a75lhzc8f18aa32q2rxq4wxxacm6l7zxiqz98kl0gvfyi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/embrace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/embrace";
           sha256 = "1w9zp9n91703d6jd4adl2xk574wsr7fm2a9v32b1i9bi3hr0hdjc";
           name = "embrace";
         };
@@ -15869,7 +15953,7 @@
           sha256 = "1dh43fhkaqljnh1517kf8h3rjqaygj6wdhcbsy7mzcac0jrbfsfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emmet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emmet-mode";
           sha256 = "0wjv4hqddjvbdrmsxzav5rpwnm2n6lr86jzkrnav8f2kyzypdsnr";
           name = "emmet-mode";
         };
@@ -15885,10 +15969,10 @@
         src = fetchgit {
           url = "git://git.sv.gnu.org/emms.git";
           rev = "bb8bb83cd83b02ba57e3283475d7fd2689ea5c33";
-          sha256 = "1syy2y4rp0nqjdkq0lwnii20xkzv7iyryh2zlq6qg4pd6b2c73jb";
+          sha256 = "08sxv4j3sw03jg60z5dr1cy866a10h4392pmzyz3q57pix2kjwfw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms";
           sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m";
           name = "emms";
         };
@@ -15909,7 +15993,7 @@
           sha256 = "07qbbs2i05bqndr4dxb84z50wav8ffbc56f6saw6pdx6n0sw6n6n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms-info-mediainfo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms-info-mediainfo";
           sha256 = "17x8vvfhx739hcj9j1nh6j4r6zqnwa5zq9zpi9b6lxc8979k3m4w";
           name = "emms-info-mediainfo";
         };
@@ -15930,7 +16014,7 @@
           sha256 = "03a7sn8pl0pnr05rmrrbw4hjyi8vpjqbvkvh0fqnij913a6qc64l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms-mark-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms-mark-ext";
           sha256 = "13h6hy8y0as0xfc1cg8balw63as81fzar32q9h4zhnndl3hc1081";
           name = "emms-mark-ext";
         };
@@ -15951,7 +16035,7 @@
           sha256 = "0q80f0plch6k4lhs8c9qm3mfycfbp3kn5sjrk9zxgxwnn901y9mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms-mode-line-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms-mode-line-cycle";
           sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
           name = "emms-mode-line-cycle";
         };
@@ -15972,7 +16056,7 @@
           sha256 = "104iw4bl6y33diqs5ayrvdljkhb6f9g2m5p5kh8klgy7z1yjhp4p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms-player-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms-player-mpv";
           sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
           name = "emms-player-mpv";
         };
@@ -15993,7 +16077,7 @@
           sha256 = "1phjrisr9m6rpd40y6f8iiagrr7vpqc8ksgwymi8w11b1kmxhdja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms-player-mpv-jp-radios";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms-player-mpv-jp-radios";
           sha256 = "0gdap5cv08pz370fl92v9lyvgkbbyjhp9wsc4kyjm4f4pwx9fybv";
           name = "emms-player-mpv-jp-radios";
         };
@@ -16014,7 +16098,7 @@
           sha256 = "0ajxyv7yx4ni8dizs7acpsxnmy3c9s0dx28vw9y1ym0bxkgfyzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms-player-simple-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms-player-simple-mpv";
           sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
           name = "emms-player-simple-mpv";
         };
@@ -16035,7 +16119,7 @@
           sha256 = "0nx5bb5fjmaa1nhkbfnhd1aydqrq390x4rl1vfh11ilnf52wzzld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms-soundcloud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms-soundcloud";
           sha256 = "0nf1f719m4pvxn0mf4qyx8mzwhrhv6kchnrpiy9clx520y8x3dqi";
           name = "emms-soundcloud";
         };
@@ -16056,7 +16140,7 @@
           sha256 = "1kipxa9ax8zi9qqk19mknpg7nnlzgr734kh9bnklydipwnsy00pi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms-state";
           sha256 = "080y02hxxqfn0a0dhq5vm0r020v2q3h1612a2zkq5fxi8ssvhp9i";
           name = "emms-state";
         };
@@ -16077,7 +16161,7 @@
           sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emoji-cheat-sheet-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emoji-cheat-sheet-plus";
           sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
           name = "emoji-cheat-sheet-plus";
         };
@@ -16098,7 +16182,7 @@
           sha256 = "0sh4q4sb4j58ryvvmlsx7scry9inzgv2ssa87vbyzpxq0435l229";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emoji-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emoji-display";
           sha256 = "04cf18z26d64l0sv8qkbxjixi2wbw23awd5fznvg1cs8ixss01j9";
           name = "emoji-display";
         };
@@ -16119,7 +16203,7 @@
           sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emoji-fontset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emoji-fontset";
           sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
           name = "emoji-fontset";
         };
@@ -16132,15 +16216,15 @@
     emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "emojify";
-        version = "20160316.1748";
+        version = "20160610.1011";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "emacs-emojify";
-          rev = "6016e30bf5f76993506e0a95338686d2364cd555";
-          sha256 = "1zz6q5jf22nwb9qlyxxrz56gz7x5gcxh6q6d0ybf4bapk35g3v0q";
+          rev = "f33dcffb2cc9748710b6793331104ba5a8bb9db8";
+          sha256 = "11h8502f3nkl8gpl64kk5ixfxcmifi6bx8c99lg0l6z8yf2fpmwx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emojify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emojify";
           sha256 = "1sgd32qm43hwby75a9q2pz1yfzj988i35d8p9f18zvbxypy7b2yp";
           name = "emojify";
         };
@@ -16161,7 +16245,7 @@
           sha256 = "0bm0cxnv7g2dzfvfhkyy16kzn6shvy9gzypiqyjj42ng54xmhs0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/empos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/empos";
           sha256 = "0wbrszl9rq4is0ymxq9lxpqzlfg93gljh6almjy0hp3cs7pkzyl4";
           name = "empos";
         };
@@ -16182,7 +16266,7 @@
           sha256 = "1frcn6694q74is8qbvrjkcsw0q1wz56z4gl35n4v3wakr9wvdvd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emr";
           sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
           name = "emr";
         };
@@ -16215,7 +16299,7 @@
           sha256 = "0dz5xm05d7irh1j8iy08jk521p19cjai1kw68z2nngnyf1az7cim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/enclose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/enclose";
           sha256 = "1bkrv3cwhbiydgfjhmyjr96cvsgr9zi8n0ir1akgamccm2ln73d6";
           name = "enclose";
         };
@@ -16236,7 +16320,7 @@
           sha256 = "0k5ns40s5nskn0zialwq96qll1v5k50lfa5xh8hxbpcamsfym6h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/encourage-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/encourage-mode";
           sha256 = "0fwn6w7s61c08z0d8z3awclqrhszia9is30gm2kx4hwr9dhhwh63";
           name = "encourage-mode";
         };
@@ -16257,7 +16341,7 @@
           sha256 = "066pxfv4rpxgi7jxdyc0a3g5z9m1j66sbi5gh2l7m4rwhzkqchn9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/engine-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/engine-mode";
           sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
           name = "engine-mode";
         };
@@ -16278,7 +16362,7 @@
           sha256 = "008wggl6xxk339njrgpj2fndbil7k9f3i2hg1mjwqk033j87nbz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/enh-ruby-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/enh-ruby-mode";
           sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns";
           name = "enh-ruby-mode";
         };
@@ -16299,7 +16383,7 @@
           sha256 = "0vd7zy06nqb1ayjlnf2wl0bfv1cqv2qcb3cgy3zr9k9c4whcd8jh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/enlive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/enlive";
           sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
           name = "enlive";
         };
@@ -16320,7 +16404,7 @@
           sha256 = "1qimqrvk0myqfi2l3viigkx1ld90qpjgi1gs6xhw2g51r8x4i3in";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eno";
           sha256 = "0k4n4vw261v3bcxg7pqhxr99vh673l963yjridl0dp1663gcrfpk";
           name = "eno";
         };
@@ -16341,7 +16425,7 @@
           sha256 = "0v5p97dvzrk3j59yjc6iny71j3fdw9bb8737wnnzm098ff42dfmd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/enotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/enotify";
           sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
           name = "enotify";
         };
@@ -16354,15 +16438,15 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20160602.2003";
+        version = "20160611.1255";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "caf2e8b7a57a604c1a2a4d999a1e963837a75bd3";
-          sha256 = "1d90msjym36w8wzyvdrxfpl4n7a6qn37qajpj5dnv8zkqifl9fmh";
+          rev = "37b9c99a6a0e526399bd5a84112190e1dfc52fac";
+          sha256 = "0cvyn9phrppp7j5043dan3jjrfba6dahrplj9lzzj8fcpbr5j467";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ensime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ensime";
           sha256 = "1d8y72l7bh93x9zdj3d3qjhrrzr804rgi6kjifyrin772dffjwby";
           name = "ensime";
         };
@@ -16391,7 +16475,7 @@
           sha256 = "1jyhr9gv3d0rxv5iks2g9x6xbxqv1bvf1fnih96h4pgsfxz8wrp6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/envdir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/envdir";
           sha256 = "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8";
           name = "envdir";
         };
@@ -16412,7 +16496,7 @@
           sha256 = "0pmawjfyihqygqz7y0nvyrs6jcvckqzkq9k6z6yanpvkd2x5g13x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eopengrok";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eopengrok";
           sha256 = "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av";
           name = "eopengrok";
         };
@@ -16433,7 +16517,7 @@
           sha256 = "11z08y61xd00rlw5mcyrix8nx41mqs127wighhjsxsyzbfqydxdr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/epc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/epc";
           sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
           name = "epc";
         };
@@ -16454,7 +16538,7 @@
           sha256 = "18gfi1287skv5xvh12arkvxy2c4fism8bdk42wc5q3y21h8nsiim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/epic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/epic";
           sha256 = "0gfl8if83jbs0icz6gcjkwxvcz5v744k1kvqnbx3ga481kds9rqf";
           name = "epic";
         };
@@ -16475,7 +16559,7 @@
           sha256 = "18am0nc2kjxbnkls7dl9j47cynwiiafx8w6rqa4d9dyx7khl2rmp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/epkg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/epkg";
           sha256 = "0vc1g29rfmgd2ks4lbz4599rbgcax7rgdva53ahhvp6say8fy22q";
           name = "epkg";
         };
@@ -16496,7 +16580,7 @@
           sha256 = "0s4k2grikhibd075435giv3bmba1mx71ndxlr0k1i0q0xawpyyb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/epl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/epl";
           sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
           name = "epl";
         };
@@ -16509,15 +16593,15 @@
     epm = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epm";
-        version = "20160601.902";
+        version = "20160612.917";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "epm";
-          rev = "2ee9a69d725a77ac4e57cc652ce4b4cfd1fef63a";
-          sha256 = "1kjkb2cvpkbbcvlq64imnv5ispkf3yrj4f5acagd32jx7gcgxfj8";
+          rev = "ee004d00c8c8fbe32c4e5baf6279c5e68dc5f201";
+          sha256 = "0llkgjqr9hl66nya1ppvrlcvmy3rh4pwc25ywq4zi0fbl25qsf5d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/epm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/epm";
           sha256 = "0k94qhzxjzw5d0c53jnyx1xfciwr9qib845awyjaybzzs34s8r08";
           name = "epm";
         };
@@ -16538,7 +16622,7 @@
           sha256 = "1qa1nq63kax767gs53s75ihspirvh69l4xdm89mj57qvrbpz36z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/epresent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/epresent";
           sha256 = "176d1nwsafi6fb0dnv35bfskp0xczyzf2939gi4bz69zh0161jg8";
           name = "epresent";
         };
@@ -16559,7 +16643,7 @@
           sha256 = "1wwg46xdb488wxvglwvsy08vznrnmdmmbcvm9vb60dy3gqjmz7cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eprime-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eprime-mode";
           sha256 = "0vswjcs24f3mdyw6ai7p21ab8pdn327lr2d6css0a5nrg539cn2g";
           name = "eprime-mode";
         };
@@ -16580,7 +16664,7 @@
           sha256 = "13ds5z2nvanx8cvxrzi0da6ixx7kw222z6mrlbs8cldqcmzm7xh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eproject";
           sha256 = "0kpg4r57khbyinc73v9kj32b9m3b4nb5014r5fkl5mzzpzmd85b4";
           name = "eproject";
         };
@@ -16601,7 +16685,7 @@
           sha256 = "18r66yl52xm1gjbn0dm8z80gv4p3794pi91qa8i2sri4grbsyi5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-colorize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-colorize";
           sha256 = "1m941q7ql3yb71s71783nvz822bwhn1krmin18fvh0fbsbbnck2a";
           name = "erc-colorize";
         };
@@ -16622,7 +16706,7 @@
           sha256 = "0yiv16k0b2399asghc7qv9c9pj6ih0rwc863dskr2isnpl39amra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
           name = "erc-crypt";
         };
@@ -16642,7 +16726,7 @@
           sha256 = "11a64rvhd88val6vg9l1d5j3zdjd0bbbwcqilj0wp6rbn57xy0w8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-hipchatify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-hipchatify";
           sha256 = "1a4gl05i757vvap0rzrfwms7mhw80sa84gvbwafrvj3x11rja24x";
           name = "erc-hipchatify";
         };
@@ -16663,7 +16747,7 @@
           sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-hl-nicks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-hl-nicks";
           sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
           name = "erc-hl-nicks";
         };
@@ -16684,7 +16768,7 @@
           sha256 = "03r13x2hxy4hk0n0ri5wld8rp8frx4j3mig6mn2v25k0cr52689f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-image";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-image";
           sha256 = "1cgzygkysjyrsdr6jwqkxlnisxccsvh4kxgn19rk4n61ms7bafvf";
           name = "erc-image";
         };
@@ -16705,7 +16789,7 @@
           sha256 = "0k3gp4c74g5awk7v9lzb6py3dvf59nggh6dw7530cswxb6kg2psa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-social-graph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-social-graph";
           sha256 = "07arn3k89cqxab5x5lczv8bpgrbirmlw9p6c37fgrl3df6f46h4h";
           name = "erc-social-graph";
         };
@@ -16726,7 +16810,7 @@
           sha256 = "0cfqbqskh260zfq1lx1s8jz2351w2ij9m73rqim16fy7zr0s0670";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-terminal-notifier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-terminal-notifier";
           sha256 = "0vrxkg62qr3ki8n9mdn02sdni5fkj79fpkn0drx0a4kqp0nrrj7c";
           name = "erc-terminal-notifier";
         };
@@ -16747,7 +16831,7 @@
           sha256 = "0n107d77z04ahypa7hn2165kkb6490v4vkzdm5zwm4lfhvlmp0x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-track-score";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-track-score";
           sha256 = "19wjwah2n8ri6gyrsbzxnrvxwr5cj48sxrar1226n9miqvgj5whx";
           name = "erc-track-score";
         };
@@ -16768,7 +16852,7 @@
           sha256 = "118q4zj9dh5xnimcsi229j5pflhcd8qz0p212kc4p9dmyrx2iw0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-tweet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-tweet";
           sha256 = "0bazwq21mah4qrzwaji6w13m91l6v9dqh9svxrd13ij8yycr184b";
           name = "erc-tweet";
         };
@@ -16789,7 +16873,7 @@
           sha256 = "094pzznjiv33lbjjg7yfjngc5hrphjj5j2l6jjy7fd62vh4m9jxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-twitch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-twitch";
           sha256 = "08vlwcxrzc2ndm52112z1r0qnz6jlmjhiwq2j3j59fbw82ys61ia";
           name = "erc-twitch";
         };
@@ -16810,7 +16894,7 @@
           sha256 = "0bzi2sh2fhrz49j5y53h6jgf41av6rx78smb3bbk6m74is8vim2y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-view-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-view-log";
           sha256 = "1k6fawblz0d7kz1y7sa3q43s7ci28jsmzkp9vnl1nf55p9xvv4cf";
           name = "erc-view-log";
         };
@@ -16831,7 +16915,7 @@
           sha256 = "0kh4amx3l3a14qaiyvjyak1jbybs6n49mdvzjrd1i2vd1y74zj5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-youtube";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-youtube";
           sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
           name = "erc-youtube";
         };
@@ -16852,7 +16936,7 @@
           sha256 = "1dlw34kaslyvnsrahf4rm76r2b7qqqn589i4mmhr23prl8xbz9z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-yt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-yt";
           sha256 = "0yrwvahv4l2s1aavy6y6mjlrw8l11i00a249825ab5yaxrkzz7xc";
           name = "erc-yt";
         };
@@ -16873,7 +16957,7 @@
           sha256 = "0xw3d9fz4kmn1myrsy44ki4bgg0aclv41wldl6r9nhvkrnri41cv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ercn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ercn";
           sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
           name = "ercn";
         };
@@ -16894,7 +16978,7 @@
           sha256 = "0cdyhklmsv0xfcq97c3wqh8scs6910jzvvp04w0jxlayd1dbzx49";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eredis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eredis";
           sha256 = "087lln2izn5bv7bprmbaciivf17vv4pz2cjl91hy2f0sww6nsiw8";
           name = "eredis";
         };
@@ -16915,7 +16999,7 @@
           sha256 = "1v8x6qmhywfxs7crzv7hfl5n4zq5y3ar40l873946l4wyk0wclng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erefactor";
           sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
           name = "erefactor";
         };
@@ -16936,7 +17020,7 @@
           sha256 = "1f793x1xmf5p9cbaixdkk9qq3cxiz618nb5g2gpsv8mm71x88172";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ergoemacs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
           name = "ergoemacs-mode";
         };
@@ -16957,7 +17041,7 @@
           sha256 = "06pdwrhflpi5rkigqnr5h3jzv3dm1p9nydpvql9w33ixm6qhjj71";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ergoemacs-status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ergoemacs-status";
           sha256 = "065pw31s8dmqpag7zj40iv6dbl0qln7c65gcyp7pz9agg9rp6vbb";
           name = "ergoemacs-status";
         };
@@ -16978,7 +17062,7 @@
           sha256 = "1ss9jl5zasn7y7xk395igbbmaa2vw5pwhc120hs7hp07qqyqgyh0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erlang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erlang";
           sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
           name = "erlang";
         };
@@ -16999,7 +17083,7 @@
           sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ert-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ert-async";
           sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
           name = "ert-async";
         };
@@ -17017,7 +17101,7 @@
           sha256 = "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ert-expectations";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ert-expectations";
           sha256 = "094lkf1h83rc0dkvdv8923xjrzj5pnpnsb4izk8n5n7g0rbz1l9w";
           name = "ert-expectations";
         };
@@ -17034,10 +17118,10 @@
         src = fetchgit {
           url = "https://bitbucket.org/olanilsson/ert-junit";
           rev = "c303c04da7a3ba4d2c46b00b79b67ff7ec57cc6d";
-          sha256 = "0ipcpsymbpicg0b0v1gbv0hkjwg8pq5d5rj1lfx1cbf3adkxvpzf";
+          sha256 = "03b1pdms34izdjcyfg0gi3rzbw6iirp9lxyfjilb249grqg1mv6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ert-junit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ert-junit";
           sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
           name = "ert-junit";
         };
@@ -17058,7 +17142,7 @@
           sha256 = "08yfq3qzscxvzyxvyvdqpkrm787278yhkdd9prbvrgjj80p8n7vq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ert-modeline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ert-modeline";
           sha256 = "06pc50q9ggin20cbfafxd53x35ac3kh85dap0nbws7514f473m7b";
           name = "ert-modeline";
         };
@@ -17079,7 +17163,7 @@
           sha256 = "0cjdpk0v07yzxbxqhxlgrk0nh9cj31yx6dd90d9f7jd4bxyzkzbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ert-runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ert-runner";
           sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
           name = "ert-runner";
         };
@@ -17100,7 +17184,7 @@
           sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/es-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/es-lib";
           sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
           name = "es-lib";
         };
@@ -17121,7 +17205,7 @@
           sha256 = "04lll5sscbpqcq3sv5gsfky5qcj6asqql7fw1bp6g12qqf9r02nd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/es-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/es-mode";
           sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
           name = "es-mode";
         };
@@ -17142,7 +17226,7 @@
           sha256 = "14rsifcx2kwdmwq9zh41fkb848l0f4igp5v9pk3x4jd2yw9gay7m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/es-windows";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/es-windows";
           sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
           name = "es-windows";
         };
@@ -17163,7 +17247,7 @@
           sha256 = "1rxfqj46zg3xgg7miflgsb187xa9fpwcvrbkqj41g8lvmycdnm0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/esa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/esa";
           sha256 = "1kbsv4xsp7p9v0g22had0dr7w5zsr24bgi2xzryy76699pxq4h6c";
           name = "esa";
         };
@@ -17184,7 +17268,7 @@
           sha256 = "0id7820vjbprlpprj4fyhylkjvx00b87mw4n7jnxn1gczvjgafmc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/escreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/escreen";
           sha256 = "0yis27362jc63jkzdndz1wpysmf1b51rrbv3swvi6b36da5i6b54";
           name = "escreen";
         };
@@ -17205,7 +17289,7 @@
           sha256 = "1k8k9hl9m4vjqdw3x9wg04cy2lb9x64mq0mm0i3i6w59zrsnkn4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/esh-buf-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/esh-buf-stack";
           sha256 = "0zmwlsm98m9vbjk9mldfj2nf6cip7mlvb71j33ddix76yqggp4qg";
           name = "esh-buf-stack";
         };
@@ -17226,7 +17310,7 @@
           sha256 = "1yfvdx763xxhxf2r6kjjjyafaxrj1lpgrz1sgbhzkyj6nspmm9ms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/esh-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/esh-help";
           sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w";
           name = "esh-help";
         };
@@ -17247,7 +17331,7 @@
           sha256 = "13crzgkx1lham1nfsg6hj2zg875majvnig0v4ydg691zk1qi4hc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eshell-autojump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eshell-autojump";
           sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
           name = "eshell-autojump";
         };
@@ -17268,7 +17352,7 @@
           sha256 = "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eshell-did-you-mean";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eshell-did-you-mean";
           sha256 = "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz";
           name = "eshell-did-you-mean";
         };
@@ -17289,7 +17373,7 @@
           sha256 = "10c31a1ypa6yd957r1jiasx0ql2z9ykbn31l51y1xwrp00mq3yls";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eshell-fringe-status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eshell-fringe-status";
           sha256 = "1vavidnijxzhr4v39q4bxi645vsfcj6vp0wnlhznpxagshr950lg";
           name = "eshell-fringe-status";
         };
@@ -17310,7 +17394,7 @@
           sha256 = "00gaq8vz8vnhh0j2i66mp763hm3dfxkxz3j782nsfml81sngkww0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eshell-git-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eshell-git-prompt";
           sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s";
           name = "eshell-git-prompt";
         };
@@ -17331,7 +17415,7 @@
           sha256 = "0lhmqnqrcnwnir0kqhkhnda6dyn7ggcidmk6lf24p57n3sf33pww";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eshell-prompt-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eshell-prompt-extras";
           sha256 = "0kh4lvjkayjdz5lqvdqmdcblxizxk9kwmigjwa68kx8z6ngmfwa5";
           name = "eshell-prompt-extras";
         };
@@ -17352,7 +17436,7 @@
           sha256 = "0znk2wmvk7b5mi727cawbddvzx74dlm1lwsxgkiylx2qp299ark0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eshell-z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eshell-z";
           sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
           name = "eshell-z";
         };
@@ -17373,7 +17457,7 @@
           sha256 = "0ir7j4dgy0fq9ybixaqs52kiqk73p9v6prgqzjs8nyicjrpmnpyq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/espresso-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/espresso-theme";
           sha256 = "1bsff8fnq5z0f6cwg6wprz8qi3ivsqxpxx6v6fxfammn74qqyvb5";
           name = "espresso-theme";
         };
@@ -17394,7 +17478,7 @@
           sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/espuds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/espuds";
           sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
           name = "espuds";
         };
@@ -17415,7 +17499,7 @@
           sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/esqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/esqlite";
           sha256 = "1dny5qjzl9gaj90ihzbhliwk0n0x7jz333hzf6gaw7wsjmx91wlh";
           name = "esqlite";
         };
@@ -17436,7 +17520,7 @@
           sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/esqlite-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/esqlite-helm";
           sha256 = "00y2nwyx13xlny40afczr31lvbpnw1cgmj5wc3iycyznizg5kvhq";
           name = "esqlite-helm";
         };
@@ -17457,7 +17541,7 @@
           sha256 = "1xxasavqvymw339h12g3swyjq8v4if7jfaxky51h1rqskgx7xy7x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ess";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ess";
           sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
           name = "ess";
         };
@@ -17478,7 +17562,7 @@
           sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ess-R-data-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ess-R-data-view";
           sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
           name = "ess-R-data-view";
         };
@@ -17499,7 +17583,7 @@
           sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ess-R-object-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ess-R-object-popup";
           sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
           name = "ess-R-object-popup";
         };
@@ -17520,7 +17604,7 @@
           sha256 = "0ici253mllqyzcbhxrazfj2kl50brr8qid99fk9nlyfgh516ms1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ess-smart-equals";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ess-smart-equals";
           sha256 = "0mfmxmsqr2byj56psx4h08cjc2j3aac3xqr04yd47k2mlivnyrxp";
           name = "ess-smart-equals";
         };
@@ -17541,7 +17625,7 @@
           sha256 = "01xa98q0pqsf4gyl6ixlpjjdqazqsxg1sf7a3j2wbh7196ps61v5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ess-smart-underscore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ess-smart-underscore";
           sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
           name = "ess-smart-underscore";
         };
@@ -17562,7 +17646,7 @@
           sha256 = "1fdg8a4nsyjhwqsslawfvij77g3fp9klpas7m8vwjsjpc85iwh3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ess-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ess-view";
           sha256 = "1zx5sbxmbs6ya349ic7yvnx56v3km2cb27p8kan5ygisnwwq2wc4";
           name = "ess-view";
         };
@@ -17583,7 +17667,7 @@
           sha256 = "034rs6mmc5f6y8ply2a90b5s4pi4qx9m49wsxc9v0zwa9i5skmx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/esup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/esup";
           sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
           name = "esup";
         };
@@ -17604,7 +17688,7 @@
           sha256 = "0mrfkq3jcsjfccqir02yijl24hllc347b02y7gk3b2yn0b676dv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/esxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/esxml";
           sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
           name = "esxml";
         };
@@ -17625,7 +17709,7 @@
           sha256 = "1k361bbwd9z17qlycymb1x7scidvgvrh9bdp06rhwfh9j3slrbxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/etable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/etable";
           sha256 = "0m4h24mmhp680wfhb90im228mrcyxapzyi4kla8xdmss83gc0c32";
           name = "etable";
         };
@@ -17643,7 +17727,7 @@
           sha256 = "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/etags-select";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/etags-select";
           sha256 = "0j6mxj10n7jf087l7j86s3a8si5hzpwmvrpqisfvlnvn6a0rdy7h";
           name = "etags-select";
         };
@@ -17661,7 +17745,7 @@
           sha256 = "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/etags-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/etags-table";
           sha256 = "1jzij9jknab42jmx358g7f1c0d8lsp9baxbk3xsy7w4nl0l53d84";
           name = "etags-table";
         };
@@ -17682,7 +17766,7 @@
           sha256 = "1xqc4lqzirpmr21w766g8vmcvvsq8b3hv9i7r27i5x1g0j4jabja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ethan-wspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ethan-wspace";
           sha256 = "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws";
           name = "ethan-wspace";
         };
@@ -17703,7 +17787,7 @@
           sha256 = "1zrf652ipy701s6n5k1aga0l97ws66imhk7dj6ii9qf4587byy7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/euslisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/euslisp-mode";
           sha256 = "0m04a8k2z7inhfpqz68hv56h352ikcd39fg65dqvj79md05yila9";
           name = "euslisp-mode";
         };
@@ -17724,7 +17808,7 @@
           sha256 = "07jlrngmnfp1jp30hx9vk42h065c74dz92b38sa18swzfmhwd4y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eval-in-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eval-in-repl";
           sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
           name = "eval-in-repl";
         };
@@ -17745,7 +17829,7 @@
           sha256 = "1syqakdyg3ydnq9gvkjf2rw9rz3kyhzp7avhy6dvyy65pv2ndyc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eval-sexp-fu";
           sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
           name = "eval-sexp-fu";
         };
@@ -17766,7 +17850,7 @@
           sha256 = "1llxxdprs8yw2hqj4dhrkrrzmkl25h7p4rcaa2cw544fmg3kvlz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evalator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evalator";
           sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk";
           name = "evalator";
         };
@@ -17787,7 +17871,7 @@
           sha256 = "1q5s1ffmfh5dby92853xm8kjhgjfd5vbvcg1xbf8lswc1i41k7n7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evalator-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evalator-clojure";
           sha256 = "10mxlgirnsq3z7l1izrf2v1l1yr4sbdjsaszz7llqv6l80y4bji3";
           name = "evalator-clojure";
         };
@@ -17800,14 +17884,14 @@
     evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20160525.2048";
+        version = "20160608.1129";
         src = fetchhg {
           url = "https://bitbucket.com/lyro/evil";
-          rev = "136e0e5a8fc4";
-          sha256 = "1f5kdaj0gh3kcqlsxly8kiq2a9k75j6nwnvjwwxl6c8n6rljly3a";
+          rev = "f5e708761c6d";
+          sha256 = "0bgbfcx4amdy6r9rj24928dy0f0axdfn3j482zkxirbpkyxil4l7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil";
           sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc";
           name = "evil";
         };
@@ -17828,7 +17912,7 @@
           sha256 = "0cnj91lwpmk4c8nf3xi80yvv6anvkg8h1kbzbp16glkgmy6jpmy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-anzu";
           sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
           name = "evil-anzu";
         };
@@ -17849,7 +17933,7 @@
           sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-args";
           sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
           name = "evil-args";
         };
@@ -17870,7 +17954,7 @@
           sha256 = "1q6znbnshk45mdglx519qlbfhb7g47qsm245i93ka4djsjy55j9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-avy";
           sha256 = "1hc96dd78yxgr8cs9sk9y1i5h1qnyk110vlb3wnlxv1hwn92qvrd";
           name = "evil-avy";
         };
@@ -17883,15 +17967,15 @@
     evil-cleverparens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit, smartparens }:
     melpaBuild {
         pname = "evil-cleverparens";
-        version = "20160513.604";
+        version = "20160611.1804";
         src = fetchFromGitHub {
           owner = "luxbock";
           repo = "evil-cleverparens";
-          rev = "345c0917a3e07ac54fcd57337c9a8f08be861085";
-          sha256 = "1cqkx9wx3cmskybxl2h35wfpykba8f4ap70wn1mch2rc56j27l0a";
+          rev = "82c920ba04accfd31fa292e11c454d5112b4fd51";
+          sha256 = "0ajy5kp2asrg070vzyzgyqs9jnzglm7lvx8fqvgdhpmhzzfckhbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-cleverparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-cleverparens";
           sha256 = "10zkyaxy52ixh26hzm9v1y0gakcn5sdwz4ny8v1vcmjqjphnk799";
           name = "evil-cleverparens";
         };
@@ -17912,7 +17996,7 @@
           sha256 = "183fdg7rmnnbps0knnj2kmhf1hxk0q91wbqx1flhciq6wq4rilni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-commentary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-commentary";
           sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
           name = "evil-commentary";
         };
@@ -17933,7 +18017,7 @@
           sha256 = "15rnxhqc56g4ydr8drvcgzvjp8blxsarm86dqc36rym7g5gnxr20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-dvorak";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-dvorak";
           sha256 = "1iq9wzcb625vs942khja39db1js8r46vrdiqcm47yfji98g39gsn";
           name = "evil-dvorak";
         };
@@ -17954,7 +18038,7 @@
           sha256 = "1rdhfsqrkzhbybb49365hx2nxfw7bsnpzh12fqfzq92vcn5441lq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-easymotion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-easymotion";
           sha256 = "0zixgdhc228y6yqr044cbyls0pihzacqsgvybhhar916p4h8izgv";
           name = "evil-easymotion";
         };
@@ -17975,7 +18059,7 @@
           sha256 = "16pz48gdpl68azaqwyixh10y1x9xzi1lnhq2v0nrd0y6bfcqcvc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-ediff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-ediff";
           sha256 = "1xwl2511byb00ybfnm6q6mbkgzarrq8bfv5rbip67zqbw2qgmb6i";
           name = "evil-ediff";
         };
@@ -17996,7 +18080,7 @@
           sha256 = "1cplq9s3fw8nadcipjrix46jfcjbgg3xhz6d226wcqgmg90aclfn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-embrace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-embrace";
           sha256 = "10cfkksh3llyfk26x36b7ri0x6a6hrcv275pxk7ckhs1pyhb14y7";
           name = "evil-embrace";
         };
@@ -18009,15 +18093,15 @@
     evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-escape";
-        version = "20160313.2005";
+        version = "20160607.1915";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "evil-escape";
-          rev = "58ec625a94c3a7f1d8f45fae29f26e890a190062";
-          sha256 = "0v30yfkyy21nl45f9c05rbkbpfivf173bn2470r1b9vxgx6gcj8g";
+          rev = "09e0622e167c89cd4dfa4e2037aaff0aceee52ad";
+          sha256 = "0lk1wsv7k53774mn6ggrm28i9mxzg0xqv8hj372ka66v6ahlb34f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-escape";
           sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
           name = "evil-escape";
         };
@@ -18038,7 +18122,7 @@
           sha256 = "0avaw5pgyv75nhbinjjpy30pgkwfq79fx2k9z034f1x76ls9s683";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-exchange";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-exchange";
           sha256 = "1mvw7w23yfbfmhzj6wimslbryb0gppryw24ac0wh4fzl9rdcma4r";
           name = "evil-exchange";
         };
@@ -18059,7 +18143,7 @@
           sha256 = "10vwyrg833imja3ak9fx0zackdjwlcncl7wm9dym3kjs6qf2rvv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-extra-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-extra-operator";
           sha256 = "066apin0yrjx7zr007p2h9p2nq58lz7qikzjzg0spqkb8vy7vkc5";
           name = "evil-extra-operator";
         };
@@ -18080,7 +18164,7 @@
           sha256 = "1bsy2bynzxr1ibyidv2r21xnfnxbzr0xh5m3h05s5igbmajxr12d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-find-char-pinyin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-find-char-pinyin";
           sha256 = "0n52ijdf5hy7mn0rab4493zs2nrf7r1qkmvf0algqaj7bfjscs79";
           name = "evil-find-char-pinyin";
         };
@@ -18101,7 +18185,7 @@
           sha256 = "1cv24qnxxf6n1grf4n5969v8y9xll5zb9mbfdnq9iavdvhnndk2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-god-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-god-state";
           sha256 = "1g547d58zf11qw0zz3fk5kmrzmfx1rhawyh5d2h8bll8hwygnrxf";
           name = "evil-god-state";
         };
@@ -18122,7 +18206,7 @@
           sha256 = "0r9gif2sgf84z8qniz6chr32av9g2i38rlyms81m8ssghf0j86ss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-iedit-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-iedit-state";
           sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
           name = "evil-iedit-state";
         };
@@ -18143,7 +18227,7 @@
           sha256 = "1g6r1ydscwjvmhh1zg4q3nap4avk8lb9msdqrh7dff6pla0r2qs6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-indent-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-indent-plus";
           sha256 = "15vnvch0qsaram22d44k617bqhr9rrf8qc86sf20yvdyy3gi5j12";
           name = "evil-indent-plus";
         };
@@ -18164,7 +18248,7 @@
           sha256 = "0nghisnc49ivh56mddfdlcbqv3y2vqzjvkpgwv3zp80ga6ghvdmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-indent-textobject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-indent-textobject";
           sha256 = "172a3krid5lrx1w9xcifkhjnvlxg1nbz4w102d99d0grr9465r09";
           name = "evil-indent-textobject";
         };
@@ -18185,7 +18269,7 @@
           sha256 = "10xrlimsxk09z9cw6rxdz8qvvn1i0vhc1gdicwxri0j10p0hacl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-leader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-leader";
           sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
           name = "evil-leader";
         };
@@ -18206,7 +18290,7 @@
           sha256 = "1n6r8xs670r5qp4b5f72nr9g8nlqcrx1v7yqqlbkgv8gns8n5xgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-lisp-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-lisp-state";
           sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
           name = "evil-lisp-state";
         };
@@ -18227,7 +18311,7 @@
           sha256 = "1ylj4mblill964ffbkg8mqy8gxhr8krjgnl9gzp8icr0izb9hj14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-lispy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-lispy";
           sha256 = "17z830b0x6lhmqkk07hfbrg63c7q7mpn4zz1ppjd1smv4mcqzyld";
           name = "evil-lispy";
         };
@@ -18248,7 +18332,7 @@
           sha256 = "17dc48qc8sicmqngy8kpw7r0qm1gnzsal1106d4lx4z7d8lyhpvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-magit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-magit";
           sha256 = "10mhq6mzpklk5sj28lvd478dv9k84s81ax5jkwwxj26mqdw1ybg6";
           name = "evil-magit";
         };
@@ -18269,7 +18353,7 @@
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-mark-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-mark-replace";
           sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
           name = "evil-mark-replace";
         };
@@ -18290,7 +18374,7 @@
           sha256 = "0x6rc98g7hvvmlgq31n7qanylrld6dzvg6n8qgzp4s544l0dwfw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-matchit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-matchit";
           sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
           name = "evil-matchit";
         };
@@ -18311,7 +18395,7 @@
           sha256 = "1ayfrl0bk8i6mqaq4hwgd0wbigiw6ndsi3c2q6znahhcbdfzjjmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-mc";
           sha256 = "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs";
           name = "evil-mc";
         };
@@ -18324,15 +18408,15 @@
     evil-mu4e = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mu4e";
-        version = "20160214.1222";
+        version = "20160611.2058";
         src = fetchFromGitHub {
           owner = "JorisE";
           repo = "evil-mu4e";
-          rev = "e52ffae4c19385575f4dbd2b7af3d0a0221b4efa";
-          sha256 = "0zqmmv3if9zzq9fgjg8wj62pk1qn65nax9hsk9m7lx2ncdv8cph1";
+          rev = "5bd77b716d07881a0f78ea5808e10b218902b80b";
+          sha256 = "0zcypvihhmczmmakxm0c34l410197avdx1svrh634iy0gnv3lkb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-mu4e";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-mu4e";
           sha256 = "1ks4vnga7dkz27a7gza5hakzbcsiqgkq1ysc0lcx7g82ihpmrrcq";
           name = "evil-mu4e";
         };
@@ -18353,7 +18437,7 @@
           sha256 = "171bq84dg86s33p73l6lji155c4as2dnjs7q3jyl8jhqsqf2cmyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-multiedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-multiedit";
           sha256 = "0p02q9skqw2zhx7sfadqgs7vn518s72856962dam0xw4sqasplfp";
           name = "evil-multiedit";
         };
@@ -18374,7 +18458,7 @@
           sha256 = "05lv08gj0659j16jf8x1pif3b885vnj0qg3md7n827la9k94sfml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-nerd-commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-nerd-commenter";
           sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
           name = "evil-nerd-commenter";
         };
@@ -18395,7 +18479,7 @@
           sha256 = "1aq95hj8x13py0pwsnc6wvd8cc5yv5qin8ym9js42y5966vwj4np";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-numbers";
           sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
           name = "evil-numbers";
         };
@@ -18416,7 +18500,7 @@
           sha256 = "0pir7a3xxbcp5f3q9pi36rpdpi8pbx18afmh0r3501ynssyjfq53";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-org";
           sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
           name = "evil-org";
         };
@@ -18437,7 +18521,7 @@
           sha256 = "0b08y4spapl4g2292j3l4cr84gjlvm3rpma3gqld4yb1sxd7v78p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-paredit";
           sha256 = "0xvxxa3gjgsrv10a61y0591bn3gj8v1ff2wck8s0svwfl076gyfy";
           name = "evil-paredit";
         };
@@ -18458,7 +18542,7 @@
           sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-quickscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-quickscope";
           sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
           name = "evil-quickscope";
         };
@@ -18479,7 +18563,7 @@
           sha256 = "12rdx5zjp5pck008cykpw200rr1y0b3lj2dpzf82llfyfaxzh7wi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-rails";
           sha256 = "0ah0nvzl30z19566kacyrsznsdm3cpij8n3bw3dfng7263rh60gj";
           name = "evil-rails";
         };
@@ -18500,7 +18584,7 @@
           sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-rsi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-rsi";
           sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
           name = "evil-rsi";
         };
@@ -18521,7 +18605,7 @@
           sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-search-highlight-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-search-highlight-persist";
           sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
           name = "evil-search-highlight-persist";
         };
@@ -18542,7 +18626,7 @@
           sha256 = "1jvyj2qc340vzw379ij9vkzfw5qningkv0n1mwzhzhb1dg8i1ciq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-smartparens";
           sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
           name = "evil-smartparens";
         };
@@ -18563,7 +18647,7 @@
           sha256 = "15rhnrz2ppwyyhjj4y251654kvyw3yjzmkbslvszcp5y8a5m30pg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-snipe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
           name = "evil-snipe";
         };
@@ -18584,7 +18668,7 @@
           sha256 = "1x4nphjq8lvg8qsm1pj04mk9n59xc6jlxiv5s3bih1nl4xkssrxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-space";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-space";
           sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
           name = "evil-space";
         };
@@ -18605,7 +18689,7 @@
           sha256 = "1sl89qm3wgmsr1mld1nv18mz7fjc2wq11br6hkdf7qm733q68b7a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-surround";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-surround";
           sha256 = "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag";
           name = "evil-surround";
         };
@@ -18626,7 +18710,7 @@
           sha256 = "1qklx0j3fz3mp87v64yqbyyq5csfymbjfwvy2s4nk634wbnrra93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-tabs";
           sha256 = "0qgvpv5hcai8wmkv2fp6i2vdy7qp4gwidwpzz8j6vl9519x73s62";
           name = "evil-tabs";
         };
@@ -18647,7 +18731,7 @@
           sha256 = "10aic2r1akk38hh761hr5vp9fjlh1m5nimag0nzdq5x9g9467cc8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-terminal-cursor-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-terminal-cursor-changer";
           sha256 = "1300ch6f8mkz45na1hdffglhw0cdrrxmwnbd3g4m3sl5z4midian";
           name = "evil-terminal-cursor-changer";
         };
@@ -18668,7 +18752,7 @@
           sha256 = "1v4z2snllgg32cy8glv7xl0m9ib7rwi5ixgdydz1d0sx0z62jyhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-textobj-anyblock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-textobj-anyblock";
           sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
           name = "evil-textobj-anyblock";
         };
@@ -18689,7 +18773,7 @@
           sha256 = "0nff90v6d97n2xizvfz126ksrf7ngd5rp0j7k7lhbv0v5zcqgxiv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-textobj-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-textobj-column";
           sha256 = "13q3nawx05rn3k6kzq1889vxjznr454cib96pc9lmrq7h65lym2h";
           name = "evil-textobj-column";
         };
@@ -18710,7 +18794,7 @@
           sha256 = "00yfq8aflxvp2nnz7smgq0c5wlb7cips5irj8qs6193ixlkpffvx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-tutor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-tutor";
           sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
           name = "evil-tutor";
         };
@@ -18731,7 +18815,7 @@
           sha256 = "1z75wp4az5pykvn90vszfb9y8w675g1w288lx8ar9i2hyddsids4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-vimish-fold";
           sha256 = "01wp4h97hjyzbpd7iighjj26m79499wp5pn8m4pa7v59f6r3sdk6";
           name = "evil-vimish-fold";
         };
@@ -18752,7 +18836,7 @@
           sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-visual-mark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-visual-mark-mode";
           sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
           name = "evil-visual-mark-mode";
         };
@@ -18773,7 +18857,7 @@
           sha256 = "0mkbzw12fav945icibc2293m5haxqr3hzkyli2cf4ssk6yvn0x4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-visualstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-visualstar";
           sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
           name = "evil-visualstar";
         };
@@ -18794,7 +18878,7 @@
           sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evm";
           sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
           name = "evm";
         };
@@ -18815,7 +18899,7 @@
           sha256 = "1frhcgkiys0pqrlcsi5zcl3ngblr38wrwfi6wzqk75x21rnwnbqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ewmctrl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ewmctrl";
           sha256 = "1w60pb7szai1kh06jd3qvgpzq3z1ci4a77ysnpqjfk326s6zv7hl";
           name = "ewmctrl";
         };
@@ -18836,7 +18920,7 @@
           sha256 = "1i6zf17rwa390c33cbspz81dz86vwlphyhjjsia4gp205nfk3s20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eww-lnum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eww-lnum";
           sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
           name = "eww-lnum";
         };
@@ -18857,7 +18941,7 @@
           sha256 = "0xxk0cr28g7vw8cwsnwrdrc8xqr50g6m9h0v43mx2iws9pn9dd47";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/exec-path-from-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/exec-path-from-shell";
           sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
           name = "exec-path-from-shell";
         };
@@ -18878,7 +18962,7 @@
           sha256 = "0wz4h5hrr5ci0w8pynd2nr1b2zl5hl4pa8gc16mcabik5927rf7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/expand-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/expand-line";
           sha256 = "07nfgp6jlrb9wxqy835j79i4g88714zndidkda84z16qn2y901a9";
           name = "expand-line";
         };
@@ -18899,7 +18983,7 @@
           sha256 = "0qqqv0pp25xg1zh72i6fsb7l9vi14nd96rx0qdj1f3pdwfidqms1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/expand-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/expand-region";
           sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
           name = "expand-region";
         };
@@ -18920,7 +19004,7 @@
           sha256 = "0ah8zayipwp760909llb9whcdvmbsdgkg0x5y4qlcicm1r9kwcc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/express";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/express";
           sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
           name = "express";
         };
@@ -18941,7 +19025,7 @@
           sha256 = "0sx3kywaqb8sgywqgcx9gllz8zm53pr5vp82vlv7aj5h93lxhxzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/extempore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/extempore-mode";
           sha256 = "1z8nzpcj27s74kxfjz7wyr3848jpd6mbyjkssd06ri5p694j9php";
           name = "extempore-mode";
         };
@@ -18962,7 +19046,7 @@
           sha256 = "15dwl1rb3186k328a83dz9xmslc0px60ah16fifvmr3migis9hwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/extend-dnd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/extend-dnd";
           sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
           name = "extend-dnd";
         };
@@ -18983,7 +19067,7 @@
           sha256 = "1i9lklzg7fyi4rl0vv1lidx0shlhih0474bbjsvc74p19p5cmlrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/exwm-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/exwm-x";
           sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3";
           name = "exwm-x";
         };
@@ -19004,7 +19088,7 @@
           sha256 = "0w2g7rpw26j65j4r23w6j8nw3arw73l601kyy6qv9p9bkk1yc072";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eyebrowse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eyebrowse";
           sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
           name = "eyebrowse";
         };
@@ -19023,7 +19107,7 @@
           sha256 = "1fg3j0jlww2rqc6k2nq95hcg6i26nqdp043h7kyjcwrgqbjfsigl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eyedropper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eyedropper";
           sha256 = "07kdn90vm2nbdprw9hwdgi4py6gqzmrad09y1fwqdy49hrvbwdzk";
           name = "eyedropper";
         };
@@ -19044,7 +19128,7 @@
           sha256 = "1rgzydxv7c455vj1jm44vvs6xc4qgivqqb0g6zh5x4wdcpgdi2g9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eyuml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eyuml";
           sha256 = "0ada2gcl8bw9nn0fz8g9lbqy8a8w1554q03fzd7lv8qla33ri3wx";
           name = "eyuml";
         };
@@ -19065,7 +19149,7 @@
           sha256 = "15qa09x206s7rxmk35rslqniydh6hdb3n2kbspm5zrndcmsqz4zi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ez-query-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ez-query-replace";
           sha256 = "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx";
           name = "ez-query-replace";
         };
@@ -19086,7 +19170,7 @@
           sha256 = "0v6y897ibs589gry7xrs1vj14h9qd6riach6r27xf7386ji5hb6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/f";
           sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
           name = "f";
         };
@@ -19107,7 +19191,7 @@
           sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fabric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fabric";
           sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
           name = "fabric";
         };
@@ -19125,7 +19209,7 @@
           sha256 = "0yr3fqpn9pj6y8bsb6g7hkg75sl703pzngn8gp0sgs3v90c180l5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/face-remap+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/face-remap+";
           sha256 = "0vq6xjrv3qic89pxzi6mx1s08k4ba27g8wqm1ap4fxh3l14wkg0y";
           name = "face-remap-plus";
         };
@@ -19143,7 +19227,7 @@
           sha256 = "1kayc4hsalvqnn577y3f97w9kz94c53vcxwx01s0k34ffav919c2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/facemenu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/facemenu+";
           sha256 = "0lbggalgkj59wj67z95949jmppmqrzrp63mdhw42r2x0fz1ir0iv";
           name = "facemenu-plus";
         };
@@ -19161,7 +19245,7 @@
           sha256 = "0sqrymmr583cgqmv4bs6rjms5ij5cm8vvxjrfc9alacwyz5f7w8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/faces+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/faces+";
           sha256 = "0k3m434f3d3061pvir0dnykmv6r9jswl7pzybzja3afiy591hh92";
           name = "faces-plus";
         };
@@ -19182,7 +19266,7 @@
           sha256 = "0sjmjydapfnv979dx8dwiz67wffamiaf41s4skkwa0wn2h4p6wja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/faceup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/faceup";
           sha256 = "0l41xp38iji55dv20lk7r187ywcz8s1g2jmwbjwkspzmcf763xvx";
           name = "faceup";
         };
@@ -19203,7 +19287,7 @@
           sha256 = "19zm9my7fl1r3q48axjv2f8x9hcjk6qah4y4r92b90bzfmcdc30y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/factlog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/factlog";
           sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
           name = "factlog";
         };
@@ -19224,7 +19308,7 @@
           sha256 = "1iv9xnpylw2mw18993yy5s9bkxs1rjrn4q92b1wvrx1n51kcw2ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/faff-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/faff-theme";
           sha256 = "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g";
           name = "faff-theme";
         };
@@ -19245,7 +19329,7 @@
           sha256 = "11fm0h9rily5731s137mgv8rdbfqi99s6f36bgr0arwbq3f2j3fs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fakespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fakespace";
           sha256 = "09dsmrqax4wfcw8fd5jf07bjxm5dizpc2qvjkqwg74j2n352wv27";
           name = "fakespace";
         };
@@ -19266,7 +19350,7 @@
           sha256 = "1w5apzbzr1jd983b0rzsy9ldb0z0zcq6mpyb5r8czl5wd4vvj69h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fakir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fakir";
           sha256 = "07bicglgpm6qkcsxwj6rswhx4hgh27rfg8s1cki7g8qcvk2f7b25";
           name = "fakir";
         };
@@ -19287,7 +19371,7 @@
           sha256 = "0m7rjzl9js2gjfcaqp2n5pn5ykpqnv8qfv35l5m5kpfigsi9cbb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fancy-battery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fancy-battery";
           sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
           name = "fancy-battery";
         };
@@ -19308,7 +19392,7 @@
           sha256 = "0825hyz8b2biil0pd2bgjxqd2zm3gw9si7br5hnh51qasbaw9hid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fancy-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fancy-narrow";
           sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
           name = "fancy-narrow";
         };
@@ -19329,7 +19413,7 @@
           sha256 = "08lgfa2k42qpcs4999b77ycsg76zb56qbcxbsvmg0pcwjwa1ambz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/farmhouse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/farmhouse-theme";
           sha256 = "0hbqdrw6x25b331qhbg3yaaa45c2b896wknsjm0a1kg142klq229";
           name = "farmhouse-theme";
         };
@@ -19350,7 +19434,7 @@
           sha256 = "0m2qn3rd16s7ahyw6f9a4jb73sdc8bqp6d03p450yzcn36lw78z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fasd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fasd";
           sha256 = "0i49z50bpi7fx0dm5jywlndnq9hb0dm5a906k4017w8y7sfpfl6c";
           name = "fasd";
         };
@@ -19363,15 +19447,15 @@
     fastdef = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, w3m }:
     melpaBuild {
         pname = "fastdef";
-        version = "20160517.1420";
+        version = "20160608.452";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "fastdef";
-          rev = "602808385974db7a8e57b2980b3adc1bc61e4aec";
-          sha256 = "0kidb2kwjyrz93yy9gnwwsb60xx3k6npni2gj8q38w50lql5ja2l";
+          rev = "b9e7427d65ca5a14db0d318cb799f6cc34c5c58a";
+          sha256 = "196agfqcd943wmd3kq6g0dwrqwrx93zn1r7yqj1wri60vv6b9p8q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fastdef";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fastdef";
           sha256 = "1cf4slxhcp2z7h9k3l31h06nnqsyb4smwnj55ivil2lm0fa0vlzj";
           name = "fastdef";
         };
@@ -19392,7 +19476,7 @@
           sha256 = "0y95lrdqd9i2kbb266s1wdiim4m8vrn3br19d8s55ib6xlywf8cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fastnav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fastnav";
           sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
           name = "fastnav";
         };
@@ -19413,7 +19497,7 @@
           sha256 = "0m9nzl0z3gc6fjpfqklwrsxlcgbbyydls004a39wfppyz0wr94fy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/faust-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/faust-mode";
           sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc";
           name = "faust-mode";
         };
@@ -19426,15 +19510,15 @@
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
-        version = "20160518.1854";
+        version = "20160608.2019";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "fcitx.el";
-          rev = "7747865f0af9320439066ae53d82a951f1b5cd77";
-          sha256 = "1qrmzlvc7bbq0ayv9l7wp32vg22c2w27y7nr0k79qk4p6kn1pnn6";
+          rev = "77f1e187b9cecb6975bedcfe91c8c81f1b133686";
+          sha256 = "0n0v9jwswcc16cigyffvy3m9y7qqrs8qzjs11sq3d420zrv16b39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fcitx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fcitx";
           sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
           name = "fcitx";
         };
@@ -19455,7 +19539,7 @@
           sha256 = "0c56j8ip2fyma9yvwaanz89jyzgi9k11xwwkflzlzc4smnvgfibr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fcopy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fcopy";
           sha256 = "13337ymf8vlbk8c4jpj6paqi06xdmk39yf72s40kmfrbvgmi8qy1";
           name = "fcopy";
         };
@@ -19476,7 +19560,7 @@
           sha256 = "0ylm4zcf82f5rl4lps5p6p8dc3i5p2v7w93caadgzv5qbl400h5d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/feature-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/feature-mode";
           sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
           name = "feature-mode";
         };
@@ -19497,7 +19581,7 @@
           sha256 = "0pjw9fb3n08yd38680ifdn2wlnw2k6q97lzhqb2259mywsycyqy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fetch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fetch";
           sha256 = "1jqc6pspgcrdzm7ij46r1q6vpjq7il5dy2xyxwn2c1ky5a80paby";
           name = "fetch";
         };
@@ -19518,7 +19602,7 @@
           sha256 = "06xd5rvn037g1kjdw7aa1n71i1mpnp4qz3a7wcmzbls0amhhnx1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fic-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fic-mode";
           sha256 = "0yy1zw0b0s93qkzyq0n17gzn33ma5h56mh40ysz6adwsi68af84c";
           name = "fic-mode";
         };
@@ -19539,7 +19623,7 @@
           sha256 = "0dkng4zkd5xdyvqy67bnfp4z6w8byx66bssq1zl7bhga45vihfjg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fifo-class";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fifo-class";
           sha256 = "0yyjrvdjiq5166vrys13c3dqy5807a3x99597iw5v6mcxg37jg3h";
           name = "fifo-class";
         };
@@ -19558,7 +19642,7 @@
           sha256 = "1c18b1h154sdxkksqwk8snyk8n43bwzgavi75l8mnz8dnl1ciaxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/figlet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/figlet";
           sha256 = "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj";
           name = "figlet";
         };
@@ -19576,7 +19660,7 @@
           sha256 = "0s79b5jj3jfl3aih6r3fa0zix40arysk6mz4fijapd8ybaflz25n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/files+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/files+";
           sha256 = "1m1pxf6knrnyc9ygmyr27gm709ydxf0kkh1xrfcza6n476frmwr8";
           name = "files-plus";
         };
@@ -19594,7 +19678,7 @@
           sha256 = "020rpjrjp2gh4w6mrphrvk27kdizfqbjsw2sxraf8jz0dibg9gfg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/filesets+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/filesets+";
           sha256 = "06n8pw8c65bmrkxda2akvv57ndfijgbp95l40j7sjg8bjp385spn";
           name = "filesets-plus";
         };
@@ -19615,7 +19699,7 @@
           sha256 = "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fill-column-indicator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fill-column-indicator";
           sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
           name = "fill-column-indicator";
         };
@@ -19636,7 +19720,7 @@
           sha256 = "1x9wmxbcmd6qgdyzrl978nczfqrgyk6xz3rnh5hffbapy1v1rw47";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fillcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fillcode";
           sha256 = "0bfsw55vjhx88jpy6npnzfwinvggivbvkk7fa3iwzq19005fkag2";
           name = "fillcode";
         };
@@ -19657,7 +19741,7 @@
           sha256 = "0f76cgh97z0rbbg2bp217nqmxfimzkvw85k9mx8bj78i9s2cdmwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/finalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
@@ -19678,7 +19762,7 @@
           sha256 = "18a4ydp30ycx5w80j3xgghclzmzbvrkl2awxixy4aj68nmljk480";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/find-by-pinyin-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
           name = "find-by-pinyin-dired";
         };
@@ -19696,7 +19780,7 @@
           sha256 = "0a2wgdrj6yxvpmzqiqpgzj3gbf04fvbhrfa3213hiah1k9l066m5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/find-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/find-dired+";
           sha256 = "06a6lwx61xindlchh3ps8khhxc6sr7i9d7i60rjw1h07nxmh0fli";
           name = "find-dired-plus";
         };
@@ -19706,22 +19790,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
+    find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "20160516.754";
+        version = "20160609.811";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "faaab6ebf0c3dd2d32c8021320d481e7eaffb6f8";
-          sha256 = "0n1vpnh4afzb67k0s0jxlynv01m2lqczsfscpcvbmvxa22fnlal9";
+          rev = "50eb89efe4b72a91426c9c53c00c8a39b9a8aaf7";
+          sha256 = "1h08v9ccz2zgwg4rvzhimf4fm97s0c85mniw3abav10ajkr66glk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/find-file-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/find-file-in-project";
           sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
           name = "find-file-in-project";
         };
-        packageRequires = [ emacs swiper ];
+        packageRequires = [ emacs ivy ];
         meta = {
           homepage = "https://melpa.org/#/find-file-in-project";
           license = lib.licenses.free;
@@ -19738,7 +19822,7 @@
           sha256 = "090m5647dpc8r8fwi3mszvc8kp0420ma5sv0lmqr2fpxyn9ybkjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/find-file-in-repository";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/find-file-in-repository";
           sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
           name = "find-file-in-repository";
         };
@@ -19759,7 +19843,7 @@
           sha256 = "1d6zn3qsg4lpk13cvn5r1w88dnhfydnhwf59x6cb4sy5q1ihk0g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/find-temp-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/find-temp-file";
           sha256 = "0c98zm94958rb9kdvqr3pad744nh63y3vy3lshfm0lsg85k9j62p";
           name = "find-temp-file";
         };
@@ -19780,7 +19864,7 @@
           sha256 = "1r6cs7p43pi6n2inbrv9q924m679izxwxqgyr4sjjj3lg6an4cnx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/find-things-fast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/find-things-fast";
           sha256 = "1fs3wf61lzm1hxh5sx8pr74g7g9np3npdwg7xmk81b5f2jx2vy6m";
           name = "find-things-fast";
         };
@@ -19798,7 +19882,7 @@
           sha256 = "0x3f9qygp26c4yw32cgyy35bb4f1fq0fg7q8s9vs777skyl3rvp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/finder+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/finder+";
           sha256 = "1ichxghp2vzx01n129fmjm6iwx4b98ay3xk1ja1i8vzyd2p0z8vh";
           name = "finder-plus";
         };
@@ -19816,7 +19900,7 @@
           sha256 = "0a04mgya59w468jv2bmkqlayzgh0r8sdz0qg3n70wn9rhdcwnl9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/findr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/findr";
           sha256 = "0pxyfnn3f70gknxv09mfkjixqkzn77rdbql703wsslrj2v1l7bfq";
           name = "findr";
         };
@@ -19837,7 +19921,7 @@
           sha256 = "1vjgcxyzv2p74igr3y0z6hk7bj6yqwjawx90xvvmp9z7m91d4yrg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fingers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fingers";
           sha256 = "1r8fy6q6isjxz9mvaa8in4imdghzla3gg1l93dfm1v2rlr7bhzbg";
           name = "fingers";
         };
@@ -19858,7 +19942,7 @@
           sha256 = "14yy7kr2iv549xaf5gkav48lk2hzmvipwbs0rzljzw60il6k05hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fiplr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fiplr";
           sha256 = "1a4w0yqdkz477lfyin4lb9k9qkfpx4350kfxmrqx6dj3aadkikca";
           name = "fiplr";
         };
@@ -19879,7 +19963,7 @@
           sha256 = "02ajday0lnk37dnzf4747ha3w0azisq35fmdhq322hx0hfb1c66x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/firebelly-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/firebelly-theme";
           sha256 = "0lns846l70wcrzqb6p5cy5hpd0szh4gvjxd4xq4zsb0z5nfz97jr";
           name = "firebelly-theme";
         };
@@ -19900,7 +19984,7 @@
           sha256 = "0v8liv6aq10f8dxbl3d4rph1qk891dlxm9wqdc6w8aj318750hfm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/firecode-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/firecode-theme";
           sha256 = "10lxd93lkrvz8884dv4sh6fzzg355j7ab4p5dpvwry79rhs7f739";
           name = "firecode-theme";
         };
@@ -19921,7 +20005,7 @@
           sha256 = "0icgl88pwizwzkdqsxbwhnc6pdyqsfd7wgjnkvg3206i7hcqwpsp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/firefox-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/firefox-controller";
           sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6";
           name = "firefox-controller";
         };
@@ -19942,7 +20026,7 @@
           sha256 = "1smg4mqc5qdwzk5mp2hfm6l4s7k408x46xfl7fl45csb18islmrp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fireplace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fireplace";
           sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
           name = "fireplace";
         };
@@ -19963,7 +20047,7 @@
           sha256 = "0ssx3qjv600n8x83g34smphiyywgl97dh4wx8kzm9pp42jnp29cj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/firestarter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/firestarter";
           sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
           name = "firestarter";
         };
@@ -19984,7 +20068,7 @@
           sha256 = "0z0ji88mdp3xm5lg3drkd56gpl4qy61mxh11i09rqiwmiw0lp1vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fish-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fish-mode";
           sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
           name = "fish-mode";
         };
@@ -20002,7 +20086,7 @@
           sha256 = "082c6yyb1269va6k602hxpdf7ylfxz8gq8swqzwf07qaas0b5qxd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fit-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fit-frame";
           sha256 = "1xcq4n9gj0npjjl98vqacms0a0wnzw62a9iplyf7bgj7n77pgkjb";
           name = "fit-frame";
         };
@@ -20023,7 +20107,7 @@
           sha256 = "1hw3fvj2xq96di4xfs852vy1268hi3a4n10pzrnwnrn0mqy0hn30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fix-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fix-input";
           sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p";
           name = "fix-input";
         };
@@ -20044,7 +20128,7 @@
           sha256 = "02ixv7ckf419sy0r596fkc7f81bfwk410jl23z6cvdh3j64q12l6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fix-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fix-word";
           sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
           name = "fix-word";
         };
@@ -20065,7 +20149,7 @@
           sha256 = "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fixmee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fixmee";
           sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
           name = "fixmee";
         };
@@ -20093,7 +20177,7 @@
           sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flappymacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flappymacs";
           sha256 = "0dcpl5n7wwsk62ddgfrkq5dkm91569y4i4f0yqa61pdmzhgllx7d";
           name = "flappymacs";
         };
@@ -20114,7 +20198,7 @@
           sha256 = "0z77lm6jv2w5z551pwarcx6xg9kx8fgms9dlskngfvnzbqkldj1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flash-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flash-region";
           sha256 = "1rgg7j34ka0nj1yjl688asim07bbz4aavh67kly6dzzwndr0nw8c";
           name = "flash-region";
         };
@@ -20135,7 +20219,7 @@
           sha256 = "0ib6r6q4wbkkxdwgqsd25nx7ccxhk16lqkvwikign80j9n11g7s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flatland-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flatland-black-theme";
           sha256 = "0cl2qbry56nb4prbsczffx8h35x91pgicw5pld0ndw3pxid9h2da";
           name = "flatland-black-theme";
         };
@@ -20156,7 +20240,7 @@
           sha256 = "0cl8m1i1aaw4zmkrkhfchhp0gxhpvhcmpjglsisjni47y5mydypf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flatland-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flatland-theme";
           sha256 = "14drqwcp9nv269aqm34d426a7gx1a7kr9ygnqa2c8ia1fsizybl3";
           name = "flatland-theme";
         };
@@ -20177,7 +20261,7 @@
           sha256 = "0j8pklgd2sk01glgkr24b5n5521425vws8zwdi4sxcv74922j5zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flatui-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flatui-theme";
           sha256 = "0s88xihw44ks4b07wcb9swr52f3l1ls0jn629mxvfkv4a6hn7rmz";
           name = "flatui-theme";
         };
@@ -20198,7 +20282,7 @@
           sha256 = "187ah7yhmr3ckw23bf4fivx8v79yj0zmilrkjj7k6l198w8wmvql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flex-autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flex-autopair";
           sha256 = "0hphrqwryp3c0wwyf2f16hj8nc7jlg2dkvljgm2rdvmh2kgj3007";
           name = "flex-autopair";
         };
@@ -20218,7 +20302,7 @@
           sha256 = "02z1w8z9fqdshyyf03c26zjwhmmclb02caw3b6nhhk4w1rkbh6is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flex-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flex-isearch";
           sha256 = "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3";
           name = "flex-isearch";
         };
@@ -20239,7 +20323,7 @@
           sha256 = "10sayqyf5jwmz7h9gpp4657v6v8vmcd8ahzbshwwqbakjqwnn08c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flim";
           sha256 = "1gkaq549svflx8qyqrk0ccb52b7wp17wmd5jgzkw1109bpc4k6jc";
           name = "flim";
         };
@@ -20257,7 +20341,7 @@
           sha256 = "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fliptext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fliptext";
           sha256 = "0cmyan9hckjsv5wk1mvjzif9nrc07frhzkhhl6pkgm0j0f1q30ji";
           name = "fliptext";
         };
@@ -20278,7 +20362,7 @@
           sha256 = "0acgyxl4kpfld6h6j54415ac8crk7byfs5lcysil9s5l3qrxjl3h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/floobits";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/floobits";
           sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
           name = "floobits";
         };
@@ -20299,7 +20383,7 @@
           sha256 = "0csflhd69vz3wwq5j7872xx2l62hwiz1f5nggl5nz7h7v9anjx3r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flx";
           sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
           name = "flx";
         };
@@ -20320,7 +20404,7 @@
           sha256 = "0csflhd69vz3wwq5j7872xx2l62hwiz1f5nggl5nz7h7v9anjx3r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flx-ido";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flx-ido";
           sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
           name = "flx-ido";
         };
@@ -20341,7 +20425,7 @@
           sha256 = "1cmjw1zrb1nq9nx0d634ajli1di8x48k6s88zi2s2q0mbi28lzz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flx-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flx-isearch";
           sha256 = "14cshv5xb57ch5g3m3hfhawnnabdnbacp4kx40d0pw6jxw677gqd";
           name = "flx-isearch";
         };
@@ -20354,15 +20438,15 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20160604.1054";
+        version = "20160606.1202";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "c794314868af3180c3f3f5d4312d952f5291f0b8";
-          sha256 = "0ph9liakhpnrxy11ckb3w9p6d5q9xmmd3yiilqxlzzg1974z7gjm";
+          rev = "67ed6be14001a2581b54334926ad577db70ab711";
+          sha256 = "0m4mjgh3y50bhnib1105rrhjlrn8r6n5zv60w3v1r8r6grlmik2l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck";
           sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
           name = "flycheck";
         };
@@ -20383,7 +20467,7 @@
           sha256 = "14idjjz6fhmq806mmncmqnr9bvcjks6spin8z6jb0gqcg1dbhm06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-apertium";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-apertium";
           sha256 = "1cc15sljqs6gvb3wiw7n1wkd714qkvfpw6l1kg4lfx9r4jalcvw7";
           name = "flycheck-apertium";
         };
@@ -20404,7 +20488,7 @@
           sha256 = "0fh5z68gnggm0qjb8ncmfngv195lbp1dxz9jbmdi418d47mlba9c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-ats2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-ats2";
           sha256 = "0xm7zzz6hs5qnqkmv7hwxpvp3jjca57agx71sj0m12v0h53gbzhr";
           name = "flycheck-ats2";
         };
@@ -20425,7 +20509,7 @@
           sha256 = "0klnhq0zfn5zbkwl7y9kja7x49n1w6r1qbphk7a7v9svgm3h9s7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-cask";
           sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
           name = "flycheck-cask";
         };
@@ -20446,7 +20530,7 @@
           sha256 = "1s2zq97d7ryif6rlbvriz36dh23wmwi67v4q6krl77dfzcs705b3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-checkbashisms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-checkbashisms";
           sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
           name = "flycheck-checkbashisms";
         };
@@ -20467,7 +20551,7 @@
           sha256 = "1ckzs32wzqpnw89rrw3l7i4gbyn25wagbadsc4mcrixml5nf0mck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-clangcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-clangcheck";
           sha256 = "1316cj3ynl80j39ha0371ss7cqw5hcr3m8944pdacdzbmp2sak2m";
           name = "flycheck-clangcheck";
         };
@@ -20488,7 +20572,7 @@
           sha256 = "04qyylw868mn7wvml8l23vxgca9pwq1hrv6xlcd3xqgn7102n3w2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-clojure";
           sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
           name = "flycheck-clojure";
         };
@@ -20509,7 +20593,7 @@
           sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-color-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-color-mode-line";
           sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
           name = "flycheck-color-mode-line";
         };
@@ -20530,7 +20614,7 @@
           sha256 = "073vkjgcyqp8frsi05s6x8ml3ar6hwjmn2c7ryfab5b35kp9gmdi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-css-colorguard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-css-colorguard";
           sha256 = "1n56j5nicac94jl7kp8fbqxmd115vbhzklzgfz5jbib2ab8y60jc";
           name = "flycheck-css-colorguard";
         };
@@ -20551,7 +20635,7 @@
           sha256 = "1fric65r33bgn2h1s1m3pxnm3d1gk2z4pwnj72in6p7glj3kg24w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-cstyle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-cstyle";
           sha256 = "0p3lzpcgwk4nkq1w0iq40njz8ll2h3vi9z5fbvv1ar4r80fqd909";
           name = "flycheck-cstyle";
         };
@@ -20572,7 +20656,7 @@
           sha256 = "0994346iyp7143476i3y6pc5m1n6z7g1r6n1rldivsj0qr4gjh01";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-cython";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-cython";
           sha256 = "1mbrwhpbs8in11mp79cnl4bd3m33qdgrvnbvi1mqvrsvz1ay28g4";
           name = "flycheck-cython";
         };
@@ -20593,7 +20677,7 @@
           sha256 = "0lrxyrvdkj88qh78jmamrnji770vjsr6h01agl7hvd4n2xvlxcym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-d-unittest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-d-unittest";
           sha256 = "0n4m4f0zqcx966582af1nqff5sla7jcr0wrmgzzxnn97yjrlnzk2";
           name = "flycheck-d-unittest";
         };
@@ -20614,7 +20698,7 @@
           sha256 = "1hw875dirz041vzw1pxjpk5lr1zmrp2kp9m6pazs9j19d686hyn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-dedukti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-dedukti";
           sha256 = "00nc18w4nsi6vicpbqqpr4xcdh48g95vnay3kirb2xp5hc2rw3x8";
           name = "flycheck-dedukti";
         };
@@ -20635,7 +20719,7 @@
           sha256 = "1i5wm2r6rck6864a60mm6kv31vgvqnq49hi9apvhyywfn6sycwkf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-dialyzer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-dialyzer";
           sha256 = "0bn81yzijmnfg5xcnvcvxvqxz995iaafhgbfckgcal974s229kd2";
           name = "flycheck-dialyzer";
         };
@@ -20648,15 +20732,15 @@
     flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-dmd-dub";
-        version = "20160601.1909";
+        version = "20160609.914";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "flycheck-dmd-dub";
-          rev = "6d5c97d1632ede73d32b3c1541e32d31bddd23cb";
-          sha256 = "1x4x3h27xalvzvzhjr5cz2jzhc4x0v1jggpdp23bdkwdpra80fgs";
+          rev = "030ebb45e7eef9e2bb41ccf3b9557ef2207c29b1";
+          sha256 = "1z4z53n8hivshyv15mn31d0hr6qs09xwlxm118a78zfd167xckwj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-dmd-dub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-dmd-dub";
           sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
           name = "flycheck-dmd-dub";
         };
@@ -20677,7 +20761,7 @@
           sha256 = "1aa7x25a70ldbm6rl0s1wa1ncd6p6z1a7f75lk5a3274ghq8jv8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-elixir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-elixir";
           sha256 = "0f78fai6q15smh9rvsliv8r0hh3kpwn1lz37yvqkkbx9vl7rlwld";
           name = "flycheck-elixir";
         };
@@ -20698,7 +20782,7 @@
           sha256 = "08dlm3g2d8rl53hq0b4z7gp8529almlkyf69d3c8f9didmlhizk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-elm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-elm";
           sha256 = "06dpv19wgbw48gbf701c77vw1dkpddx8056wpim3zbvwwfwk8ra4";
           name = "flycheck-elm";
         };
@@ -20719,7 +20803,7 @@
           sha256 = "0lk7da7axn9fm0kzlzx10ir014rsdsycffi8jcy4biqllw6yi4dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-flow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-flow";
           sha256 = "0p4vvk09vjgk98dwzr2qzldvij3v6af56pradssi6sm3shbqhkk3";
           name = "flycheck-flow";
         };
@@ -20740,7 +20824,7 @@
           sha256 = "0q1m1f3vhw1wy0pa3njy55z28psznbw2xwmwk2v1p5c86n74ns8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-ghcmod";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-ghcmod";
           sha256 = "0mqxg622lqnkb52a0wff7h8b0k6mm1k7fhkfi95fi5sahclja0rp";
           name = "flycheck-ghcmod";
         };
@@ -20761,7 +20845,7 @@
           sha256 = "0frgyj57mrggq5ib6xi71696m97ch0bw6cc208d2qbnb55sf4fgb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-gometalinter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-gometalinter";
           sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
           name = "flycheck-gometalinter";
         };
@@ -20782,7 +20866,7 @@
           sha256 = "0l6sg83f6z8x2alnblpv03rj442sbnkkkcbf8i0agjmx3713a5yx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-google-cpplint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-google-cpplint";
           sha256 = "0llrvg6mhcsj5aascsndhbv99122zj32agxk1w6s8xn8ksk2i90b";
           name = "flycheck-google-cpplint";
         };
@@ -20803,7 +20887,7 @@
           sha256 = "05a5hyl6avf09drq6wva8mmxbag41dqixaz6azifywa8p63w1mlk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-haskell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-haskell";
           sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
           name = "flycheck-haskell";
         };
@@ -20824,7 +20908,7 @@
           sha256 = "1x61q0fqr1jbqs9kk59f565a02qjxh1gnp1aigys0yz6qnshvzbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-hdevtools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-hdevtools";
           sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
           name = "flycheck-hdevtools";
         };
@@ -20845,7 +20929,7 @@
           sha256 = "0qa5a8wzvzxwqql92ibc9s43k8sj3vwn7skz9hfr8av0skkhx996";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-irony";
           sha256 = "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z";
           name = "flycheck-irony";
         };
@@ -20866,7 +20950,7 @@
           sha256 = "15cgqbl6n3nyqiizgs2zvcvfs6bcnjk3bj81lhhwrzizbjvap3rv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-ledger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-ledger";
           sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
           name = "flycheck-ledger";
         };
@@ -20887,7 +20971,7 @@
           sha256 = "0isqa6ybdd4166h3rdcg0b8pcxn00v8dav58xwfcj92nhzvs0qca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-mercury";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-mercury";
           sha256 = "1z2y6933f05yv9y2aapmn876jnsydh642zqid3j88bb9kqi67x0h";
           name = "flycheck-mercury";
         };
@@ -20897,6 +20981,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-mix = callPackage ({ elixir-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-mix";
+        version = "20160606.2229";
+        src = fetchFromGitHub {
+          owner = "tomekowal";
+          repo = "flycheck-mix";
+          rev = "c565ebb12a48fcd49cc65656d79295c3288fcb84";
+          sha256 = "1yncail979sfljmib7b1m9aw376xd4b76apz4d50hj83lrfy169c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-mix";
+          sha256 = "1wp8lp45lc519w3xsws2c91jlbfmc0pc8764kxsifk74akwcizfl";
+          name = "flycheck-mix";
+        };
+        packageRequires = [ elixir-mode flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-mix";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-mypy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-mypy";
@@ -20908,7 +21013,7 @@
           sha256 = "01r2ycbayhsxh3dq4d3qky5s0gcv3fjlp8j08y8dgyl406pkzhdz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-mypy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-mypy";
           sha256 = "1w418jm6x3vcg2x31nzc8a3b8asx6gznl6m76ip8w98riz7vy02f";
           name = "flycheck-mypy";
         };
@@ -20929,7 +21034,7 @@
           sha256 = "06hs41l41hm08dv93wldd98hmnd3jqbg58pj5ymn15kgdsy1rirg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-nim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-nim";
           sha256 = "0w6f6998rqx8a3i4xhga7mrmvhxrm690wkqwfzspidid2z7v71az";
           name = "flycheck-nim";
         };
@@ -20950,7 +21055,7 @@
           sha256 = "0fm8w7126vf04n76qhh33rzybvl1n7va2whbqzafbvmv2nny3v94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-ocaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-ocaml";
           sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
           name = "flycheck-ocaml";
         };
@@ -20971,7 +21076,7 @@
           sha256 = "1x5lk6fdai5jvq4hlcgb88ljjncwkq1lkqs8d3wkqwyc3kh3rwjg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-package";
           sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
           name = "flycheck-package";
         };
@@ -20992,7 +21097,7 @@
           sha256 = "0ffas4alqhijvm8wl1p5nqjhnxki8gs6b5bxb4nsqwnma8qmlcx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-perl6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-perl6";
           sha256 = "0czc0fqx7g543afzkbjyz4bhxfl4s3v5swn9xrkayv8cgk8acvp4";
           name = "flycheck-perl6";
         };
@@ -21005,15 +21110,15 @@
     flycheck-pkg-config = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "flycheck-pkg-config";
-        version = "20160501.11";
+        version = "20160610.2235";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "flycheck-pkg-config";
-          rev = "ea79cac9ae66f003f15497f68b0411ab45edc86a";
-          sha256 = "1fnk59mk4qrkaaig3nv2w45add82agjfm82a9rf0128znfipf02p";
+          rev = "6884b0636f4bfe5648d5f4e3db288b7643d91111";
+          sha256 = "1b3b240hlr5jkfzbj814hiblp32r6bahqs1zjcj045pb7cg2cxxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-pkg-config";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-pkg-config";
           sha256 = "0w7h4fa4mv8377sdbkilqcw4b9qda98c1k01nxic7a8i3iyq02d6";
           name = "flycheck-pkg-config";
         };
@@ -21034,7 +21139,7 @@
           sha256 = "06wij2g3prj5qzd8csc6v0phww7prdsf8hqmli6kil954lyxxaxl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-pony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-pony";
           sha256 = "18w1d7y3jsmsc4wg0909p72cnvbxzsmnirmrahhwgsb963fij5qk";
           name = "flycheck-pony";
         };
@@ -21055,7 +21160,7 @@
           sha256 = "0wca22jp0alknmllfl22j89aasiwms6ipqyv1pnvbrgmrbzcmlp7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-pos-tip";
           sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
           name = "flycheck-pos-tip";
         };
@@ -21076,7 +21181,7 @@
           sha256 = "1adcijysw4v8rrxzswi8zhd6w99iaqq7asps0jp21gr9nqci8vdj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-protobuf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-protobuf";
           sha256 = "0cn5b9pr9i9hrix7dbrylwb2812al8ipbpqvlb9bm2f8hc9kgsmc";
           name = "flycheck-protobuf";
         };
@@ -21097,7 +21202,7 @@
           sha256 = "10cjgbxxc26ykm0ww4b6ykjbx89c12mjrmqmny6riq92pfrnl4y3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-purescript";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-purescript";
           sha256 = "05j1iscyg9khw0zq63676zrisragklxp48hmbc7vrbmbiy964lwd";
           name = "flycheck-purescript";
         };
@@ -21118,7 +21223,7 @@
           sha256 = "16albss527dq4ncpiy8p326fib038qc6wjbh985lw2p1f9babswa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-pyflakes";
           sha256 = "186h5ky48i1xmjbvvhn1i0rzhsy8bgdv1d8f7rlr2z4brb52f9c1";
           name = "flycheck-pyflakes";
         };
@@ -21139,7 +21244,7 @@
           sha256 = "136rwl2dm686v2a9s7wg5yppr0is1vx5q4mvah030m9xs9r66jkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-rust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-rust";
           sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w";
           name = "flycheck-rust";
         };
@@ -21160,7 +21265,7 @@
           sha256 = "139q43ldvymfxns8zv7gxasn3sg0rn4i9yz08wgk50psg5zq5mjr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-stack";
           sha256 = "1r9zppqmp1i5i06jhkrgvwy1p3yc8kmcvgibricydqsij26lhpmf";
           name = "flycheck-stack";
         };
@@ -21181,7 +21286,7 @@
           sha256 = "0v7d0yijqn3mhgjwqiv1rsdhw2ay6ffbn8i45x0dlp960v7k2k8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-status-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-status-emoji";
           sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
           name = "flycheck-status-emoji";
         };
@@ -21202,7 +21307,7 @@
           sha256 = "0lrgww53xzz2hnc8c83hqxczzfm1bvixfswhsav4i8aakk3idjxi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-tip";
           sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
           name = "flycheck-tip";
         };
@@ -21223,7 +21328,7 @@
           sha256 = "18v546yq65sf75a46k7slqh5dz12ifh30linm0m9gv65yrjpv02j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-ycmd";
           sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
           name = "flycheck-ycmd";
         };
@@ -21244,7 +21349,7 @@
           sha256 = "10i0rbvk6vyifgbgskdyspmw9q64x99fzi8i1h8bgv58xhfx6pm7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-coffee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-coffee";
           sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
           name = "flymake-coffee";
         };
@@ -21265,7 +21370,7 @@
           sha256 = "1dlxn8hhz3gfrhvkwhlxjmby6zc0g8yy9n9j9dn8c4cbi2fhyx5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-cppcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-cppcheck";
           sha256 = "11brzgq2zl32a8a2dgj2imsldjqaqvxwk2jypf4bmfwa3mkcqh3d";
           name = "flymake-cppcheck";
         };
@@ -21286,7 +21391,7 @@
           sha256 = "00cnz3snhs44aknq6wmf19hq9bzb5pj0hvfzz93l6n7ngd8vvpzy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-css";
           sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
           name = "flymake-css";
         };
@@ -21304,7 +21409,7 @@
           sha256 = "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-cursor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-cursor";
           sha256 = "1s065w0z3sfv3d348w4zhlw96xf3j28bcz14sl46963mj2dm90lr";
           name = "flymake-cursor";
         };
@@ -21325,7 +21430,7 @@
           sha256 = "1mylcsklnv3q27q1gvf7wrila39rmxab1ypmvjh5p56d91y6pszc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-easy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-easy";
           sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
           name = "flymake-easy";
         };
@@ -21346,7 +21451,7 @@
           sha256 = "04w6g4wixrpfidxbk2bwazhvf0cx3c2v2mxnycqqlqkg0m0sb0fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-elixir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-elixir";
           sha256 = "15r3m58hnc75l3j02xdr8yg25fbn2sbz1295ac44widzis82m792";
           name = "flymake-elixir";
         };
@@ -21367,7 +21472,7 @@
           sha256 = "14kbqyw4v1c51dx7pfgqbn8x4j8j3rgyyq2fa9klqzxpldcskl24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-gjshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-gjshint";
           sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
           name = "flymake-gjshint";
         };
@@ -21388,7 +21493,7 @@
           sha256 = "03gh0y988pksghmmvb5av2vnlbcsncafvn4nwihsis0bhys8k28q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-go";
           sha256 = "030m67d8g60ljm7ny3jh4vwj3cshypsklgbjpcvh32y109ga1hy1";
           name = "flymake-go";
         };
@@ -21409,7 +21514,7 @@
           sha256 = "0zldhlvxmk0xcjmj4ns48pp4h3bvijrzs1md69ya7m3dmsbayfrc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-google-cpplint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-google-cpplint";
           sha256 = "0q7v70xbprh03f1yabq216q4q82a58s2c1ykr6ig49cg1jdgzkf3";
           name = "flymake-google-cpplint";
         };
@@ -21430,7 +21535,7 @@
           sha256 = "08rcsg76qdq2l6z8q339yw770kv1q657ywqvq6a20pxxz2158a8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-haml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-haml";
           sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
           name = "flymake-haml";
         };
@@ -21451,7 +21556,7 @@
           sha256 = "0hwcgas83wwhk0szwgw7abf70400knb8dfabknwv0qrcsk4gqffd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-haskell-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-haskell-multi";
           sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
           name = "flymake-haskell-multi";
         };
@@ -21472,7 +21577,7 @@
           sha256 = "003fdrgxlyhs595ndcdzhmdkcpsf9bpw53hrlrrrh07qlnqxwrvp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-hlint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-hlint";
           sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
           name = "flymake-hlint";
         };
@@ -21493,7 +21598,7 @@
           sha256 = "0ywm9fpb7d7ry2fly8719fa41q97yj9za3phqhv6j1chzaxvcv3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-jshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-jshint";
           sha256 = "0j4djylz6mrq14qmbm35k3gvvsw6i9qc4gd9ma4fykiqzkdjsg7j";
           name = "flymake-jshint";
         };
@@ -21514,7 +21619,7 @@
           sha256 = "0y01albwwcnhj4pnpvcry0zw7z2g9py9q2p3sw5zhgw3g0v5p9ls";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-jslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-jslint";
           sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
           name = "flymake-jslint";
         };
@@ -21535,7 +21640,7 @@
           sha256 = "1qn15pr7c07fmki484z5xpqyn8546qb5dr9gcp5n1172wnh2a534";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-json";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-json";
           sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
           name = "flymake-json";
         };
@@ -21556,7 +21661,7 @@
           sha256 = "0ggi8a4j4glpsar0sqg8q06rscajjaziis5ann31wphx88rc5wd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-less";
           sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
           name = "flymake-less";
         };
@@ -21577,7 +21682,7 @@
           sha256 = "1fz7kywp1y2nhp50b2v961wz604sw1gzqcid4k8igz9aii3ygxcv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-lua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-lua";
           sha256 = "0pa66ymhazcfgd9jmxizq5w2sgj008hph42wsa9ljr2rina1gai6";
           name = "flymake-lua";
         };
@@ -21598,7 +21703,7 @@
           sha256 = "1f4l2r4gp03s18255jawc7s5abpjjrw54937wzygmvzvqvmaiikj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-perlcritic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-perlcritic";
           sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
           name = "flymake-perlcritic";
         };
@@ -21619,7 +21724,7 @@
           sha256 = "09mibjdji5mf3qvngspv1zmik1zd9jwp4mb4c1w4256202359sf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-php";
           sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
           name = "flymake-php";
         };
@@ -21640,7 +21745,7 @@
           sha256 = "140rlp6m0aqibwa0bhv8w6l3giziybqdw7x271nq8f3r60ch13bi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-phpcs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-phpcs";
           sha256 = "0zzxi3c203fiw6jp1ar9bb9f28x2lg23bczgy8n5cicrq59jfsn9";
           name = "flymake-phpcs";
         };
@@ -21661,7 +21766,7 @@
           sha256 = "1r3yjqxig2j7l50l787qsi96mkvjcgqll9vb4ci51j7b43d53c5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-puppet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-puppet";
           sha256 = "1izq6s33p74dy4wzfnjii8wjs723bm5ggl0w6hkvzgbmyjc01hxv";
           name = "flymake-puppet";
         };
@@ -21682,7 +21787,7 @@
           sha256 = "1aijapvpw4skfhfmz09v5kpaxay6b0bp77bbjkrvgyizsqdd39vp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-python-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-python-pyflakes";
           sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
           name = "flymake-python-pyflakes";
         };
@@ -21703,7 +21808,7 @@
           sha256 = "13yk9cncp3zw6d7zkgdpgprpw6wrirk2gxgjvkr15dwcyx1g3109";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-ruby";
           sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
           name = "flymake-ruby";
         };
@@ -21724,7 +21829,7 @@
           sha256 = "1qxb3vhh83ikhmm89ms7irdip2l03hnjcq5ncmgywkaqkpslaacv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-rust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-rust";
           sha256 = "0fgpkz1d4y2ywizwwrhqdqncdmhdnbgf3mcv3hjpa82x44yb7j32";
           name = "flymake-rust";
         };
@@ -21745,7 +21850,7 @@
           sha256 = "0rwjiplpqw3rrh76llnx2fn78f6avxsg0la5br46q1rgw4n8r1w1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-sass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-sass";
           sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
           name = "flymake-sass";
         };
@@ -21766,7 +21871,7 @@
           sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-shell";
           sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
           name = "flymake-shell";
         };
@@ -21787,7 +21892,7 @@
           sha256 = "1rq47qhp3jdrw1n22cnhvhcxqzbi6v9r94kgf3200vrfp435rvkn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-solidity";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-solidity";
           sha256 = "10d1g14y3l670lqgfdsnyxanzcjs2jpgnliih56n1xhcpyz551l3";
           name = "flymake-solidity";
         };
@@ -21808,7 +21913,7 @@
           sha256 = "0qpr0frcn3w0f6yz8vgavwbxvn6wb0qkfk653v4cfy57dvslr4wf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-vala";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-vala";
           sha256 = "0yp81phd96z594ckav796qrjm0wlkrfsl0rwpmgg840qn49w71vx";
           name = "flymake-vala";
         };
@@ -21829,7 +21934,7 @@
           sha256 = "0mdam39a85csi9b90wak9j3zkd25lj6x54affwkg3fym8yphmplm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-yaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-yaml";
           sha256 = "17wghm797np4hlidf3wwb47w4klwc6qyk6ry1z05psl3nykws1g7";
           name = "flymake-yaml";
         };
@@ -21846,11 +21951,11 @@
         src = fetchFromGitHub {
           owner = "mola-T";
           repo = "flymd";
-          rev = "e49c9a5a03fe5dd6d281376868df2917c68481ca";
-          sha256 = "0dnafc5pq7j2s9lvb86imsd4a6n62qq3bxq404fyl7pc38fyxr6s";
+          rev = "8fcb2165531d2dddb7b81bb49b98b690758b59cf";
+          sha256 = "1api25sncsn8vw45zyzhq4d4xyh5sai85q7klgmis3v14pkjmrm3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymd";
           sha256 = "16wq34xv7hswbxw5w9wnnsw2mhc9qzhmaa6aydhh32blcszhp4rk";
           name = "flymd";
         };
@@ -21871,7 +21976,7 @@
           sha256 = "07hy1kyw4cbxydmhp4scsy3dcbk2s50rmdp8rch1vbcjk5lj4mvb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flyparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flyparens";
           sha256 = "1mvbfq062qj8vmgzk6rymg3idlfc1makfp1scmjvpw98h30j2a0a";
           name = "flyparens";
         };
@@ -21884,16 +21989,16 @@
     flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flyspell-correct";
-        version = "20160602.1017";
+        version = "20160608.2138";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "0ee248b35c9280c4f23aa4dcb1f2b4532a087e85";
-          sha256 = "11cajkn29a10r96x1zil40y66z2zh4khkfwsv3vwi2ryzlfpgr1j";
+          rev = "918990f5e88300b8fe3477f083f11975c32bddd7";
+          sha256 = "0knmsdm6qxak5hz0z560c9fxl6inxdapm4wfdk87kqzqh27wivxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flyspell-correct";
-          sha256 = "1bm1a9r9g5nsx544a263g26mxrmam7bx2m0a09ggzr6hpwp9sp2n";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flyspell-correct";
+          sha256 = "0j7fp2r1463517716d070wmgwxyj8p59b4ybqh106lmpc5w1i9nj";
           name = "flyspell-correct";
         };
         packageRequires = [];
@@ -21902,6 +22007,69 @@
           license = lib.licenses.free;
         };
       }) {};
+    flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flyspell-correct-helm";
+        version = "20160610.1751";
+        src = fetchFromGitHub {
+          owner = "d12frosted";
+          repo = "flyspell-correct";
+          rev = "918990f5e88300b8fe3477f083f11975c32bddd7";
+          sha256 = "0knmsdm6qxak5hz0z560c9fxl6inxdapm4wfdk87kqzqh27wivxp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flyspell-correct-helm";
+          sha256 = "18s2bzszy6x31avqg7j2lsll2cf4asb8njwhmx4mm215agack976";
+          name = "flyspell-correct-helm";
+        };
+        packageRequires = [ flyspell-correct helm ];
+        meta = {
+          homepage = "https://melpa.org/#/flyspell-correct-helm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flyspell-correct-ivy";
+        version = "20160610.1751";
+        src = fetchFromGitHub {
+          owner = "d12frosted";
+          repo = "flyspell-correct";
+          rev = "918990f5e88300b8fe3477f083f11975c32bddd7";
+          sha256 = "0knmsdm6qxak5hz0z560c9fxl6inxdapm4wfdk87kqzqh27wivxp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flyspell-correct-ivy";
+          sha256 = "1n5iyab6bj761w6vxncyqvqzwh9k60pzq5f2n00ifrz74pqs537i";
+          name = "flyspell-correct-ivy";
+        };
+        packageRequires = [ flyspell-correct ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/flyspell-correct-ivy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "flyspell-correct-popup";
+        version = "20160610.1751";
+        src = fetchFromGitHub {
+          owner = "d12frosted";
+          repo = "flyspell-correct";
+          rev = "918990f5e88300b8fe3477f083f11975c32bddd7";
+          sha256 = "0knmsdm6qxak5hz0z560c9fxl6inxdapm4wfdk87kqzqh27wivxp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flyspell-correct-popup";
+          sha256 = "1fr8ajwldcl58i8xm31dz1mjwbi9f4q8s58x5jrqhqha0x4p4h9l";
+          name = "flyspell-correct-popup";
+        };
+        packageRequires = [ flyspell-correct popup ];
+        meta = {
+          homepage = "https://melpa.org/#/flyspell-correct-popup";
+          license = lib.licenses.free;
+        };
+      }) {};
     flyspell-lazy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flyspell-lazy";
@@ -21913,7 +22081,7 @@
           sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flyspell-lazy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flyspell-lazy";
           sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
           name = "flyspell-lazy";
         };
@@ -21934,7 +22102,7 @@
           sha256 = "1rdpggnw9mz3qr4kp5gh9nvwncivj446vdhpc04d4jgrl568bhqb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flyspell-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flyspell-popup";
           sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
           name = "flyspell-popup";
         };
@@ -21955,7 +22123,7 @@
           sha256 = "1fk4zsb4jliwz10sqz5bpqgj1p479mc506dmvy4zq3vqnpbypqvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fm";
           sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f";
           name = "fm";
         };
@@ -21976,7 +22144,7 @@
           sha256 = "0984fhf1nlpdh9mh3gd2xak3v2rlv76qxppqvr6a4kl1dxwg37r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fm-bookmarks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fm-bookmarks";
           sha256 = "12ami0k6rfwhrr6xgj0dls4mkk6dp0r9smwzhr4897dv0lw89bdj";
           name = "fm-bookmarks";
         };
@@ -21997,7 +22165,7 @@
           sha256 = "0vqjyc00ba9wy2rn454hhy9rnnghljc1i8f3zrpkdmkqn5cg3336";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/focus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/focus";
           sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
           name = "focus";
         };
@@ -22018,7 +22186,7 @@
           sha256 = "1c1mh96kghp5d22assm9kzxlp0cy7bws9yrqwwgaw3d72cba40k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/focus-autosave-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/focus-autosave-mode";
           sha256 = "10cd1x5b1w7apgxd2kq45lv0jlj7az4zmn2iz4iymf2r2hancrcd";
           name = "focus-autosave-mode";
         };
@@ -22039,7 +22207,7 @@
           sha256 = "1mnak9k0hz99jq2p7gydxajzvx2vcql8yzwcm0v80a6xji2whl70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/foggy-night-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/foggy-night-theme";
           sha256 = "03x3dhkk81d2zh9nflq6wd7v3khpy9046v8qhq4i9dw6davvy9j4";
           name = "foggy-night-theme";
         };
@@ -22060,7 +22228,7 @@
           sha256 = "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fold-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fold-dwim";
           sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
           name = "fold-dwim";
         };
@@ -22081,7 +22249,7 @@
           sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fold-dwim-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fold-dwim-org";
           sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
           name = "fold-dwim-org";
         };
@@ -22102,7 +22270,7 @@
           sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fold-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fold-this";
           sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
           name = "fold-this";
         };
@@ -22123,7 +22291,7 @@
           sha256 = "1z2dkyzj1gq3gp9cc3lhi240f8f3yjpjnw520xszm0wvx1rp06ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/folding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/folding";
           sha256 = "0rb4f4llc4z502znmmc0hfi7n07lp01msx4y1iyqijvqzlq2i93y";
           name = "folding";
         };
@@ -22141,7 +22309,7 @@
           sha256 = "04j9xybn9an3bm2p2aqmqnswxxg3gwq2mc96brkgxkr88h316d4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/font-lock+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/font-lock+";
           sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
           name = "font-lock-plus";
         };
@@ -22162,7 +22330,7 @@
           sha256 = "04n32rgdz7m24jji8p0j42zmf2r60sdbbr4mkr6435fqyvmdd20k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/font-lock-studio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/font-lock-studio";
           sha256 = "0swwbfaypc78cg4ak24cc92kgxmr1x9vcpaw3jz4zgpm2wzbgmrq";
           name = "font-lock-studio";
         };
@@ -22183,7 +22351,7 @@
           sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/font-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/font-utils";
           sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
           name = "font-utils";
         };
@@ -22204,7 +22372,7 @@
           sha256 = "103xz042h8w6c85hn19cglfsa34syjh18asm41rjhr9krp15sdl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fontawesome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
           name = "fontawesome";
         };
@@ -22225,7 +22393,7 @@
           sha256 = "1x4l24cbgc4apv9cfzf6phmj5pm32hfdgv37wpbh7ml8v3p8xm0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/forecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/forecast";
           sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
           name = "forecast";
         };
@@ -22246,7 +22414,7 @@
           sha256 = "1459hy5kgp0dkzy1jab41aibixgmrk9lk6ysn1801spd8gwph371";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/foreign-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/foreign-regexp";
           sha256 = "189cq8n759f28nx10fn3w4qbq7q49bb788kp9l70pj38jgnjn7n7";
           name = "foreign-regexp";
         };
@@ -22267,7 +22435,7 @@
           sha256 = "0pp68kqg2impar6rhlpifixx0lqgkcrj6ncjn5jlids6vfhq23nd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/foreman-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/foreman-mode";
           sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
           name = "foreman-mode";
         };
@@ -22288,7 +22456,7 @@
           sha256 = "0nj056x87gcpdqkgx3li5syp6wbj58a1mw2aqa48zflbqwyvs03i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/form-feed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/form-feed";
           sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
           name = "form-feed";
         };
@@ -22309,7 +22477,7 @@
           sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/format-sql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/format-sql";
           sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
           name = "format-sql";
         };
@@ -22330,7 +22498,7 @@
           sha256 = "1nqx2igxmwswjcrnzdjpx5qcjr60zjy3q9cadq5disms17wdcr6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fortpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fortpy";
           sha256 = "1nn5vx1rspfsijwhilnjhiy0mjw154ds3lwxvkpwxpchygirlyxj";
           name = "fortpy";
         };
@@ -22351,7 +22519,7 @@
           sha256 = "1kk04hl2y2svrs07w4pq9f4g7vs9qzy2qpw9prvi1gravmnfrzc4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fortune-cookie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fortune-cookie";
           sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78";
           name = "fortune-cookie";
         };
@@ -22372,7 +22540,7 @@
           sha256 = "1zy45s1m1injwr4d1qvpnvfvv4nkkv9mricshxjannsjfbz09ra7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fountain-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fountain-mode";
           sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
           name = "fountain-mode";
         };
@@ -22391,7 +22559,7 @@
           sha256 = "1867zmm3pyqz8p9ig44jf598z9jkyvbp04mfg6j6ys3hyqfkw942";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/frame-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/frame-cmds";
           sha256 = "0xwzp6sgcb5ap76hpzm8g4kl08a8cgq7i2x9w64njyfink7frwc0";
           name = "frame-cmds";
         };
@@ -22409,7 +22577,7 @@
           sha256 = "0lvlyxb62sgrm37hc21dn7qzlrq2yagiwpspa926q6dpzcsbam15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/frame-fns";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/frame-fns";
           sha256 = "1wq8wva9q1hdzkvjk582a3fgig0lpqz9ch1p2jd6p29kb1i15f5p";
           name = "frame-fns";
         };
@@ -22430,7 +22598,7 @@
           sha256 = "0n6jhm1198c8slvdymsfjif0dfx3wlf8q4mm0yvpiln46shhwldx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/frame-restore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/frame-restore";
           sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm";
           name = "frame-restore";
         };
@@ -22451,7 +22619,7 @@
           sha256 = "1vvkdgj8warl40kqmd0408q46dxy9qp2sclq4q92b6falry9qy30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/frame-tag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/frame-tag";
           sha256 = "1n13xcc3ny9j9h1h4vslpjl6k9mqksr73kgmqrmkq301p8zps94q";
           name = "frame-tag";
         };
@@ -22469,7 +22637,7 @@
           sha256 = "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/framemove";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/framemove";
           sha256 = "10qf017j0zfnzmcs1i56pznhbvgw7mv4232p8znqaaxphgh6r0ar";
           name = "framemove";
         };
@@ -22490,7 +22658,7 @@
           sha256 = "11h9xw6jnw7dacyv1jch2a77xp7hfb93690m7hhazy6l87xmm4dk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/framesize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/framesize";
           sha256 = "1rwiwx3n7gkpfihbf6ndl1lxza4zi2rlj5av6lfp5qypbw9wddkf";
           name = "framesize";
         };
@@ -22511,7 +22679,7 @@
           sha256 = "12rmwf7gm9ib2c99jangygh2yswy41vxlp90rg0hvlhdfmbqa8p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/free-keys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/free-keys";
           sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj";
           name = "free-keys";
         };
@@ -22532,7 +22700,7 @@
           sha256 = "0zwlnzbi91hkfz1jgj9s9pxwi21s21cwp6psdm687wj2a3wy4231";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fringe-current-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fringe-current-line";
           sha256 = "125yn0wbrrxrmdn7qfxj0f4538sb3xnqb3r2inz3gpblc1vxnqb8";
           name = "fringe-current-line";
         };
@@ -22553,7 +22721,7 @@
           sha256 = "0ra9rc53l1gvkqank8apasl3r7wz2yfjrcvmfk3wpxhh24ppxv9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fringe-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fringe-helper";
           sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
           name = "fringe-helper";
         };
@@ -22574,7 +22742,7 @@
           sha256 = "1d28kdh96izj05mfknhgyd8954kl2abjgjlinmx1bsa9flb9vgpb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fsharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fsharp-mode";
           sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
           name = "fsharp-mode";
         };
@@ -22595,7 +22763,7 @@
           sha256 = "0vw6z68b99llcj10jy7vbmirlx62j23rgzxgdngl7kj6rfg9llpy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fstar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fstar-mode";
           sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy";
           name = "fstar-mode";
         };
@@ -22611,11 +22779,11 @@
         version = "20160525.2300";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "c7041fe96ec2db36dac7e1201270b970b854d2f3";
-          sha256 = "175d9qqw1sgwkdhbhcmm5b1m5cd1hmg12h7llcycx161jkhl66zb";
+          rev = "29a2a2595476d6ccb04d17c33979ad1a1a090d21";
+          sha256 = "0x965kk7y51d2i8swfdkajjasd2r0l53q5k73wbfyyr81p8g9gnh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fuel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fuel";
           sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
           name = "fuel";
         };
@@ -22636,7 +22804,7 @@
           sha256 = "0bjny4ryrs788myhiaf3ir99vadf2v4swa5gkz9i36a7j6wzpgk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/full-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/full-ack";
           sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
           name = "full-ack";
         };
@@ -22657,7 +22825,7 @@
           sha256 = "0nhw708b5jjymbw3b7np11jlkzdrzq7qnnxdyl8nndsn1c3qcr0l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fullframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fullframe";
           sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
           name = "fullframe";
         };
@@ -22678,7 +22846,7 @@
           sha256 = "067fmk46wk6jpc01wylagw948sgs3ndrq18mp3x81pdv3dykzmr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/function-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
           name = "function-args";
         };
@@ -22699,7 +22867,7 @@
           sha256 = "0wrmbvx0risdjkaxqmh4li6iwvg4635cdpjvw32k2wkdsyn2dlsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/furl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/furl";
           sha256 = "1z3yqx95qmvpi6vkkgcwvkmw96s24h8ssd5gc06988picw6vj76f";
           name = "furl";
         };
@@ -22720,7 +22888,7 @@
           sha256 = "0rzp8c2164w775ggm2fs4j5dz33vqcah84ysp81majirwfql1niv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fuzzy";
           sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
           name = "fuzzy";
         };
@@ -22738,7 +22906,7 @@
           sha256 = "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fuzzy-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fuzzy-format";
           sha256 = "055b8710yxbi2sdqsqk6jqgnzky4nykv8jgqgwy8q2isgj6q98jb";
           name = "fuzzy-format";
         };
@@ -22756,7 +22924,7 @@
           sha256 = "1q3gbv9xp2jxrf9vfarjqk9k805xc9z72zbaw7aqdxrj1bafxwnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fuzzy-match";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fuzzy-match";
           sha256 = "0mpy84f2zdyzmipzhs06b8rl2pxiypazf35ls1nc1yj8r16ijrds";
           name = "fuzzy-match";
         };
@@ -22777,7 +22945,7 @@
           sha256 = "03zmk4v259pqx7gkwqq95lccn78rwmh7iq5j0d5jj4jf9h39rr20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fvwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fvwm-mode";
           sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
           name = "fvwm-mode";
         };
@@ -22798,7 +22966,7 @@
           sha256 = "1c7h043lz10mw1hdsx9viksy6q79jipz2mm18y1inlbqhmg33n2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fwb-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fwb-cmds";
           sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
           name = "fwb-cmds";
         };
@@ -22819,7 +22987,7 @@
           sha256 = "1m8zgwcfl0i3yizx01ikxjhhqm1nj74q35fs3d32z9fkk5h21m2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fxrd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fxrd-mode";
           sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
           name = "fxrd-mode";
         };
@@ -22840,7 +23008,7 @@
           sha256 = "08x5li0mshrlamr7vswy7xh358bqhh3pngjr4ckswfi0l2r5fjbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fyure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fyure";
           sha256 = "0k5z2xqlrzp5lyvp2lr462x38kqdmqld845bvyvkfjd2k4yri71x";
           name = "fyure";
         };
@@ -22861,7 +23029,7 @@
           sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fzf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fzf";
           sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
           name = "fzf";
         };
@@ -22882,7 +23050,7 @@
           sha256 = "16x3fz2ljrmqhjy7w96fhp3j9ja2gib042c363yfrzwa7q5rxzd2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gams-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gams-mode";
           sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci";
           name = "gams-mode";
         };
@@ -22903,7 +23071,7 @@
           sha256 = "0sn3y1ilbg532mg941qmzipvzq86q31x86ypaf0h0m4015r7l59v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gandalf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gandalf-theme";
           sha256 = "0wkmsg3pdw98gyp3q508wsqkzw821qsqi796ynm53zd7a4jfap4p";
           name = "gandalf-theme";
         };
@@ -22922,7 +23090,7 @@
           sha256 = "1jsw2mywc0y8sf7yl7y3i3l8vs3jv1srjf34lgb5xfz6p8wc5lc0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gap-mode";
           sha256 = "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2";
           name = "gap-mode";
         };
@@ -22943,7 +23111,7 @@
           sha256 = "0j0dg7nl9kmanayvw0712x5c5x9h48qmqdsyi0pijvgmv8l5slg5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gather";
           sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
           name = "gather";
         };
@@ -22964,7 +23132,7 @@
           sha256 = "04s25rgyk8qqalynkgdafzg9c1c3jq6g9c4dq1nm579bmzkp3hhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/geben";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/geben";
           sha256 = "1ai1qcx76m8xh80c8zixq9cqbhnqmj3jk3r7lj3ngbiwx4pnlnwf";
           name = "geben";
         };
@@ -22977,15 +23145,15 @@
     geben-helm-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, geben, helm-projectile, lib, melpaBuild }:
     melpaBuild {
         pname = "geben-helm-projectile";
-        version = "20160430.748";
+        version = "20160611.259";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "geben-helm-projectile";
-          rev = "b2528b2c7c72047aee7956956d7cc5932bd97db8";
-          sha256 = "1w2h059bfdxa18sk8xrk2cdssj1s1qdp7mb38plgvndgs6fccwn3";
+          rev = "14db489efcb20c5aa9102288c94cec3c5a87c35d";
+          sha256 = "1nd1jhy393vkn2g65zhygxkpgna0l8gkndxr8jb6qjkkapk58k8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/geben-helm-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/geben-helm-projectile";
           sha256 = "11zhapys6wx2cadflvjimsmilwvjpfd4ihwzzmap8shxpyllsq9r";
           name = "geben-helm-projectile";
         };
@@ -23006,7 +23174,7 @@
           sha256 = "14v5gm931dcsfflhsvijr4ihx7cs6jymvnjzph3arvhvqwyqhwgq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/geeknote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/geeknote";
           sha256 = "1ci82fj3layd95lqj2w40y87xps6bs7x05z8ai9m59k244g26m8v";
           name = "geeknote";
         };
@@ -23019,15 +23187,15 @@
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "20160529.339";
+        version = "20160612.433";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "d8cb36651aa628075df494c0a1515d98d5a75adf";
-          sha256 = "04a4zkj4l8xhf79rb9nprlpw7li795pg6awjs2k2zja4j15ins4p";
+          rev = "bebd3944c130a75c5d39eb7d50439fe524b57d39";
+          sha256 = "1snsgh1lvs5qn3y9jn0p3lhslrnnj72lp1ahq4749qch1sqa7cys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/geiser";
           sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
           name = "geiser";
         };
@@ -23040,15 +23208,15 @@
     general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "general";
-        version = "20160603.218";
+        version = "20160612.529";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "general.el";
-          rev = "93045954e914779fc0cc81c9aa03cde5413acb6d";
-          sha256 = "0km0wfp1sd575ymalzqbb9pg7l22lbyb88hgjy58595rrx6xlbqf";
+          rev = "38d115d789cd4c4f4fafbf7e01d1bdc5778003fd";
+          sha256 = "15i4pmc3fss7pa4gw0xjmidnr3h8d2pv2rks6hcln071k40wzajq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/general";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/general";
           sha256 = "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc";
           name = "general";
         };
@@ -23069,7 +23237,7 @@
           sha256 = "024xshsl1wvjgnik3dc29g29a503rx46j8v9d6hfd597nf0qmz6p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/general-close";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/general-close";
           sha256 = "17v0aprfvxbygx5517a8hrl88qm5lb9k7523yd0ps5p9l5x96964";
           name = "general-close";
         };
@@ -23090,7 +23258,7 @@
           sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/genrnc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/genrnc";
           sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
           name = "genrnc";
         };
@@ -23111,7 +23279,7 @@
           sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/german-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/german-holidays";
           sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
           name = "german-holidays";
         };
@@ -23132,7 +23300,7 @@
           sha256 = "1ch8yp0mgk57x0pny9bvkknsqj27fd1rcmpm9s7qpryrwqkp1ix4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gerrit-download";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gerrit-download";
           sha256 = "1rlz0iqgvr8yxnv5qmk29xs1jwf0g0ckzanlyldcxvs7n6mhkjjp";
           name = "gerrit-download";
         };
@@ -23153,7 +23321,7 @@
           sha256 = "0bwjiq4a4f5pg0ngvc3lmkk7aki8n9zqfa1dym0lk4vy6yfhcbhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ggo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ggo-mode";
           sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
           name = "ggo-mode";
         };
@@ -23174,7 +23342,7 @@
           sha256 = "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ggtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ggtags";
           sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
           name = "ggtags";
         };
@@ -23195,7 +23363,7 @@
           sha256 = "10iy5sfyqnz3mrl951j9skxp1s8zm6cqmsadgbxnl9fj3br3ygd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gh";
           sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
           name = "gh";
         };
@@ -23216,7 +23384,7 @@
           sha256 = "0g3bjpnwgqczw6ddh4mv7pby0zyqzqgywjrjz2ib6hwmdqzyp1s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gh-md";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gh-md";
           sha256 = "0b72fl1hj7gkqlqrr8hklq0w3ryqqqfn5qpb7a9i6q0vh98652xm";
           name = "gh-md";
         };
@@ -23237,7 +23405,7 @@
           sha256 = "0zm8x7bclh5sdfgkj6jv6id2mjfvb8bb4iy1kmk83am076bj5ysh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ghc";
           sha256 = "02nc7a9khqpd4ca2snam8dq72m53q8x7v5awx56bjq31z6vcmav5";
           name = "ghc";
         };
@@ -23258,7 +23426,7 @@
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ghc-imported-from";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ghc-imported-from";
           sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
           name = "ghc-imported-from";
         };
@@ -23279,7 +23447,7 @@
           sha256 = "17fl3k2sqiavbv3bp6rnp3p89j6pnpkkp7wi26pzzk4675r5k45q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ghci-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ghci-completion";
           sha256 = "1a6k47z5kmacj1s5479393jyj27bjx0911yaqfmmwg2hr0yz7vll";
           name = "ghci-completion";
         };
@@ -23300,7 +23468,7 @@
           sha256 = "0lcbyw6yrl6c8py5v2hqghcbsf9cbiplzil90al4lwqps7rw09a8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gherkin-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gherkin-mode";
           sha256 = "0dhrsz24hn0sdf22wpmzbkn66g4540vdkl03pc27kv21gwa9ixxv";
           name = "gherkin-mode";
         };
@@ -23321,7 +23489,7 @@
           sha256 = "1br27p8kqnj6gfii6xp37yd3rja876vhpcf784n98qhnkd7a63q1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ghost-blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ghost-blog";
           sha256 = "1wqi7r5jr3n0mgax7lddq5h3jfkcq69vvj02a6078vzd2bfxg9ia";
           name = "ghost-blog";
         };
@@ -23342,7 +23510,7 @@
           sha256 = "1aj5j0y244r1fbbbl0lzb53wnyhljw91kb4n3hi2gagm7zwp8jcf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ghq";
           sha256 = "0prvywcgwdhx5pw66rv5kkfriahal2mli2ibam5np3z6bwcq4ngh";
           name = "ghq";
         };
@@ -23363,7 +23531,7 @@
           sha256 = "1na8pp1g940zi22jgqi6drsm12db0hyw99v493i5j1p2y67c4hxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gildas-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gildas-mode";
           sha256 = "0bc3d8bnvg1w2chrr4rp9daq1x8p41qgklrniq0bbkr2h93cmkgv";
           name = "gildas-mode";
         };
@@ -23384,7 +23552,7 @@
           sha256 = "18433gjhra0gqrwnxssd3njpxbvqhh64bds9rym1vq9l7w09z024";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gist";
           sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
           name = "gist";
         };
@@ -23405,7 +23573,7 @@
           sha256 = "0471xm0h6jkmxnrcqy5agq42i8immdb2qpnw7q7czrbsl521al8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git";
           sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
           name = "git";
         };
@@ -23426,7 +23594,7 @@
           sha256 = "0d2blcnyqd1br7zhwprdxpx2jphjhsb4jgaw9dr4gvv0xdb2sr87";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-annex";
           sha256 = "0194y24vq1w6m2cjgqgx9dqp99cq8y9licyry2zxa5brbrsxi94l";
           name = "git-annex";
         };
@@ -23447,7 +23615,7 @@
           sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-auto-commit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-auto-commit-mode";
           sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
           name = "git-auto-commit-mode";
         };
@@ -23468,7 +23636,7 @@
           sha256 = "0g839pzmipjlv32r0gh166jn3na5d0wh2w1sia2k4yx1w0ch1bsx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-blame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-blame";
           sha256 = "0glmnj77vya8ivjin4qja7lis67wyibzy9k6z8b54z7mqf9ikx06";
           name = "git-blame";
         };
@@ -23489,7 +23657,7 @@
           sha256 = "1irqmypgc4l1jlzj4g65ihpic3ffnnkcg1hlysj7qpip5nbflqgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-command";
           sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
           name = "git-command";
         };
@@ -23506,11 +23674,11 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "7ceca0af16ab4a7c16298b11640fc331f17b29f2";
-          sha256 = "0sdg30lcisrc1y2n6hjra3c7v6s7xjfbp8ay6mj3x7ynjqp7a65c";
+          rev = "1ce3bc98729bf12a0aae2bb4718d5019e823a842";
+          sha256 = "0gv2yan74k8hacasl498sm5pcqj39ymj2gqnzgwwynxfxpl2l6pd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-commit";
           sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
           name = "git-commit";
         };
@@ -23531,7 +23699,7 @@
           sha256 = "1vdyrqg2w5q4xmazqqh2ymjnrp9p1x5172nllwryz43jvvxaw05s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-commit-insert-issue";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-commit-insert-issue";
           sha256 = "0mhpszm2y178dxgjv3kh2n744hg2kd60h16zbgmjf4f8228xw8j3";
           name = "git-commit-insert-issue";
         };
@@ -23552,7 +23720,7 @@
           sha256 = "12k0bh0mrwlkrsfhc0pm9b1xvdks20smarsmvzg4zi5060ds1pzg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-dwim";
           sha256 = "0xcigah06ak5wdma4ddcix58q2v5hszncb65f272m4lc2racgsfl";
           name = "git-dwim";
         };
@@ -23565,15 +23733,15 @@
     git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-gutter";
-        version = "20160521.155";
+        version = "20160610.1752";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-gutter";
-          rev = "c40683e9c5931dd67f89ad9ef8625de28752f00c";
-          sha256 = "1gr57n6chhbzazqxb0vwsddais14zpg9c5qpfn6igw0qzhkxn8x0";
+          rev = "02f67e207f0653077c06ddc8502c6a0cd28de260";
+          sha256 = "04qkznd85f9msrgpwsfswbfi5nzvpy4mk5mcmv2cvbq68grs4c40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-gutter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-gutter";
           sha256 = "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg";
           name = "git-gutter";
         };
@@ -23594,7 +23762,7 @@
           sha256 = "18jpa5i99x0gqizs2qbqr8c1jlza8x9vpb6wg9zqd4np1p6q4lan";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-gutter-fringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-gutter-fringe";
           sha256 = "10k07dzmkxsxzwc70vpv05rxjyps9494y6k7yhlv8d46x7xjyp0z";
           name = "git-gutter-fringe";
         };
@@ -23615,7 +23783,7 @@
           sha256 = "1rsj193zpblndki4khjjlwl2njxb329d42l75ki55msxifqrn4fi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-gutter-fringe+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-gutter-fringe+";
           sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
           name = "git-gutter-fringe-plus";
         };
@@ -23636,7 +23804,7 @@
           sha256 = "0bhrrgdzzj8gwxjx7b2kibp1b6s0vgvykfg0n47iq49m6rqkgi5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-gutter+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-gutter+";
           sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
           name = "git-gutter-plus";
         };
@@ -23657,7 +23825,7 @@
           sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-lens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-lens";
           sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
           name = "git-lens";
         };
@@ -23678,7 +23846,7 @@
           sha256 = "0a1kxdz05ly9wbzyxcb79xlmy11q38xplf5s8w8klmyajdn43g1j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
           name = "git-link";
         };
@@ -23699,7 +23867,7 @@
           sha256 = "05wm9hl1fi2dav6hx02j59vnljn5awbk3i32xvv8qlpkhv6fk4ld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-messenger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
           name = "git-messenger";
         };
@@ -23720,7 +23888,7 @@
           sha256 = "1v0jk35ynfg9hivw9gdz2snk73pac67xlfx7av8argdcss1bmyb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-ps1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-ps1-mode";
           sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
           name = "git-ps1-mode";
         };
@@ -23730,22 +23898,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-timemachine";
-        version = "20160323.2040";
+        version = "20160607.2128";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-timemachine";
-          rev = "2e1674b1b5f2fcc485e19bb259eb2e4ab51aa914";
-          sha256 = "1iz5cy3fc7y56s4005syxnb1y3sn1q0s0nlpa01bnxksrfy5zahl";
+          rev = "96a72dc0f86e420629760915db99533f4301e759";
+          sha256 = "1718d20f87wypfsrxyihna7mqpy94fl44hhdw1l42v1iizk9157p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-timemachine";
           sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
           name = "git-timemachine";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/git-timemachine";
           license = lib.licenses.free;
@@ -23762,7 +23930,7 @@
           sha256 = "1ivnf4vsqk6c7iw1cid7q1hxp7047ajd1mpg0fl002d7m7ginhyl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-wip-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-wip-timemachine";
           sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
           name = "git-wip-timemachine";
         };
@@ -23783,7 +23951,7 @@
           sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gitattributes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gitattributes-mode";
           sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
           name = "gitattributes-mode";
         };
@@ -23804,7 +23972,7 @@
           sha256 = "184q3vsxa9rvhc1n57ms47r73f3zap25wswzi66rm6rmfi2k7678";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gitconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gitconfig";
           sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
           name = "gitconfig";
         };
@@ -23825,7 +23993,7 @@
           sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gitconfig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gitconfig-mode";
           sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
           name = "gitconfig-mode";
         };
@@ -23846,7 +24014,7 @@
           sha256 = "0i3dkm0j4gh21b7r5vxr6dddql5rj7lg8xlaairvild0ccf3bhdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/github-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/github-browse-file";
           sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
           name = "github-browse-file";
         };
@@ -23867,7 +24035,7 @@
           sha256 = "000m6w2akx1z1lb32nvy6qzyggpcvlbdjh1i8419rzaidxf5gaxg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/github-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/github-clone";
           sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
           name = "github-clone";
         };
@@ -23888,7 +24056,7 @@
           sha256 = "065gpnllsk4x574fn9d6m4ajxl7mj5w2w5g9in421sp5r80fp9fv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/github-issues";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/github-issues";
           sha256 = "12c6yb3v7xwkzc51binfgl4jb3sm3al5nlrklbsxhn44alazsvb0";
           name = "github-issues";
         };
@@ -23909,7 +24077,7 @@
           sha256 = "0n5mrd2la44r66bkqs0r3298qn5yybs80nwsy54pzlaz88v899bl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/github-notifier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/github-notifier";
           sha256 = "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw";
           name = "github-notifier";
         };
@@ -23930,7 +24098,7 @@
           sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gitignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gitignore-mode";
           sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
           name = "gitignore-mode";
         };
@@ -23951,7 +24119,7 @@
           sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gitlab";
           sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
           name = "gitlab";
         };
@@ -23964,15 +24132,15 @@
     gitolite-clone = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
     melpaBuild {
         pname = "gitolite-clone";
-        version = "20150819.1539";
+        version = "20160610.155";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "gitolite-clone";
-          rev = "36e8dbc2906b7bfce382db64211d982c9719ab59";
-          sha256 = "1h66wywhl5ipryx0s0w1vxp3ydg57zpizjz61wvf6qd8zn07nhng";
+          rev = "d8a4c2875c984e51137c980b5773f42703602721";
+          sha256 = "11i9hxj76869w1z9xn7wq370v56hx5hm4d7msn4zgp64glpa66j9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gitolite-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gitolite-clone";
           sha256 = "1la1nrfns9j6wii6lriwwsd44cx3ksyhh09h8lf9dai6wp67kjac";
           name = "gitolite-clone";
         };
@@ -23993,7 +24161,7 @@
           sha256 = "0y8msn22lzfwh7d417abay9by2zhs9zswhcj8a0l7ln2ksljl500";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gitty";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gitty";
           sha256 = "1z6w4vbn0aaajyqanc7h1m5ali7dbrnh4ngw87a2x2pkxarx6x16";
           name = "gitty";
         };
@@ -24014,7 +24182,7 @@
           sha256 = "14ziljq34k585scwn606hqbkcvy8h1iylsc4h2n1grfmm8ilf0ws";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/glsl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/glsl-mode";
           sha256 = "0d05qb60k5f7wwpsp3amzghayfbwcha6rh8nrslhnklpjbg87aw5";
           name = "glsl-mode";
         };
@@ -24035,7 +24203,7 @@
           sha256 = "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gmail-message-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gmail-message-mode";
           sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
           name = "gmail-message-mode";
         };
@@ -24056,7 +24224,7 @@
           sha256 = "01hhanijqlh741f9wh6xn88qvghwqnfj5j0rvys5mghssfspqs3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gmail2bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gmail2bbdb";
           sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
           name = "gmail2bbdb";
         };
@@ -24077,7 +24245,7 @@
           sha256 = "08d6j5wws2ngngf3p31ic0lrsrp9i9lkpr3nxgmiiadm617x8hv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gmpl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gmpl-mode";
           sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
           name = "gmpl-mode";
         };
@@ -24098,7 +24266,7 @@
           sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnome-calendar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnome-calendar";
           sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
           name = "gnome-calendar";
         };
@@ -24119,7 +24287,7 @@
           sha256 = "1svnvm9fqqx4mrk9jjn11pzqwk71w8kyyd9wwxam8gz22ykw5jb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnomenm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnomenm";
           sha256 = "01vmr64j6hcvdbzg945c5a2g4fiidl18dsk4px7mdf85cv45kzqm";
           name = "gnomenm";
         };
@@ -24140,7 +24308,7 @@
           sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gntp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gntp";
           sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
           name = "gntp";
         };
@@ -24161,7 +24329,7 @@
           sha256 = "15v14ff1639i3i1rgjh72qgq7r70bdy9li28r3rsrjbaiizyrbs8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnu-apl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnu-apl-mode";
           sha256 = "0971pzc14gw8f0b4lzvicxww1k3wc58gbr3fd0qvdra2jifk2is6";
           name = "gnu-apl-mode";
         };
@@ -24182,7 +24350,7 @@
           sha256 = "1gm116479gdwc4hr3nyv1id692dcd1sx7w2a80pvmgr35ybccn7c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnuplot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnuplot";
           sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
           name = "gnuplot";
         };
@@ -24203,7 +24371,7 @@
           sha256 = "1pss9a60dh6i277pkp8j5g1v5h7qlh11w2fki50qcp0zglyw1kaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnuplot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnuplot-mode";
           sha256 = "1avpik06cmi4h6v6039c64b4zw1r1nsg3nrryl254gl881pysfxg";
           name = "gnuplot-mode";
         };
@@ -24224,7 +24392,7 @@
           sha256 = "1i278npayv3kfxxd1ypi9n83q5l402sbc1zkm11pf8g006ifqsp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnus-alias";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnus-alias";
           sha256 = "0mbq9v8fiqqyldpb66v9bc777mzxywaq2dabivabxjg6554s8chf";
           name = "gnus-alias";
         };
@@ -24245,7 +24413,7 @@
           sha256 = "1zizmxjf55bkm9agmrym80h2mnyvpc9bamkjy2azs42fqgi9pqjn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnus-desktop-notify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnus-desktop-notify";
           sha256 = "08k32vhdp6i8c03rp1k6b5jmvj5ijplj26mdblrgasklcqbdnlfs";
           name = "gnus-desktop-notify";
         };
@@ -24263,7 +24431,7 @@
           sha256 = "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnus-spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnus-spotlight";
           sha256 = "065jcix6a4mxwq8wc8gkr0x9lxmn6hlvf0rqmhi8hb840km1syjx";
           name = "gnus-spotlight";
         };
@@ -24276,15 +24444,15 @@
     gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gnus-summary-ext";
-        version = "20160531.1824";
+        version = "20160606.1319";
         src = fetchFromGitHub {
           owner = "vapniks";
           repo = "gnus-summary-ext";
-          rev = "189f60abba68b08b92924d5d0df74a5a8c492185";
-          sha256 = "0xpmk931jak8323v67dfw7q0y5v031a2pinhmllnml8rbx7n6cbk";
+          rev = "39acdfbab230196a84250243c3a346abfdf62fe6";
+          sha256 = "0ajbj7zc9b5wamsb8bp8lmphz7xv95ix0vrr06viakf8j1kndgy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnus-summary-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnus-summary-ext";
           sha256 = "0svyz8fy4k9ba6gpdymf4cf8zjjpgm71y48vlybxbv507xjm17qf";
           name = "gnus-summary-ext";
         };
@@ -24305,7 +24473,7 @@
           sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnus-x-gm-raw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnus-x-gm-raw";
           sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
           name = "gnus-x-gm-raw";
         };
@@ -24326,7 +24494,7 @@
           sha256 = "1i6x7larpqm5h4369pz07353lk0v6gyb5grk52xslmg8w14si52n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go";
           sha256 = "1mk1j504xwi3xswc0lfr3czs9j6wcsbrw2halr46mraiy8lnbz6h";
           name = "go";
         };
@@ -24343,11 +24511,11 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "15ca134d752c32e5eb27e2597cd2ee48f3a87639";
-          sha256 = "120bdalz29b5lvl0iqg00da194ihrwwbbib8gjga8w5gnnscm6nx";
+          rev = "bb0c614120474a3519c692834afb7b69b097b465";
+          sha256 = "1lirp62ppf857rfhzm007sn1pzb8vdf7x1186mc3mqrmwhpyyw8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-autocomplete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-autocomplete";
           sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
           name = "go-autocomplete";
         };
@@ -24368,7 +24536,7 @@
           sha256 = "0phy24cra8cza89xrqsx9xrwg98v9qwqx0fzgm1gwlf333zb3hha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-complete";
           sha256 = "0dl0ibw145f84kd709r5i2kaw07z1sjzn3dmsiqn8dncspcf2vb4";
           name = "go-complete";
         };
@@ -24389,7 +24557,7 @@
           sha256 = "09rxz40bkr0l75v3lmf8lcwqsgjiv5c8zjmwzy2d4syj4qv69c5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-direx";
           sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
           name = "go-direx";
         };
@@ -24410,7 +24578,7 @@
           sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-dlv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-dlv";
           sha256 = "13mk7mg2xk7v65r1rs6rmvi4g5nvm8jqg3p9nhk62d46i7dzp61i";
           name = "go-dlv";
         };
@@ -24431,7 +24599,7 @@
           sha256 = "1n5fnlfq9cy9rbn2hizqqsy0iryw5g2blaa7nd75ya03gxm10p8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
           name = "go-eldoc";
         };
@@ -24452,7 +24620,7 @@
           sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-errcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-errcheck";
           sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
           name = "go-errcheck";
         };
@@ -24473,7 +24641,7 @@
           sha256 = "1hfyxf07m73jf8zca8dna3w828ypvx8a3p70f8nfr5mijy4q3i4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-gopath";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-gopath";
           sha256 = "0jfy2r3axqpn2cnibp8f9vw36kmx0icixhj6zy43d9xa4znvdqal";
           name = "go-gopath";
         };
@@ -24489,11 +24657,11 @@
         version = "20160428.1621";
         src = fetchgit {
           url = "https://go.googlesource.com/tools";
-          rev = "b41cbfc0fac050e3a416b4f51df202a101cd2aa5";
-          sha256 = "1xyvj8bsgdnn8zhzw6w0zracr960six5rsipi89wj6zjh0z9ywxd";
+          rev = "95963e031d86b0e7dafe40fde044d7f610404855";
+          sha256 = "0w4gid5c1gjny8bwm6h8bkwqpk45lgydgqfi3bd4z4yl2s3661aq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-guru";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-guru";
           sha256 = "0c62rvsfqcx2g02iwaga2zp1266w0zhkc73ihpi0iq7cd6nr4wn0";
           name = "go-guru";
         };
@@ -24514,7 +24682,7 @@
           sha256 = "01j67naqvajhg5ccb5yk4dz7hg6rrc6k9q6ppbm77c0aacjxcr39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-impl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-impl";
           sha256 = "09frwpwc080rfpwkb63yv47dyj741lrpyrp65sq2bn4sf03xw0cx";
           name = "go-impl";
         };
@@ -24535,7 +24703,7 @@
           sha256 = "0g0vjm125wmw5nd38r3d7gc2h4pg3a9yskcbk1mzg9vf6gbhr0hx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-mode";
           sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
           name = "go-mode";
         };
@@ -24552,11 +24720,11 @@
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "go-playground";
-          rev = "39589e678aac43cee9ff435e5303a411e80054e9";
-          sha256 = "16qpxi9d240rdqnqcnbnsqlh2gcy6c9hxwdpdy874akzw7942nc0";
+          rev = "c0acf75774d4e87a8454be610de1408e7c3a344b";
+          sha256 = "1zr8bhmihix8lwhz84qgbih9q9spvb4681c0n4s6x4qhk61231q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-playground";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-playground";
           sha256 = "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6";
           name = "go-playground";
         };
@@ -24577,7 +24745,7 @@
           sha256 = "1fcm65r1sy2fmcp2i7mwc7mxqiaf4aaxda4i2qrm8s25cxsffir7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-playground-cli";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-playground-cli";
           sha256 = "00h89rh8d7lq1di77nv609xbzxmjmffq6mz3cmagylxncflg81jc";
           name = "go-playground-cli";
         };
@@ -24598,7 +24766,7 @@
           sha256 = "0010dgkk521pn4cwir5lvkxxzfzzw2nyz1cr5zx1h1ahxvhrzsqm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-projectile";
           sha256 = "07diik27gr82n11a8k62v1jxq8rhi16f02ybk548f6cn7iqgp2ml";
           name = "go-projectile";
         };
@@ -24614,11 +24782,11 @@
         version = "20160307.1644";
         src = fetchgit {
           url = "https://go.googlesource.com/tools";
-          rev = "b41cbfc0fac050e3a416b4f51df202a101cd2aa5";
-          sha256 = "1xyvj8bsgdnn8zhzw6w0zracr960six5rsipi89wj6zjh0z9ywxd";
+          rev = "95963e031d86b0e7dafe40fde044d7f610404855";
+          sha256 = "0w4gid5c1gjny8bwm6h8bkwqpk45lgydgqfi3bd4z4yl2s3661aq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-rename";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-rename";
           sha256 = "1sc3iwxiydgs787a6pi778i0qzqv3bf498r47jwiw5b6mmib3fah";
           name = "go-rename";
         };
@@ -24639,7 +24807,7 @@
           sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-scratch";
           sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
           name = "go-scratch";
         };
@@ -24660,7 +24828,7 @@
           sha256 = "0di6xwpl6pi0430q208gliz8dgrzwqnmp997q7xcczbkk8zfwn0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-snippets";
           sha256 = "1wcbnfzxailv18spxyv4a0nwlqh9l7yf5vxg0qcjcp5ajd2w12kn";
           name = "go-snippets";
         };
@@ -24681,7 +24849,7 @@
           sha256 = "0n5nsyfwx2pdlwx6bl35wrfyady5dwraimv92f58mhc344ajd70y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-stacktracer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-stacktracer";
           sha256 = "1laz2ggqydnyr7b36ggb7sphlib79dhp7nszw42wssmv212v94cy";
           name = "go-stacktracer";
         };
@@ -24702,7 +24870,7 @@
           sha256 = "1am415k4xxcva6y3vbvyvknzc6bma49pq3p85zmpjsdmsp18qdix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/god-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/god-mode";
           sha256 = "01xx2byjh6vlckaxamm2x2qzicd9qc8h6amyjg0bxz3932a4llaa";
           name = "god-mode";
         };
@@ -24723,7 +24891,7 @@
           sha256 = "1k4i9z9h4m0h0y92mncr96jir63q5h1bix5bpnlfxhxl5w8pvk1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gold-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gold-mode";
           sha256 = "1b67hd1fp6xcj65xxp5jcpdjspxsbzxy26v6lqg5kiy8knls57kf";
           name = "gold-mode";
         };
@@ -24744,7 +24912,7 @@
           sha256 = "0wdw89n7ngxpcdigv8c01h4i84hsdh0y7xq6jdj1i6mnajl8gk92";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/golden-ratio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/golden-ratio";
           sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
           name = "golden-ratio";
         };
@@ -24765,7 +24933,7 @@
           sha256 = "18a7dv8yshspyq4bi30j0l4ap9qp696syfc29mgvly4xyqh9x4qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/golden-ratio-scroll-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/golden-ratio-scroll-screen";
           sha256 = "1ygh104vr65s7frlkzyhrfi6shrbvp2b2j3ynj5dip253v85xki5";
           name = "golden-ratio-scroll-screen";
         };
@@ -24786,7 +24954,7 @@
           sha256 = "024dllcmpg8lx78cqgq551i6f9w6qlykfcx8l7yazak9kjwhpwjg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/golint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/golint";
           sha256 = "1q4y6mgll8wyp0c7zx810nzsm0k4wvz0wkly1fbja9z63sjzzxwb";
           name = "golint";
         };
@@ -24807,7 +24975,7 @@
           sha256 = "1anjzlg53kjdqfjcdahbxy8zk9hdha075c1f9nzrnnbbqvmirbbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gom-mode";
           sha256 = "07zr38gzqb3ds9mpf94c1vhl1rqd0cjh4g4j2bz86q16c0rnmp7m";
           name = "gom-mode";
         };
@@ -24828,7 +24996,7 @@
           sha256 = "06p1dpnmg7lhdff1g7c04qq8f9srgkmnm42jlqy85k87j3p5ys2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/google";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/google";
           sha256 = "11a521cq5bj7afl7bqiilg0c81dy00lnhak7h3d9c9kwg7kfljiq";
           name = "google";
         };
@@ -24849,7 +25017,7 @@
           sha256 = "1ardfwbdxxs2v1rip4vm4hjs2cjxrz8zxch98vv83pbir7561lhk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/google-c-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/google-c-style";
           sha256 = "10gsbg880jbvxs4291vi2ww30ird2f313lbgcb11lswivmhrmd1r";
           name = "google-c-style";
         };
@@ -24870,7 +25038,7 @@
           sha256 = "1h7nj570drp2l9x6475gwzcjrp75ms8dkixa7qsgszjdk58qyhnb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/google-contacts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/google-contacts";
           sha256 = "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn";
           name = "google-contacts";
         };
@@ -24891,7 +25059,7 @@
           sha256 = "183igr5lp20zcqi7rc01fk76sfxdhksd74i11v16gdsifdkjimd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/google-maps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/google-maps";
           sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx";
           name = "google-maps";
         };
@@ -24912,7 +25080,7 @@
           sha256 = "14dz9wjp8ym86a03pw5y1sd51zw83d6485hpq8mh8zm0j1fba0y0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/google-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/google-this";
           sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
           name = "google-this";
         };
@@ -24933,7 +25101,7 @@
           sha256 = "1098cmcd8ihvk67l5y5h6w4yfii5cg79yakjjyjh24zwpj5l0gaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/google-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/google-translate";
           sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
           name = "google-translate";
         };
@@ -24954,7 +25122,7 @@
           sha256 = "1ms5f6imzw5klxi1mqqjxgb02iflvpam8cfxii3ljcr4fz093m4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/goose-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/goose-theme";
           sha256 = "18kfz61mhf8pvp3z5cdvjklla9p840p1dazylrgjb1g5hdwqw0n9";
           name = "goose-theme";
         };
@@ -24975,7 +25143,7 @@
           sha256 = "0l022aqpnb38q6kgdqpbxrc1r7fljwl7xq14yi5jb7qgzw2v43cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gore-mode";
           sha256 = "0nljybh2pw8pbbajfsz57r11rs4bvzfxmwpbm5qrdn6dzzv65nq3";
           name = "gore-mode";
         };
@@ -24996,7 +25164,7 @@
           sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gorepl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gorepl-mode";
           sha256 = "12h9r4kf9y2v601myhzzdw2c4jc5cb7s94r5dkzriq578digxphl";
           name = "gorepl-mode";
         };
@@ -25017,7 +25185,7 @@
           sha256 = "1idhnsl8vkq3v3nbvhkmxmvgqp97aycxvmkj7894mj9hvhib68l9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gotest";
           sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
           name = "gotest";
         };
@@ -25038,7 +25206,7 @@
           sha256 = "1ch1acw23y37igy48wlb97q1l2dyjl1a0vazwwakwlmlcfg15l6d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gotham-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gotham-theme";
           sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
           name = "gotham-theme";
         };
@@ -25056,7 +25224,7 @@
           sha256 = "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/goto-chg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/goto-chg";
           sha256 = "0fs0fc1mksbb1266sywasl6pppdn1f9a4q9dwycl9zycr588yjyv";
           name = "goto-chg";
         };
@@ -25077,7 +25245,7 @@
           sha256 = "0j2hdxqfsifm0d8ilwcw7np6mvn4xm58xglzh42gigj2fxv87g99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/goto-gem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/goto-gem";
           sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
           name = "goto-gem";
         };
@@ -25098,7 +25266,7 @@
           sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/goto-last-change";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/goto-last-change";
           sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
           name = "goto-last-change";
         };
@@ -25115,11 +25283,11 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "d39fd6858eeb5a8ac81a103063eaccd50c2b3e17";
-          sha256 = "0mqhk6jaayjv5jnkkr0sd3nqk9f7asnk5ib6y488l9gs5nfvazrp";
+          rev = "c740eb715388f78ecca315dd4b1b092f68e3f805";
+          sha256 = "19qrq61rb1nqr3qagdqx9hvnr1sx67g7fm0826h44n0n9z2bwv18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/govc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/govc";
           sha256 = "1ivgaziv25wlzg6y4zh8x7mv97pnyhi7p8jpvgh5fg5lnqpzhl4v";
           name = "govc";
         };
@@ -25140,7 +25308,7 @@
           sha256 = "1fzf43my7qs4n37yh1jm6fyp76dfgknc5g4zin7x5b5lc63g0wxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/govet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/govet";
           sha256 = "1rpgngixf1xnnqf0l2vvh6y9q3395qyj9ln1rh0xz5lm7d4pq4hy";
           name = "govet";
         };
@@ -25161,7 +25329,7 @@
           sha256 = "1l43h008l7n6waclb2km32dy8aj7m5yavm1pkq38p9ppzayfxqq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gplusify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gplusify";
           sha256 = "0fgkcvppkq6pba1giddkfxp9z4c8v2cid9nb8a190b3g85wcwycr";
           name = "gplusify";
         };
@@ -25182,7 +25350,7 @@
           sha256 = "0xs2278gamzg0710bm1fkhjh1p75m2l1jcl98ldhyjhvaf9d0ysc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gradle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gradle-mode";
           sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
           name = "gradle-mode";
         };
@@ -25203,7 +25371,7 @@
           sha256 = "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grails";
           sha256 = "177y6xv35d2dhc3pdx5qhpywlmlqgfnjpzfm9yxc8l6q2rgs8irw";
           name = "grails";
         };
@@ -25224,7 +25392,7 @@
           sha256 = "1dwj53z4422ks30cqr5rj6x91qf63sjzbmb06sz4ac5pdr1d66q6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grails-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grails-mode";
           sha256 = "1zdlmdkwyaj2zns3xwmqpil83j7857aj2070kvx8xza66dxcnlm4";
           name = "grails-mode";
         };
@@ -25245,7 +25413,7 @@
           sha256 = "0xnj0wp0na53l0y8fiaah50ij4r80j8a29hbjbcicska21p5w1s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grails-projectile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grails-projectile-mode";
           sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
           name = "grails-projectile-mode";
         };
@@ -25266,7 +25434,7 @@
           sha256 = "0803j6r447br0nszzcy6pc65l53j871icyr91dd7x10xi7ygw0lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grandshell-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grandshell-theme";
           sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
           name = "grandshell-theme";
         };
@@ -25287,7 +25455,7 @@
           sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/graphene";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/graphene";
           sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
           name = "graphene";
         };
@@ -25320,7 +25488,7 @@
           sha256 = "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/graphene-meta-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/graphene-meta-theme";
           sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
           name = "graphene-meta-theme";
         };
@@ -25341,7 +25509,7 @@
           sha256 = "12r6a3hikzqcdbplmraa4p4w136c006yamylxfjf8580v15xngrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/graphviz-dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/graphviz-dot-mode";
           sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
           name = "graphviz-dot-mode";
         };
@@ -25362,7 +25530,7 @@
           sha256 = "0nvl8mh7jxailisq31h5bi64s9b74ah1465wiwh18x502swr2s3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grapnel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grapnel";
           sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
           name = "grapnel";
         };
@@ -25382,7 +25550,7 @@
           sha256 = "0mnwmsn078hz317xfz6c05r7narx3k8956v1ajz5myxx8xrcr24z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grass-mode";
           sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
           name = "grass-mode";
         };
@@ -25403,7 +25571,7 @@
           sha256 = "0rgv96caigcjffg1983274p4ff1icx1xh5bj7rcd53hai5ag16mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/green-phosphor-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/green-phosphor-theme";
           sha256 = "1p4l75lahmbjcx74ca5jcyc04828vlcahk7gzv5lr7z9mhvq6fbh";
           name = "green-phosphor-theme";
         };
@@ -25424,7 +25592,7 @@
           sha256 = "1670pxgmqflzw5d02mzsmqjf3gp0c4wf25z0crmaamyfmwdz9pag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gregorio-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gregorio-mode";
           sha256 = "0f226l67bqqc6m8wb97m7lkxvwrfbw74b1riasirca1anzjl8jfx";
           name = "gregorio-mode";
         };
@@ -25445,7 +25613,7 @@
           sha256 = "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grep-a-lot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grep-a-lot";
           sha256 = "1513vnm5b587r15hcbnplgsfv7kv8g5fd0w4nwb6pq7myzv53ra1";
           name = "grep-a-lot";
         };
@@ -25463,7 +25631,7 @@
           sha256 = "08jl4xhh25znyc6cm7288x4b55pykrpcsyym78fdlrw3xxr77cxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grep+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grep+";
           sha256 = "1qj4f6d3l88bdcnq825pylnc76m22x2i15yxdhc2b6rv80df7zsx";
           name = "grep-plus";
         };
@@ -25484,7 +25652,7 @@
           sha256 = "14c09m9p6556rrf0qfad4zsv7qxa5flamzg6fa83cxh0qfg7wjbp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/greymatters-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/greymatters-theme";
           sha256 = "10cxajyws5rwk62i4vk26c1ih0dq490kcfx7gijw38q3b5r1l8nr";
           name = "greymatters-theme";
         };
@@ -25503,7 +25671,7 @@
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grin";
           sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
           name = "grin";
         };
@@ -25524,7 +25692,7 @@
           sha256 = "1d2kwiq3zy8wdg5zig0q9rrdcs4xdv6zsgvgc21b3kv83daq1dsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grizzl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grizzl";
           sha256 = "0354xskqzxc38l14zxqs31hadwh27v9lyx67y3hnd94d8abr0qcb";
           name = "grizzl";
         };
@@ -25545,7 +25713,7 @@
           sha256 = "1dwj53z4422ks30cqr5rj6x91qf63sjzbmb06sz4ac5pdr1d66q6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/groovy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/groovy-mode";
           sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
           name = "groovy-mode";
         };
@@ -25566,7 +25734,7 @@
           sha256 = "0dn1iscy0vw2bcnh5s675wjnfk9f20i30b8slyffvpzbbi369pys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gruber-darker-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gruber-darker-theme";
           sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
           name = "gruber-darker-theme";
         };
@@ -25587,7 +25755,7 @@
           sha256 = "1xd6gv9bkqnj7j5mcnwvl1mxjmzvxqhp135hxj0ijc0ybdybacf7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grunt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grunt";
           sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
           name = "grunt";
         };
@@ -25608,7 +25776,7 @@
           sha256 = "0xa7pnyp0iggaxsfic7gjnbib2c9175cg9d75bml760s18fvnciv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gruvbox-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gruvbox-theme";
           sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32";
           name = "gruvbox-theme";
         };
@@ -25629,7 +25797,7 @@
           sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gs-mode";
           sha256 = "02ldd92fv1k28nygl34i8gv0b0i1v5qd7nl1l17cf5f3akdwc6iq";
           name = "gs-mode";
         };
@@ -25650,7 +25818,7 @@
           sha256 = "15x7zixm9h69qm26mzx6xza9mcdix968nikhfwsr0q5j4s75nlb5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gscholar-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gscholar-bibtex";
           sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
           name = "gscholar-bibtex";
         };
@@ -25671,7 +25839,7 @@
           sha256 = "14sx5m6fpkm2q8ljkicl1yy1sw003k4rzz9hi7lm1nfqr2l4n6q0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/guide-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/guide-key";
           sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
           name = "guide-key";
         };
@@ -25692,7 +25860,7 @@
           sha256 = "1s6p4ysdbqx5fk68s317ckj5rjmpkwwb0324sbqqa6byhw3j0xyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/guide-key-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/guide-key-tip";
           sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
           name = "guide-key-tip";
         };
@@ -25713,7 +25881,7 @@
           sha256 = "1jymhjjpn600svd5jbj42m3vnpaza838zby507ynbwc95nja29vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/guru-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/guru-mode";
           sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
           name = "guru-mode";
         };
@@ -25734,7 +25902,7 @@
           sha256 = "0060qw4gr9fv6db20xf3spgl2fwg2iid5ckfjm3vj3ydyv62q13s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gvpr-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gvpr-mode";
           sha256 = "19p6f06qdjvh2vmgbabajvkfxpn13j899jrivw9mqyssz0cyvzgw";
           name = "gvpr-mode";
         };
@@ -25755,7 +25923,7 @@
           sha256 = "1c49lfm5saafxks591qyy2nilymxz3aqlxpsmnad5d0kfhvjr47z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hackernews";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hackernews";
           sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
           name = "hackernews";
         };
@@ -25776,7 +25944,7 @@
           sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ham-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ham-mode";
           sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
           name = "ham-mode";
         };
@@ -25797,7 +25965,7 @@
           sha256 = "1rnkzl51h263nck1bd0jyb7q58b54d764gcsh7wqxfgzs1jfr4am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hamburg-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hamburg-theme";
           sha256 = "149ln7670kjyhdfj5j9akxch47dlff2hd58amla7j3297z1nhg4k";
           name = "hamburg-theme";
         };
@@ -25818,7 +25986,7 @@
           sha256 = "0fmcm4pcivigz9xhf7z9wsxz9pg1yfx9qv8na2dxj426bibk0a6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haml-mode";
           sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
           name = "haml-mode";
         };
@@ -25839,7 +26007,7 @@
           sha256 = "1njrpb1s2v9skyfbgb28clrxyvyp8i4b8kwa68ynvq3vjb4fnws6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hamlet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hamlet-mode";
           sha256 = "0ils4w8ry1inlfj4931ypibj3n60xq6ah74hig62y4vrs4d47gyx";
           name = "hamlet-mode";
         };
@@ -25860,7 +26028,7 @@
           sha256 = "0w443knp6kvjm2m79cni5d17plyhbsl0a4kip7yrpv5nmg370q3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/handlebars-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/handlebars-mode";
           sha256 = "11ahrm4n588v7ir2r7sp4dkbypl5nhnr22px849hdxjcrwal24vj";
           name = "handlebars-mode";
         };
@@ -25881,7 +26049,7 @@
           sha256 = "1z37di9vk1l35my8kl8jnyqlkr1rnp0iz13hpc0r065mib67v58k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/handlebars-sgml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/handlebars-sgml-mode";
           sha256 = "10sxm7v94yxa92mqbwj3shqjs6f3zbxjvwgbvg9m2fh3b7xj617w";
           name = "handlebars-sgml-mode";
         };
@@ -25902,7 +26070,7 @@
           sha256 = "0whn8rc98dhncgizzrb22nx6b6cm655q1cf2fpn6g3knq1c2471r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/handoff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/handoff";
           sha256 = "0iqqvygx50wi2vcbs6bfgqzhcz9a89zrwb7sg0ang9qrkiz5k36w";
           name = "handoff";
         };
@@ -25923,7 +26091,7 @@
           sha256 = "124k803pgxc7fz325yy6jcyam69f5fk9kdwfgmnwwca9ablq4cfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hardcore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hardcore-mode";
           sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
           name = "hardcore-mode";
         };
@@ -25944,7 +26112,7 @@
           sha256 = "0j9z46j777y3ljpai5czdlwl07f0irp4fsk4677n11ndyqm1amb5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hardhat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hardhat";
           sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
           name = "hardhat";
         };
@@ -25965,7 +26133,7 @@
           sha256 = "0vachg3zqnm47x4gpdy4lb453pkmi7gjps4vpw5mx6c96il3c1xp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/harvest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/harvest";
           sha256 = "1qfhfzjwlnqpbq4kfxvs97fa3xks8zi02fnwv0ik8wb1ppbb77qd";
           name = "harvest";
         };
@@ -25986,7 +26154,7 @@
           sha256 = "114qg91mb53ib7alnn1i9wjcr4psqps6ncpyqyklllmbdm0q660n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haskell-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haskell-emacs";
           sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
           name = "haskell-emacs";
         };
@@ -26007,7 +26175,7 @@
           sha256 = "114qg91mb53ib7alnn1i9wjcr4psqps6ncpyqyklllmbdm0q660n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haskell-emacs-base";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haskell-emacs-base";
           sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
           name = "haskell-emacs-base";
         };
@@ -26028,7 +26196,7 @@
           sha256 = "114qg91mb53ib7alnn1i9wjcr4psqps6ncpyqyklllmbdm0q660n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haskell-emacs-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haskell-emacs-text";
           sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
           name = "haskell-emacs-text";
         };
@@ -26041,15 +26209,15 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20160603.547";
+        version = "20160611.1204";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "cd820dcfab6a09bb7cfe88b38d75b8a3a0bcdb9f";
-          sha256 = "096hg88ld70zls94nnva038fr8rfw1mksal746hm47c1159nkn2i";
+          rev = "5661521b1692ee12229dd1025a024eb403a18e3d";
+          sha256 = "0qha3vgg30n56agvnd1dd9zgw3fgabpyx42pmj9rl712yr50bz27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haskell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haskell-mode";
           sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
           name = "haskell-mode";
         };
@@ -26070,7 +26238,7 @@
           sha256 = "1wha5f2zx5hr6y0wvpmkg7jnxcgbzx99gd70h96c3dqqqhqz6d2a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haskell-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haskell-snippets";
           sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
           name = "haskell-snippets";
         };
@@ -26090,7 +26258,7 @@
           sha256 = "0hfq8wpnyz5sqhkr53smw0k1wi7mb5k215xnvywkh5lhsq8cjhby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haskell-tab-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haskell-tab-indent";
           sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
           name = "haskell-tab-indent";
         };
@@ -26111,7 +26279,7 @@
           sha256 = "1gmh455ahd9if11f8mrqbfky24c784bb4fgdl3pj8i0n5sl51i88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haste";
           sha256 = "0wz15p58g4mxvwbpy9k60gixs1g4jw7pay5pbxnlggc39x1py8nf";
           name = "haste";
         };
@@ -26131,7 +26299,7 @@
           sha256 = "106a7kpjj4laxl7x8aqpv75ih54569b3bs2a1b8z4rghmikqc4aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haxe-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haxe-mode";
           sha256 = "032h0nxlsrk30bsqb02by842ycrw1qscpfprifjjkaiq08wigh1l";
           name = "haxe-mode";
         };
@@ -26144,15 +26312,15 @@
     haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haxor-mode";
-        version = "20160529.2029";
+        version = "20160612.1414";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
           repo = "haxor-mode";
-          rev = "c4d0a28bf090966610257ac2ce98d53211de1ecb";
-          sha256 = "0905vb0ars2qqml0m3ny88klxsa7jinan4bqxsd06plll2gl7ivw";
+          rev = "02dc0635885635561bfa01a69fa0b0df7e32eb36";
+          sha256 = "06k95pfkxxfwcnm6b6c3yr1d26j8jl1vgcibxjbrq1s5vr0yw5qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haxor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haxor-mode";
           sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
           name = "haxor-mode";
         };
@@ -26173,7 +26341,7 @@
           sha256 = "0pjxyhh8a02i54a9jsqr8p1mcqfl6k9b8gv9lnzb242gy4518y3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hayoo";
           sha256 = "1rqvnv5nxlsyvsa5my1wpfm82sw21s7kfbg80vrjmxh0mwlyv4p9";
           name = "hayoo";
         };
@@ -26194,7 +26362,7 @@
           sha256 = "0rgcj47h7a67qkw6696pcm1a4g4ryx8nrz55s69fw86958fp08hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hc-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hc-zenburn-theme";
           sha256 = "0jcddk9ppgcizyyciabj3sgk1pmingl97knf9nmr0mi89h7n2g5y";
           name = "hc-zenburn-theme";
         };
@@ -26215,7 +26383,7 @@
           sha256 = "0hiw226gv73jh7s3jg4p1c15p4km4rs7i9ab4wgpkl5lg4vrz5i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
           name = "hcl-mode";
         };
@@ -26233,7 +26401,7 @@
           sha256 = "00j74cqdnaf5rl7w4wabm4z88cm20s152y0yxnv73z9pvqbknrmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/header2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/header2";
           sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06";
           name = "header2";
         };
@@ -26254,7 +26422,7 @@
           sha256 = "06hq6p6a4fzprbj4r885vsvzddlvx0wxqk5kik06v5bm7hjmnyrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/headlong";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/headlong";
           sha256 = "042ybplkqjb30qf5cpbw5d91j1rdc71b789v277h036bri7hgxz6";
           name = "headlong";
         };
@@ -26267,15 +26435,15 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20160604.730";
+        version = "20160612.1322";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "c9cdcc316297c3e34ea214044af0b0f643adf239";
-          sha256 = "1lsf5mq37xvfshx6lgzpbvv8378mbsr5rdlq6vrrb498x28nhiv4";
+          rev = "a383aea02da5fa364865f0b02cc6d740710a3444";
+          sha256 = "14cq013gqdj2ypy5bih8z5yjyg02zlcqv8xwpd63ksay2zbjshyl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm";
           sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9";
           name = "helm";
         };
@@ -26296,7 +26464,7 @@
           sha256 = "0nip0zrmn944wy0x2dc5ryr0m7a948rn2a8cbaajghs7a7zai4cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-R";
           sha256 = "0zq9f2xhgap3ihnrlsrsaxaz0nx014k0820bfsq7lckwcnm0mng1";
           name = "helm-R";
         };
@@ -26317,7 +26485,7 @@
           sha256 = "04rvbafa77blps7x7cmlsciys8fgmvhfhq4v51pk8z5q3j1lrgc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ack";
           sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
           name = "helm-ack";
         };
@@ -26338,7 +26506,7 @@
           sha256 = "0hxfgdn56c7qr64r59g9hvxxwa4mw0ad9c9m0z5cj85bsdd7rlx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ad";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ad";
           sha256 = "0h2zjfj9hy7bkpmmjjs0a4a06asbw0yww8mw9rk2xi1gc2aqq4hi";
           name = "helm-ad";
         };
@@ -26351,15 +26519,15 @@
     helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "20160527.1654";
+        version = "20160611.53";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "a67c887b0128fd00ada27cc5e42cd5df77dc2cde";
-          sha256 = "0hajmc2imlp1srx6jj0b9r9fb4ivqv48vxbhx5ddpcpww21ifxj1";
+          rev = "07a084a2783929dee27677aa242cef0c26a65d5a";
+          sha256 = "1mqmq1z7bmqzrm8drb22x5aj0d4irfgn67bjkq1ynks6m480r3nn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ag";
           sha256 = "050qh5xqh8lwkgmz3jxm8gql5nd7bq8sp9q6mzm2z7367qy4qqyf";
           name = "helm-ag";
         };
@@ -26380,7 +26548,7 @@
           sha256 = "1rifdkhzvf7xd2npban0i8v3rjcji69063dw9rs1d32w4n7fzlfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ag-r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ag-r";
           sha256 = "0ivh7f021lbmbaj6gs4y8m99s63js57w04q7cwx7v4i32cpas7r9";
           name = "helm-ag-r";
         };
@@ -26401,7 +26569,7 @@
           sha256 = "153zq1q3s3ihjh15wyci9qdic3pin8f1j1gq2qlzyhmy0njlvgjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-anything";
           sha256 = "0yjlwsiahb7n4q3522d68xrdb8caad9gpnglz5php245yqy3n5vx";
           name = "helm-anything";
         };
@@ -26422,7 +26590,7 @@
           sha256 = "1bnypr906gfc1fbyrqfsfilsl6wiacrnhr8flpa0gmdjhvmrw7af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-aws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-aws";
           sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
           name = "helm-aws";
         };
@@ -26439,11 +26607,11 @@
         src = fetchFromGitHub {
           owner = "antham";
           repo = "helm-backup";
-          rev = "184026b9fe454aab8e7730106b4ca494fe307769";
-          sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76";
+          rev = "9f7075e81c4996c22bc9dd4fe48ad8e8acc55efb";
+          sha256 = "1zmv80iw1y6pj2c78227pc1hi85a986pkglzvjz8cb3c4rvd81ck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-backup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-backup";
           sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
           name = "helm-backup";
         };
@@ -26464,7 +26632,7 @@
           sha256 = "1zrs1gk95mna1kipgrq8mfhk0gqimvsb4b583f900fh86019nn1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-bibtex";
           sha256 = "037pqgyyb2grg88yfxx1r8yp4lrgz2fyzz9fbbp34l8s6vk3cp4z";
           name = "helm-bibtex";
         };
@@ -26485,7 +26653,7 @@
           sha256 = "10k7hjfz9jmfpbmsv20jy9vr6fqxx1yp8v115hprqvw057iifsl9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-bibtexkey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-bibtexkey";
           sha256 = "00i7ni4r73mmxavhfcm0fd7jhx6gxvxx7prax1yxmhs46fpz8jwj";
           name = "helm-bibtexkey";
         };
@@ -26506,7 +26674,7 @@
           sha256 = "1wmcy7q4ys2sf8ya5l4n7a6bq5m9d6m19amjfwkmkh4ajkwl041y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-bind-key";
           sha256 = "1yfj6mmxc165in1i85ccanssch6bg19ib1fcm7sa4i4hv0mgwaid";
           name = "helm-bind-key";
         };
@@ -26527,7 +26695,7 @@
           sha256 = "011k37p4vnzm1x8vyairllanvjfknskl20bdfv0glf64xgbdpfil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-bm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-bm";
           sha256 = "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh";
           name = "helm-bm";
         };
@@ -26548,7 +26716,7 @@
           sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-bundle-show";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
           name = "helm-bundle-show";
         };
@@ -26569,7 +26737,7 @@
           sha256 = "0w4svbg32y63v049plvk7djc1m2amjzrr1v979d9s6jbnnpzlb5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-c-moccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-c-moccur";
           sha256 = "1i6a4jqjy9amlhdbj5d26wzagndfgszha09vs5qf4760vjl7kn4b";
           name = "helm-c-moccur";
         };
@@ -26590,7 +26758,7 @@
           sha256 = "03c4w34r0q7xpz1ny8dya8f96rhjpc9r2c24n7vg9x6x4i2wl204";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-c-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-c-yasnippet";
           sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
           name = "helm-c-yasnippet";
         };
@@ -26611,7 +26779,7 @@
           sha256 = "0wkskm0d1mvh49l65xg6pgwd7yxy02llflkzx59ayqv4wjvsyayb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-chrome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-chrome";
           sha256 = "0p3n2pna83mp4ym8x69lk4r3q4apbj5v2blg2mwcsd9zij153nxz";
           name = "helm-chrome";
         };
@@ -26632,7 +26800,7 @@
           sha256 = "1dmj4f8pris1i7wvfplp4dbnyfm403l6rplxfrfi0cd9afg7m68i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-chronos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-chronos";
           sha256 = "1a65b680741cx4cyyizyl2c3bss36x3j2m9sh9hjc87xrzarg0s3";
           name = "helm-chronos";
         };
@@ -26653,7 +26821,7 @@
           sha256 = "18j4ikb3q8ygdq74zqzm83wgb39x7w209n3186mm051n8lfmkaif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-cider-history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-cider-history";
           sha256 = "12l8jyl743zqk8m2xzcz75y1ybdkbkvcbvfkn1k88k09s31kdq4h";
           name = "helm-cider-history";
         };
@@ -26674,7 +26842,7 @@
           sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-circe";
           sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
           name = "helm-circe";
         };
@@ -26695,7 +26863,7 @@
           sha256 = "015b8zxh91ljhqvn6z43gy08di54xcw9skw0i7frj3d7gk984qhl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-clojuredocs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-clojuredocs";
           sha256 = "0yz0wlyay9286by8i30gs3ispswq8ayqlcnna1s7bgspjvb7scmk";
           name = "helm-clojuredocs";
         };
@@ -26716,7 +26884,7 @@
           sha256 = "10cp21v8vwgp8hv2rkdn9x8v2n8wqbphgslb561rlwc2rfpvzqvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-cmd-t";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-cmd-t";
           sha256 = "1w870ldq029wgicgv4cqm31zw2i8vkap3m9hsr9d0i3gv2virnc6";
           name = "helm-cmd-t";
         };
@@ -26737,7 +26905,7 @@
           sha256 = "05nvbwz3inbmfj88am69sz032wsj8jkfpjk5drgfijw98il9blk9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-codesearch";
           sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q";
           name = "helm-codesearch";
         };
@@ -26758,7 +26926,7 @@
           sha256 = "0fxrmvb64lav4aqs61z3a4d2mcp9s2nw7fvysyjn0r1291pkzk9j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-commandlinefu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-commandlinefu";
           sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
           name = "helm-commandlinefu";
         };
@@ -26779,7 +26947,7 @@
           sha256 = "0kbm8w1hxff0nb8pyjnq2l43ra1m0ywzjvvqs0lncji5zqirvp8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-company";
           sha256 = "1pbsg7zrz447siwd8pasw2hz5z21wa1xpqs5nrylhbghsk076ld3";
           name = "helm-company";
         };
@@ -26792,15 +26960,15 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20160601.2214";
+        version = "20160612.1311";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "c9cdcc316297c3e34ea214044af0b0f643adf239";
-          sha256 = "1lsf5mq37xvfshx6lgzpbvv8378mbsr5rdlq6vrrb498x28nhiv4";
+          rev = "a383aea02da5fa364865f0b02cc6d740710a3444";
+          sha256 = "14cq013gqdj2ypy5bih8z5yjyg02zlcqv8xwpd63ksay2zbjshyl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-core";
           sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
           name = "helm-core";
         };
@@ -26821,7 +26989,7 @@
           sha256 = "0nhi8xhcf7qpsibpyy5v364xx7lqkhskzai7awkg0xcdq8b5090x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-cscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-cscope";
           sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
           name = "helm-cscope";
         };
@@ -26842,7 +27010,7 @@
           sha256 = "01a3pahpsxb7d15dkfgxypl7gzqb4dy4f36lmid1w77b9rhs6nph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-css-scss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-css-scss";
           sha256 = "0iflwl0rijbkx1b7i1s7984dw7sz1wa1cb74fqij0kcn76kal7ak";
           name = "helm-css-scss";
         };
@@ -26863,7 +27031,7 @@
           sha256 = "18d96alik66nw3rkk7k8740b4rx2bnh3pwn27ahpgj5yf51wm0ry";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ctest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ctest";
           sha256 = "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm";
           name = "helm-ctest";
         };
@@ -26884,7 +27052,7 @@
           sha256 = "03h9p3z6n9mi6hld86i6wj01glx4p058iifygrph0vvzczisixcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-dash";
           sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
           name = "helm-dash";
         };
@@ -26897,15 +27065,15 @@
     helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-descbinds";
-        version = "20160109.447";
+        version = "20160609.1812";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-descbinds";
-          rev = "3c344979f1df0d1a5cc913674e56c4d45c346134";
-          sha256 = "0y0xxs67bzh6j68j3f4zxzrl2ij5g1qvvxqklw7nz305xliis29g";
+          rev = "b4ad76372a1b9f4415322d210b3888423247693d";
+          sha256 = "1qjhk1aag3arks0pgj3k2plr6k3cvb7i45apyczka6dvz8fmwj47";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-descbinds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-descbinds";
           sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
           name = "helm-descbinds";
         };
@@ -26926,7 +27094,7 @@
           sha256 = "0li9bi1lm5ldwfpvzahxp7hyfd94jr1kl43rprx0myxb016yk2p5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-describe-modes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-describe-modes";
           sha256 = "0ajy9kwspm8rzafl0df57fad5867s86yjqj29shznqb12r91lpqb";
           name = "helm-describe-modes";
         };
@@ -26947,7 +27115,7 @@
           sha256 = "1pb7jnpddy00bmsh5lcr1hxlkfmn4xbi3s7vj47m1vn0wf3gcxpa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-dictionary";
           sha256 = "1pak8qn0qvbzyclhzvr5ka3pl370i4kiykypfkwbfgvqqwczhl3n";
           name = "helm-dictionary";
         };
@@ -26968,7 +27136,7 @@
           sha256 = "14sifdrfg8ydvi9mj8qm2bfphbffglxrkb5ky4q5b3j96bn8v110";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-dired-recent-dirs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-dired-recent-dirs";
           sha256 = "0kh0n5674ksswjzi9gji2qmx8v8g0axx8xbi0m3zby9nwcpv4qzs";
           name = "helm-dired-recent-dirs";
         };
@@ -26989,7 +27157,7 @@
           sha256 = "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-dirset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-dirset";
           sha256 = "0vng52axp7r01s00cqbbclbm5bx1qbhmlrx9h9kj7smx1al4daml";
           name = "helm-dirset";
         };
@@ -27010,7 +27178,7 @@
           sha256 = "0c3mn5w98phsv7gsljyp5vxxmr2w6n3nczh5zm4hcpwsra3wh1v9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-emmet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-emmet";
           sha256 = "1dkn9qa3dv2im11lm19wfh5jwwwp42sv7jc0p6qg35rhzwdpfg03";
           name = "helm-emmet";
         };
@@ -27031,7 +27199,7 @@
           sha256 = "0330s07b41nw9q32xhjdl7yw83p8ikj6b2qkir3y0jyx16gk10dl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-emms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-emms";
           sha256 = "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5";
           name = "helm-emms";
         };
@@ -27052,7 +27220,7 @@
           sha256 = "00yhmpv5xjlw1gwbcrznz83gkaby8zlqv74d3p7plca2cwjll1g9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-filesets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-filesets";
           sha256 = "1yhhchksi0r4r5c5q1mggz2hykkvk93baq91b5hkaflqi30d1v8f";
           name = "helm-filesets";
         };
@@ -27073,7 +27241,7 @@
           sha256 = "0xl2nakprgjf65haa0xn0jkh69skmbp3k6q1bamvqijgvra9waa0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-firefox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-firefox";
           sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
           name = "helm-firefox";
         };
@@ -27094,7 +27262,7 @@
           sha256 = "0mrck7qbqjqz5kpih3zb1yn2chjgv5ghrqc5cp80kmsmxasvk8zw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-flx";
           sha256 = "03vxr5f5m4s6k6rm0976w8h3s4c3b5mrdqgmkd281hmyh9q3cslq";
           name = "helm-flx";
         };
@@ -27115,7 +27283,7 @@
           sha256 = "062s08k8v657fpkqvdspv32awvj7dq929ks27w29k3kbzlqlrihp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-flycheck";
           sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b";
           name = "helm-flycheck";
         };
@@ -27128,15 +27296,15 @@
     helm-flymake = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-flymake";
-        version = "20130717.744";
+        version = "20160610.202";
         src = fetchFromGitHub {
           owner = "tam17aki";
           repo = "helm-flymake";
-          rev = "afb1089d6a0dc9a63bc2aa1df19d80830cc33c6a";
-          sha256 = "1liaid4l4x8sb133lj944gwwpqngsf8hzibdwyfdmsi4m4abh73h";
+          rev = "72cf18a1a1f843db9bb5d58301739ea9ccb1655b";
+          sha256 = "05wpclg4ibp0ida692m3s8nknx4aizfcdgxgfzlwczgdgw0922kn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-flymake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-flymake";
           sha256 = "0h87yd56nhxpahrcpk6hin142hzv3sdr5bvz0injbv8a2lwnny3b";
           name = "helm-flymake";
         };
@@ -27157,7 +27325,7 @@
           sha256 = "1k7invgzqrcm11plyvinqwf98yxibr8i4r9yw3csfsicc8b6if59";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-flyspell";
           sha256 = "1g6xry2y6396pg7rg8hc0l84z5r3j2df7dpd1jgffxa8xa3i661f";
           name = "helm-flyspell";
         };
@@ -27170,15 +27338,15 @@
     helm-fuzzier = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-fuzzier";
-        version = "20160220.940";
+        version = "20160605.2345";
         src = fetchFromGitHub {
           owner = "EphramPerdition";
           repo = "helm-fuzzier";
-          rev = "f24c2e92b1dfcfa0c43b9030f8160cbe1c94decc";
-          sha256 = "15am2dpva3fzj68sw9n4mpdxkw75l97l1k2j9vlvi2lbqk1h46pi";
+          rev = "8798dcf3583b863df5b9dea7fe3b0179ba1c35bc";
+          sha256 = "1250mh0ydap0sifcyrgs32dnr6c8d723v4c55yvwm23dzvzwycp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-fuzzier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-fuzzier";
           sha256 = "0qdgf0phs3iz29zj3qjhdgb3i4xvf5r2vi0709pwxx2s6r13pvcc";
           name = "helm-fuzzier";
         };
@@ -27199,7 +27367,7 @@
           sha256 = "1yxnmxq6ppfgwxrk5ryc5xfn82kjf4j65j14hy077gphr0q61q6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-fuzzy-find";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-fuzzy-find";
           sha256 = "0lczlrpd5jy2vhy9jl3rjcdyiwr136spqm8k2rj8m9s8wpn0v75i";
           name = "helm-fuzzy-find";
         };
@@ -27220,7 +27388,7 @@
           sha256 = "16p1gisbza48qircsvrwx020n96ss1c6s68d7cgqqfc0bf2467is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ghc";
           sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
           name = "helm-ghc";
         };
@@ -27241,7 +27409,7 @@
           sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
           name = "helm-ghq";
         };
@@ -27262,7 +27430,7 @@
           sha256 = "1yfy4a52hx44r32i0b75bka8gfcn5lp61jl86lzrsi2cr9wg10pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-git";
           sha256 = "1ib73p7cmkw96csxxpkqwn6m60k1xrd46z6vyp29gj85cs4fpsb8";
           name = "helm-git";
         };
@@ -27283,7 +27451,7 @@
           sha256 = "157b525h0kiaknn12fsw67fg26lzb20apx8sssmvlcicqcd51iaw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-git-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-git-files";
           sha256 = "02109r956nc1dmqh4v082vkr9wdixh03xhl7icwkzl7ipr5453s6";
           name = "helm-git-files";
         };
@@ -27304,7 +27472,7 @@
           sha256 = "0c11300hlj62jkcx5j56rx6ppkckr0zlngmi4pf5wxpgj1wfsbfy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-git-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-git-grep";
           sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
           name = "helm-git-grep";
         };
@@ -27325,7 +27493,7 @@
           sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-github-stars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-github-stars";
           sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
           name = "helm-github-stars";
         };
@@ -27346,7 +27514,7 @@
           sha256 = "0pd755s5zcg8y1svxj3g8m0znkp6cyx5y6lsj4lxczrk7lynzc3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-gitignore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-gitignore";
           sha256 = "01l7mx8g1m5qnwz973hzrgds4gywm56jgl4hcdxqvpi1n56md3x6";
           name = "helm-gitignore";
         };
@@ -27367,7 +27535,7 @@
           sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-gitlab";
           sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
           name = "helm-gitlab";
         };
@@ -27388,7 +27556,7 @@
           sha256 = "0iyfn58h50xms5915i29b54wfyxh6vi9vy3v3r91g6dwlxrjibka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-go-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-go-package";
           sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6";
           name = "helm-go-package";
         };
@@ -27409,7 +27577,7 @@
           sha256 = "1addskcm325lb9plcbxfp1f6fsj3dcccb87gzihrp7ahiy7pmvih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-google";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-google";
           sha256 = "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32";
           name = "helm-google";
         };
@@ -27430,7 +27598,7 @@
           sha256 = "1f88vd31fc7ksrhlc72i6c0wbbz62lxw9yakxdk0m72pfz345mz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-grepint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-grepint";
           sha256 = "00wr3wk41sbpamxbjkqlby49g8y5z9n79p51sg7ginban4qy91gf";
           name = "helm-grepint";
         };
@@ -27451,7 +27619,7 @@
           sha256 = "0p0mk44y2z875ra8mzcb6vlf4rbkiq9yank5hdxvg2x2sxsaambk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-growthforecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-growthforecast";
           sha256 = "0716rhs5dam6p8ym83vy19svl6jr49lcfgb29mm3cqi9jcch3ckh";
           name = "helm-growthforecast";
         };
@@ -27472,7 +27640,7 @@
           sha256 = "0zyspn9rqfs3hkq8qx0q1w5qiv30ignbmycyv0vn3a6q7a5fsnhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-gtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-gtags";
           sha256 = "1kbpfqhhbxmp3f70h91x2fws9mhx87zx4nzjjl29lpl93vf8xckl";
           name = "helm-gtags";
         };
@@ -27493,7 +27661,7 @@
           sha256 = "0hmvyyhddpf831cad35c9z9fv5mpdq6qg4nzbdghlqs9pf7ik6h2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-hatena-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
           name = "helm-hatena-bookmark";
         };
@@ -27514,7 +27682,7 @@
           sha256 = "08pfzs030d8g5s7vkpgicz4srp5cr3xpd84lhrr24ncrhbszxar9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-hayoo";
           sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
           name = "helm-hayoo";
         };
@@ -27535,7 +27703,7 @@
           sha256 = "05ksfx54ar2j4mypzwh0gfir8r26s4f1i4xw319q5pa1y2100cpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-helm-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-helm-commands";
           sha256 = "0dq9p37i5rrp2nb1vhqzzqfmdg11va2xr3yz8hdxpwykm1ldqdcf";
           name = "helm-helm-commands";
         };
@@ -27556,7 +27724,7 @@
           sha256 = "1l85kip4zd08d38sk7cdafmx0v68dh419cs86g7x0mgi0wn00kfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-hoogle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-hoogle";
           sha256 = "0vhk4vwqfirdm5d0pppplfpqyc2sfj6jybhzp9n1w8xgrh2d1c0x";
           name = "helm-hoogle";
         };
@@ -27577,7 +27745,7 @@
           sha256 = "0128nrhwyzslzl0l7wcjxn3dlx3h1sjmwnbbnp2fj4bjk7chc59q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-idris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-idris";
           sha256 = "1y52675j4kcq14jypxjw1rflxrxwaxyn1n3m613klad55wpfaamf";
           name = "helm-idris";
         };
@@ -27598,7 +27766,7 @@
           sha256 = "0py4xs27z2jvg99i6qaf2ccz0mvk6bb9cvdyz8v8ngmnj3rw2vla";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-img";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-img";
           sha256 = "0sq9l1wgm97ppfc45w3bdcv0qq5m85ygnanv1bdcp8bxbdl4vg0q";
           name = "helm-img";
         };
@@ -27619,7 +27787,7 @@
           sha256 = "04vdin0n3514c8bycdjrwk3l6pkarrwanlklnm75315b91nkkbcp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-img-tiqav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-img-tiqav";
           sha256 = "1m083hiih2rpyy8i439745mj4ldqy85fpnvms8qnv3042b8x35y0";
           name = "helm-img-tiqav";
         };
@@ -27640,7 +27808,7 @@
           sha256 = "04ddjdia09y14gq4h6m8g6aiwkqvdxp66yjx3j5dh2xrkyxhlxpz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ispell";
           sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
           name = "helm-ispell";
         };
@@ -27661,7 +27829,7 @@
           sha256 = "1czgf5br89x192g3lh3x2n998f79hi1n2f309ll264qnl35kv14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-itunes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-itunes";
           sha256 = "0zi4wyraqkjwp954pkng8b23giv1q9618apd9v3dczsvlmaar9hf";
           name = "helm-itunes";
         };
@@ -27682,7 +27850,7 @@
           sha256 = "0f2psp7p82sa2fip282w152zc1rjd3l0sna1g7rgwi9x29gcsh0v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-j-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-j-cheatsheet";
           sha256 = "0lppzk60vl3ps9fqnrh020awiy5w46gwlb6d91pr889x24ryphmm";
           name = "helm-j-cheatsheet";
         };
@@ -27703,7 +27871,7 @@
           sha256 = "0vhqpcv8xi6a6q7n6xxahdzijr1x5s40fvk9nc44q55psbyv627g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-jstack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-jstack";
           sha256 = "0giix1rv2jrmdxyg990w90ivl8bvgbbvah6nkpj7gb6vbnm15ldz";
           name = "helm-jstack";
         };
@@ -27724,7 +27892,7 @@
           sha256 = "0nkmc17ggyfi7iz959mvzh6q7116j44zqwi7ydm9i8z49xfpzafy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-lobsters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-lobsters";
           sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
           name = "helm-lobsters";
         };
@@ -27745,7 +27913,7 @@
           sha256 = "0yridy54p53zps33766hl7p2hq5pc4vxm08rb5vzbjw84vwaq07b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ls-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ls-git";
           sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
           name = "helm-ls-git";
         };
@@ -27766,7 +27934,7 @@
           sha256 = "1msrsqiwk7bg5gry5cia8a6c7ifymfyn738hk8g2qwzzw4vkxxcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ls-hg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ls-hg";
           sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
           name = "helm-ls-hg";
         };
@@ -27782,11 +27950,11 @@
         version = "20150717.939";
         src = fetchsvn {
           url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el";
-          rev = "149168";
+          rev = "149330";
           sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ls-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ls-svn";
           sha256 = "08mwzi340akw4ar20by0q981mzmzvf0wz3mn738q4inn2kqgs60d";
           name = "helm-ls-svn";
         };
@@ -27807,7 +27975,7 @@
           sha256 = "1zxahr48s17di8mcy2sxvy4006ch9vwbvkbgkxdphijgqz41irqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-make";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-make";
           sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
           name = "helm-make";
         };
@@ -27828,7 +27996,7 @@
           sha256 = "0gzlprf5js4y3vzkf7si2xc7ai5j97b5cqrs002hyjj5ij4f2vix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-migemo";
           sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
           name = "helm-migemo";
         };
@@ -27849,7 +28017,7 @@
           sha256 = "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-mode-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-mode-manager";
           sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
           name = "helm-mode-manager";
         };
@@ -27870,7 +28038,7 @@
           sha256 = "09rb8aq7fnf661w3liwbkkaczjph3dzvg26slm9cwcnl7pqnvagl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-mt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-mt";
           sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
           name = "helm-mt";
         };
@@ -27891,7 +28059,7 @@
           sha256 = "1ifws3p0civl60wpri0zs3mi23c6jajrvz1zaimw6am222s2sx3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-mu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-mu";
           sha256 = "0pydp6scj5icaqfp3dp5h0q1y2i7z9mfyw1ll6iphsz9qh3x2bj2";
           name = "helm-mu";
         };
@@ -27912,7 +28080,7 @@
           sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-nixos-options";
           sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
           name = "helm-nixos-options";
         };
@@ -27933,7 +28101,7 @@
           sha256 = "04c6k1rxdi175kwn146sb2nxd13mvx3irr9fbqykcfv81609kqx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-notmuch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-notmuch";
           sha256 = "1ixdc1ba4ygxl0lpg6ijk06dgj2hfv5p5k6ivq60ss0axyisnnv0";
           name = "helm-notmuch";
         };
@@ -27954,7 +28122,7 @@
           sha256 = "1wkmbc7247f209krvw4dzja3z0wyny12x5yi1cn3fnfh5nx04851";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-open-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-open-github";
           sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx";
           name = "helm-open-github";
         };
@@ -27975,7 +28143,7 @@
           sha256 = "0glrbln15wang9n1h76dk19ykcgmc8hwphg1qcmc4fbbcgmh1a1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-org-rifle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-org-rifle";
           sha256 = "0hx764vql2qgw9i8qrr3kkn23lw6jx3x604dm1y33ig6a15gy3a3";
           name = "helm-org-rifle";
         };
@@ -27996,7 +28164,7 @@
           sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-orgcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-orgcard";
           sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
           name = "helm-orgcard";
         };
@@ -28017,7 +28185,7 @@
           sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-package";
           sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
           name = "helm-package";
         };
@@ -28038,7 +28206,7 @@
           sha256 = "1dyi3rs72jl7739knnikv8pawam54k0sxz5a4a33i6s2bg3ghxcd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-pages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-pages";
           sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
           name = "helm-pages";
         };
@@ -28059,7 +28227,7 @@
           sha256 = "13wnagmgicl2mi4iksqckrjbaiz05j9ykbmvj26jy8zcbll5imfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-perldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-perldoc";
           sha256 = "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb";
           name = "helm-perldoc";
         };
@@ -28080,7 +28248,7 @@
           sha256 = "0wirqnzprfxbppdawfx6ah5rdawgyvl8b4zn2r3zm9mnj9jci4dw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-phpunit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-phpunit";
           sha256 = "0anbrzlpmashcklifyvnnf2rwv5fk4x0kbls2dp2db1bliw3rdh6";
           name = "helm-phpunit";
         };
@@ -28101,7 +28269,7 @@
           sha256 = "0bgpd50ningqyzwhfinfrn6gqacard5ynwllhg9clq0f683sbck2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-proc";
           sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
           name = "helm-proc";
         };
@@ -28122,7 +28290,7 @@
           sha256 = "0j54c1kzsjgr05qx25rg3ylawvyw6n6liypiwaas47vpyfswbxhv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-project-persist";
           sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
           name = "helm-project-persist";
         };
@@ -28143,7 +28311,7 @@
           sha256 = "0b9nd668p5lya214hyc0lv9pbmxjfy4ls1yhljr6j71qsfl0mjva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-projectile";
           sha256 = "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a";
           name = "helm-projectile";
         };
@@ -28164,7 +28332,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-prosjekt";
           sha256 = "019rya3bf13cnval8iz680wby3sqlmqg4nbn0a13l1pkhlnv9fvm";
           name = "helm-prosjekt";
         };
@@ -28185,7 +28353,7 @@
           sha256 = "03ys40rr0pvgp35j5scw9c28j184f1c9m58a3x0c8f0lgyfpssjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-pt";
           sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
           name = "helm-pt";
         };
@@ -28206,7 +28374,7 @@
           sha256 = "1lxknzjfhl6irrspynlkc1dp02s0byp94y4qp69gcl9sla9262ip";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-purpose";
           sha256 = "0am8fy7ihk4hv07a6bnk9mwy986h6i6qxwpdmfhajzga71ixchg6";
           name = "helm-purpose";
         };
@@ -28227,7 +28395,7 @@
           sha256 = "0admgfy0p13nilb4fi3dq8pm48w1fib8h8avi7h9ybi9k5h6x4ii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-pydoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-pydoc";
           sha256 = "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7";
           name = "helm-pydoc";
         };
@@ -28248,7 +28416,7 @@
           sha256 = "05394vf125qlgfrhkaqvly3340qp3zy7kldsnisms9gv0l1c60bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-qiita";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-qiita";
           sha256 = "1iz2w1901zz3zk9zazikmnkzng5klnvqn4ph1id7liksrcdpdmpm";
           name = "helm-qiita";
         };
@@ -28269,7 +28437,7 @@
           sha256 = "1a26r21jvgzk21vh3mf29s1dhvvv70jh860zaq9ihrpfrrl91158";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-rails";
           sha256 = "1iihfsmnkpfp08pldghf3w5k8v5dlmy5ns0l4niwdwp5w8lyjcd6";
           name = "helm-rails";
         };
@@ -28290,7 +28458,7 @@
           sha256 = "1b74jsr28ldz80mrqz3d1bmykpcprdbhf3fzhc0awd5i5xdnfaid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-rb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-rb";
           sha256 = "14pkrj1rpi2ihpb7c1hx6xwzvc1x7l41lwr9znp5vn7z93i034fr";
           name = "helm-rb";
         };
@@ -28303,15 +28471,15 @@
     helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-recoll";
-        version = "20160602.41";
+        version = "20160605.2323";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-recoll";
-          rev = "30d2e26c2dcd5bdd906d659cca37359ad863fd52";
-          sha256 = "07jzrra4y0vbm6f62vsl60qbh99s8f76r74l4z1fby1ww6wgbrcd";
+          rev = "8901a648fea4f2a2c0814bccfeebce3e8b1af33d";
+          sha256 = "01ikw689xjrjk4aas3z34dhldhzj3200q0kgq7xjgs777mi38054";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-recoll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-recoll";
           sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
           name = "helm-recoll";
         };
@@ -28332,7 +28500,7 @@
           sha256 = "1ng73dmligj38xbfdfr8sb69czppks7wfvh5q5xcm2pha828kcwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-rhythmbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-rhythmbox";
           sha256 = "0pnm7yvas0q3b38ch5idm7v4ih2fjyfai8217j74xhkpcc2w4g4a";
           name = "helm-rhythmbox";
         };
@@ -28349,11 +28517,11 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-robe";
-          rev = "7348d0bc0251b51979554ea678b970fd01c0efe9";
-          sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
+          rev = "6e69543b4ee76c5f8f3f2510c76e6d9aed17a370";
+          sha256 = "1qcx036pgrg4xc1y74amd8jkjylnc0g1c4841cc3fbknnn1ap54g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-robe";
           sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
           name = "helm-robe";
         };
@@ -28374,7 +28542,7 @@
           sha256 = "0s4hb1fvwr9za5gkz8s5w1kh9qjyygz6g59w7vmrg2d8ds2an03d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-rubygems-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-rubygems-local";
           sha256 = "134qyqnh9l05lfj0vizlx35631q8ih6cdblrvka3p8i571300ikh";
           name = "helm-rubygems-local";
         };
@@ -28395,7 +28563,7 @@
           sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-rubygems-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-rubygems-org";
           sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
           name = "helm-rubygems-org";
         };
@@ -28416,7 +28584,7 @@
           sha256 = "1ws5zxanaiaaxpgkcb2914qa8wxp6ml019hfnfcp7amjnajq9pyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-safari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-safari";
           sha256 = "0lvwghcl5w67g0lc97r7hfvca7ss0mysy2mxj9axxbpyiq6fmh0y";
           name = "helm-safari";
         };
@@ -28437,7 +28605,7 @@
           sha256 = "0padb6mncgc52wib3dgvdc9r4dp591gf8nblbfnsnxx4zjrcwawb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-sage";
           sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
           name = "helm-sage";
         };
@@ -28458,7 +28626,7 @@
           sha256 = "00wnqcgpf4hqdnqj5zrizr4s0pffb93xwya8k5c3rp4plncrcdzx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-sheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-sheet";
           sha256 = "0lx70l5gq43hckgdfna8s6wx287sw5ms9l1z3n6vg2x8nr9m61kc";
           name = "helm-sheet";
         };
@@ -28479,7 +28647,7 @@
           sha256 = "0i8qhlyil4p11lnb6f1x9qv7f5131dg0f74anbvnc1wjga0jifzx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-smex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-smex";
           sha256 = "02jvq2hyq4wwc9v8gaxr9vkjldc60khdbjf71p8w2iny5w3k0jbj";
           name = "helm-smex";
         };
@@ -28500,7 +28668,7 @@
           sha256 = "0j3b5ypxq8k7mg6zlx3r15jpk3x2f0gx9p9bjr0h78h0sc0f46l7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-spaces";
           sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
           name = "helm-spaces";
         };
@@ -28521,7 +28689,7 @@
           sha256 = "133dcqk42nq5gh5qlcbcmx3lczisfgymcnypnld318jvjgd2ma8a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-spotify";
           sha256 = "1rzvxnaqh8bm78qp0rhpqs971pc855qrq589r3s8z3gpqzmwlnmf";
           name = "helm-spotify";
         };
@@ -28542,7 +28710,7 @@
           sha256 = "1iid2jcnqpd5b2g0jgas76n06i8m20kp3j4lhmalg9jnyvgrlf7s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-swoop";
           sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
           name = "helm-swoop";
         };
@@ -28563,7 +28731,7 @@
           sha256 = "1yqwq8a5pw3iaj69kqvlgn4hr18ssx39lnm4vycbmsg1bi2ygfzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-systemd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-systemd";
           sha256 = "1kcf9218l8aygrcj1h3czyklk1cxc5c73qmv4d3r3bzpxbxgf6ib";
           name = "helm-systemd";
         };
@@ -28584,7 +28752,7 @@
           sha256 = "0a9h6rmjc6c6krkvxbgrzv35if260d9ma9a2k47jzm9psnyp9s2w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-themes";
           sha256 = "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j";
           name = "helm-themes";
         };
@@ -28605,7 +28773,7 @@
           sha256 = "1ypnsbx623gg3q07gxrbkn82jzy38sj4p52hj1wcb54qjqzyznkg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-unicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-unicode";
           sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4";
           name = "helm-unicode";
         };
@@ -28626,7 +28794,7 @@
           sha256 = "0xlz9rxx7y9pkrzvxmv42vgys5iwx75zv9g50k8ihwc08z80dhcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-w32-launcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-w32-launcher";
           sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
           name = "helm-w32-launcher";
         };
@@ -28647,7 +28815,7 @@
           sha256 = "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-w3m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-w3m";
           sha256 = "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz";
           name = "helm-w3m";
         };
@@ -28668,7 +28836,7 @@
           sha256 = "03a5hzgqak8wg6i2h2p3fr9ij55lqarcsblml8qrnrj27ghcvzzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-wordnet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-wordnet";
           sha256 = "0di8gxsa9r8mzja4akhz0wpgrhlidqyn1s1ix5szplwxklwf2r2f";
           name = "helm-wordnet";
         };
@@ -28689,7 +28857,7 @@
           sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-words";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-words";
           sha256 = "0l9mb7g3xzasna1bw2p7vh2wdg1hmjkff40p8kpqvwwzszdm9v76";
           name = "helm-words";
         };
@@ -28710,7 +28878,7 @@
           sha256 = "1yqr5z5sw7schvaq9pmwg79anp806gikm28s6xvrayzyn4idz2n6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-xcdoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-xcdoc";
           sha256 = "1ikphlnj053i4g1l8r2pqaljvdqglj1yk0xx4vygnw98qyzdsx4v";
           name = "helm-xcdoc";
         };
@@ -28731,7 +28899,7 @@
           sha256 = "11fznbfcv4rac4h50mkax1g66wd2f91f5dw2v4jxjq2f5y4h4w0g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-zhihu-daily";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-zhihu-daily";
           sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
           name = "helm-zhihu-daily";
         };
@@ -28749,7 +28917,7 @@
           sha256 = "00x3ln7x4d6r422x845smf3h0x1z85l5jqyjkrllqcs7qijcrk5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/help-fns+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/help-fns+";
           sha256 = "10vz7w79k3barlcs3ph3pc7914xdhcygagdk2wj3bq0wmwxa1lia";
           name = "help-fns-plus";
         };
@@ -28767,7 +28935,7 @@
           sha256 = "0qmf81maq6yvs68b8vlbxwkjk72qldamq75znrma9mhvlv8igrgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/help-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/help-mode+";
           sha256 = "1pmb845bxa5kazjpdxm12rm2wcshmv2cmisigs3kyva1pmi1shra";
           name = "help-mode-plus";
         };
@@ -28785,7 +28953,7 @@
           sha256 = "1r7kf9plnsjx87bhflsdh47wybvhis7gb10izqa1p6w0aqsg178s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/help+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/help+";
           sha256 = "1jx0wa4md1mvdsvjyx2yvi4hhm5w061qqcafsrw4axsz7gjpd4yi";
           name = "help-plus";
         };
@@ -28806,7 +28974,7 @@
           sha256 = "178dvigiw162m01x7dm8pf61w2n3bq51lvk5q7jzpb9s35pz1697";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hemisu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hemisu-theme";
           sha256 = "0byzrz74yvk12m8dl47kkmkziwrrql193q72qx974zbqdj8h2sph";
           name = "hemisu-theme";
         };
@@ -28827,7 +28995,7 @@
           sha256 = "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/heroku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/heroku";
           sha256 = "1kadmxmqhc60cb5k14943rad1gbril2hlcnqxnsy4h3j2ykmcdyy";
           name = "heroku";
         };
@@ -28848,7 +29016,7 @@
           sha256 = "15hk0v6ck076mahsz4spq75jcnv587fx4d3w50c7bdh423fl0xvx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/heroku-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/heroku-theme";
           sha256 = "0mchh9y3pqwamry6105qrv1bp1qg1g0jmz7rzc5svz9giynypwf9";
           name = "heroku-theme";
         };
@@ -28869,7 +29037,7 @@
           sha256 = "1ghknn1fd6lwxq035amrawx9ixw3qwjsfarsjyqss7rhs70wrn5a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hexo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hexo";
           sha256 = "0fgrxf6gdw0kzs6x6y8qr511cazaaiyk7licgkgznngj4w6g7jyn";
           name = "hexo";
         };
@@ -28887,7 +29055,7 @@
           sha256 = "0rqjidjxa5j6rjknklfks743lczbq3qsyiranrf2z3ghzi0gf7fd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hexrgb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hexrgb";
           sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06";
           name = "hexrgb";
         };
@@ -28908,7 +29076,7 @@
           sha256 = "1yi01qsgbmhmdgxdjfvgi2s9ijnq9x1y3j9yc1jwz89p0pc5dm1y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hfst-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hfst-mode";
           sha256 = "1w342n5k9ak1m5znysvrplpr9dhmi7hxbkr4d1dx51dn0azbpjh7";
           name = "hfst-mode";
         };
@@ -28929,7 +29097,7 @@
           sha256 = "0l22sqi9lmy25idh231p0hgq22b3dxwb9wq60yxk8dck9zlkv7rr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hgignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hgignore-mode";
           sha256 = "0ja71l3cghhn1c6w2pff80km8h8xgzf0j9gcldfyc72ar6ifhjkj";
           name = "hgignore-mode";
         };
@@ -28950,7 +29118,7 @@
           sha256 = "1ky5s7hzqbxgasdz285q3rnvzh3irwsq61rlivjrcxyfdxdjbbvp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hgrc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hgrc-mode";
           sha256 = "18400dhdackdpndkz6shjmd4klfh6b4vlccnnqlzf3a93alw6vqf";
           name = "hgrc-mode";
         };
@@ -28971,7 +29139,7 @@
           sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hi2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hi2";
           sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
           name = "hi2";
         };
@@ -28989,7 +29157,7 @@
           sha256 = "1l5jvgjgd0kzv1sn6h467fbnl487hma4h4pkwq4x1dhbc26yvfpz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hide-comnt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hide-comnt";
           sha256 = "181kns2rg4rc0pyyxw305qc06d10v025ad7v2m037y72vfwb0igx";
           name = "hide-comnt";
         };
@@ -29007,7 +29175,7 @@
           sha256 = "1q87yp1pr62cza3pqimqd09a39yyij4c7pncdww84zz7cii9qrn2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hide-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hide-lines";
           sha256 = "146sgvd88w20rqvd8y8kc76cb1nqk6dvqsz9rgl4rcrf0xfqvp7q";
           name = "hide-lines";
         };
@@ -29025,7 +29193,7 @@
           sha256 = "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hide-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hide-region";
           sha256 = "0nsc6m3yza658xsxvjz8766vkp71rcm6vwnvcv225r2pr94mq7vm";
           name = "hide-region";
         };
@@ -29046,7 +29214,7 @@
           sha256 = "1dr06b9njzih8z97k62l9w3x0a801x4bp043zvk7av9qkz8izl2r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hideshow-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hideshow-org";
           sha256 = "1bzx5ii06r64nra92zv1dvw5zv3im7la2dd3md801hxyfrpb74gc";
           name = "hideshow-org";
         };
@@ -29064,7 +29232,7 @@
           sha256 = "15ax1j3j7kylyc8a91ja825sp4mhbdgx0j4i5kqxwhvmwvpmyrv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hideshowvis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hideshowvis";
           sha256 = "1ajr71fch3v5g8brb83kwmlakcam5w21i3yr8df00c5j2pnc6v1f";
           name = "hideshowvis";
         };
@@ -29082,7 +29250,7 @@
           sha256 = "15s4463damlszd5wqi22a6w25i8l0m5rvqdg73k3yp01i65jc29z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight";
           sha256 = "0clv4mzy9kllcvc0cgsbx3a9anw68dc2c7vzwbrv13sw5gh9skc0";
           name = "highlight";
         };
@@ -29103,7 +29271,7 @@
           sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-blocks";
           sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
           name = "highlight-blocks";
         };
@@ -29121,7 +29289,7 @@
           sha256 = "18y6cw43mhizccvwfydv6g2kz8w7vff0n3k9sq5ghwq3rb3z14b2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-chars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-chars";
           sha256 = "19jawbjvqx1hsjbynx0jgpziap3r64k8s1xfckajrx8aq8m4c6i0";
           name = "highlight-chars";
         };
@@ -29139,7 +29307,7 @@
           sha256 = "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-cl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-cl";
           sha256 = "164h3c3rzriahb7v5hk2pw4i0gk2vk5ak722bai6x4zx4l1xp20w";
           name = "highlight-cl";
         };
@@ -29158,7 +29326,7 @@
           sha256 = "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-current-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-current-line";
           sha256 = "01bga6is3frzlzfajpvpgz224vhl0jnc2bl2ipvlygdcmv4h8973";
           name = "highlight-current-line";
         };
@@ -29179,7 +29347,7 @@
           sha256 = "1l10xnjyvcbv1v8xlldaca7z3fk5qav7nsbhfnjxxd0bgh5v9by2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-defined";
           sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
           name = "highlight-defined";
         };
@@ -29200,7 +29368,7 @@
           sha256 = "0rs8zyjz5mh26n8bdxn6fmyw2809nihz1vp7ih59dq11lx3mf9az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-escape-sequences";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-escape-sequences";
           sha256 = "0938b29cqapid9v9q4w2jwh8kdb0p70qwzy9xm2nxaairm7436d6";
           name = "highlight-escape-sequences";
         };
@@ -29221,7 +29389,7 @@
           sha256 = "10rj4sl99kpsggw7009vv8l4p74rmpp2hfz1d4d3gyfq5k3zblb5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-indent-guides";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-indent-guides";
           sha256 = "00ghp677qgb5clxhdjarfl8ab3mbp6v7yfsldm9bn0s14lyaq5pm";
           name = "highlight-indent-guides";
         };
@@ -29242,7 +29410,7 @@
           sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-indentation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-indentation";
           sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
           name = "highlight-indentation";
         };
@@ -29263,7 +29431,7 @@
           sha256 = "1vy6j63jp83ljdqkrqglpys74yfh7p61sd0lqiwczgr5nqyc60rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-leading-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-leading-spaces";
           sha256 = "0h2ww2vqmarghf4zg0wbwn0wgndmkcjy696mc885rwavck2dav4p";
           name = "highlight-leading-spaces";
         };
@@ -29284,7 +29452,7 @@
           sha256 = "083jmw9jaxj5d5f0b0gxxb0gjdi4dv1sm66559105slbkl2nsa3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-numbers";
           sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
           name = "highlight-numbers";
         };
@@ -29304,7 +29472,7 @@
           sha256 = "0fqfxwdz1xbc6dwxbjdhryvnvrb5vc38cq7c2yiz294mfzyn3l5s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-operators";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-operators";
           sha256 = "00agrwp2i3mkacnp4qhqcnpwn5qlbj9qv97zrw7a7ldqga0vwvhn";
           name = "highlight-operators";
         };
@@ -29325,7 +29493,7 @@
           sha256 = "0kzqx1y6rr4ryxi2md9087saad4g4bzysckmp8272k521d46xa1r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-parentheses";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-parentheses";
           sha256 = "1d38wxk5bwblddr74crzwjwpgyr8zgcl5h5ilywg35jpv7n66lp5";
           name = "highlight-parentheses";
         };
@@ -29346,7 +29514,7 @@
           sha256 = "1gq8inxfni9zgz2brqm4nlswgr8b0spq15wr532xfrgr456g10ks";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-quoted";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-quoted";
           sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
           name = "highlight-quoted";
         };
@@ -29367,7 +29535,7 @@
           sha256 = "0gnr1dqkcmc9gfzqjaixh76g1kq7xp20mg1h6vl3c4na7nk6a3fg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-stages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-stages";
           sha256 = "0r4kmjmrpi38q3y0q9h5xkxh7x728ha2nbnc152lzw6zfsxnm4x4";
           name = "highlight-stages";
         };
@@ -29388,7 +29556,7 @@
           sha256 = "19cgyk0sh8nsmf3jbi92i8qsdx4l4yilfq5jj9zfdbj9p5gvwx96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-symbol";
           sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
           name = "highlight-symbol";
         };
@@ -29406,7 +29574,7 @@
           sha256 = "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-tail";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-tail";
           sha256 = "187kv3n262l38jdapi9bwcafz8fh61pdq2zliwiz7m7xdspp2iws";
           name = "highlight-tail";
         };
@@ -29427,7 +29595,7 @@
           sha256 = "00s2nm0rfdgkpn2v9m36y0l42jyfah5hp5hd3bkwljgs99cp1ihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-thing";
           sha256 = "0rvdb1lx9xn9drqw0sw9ih759n10g7k0af39w6n8g0wfr67p96w1";
           name = "highlight-thing";
         };
@@ -29448,7 +29616,7 @@
           sha256 = "0hhc2l4pz6q8injpplv6b5l08l8q2lnjdpwabp7gwmhraq54rhjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-unique-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-unique-symbol";
           sha256 = "0lwl8pkmq0q4dvyflarggnn8vzpvk5hhcnk508r6xml2if1sg9zx";
           name = "highlight-unique-symbol";
         };
@@ -29469,7 +29637,7 @@
           sha256 = "06nnqry36ncqacfzd8yvc4q59bwk3vgf9a14rkpph2hk2rfvq2m6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight2clipboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight2clipboard";
           sha256 = "19r7abbpm31b0azf2v3xn0rjagg9h01i8g72qapp8dhqb4d9n9r0";
           name = "highlight2clipboard";
         };
@@ -29490,7 +29658,7 @@
           sha256 = "1y52fpqc85ihfbwcb2zy91dgg40jrjj8mmrf8h8s693442rj6ip3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hindent";
           sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
           name = "hindent";
         };
@@ -29511,7 +29679,7 @@
           sha256 = "141ikpyns1gd6kjply8m9jy9gifx5xdw5bn4p29hrxgiw994a78d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hippie-exp-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hippie-exp-ext";
           sha256 = "142s7cmgjnqdmac21yps3b071sv18lw068kmxchyxb0zsa067g9l";
           name = "hippie-exp-ext";
         };
@@ -29532,7 +29700,7 @@
           sha256 = "1l76r8hzhaapx76f6spm5jmjbrrm5zf79cpd5024xw3hpj1jbkjp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hippie-expand-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hippie-expand-slime";
           sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
           name = "hippie-expand-slime";
         };
@@ -29553,7 +29721,7 @@
           sha256 = "0b5wrid428s11afc48d6mdifmd31gmzyrj9zcpd3jwk63ydiihdc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hippie-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hippie-namespace";
           sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
           name = "hippie-namespace";
         };
@@ -29574,7 +29742,7 @@
           sha256 = "17dcpwx2y464g8qi3ixlsf3la8dn0bkxax296bhfg4vh73dxccl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hipster-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hipster-theme";
           sha256 = "1xrgpqlzp4lhh5h3sv7pg1nqzc9wcv1hs6ybv2h4x6jangicwfl2";
           name = "hipster-theme";
         };
@@ -29595,7 +29763,7 @@
           sha256 = "1dmrg39g0faqqkgrpcbybjbb91vcpkwawxsplckkj92y59zanq3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/history";
           sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
           name = "history";
         };
@@ -29616,7 +29784,7 @@
           sha256 = "1y275fchhx0n6dv038hsr44a3bjghqdhc8j1dcpm2rvs8chgm8g0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/historyf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/historyf";
           sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
           name = "historyf";
         };
@@ -29637,7 +29805,7 @@
           sha256 = "097lrj9lgfa7szww324hlqywwkbi31n1pxfqyg0zbfj45djkp9bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hive";
           sha256 = "1marz8gmk824hb0nkhaw48d4qw1xjk1aad27gviya7f5ilypxrya";
           name = "hive";
         };
@@ -29658,7 +29826,7 @@
           sha256 = "177blksgncxpxd1zi9kmbcfjnpd3ll1szjxiyc4am8a6hs1dyyqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hiwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hiwin";
           sha256 = "0klhxwxsz7xan2vsknw79r1dj4qhhjbfpddr67mk9qzccp8q0w8g";
           name = "hiwin";
         };
@@ -29679,7 +29847,7 @@
           sha256 = "10ps1rb5fqwaw4lz3nz2rbsry4y81asmi5557g229h8xjhp6gpnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hl-anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hl-anything";
           sha256 = "0czpc82j5hbzprc66aall72lqnk38dxgpzx4rs8sbx95cag12dxa";
           name = "hl-anything";
         };
@@ -29697,7 +29865,7 @@
           sha256 = "170sz6hjd85cw1x0y2g81ks3x3niib4f7y2xz6k8x0dpw357ggv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hl-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hl-defined";
           sha256 = "1y7vbhvpwxz70kja5hfm4i57mdd1cv43m4y9fr978y3nk265p8xx";
           name = "hl-defined";
         };
@@ -29718,7 +29886,7 @@
           sha256 = "17apqs7yqd89mv5283kmwp7byaaimj7j0vis0z1d89jlmp8i6zbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hl-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hl-indent";
           sha256 = "1z42kcwcyinjay65mv042ijh4xfaaiyri368g0sjw0fflsg0ikcr";
           name = "hl-indent";
         };
@@ -29736,7 +29904,7 @@
           sha256 = "1kxq79pfs83gp12p2g093m6shsf25q88mi29bvhapxx77ahmxpkn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hl-line+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hl-line+";
           sha256 = "13yv2nmx1wb80z4yifnh6d67rag17wirmp7z8ssq3havjl8lbpix";
           name = "hl-line-plus";
         };
@@ -29757,7 +29925,7 @@
           sha256 = "0pjfbm8p077frk475bx8xkygn8r4vdsvnx4rcqbjlpjawj0ndgxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hl-sentence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hl-sentence";
           sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
           name = "hl-sentence";
         };
@@ -29778,7 +29946,7 @@
           sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hl-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hl-sexp";
           sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
           name = "hl-sexp";
         };
@@ -29796,7 +29964,7 @@
           sha256 = "0m84d1rdsp9r5ip79jlrp69pf1daw0ch8c378q3kc328606i3p2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hl-spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hl-spotlight";
           sha256 = "1166g27fp2pj4j3a8904pzvp5idlq4l22i0w6lbk5c9zh5pqyyf3";
           name = "hl-spotlight";
         };
@@ -29809,15 +29977,15 @@
     hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hl-todo";
-        version = "20160521.1629";
+        version = "20160606.1615";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "hl-todo";
-          rev = "954ab8390b627499248986a608aacfaa6ddae4e0";
-          sha256 = "0rvkkzbcf36jbnk8adn39gmv0c8m0a189q9s235nasmbry8pjqmg";
+          rev = "dff381a5b2c9235bbdbe32123751ecdf17df7432";
+          sha256 = "0r2xyljcvhh547mkx7h9diajc21l6lpwjwpklc3h7491zazv3s6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hl-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
           name = "hl-todo";
         };
@@ -29838,7 +30006,7 @@
           sha256 = "02mkfrs55d32948x739f94v35343gw6a0f7fknbcigbz56mzsvsp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hlint-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hlint-refactor";
           sha256 = "1311z6y7ycwx0mj67bya7a39j5hiypg72y6yg93dhgpk23wk7frq";
           name = "hlint-refactor";
         };
@@ -29859,7 +30027,7 @@
           sha256 = "1yfq55gzg6p17qbd9xf0g9cza5bzkvl47rkjq19mf6kjxk0ihkh7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hlinum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hlinum";
           sha256 = "04b6m0njr7yrbcbpkhqz4hmqpfacmyca3lw75dyw3vpjpsj2g0iv";
           name = "hlinum";
         };
@@ -29876,10 +30044,10 @@
         src = fetchgit {
           url = "https://gitlab.lrde.epita.fr/spot/emacs-modes.git";
           rev = "3c608e15b655d2375c5f81323ac561c7848dc029";
-          sha256 = "1s3wgsgl1min2zbfr6wacb7wnff95r8kgmfzlma8b02440cmch5z";
+          sha256 = "19360wx1i7lkr8igddm7zl9yh5hlm3r013rkd512cs18iz1y753x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hoa-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hoa-mode";
           sha256 = "06rfqn7sqvmgpvwhfmk17qqs4q0frfzhm597z3p1q7kys2035kiv";
           name = "hoa-mode";
         };
@@ -29900,7 +30068,7 @@
           sha256 = "0g2r4d0ivbadqw1k8jsv0jwv8krpfahsg0qmzyi909p2yfddqk1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hoa-pp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hoa-pp-mode";
           sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
           name = "hoa-pp-mode";
         };
@@ -29921,7 +30089,7 @@
           sha256 = "0yh9v5zng1j2kfjjadfkdds67jws79q52kvl2mx9s8mq28263idm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/homebrew-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/homebrew-mode";
           sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
           name = "homebrew-mode";
         };
@@ -29942,7 +30110,7 @@
           sha256 = "1d3dlkrv95xrpv4rv3jgn58mxs71f6vi2lr88bddhxz702vb11d8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hookify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hookify";
           sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
           name = "hookify";
         };
@@ -29963,7 +30131,7 @@
           sha256 = "1gm5nczq5lsxqkfb38ajffg65zwxkfqvqhk33bwnnd00rpa1ix6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hound";
           sha256 = "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v";
           name = "hound";
         };
@@ -29984,7 +30152,7 @@
           sha256 = "0vygbdjy2dv7n50vrkcnqyswq48sgas0zzjfsac8x5g9vhxjkawj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/how-many-lines-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/how-many-lines-in-project";
           sha256 = "1dfh1ydpjbrawqpsj6kydvy8sz3rlwn4ma5cizfw5spd2gcmj1zb";
           name = "how-many-lines-in-project";
         };
@@ -30005,7 +30173,7 @@
           sha256 = "01sj9c8mxqaif8wh6zz9v2czjaq7vcdi66drldyjmifkln6rg2v8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/howdoi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/howdoi";
           sha256 = "12vgbypawxhhrnjp8dgh0wrcp7pvjccfaxw4yhq7msai7ik3h83b";
           name = "howdoi";
         };
@@ -30022,10 +30190,10 @@
         src = fetchgit {
           url = "git://git.osdn.jp/gitroot/howm/howm.git";
           rev = "6d6b4ca60e5c164a3e284ba82156b8ae33e83b7a";
-          sha256 = "0q9rjy8i263d6fcyj0s1l95s7vajf15i2fkbkbmhh4rp63nd04g3";
+          sha256 = "1ib97y2vm8whd2rqb8kgh0fk54mk3qjmij05bzmz4njz0k9crwgd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/howm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/howm";
           sha256 = "007r8mjn7m7m1mvsb1gaiqbizlwykh23k72g48nwan8bw556gfcr";
           name = "howm";
         };
@@ -30046,7 +30214,7 @@
           sha256 = "17x5w5kzam8cgaphyasnqzm2yhc0hwm38azvmin7ra4h912vlisd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ht";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ht";
           sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
           name = "ht";
         };
@@ -30067,7 +30235,7 @@
           sha256 = "10lbxf56gvy26grzrhhx2p710fzs0h866jd2zmmgkisvyb0vaiay";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/html-check-frag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/html-check-frag";
           sha256 = "0drancb9ryifiln44b40l6cal0c7nyp597a6q26288s3v909yk2a";
           name = "html-check-frag";
         };
@@ -30088,7 +30256,7 @@
           sha256 = "0k9ga0qi6h33akip2vrpclfp4zljnbw5ax40lxyxc1813hwkdrmh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/html-script-src";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/html-script-src";
           sha256 = "0pdyc2a9wxxc9rivjm2kgh4ysdxmdp73wg37nfy2nzka1m7qni7j";
           name = "html-script-src";
         };
@@ -30109,7 +30277,7 @@
           sha256 = "09n3zm9ivln8ng80fv5vwwzh9mj355ni685axda3m85xfxgai8gi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/html-to-markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/html-to-markdown";
           sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
           name = "html-to-markdown";
         };
@@ -30125,10 +30293,10 @@
         src = fetchgit {
           url = "http://fly.srk.fer.hr/~hniksic/emacs/htmlize.git";
           rev = "aa6e2f6dba6fdfa200c7c55efe29ff63380eac8f";
-          sha256 = "0lc2j0zifjwzab2khwmd769i5497ddx28rb96y6zv2k261xziyla";
+          sha256 = "1vkqxgirc82vc44g7xhhr041arf93yirjin3h144kjyfkgkplnkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/htmlize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/htmlize";
           sha256 = "15pym76iwqb1dqkbmkgc1yar450g2xinfl89fyss2ifyi4am1nxp";
           name = "htmlize";
         };
@@ -30149,7 +30317,7 @@
           sha256 = "09cq2s496p99c4n9y6awqs65w445if0zjxps2dcyn5s308h7gm9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/http";
           sha256 = "1176jhm8m7s1pzp0zv1sqawcgn4m5zvxghypmsrjyyb5p7m6dalm";
           name = "http";
         };
@@ -30167,7 +30335,7 @@
           sha256 = "1wp2rwc1hgd5c3yr6b96yzzakd1qmy5d95mhc6q4f6lx279nx0my";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/http-post-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/http-post-simple";
           sha256 = "1b2fh0hp5z3712ncgc5ns1f3sww84khkq7zb3k9xclsp1p12a4cf";
           name = "http-post-simple";
         };
@@ -30188,7 +30356,7 @@
           sha256 = "008iq5fhsw4qklw2l457a1cfqq8diadpnf1c1di5p07sc0za5562";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/http-twiddle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/http-twiddle";
           sha256 = "153qavpcwvk2g15w5a814xjsnsv54xksx4iz6yjffvvzq14a08ry";
           name = "http-twiddle";
         };
@@ -30209,7 +30377,7 @@
           sha256 = "02jz8qwxl69zhwvpmlqc15znr8x4f30paqszmm7xrrrz5x1c1rn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/httpcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/httpcode";
           sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
           name = "httpcode";
         };
@@ -30230,7 +30398,7 @@
           sha256 = "0wd4wmy99mx677x4sdbp57bxxll1fsnnf8hk97r85xdmmjsmrkld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/httprepl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/httprepl";
           sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
           name = "httprepl";
         };
@@ -30251,7 +30419,7 @@
           sha256 = "1vy521ljn16a1lcmpj09mr9y0m15lfjhl6xk04sb7nisps3vljyl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hungry-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hungry-delete";
           sha256 = "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz";
           name = "hungry-delete";
         };
@@ -30272,7 +30440,7 @@
           sha256 = "0wn83n1780bvrzx9p870wln51n9rfdghsxl79dp968dxycyhyxvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hy-mode";
           sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m";
           name = "hy-mode";
         };
@@ -30293,7 +30461,7 @@
           sha256 = "0k7r5zddlfipnf6za467lmjx8s6h68dflj7gk05vqr4n4xniwgja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hyai";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hyai";
           sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
           name = "hyai";
         };
@@ -30314,7 +30482,7 @@
           sha256 = "11vgz64f8vs8vqp4scj9qvrfdshag7bs615ly9zvzzlk68jivdya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hydandata-light-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hydandata-light-theme";
           sha256 = "0jw43m91m10ifqg335y6d52r6ri77hcmxkird8wsyrpsnk3cfb60";
           name = "hydandata-light-theme";
         };
@@ -30335,7 +30503,7 @@
           sha256 = "14sk9gai7sscvwgbl7y3dzz8fdhrqynilscmdimlncpm15w56m6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hyde";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hyde";
           sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
           name = "hyde";
         };
@@ -30356,7 +30524,7 @@
           sha256 = "05d4h87hshfgr8wnfmdypr4a93sglk3a8z1nfvswlag8cgnvyz63";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hydra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hydra";
           sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
           name = "hydra";
         };
@@ -30377,7 +30545,7 @@
           sha256 = "17k41rah17l9kf7bvlm83x71nzz4aizgn7254cl5sb59mdhcm8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/i2b2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/i2b2-mode";
           sha256 = "172qnprmfliic3rszzg3g7q015i3dchd23skrbdikg0kxj5c57lf";
           name = "i2b2-mode";
         };
@@ -30398,7 +30566,7 @@
           sha256 = "1gl21li9vqfjvls4ffjw8a4bicas2c7hmaa621k3hpllgpy6qdg5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/iasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/iasm-mode";
           sha256 = "09xh41ayaha07fi5crk3c6pn17gwm3samsf6h71ldkywvz74kipv";
           name = "iasm-mode";
         };
@@ -30419,7 +30587,7 @@
           sha256 = "1s5qvlf310b0z7q9k1xhcf4qmyfqd37jpqd67ciahaxk7cp224rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ibuffer-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ibuffer-git";
           sha256 = "048888y07bzmi9x5i43fg6bgqbzdqi3nfjfnn6zr29jvlx366r5z";
           name = "ibuffer-git";
         };
@@ -30440,7 +30608,7 @@
           sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ibuffer-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ibuffer-projectile";
           sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
           name = "ibuffer-projectile";
         };
@@ -30461,7 +30629,7 @@
           sha256 = "15lapyj7qkkw1i1g1aizappm7gxkfnxhvd4fq66lghkzb76clz2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ibuffer-rcirc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ibuffer-rcirc";
           sha256 = "1y6pyc6g8j42hs103yynjsdkkxvcq0q4xsz4r93rqwsr3za3wcmc";
           name = "ibuffer-rcirc";
         };
@@ -30482,7 +30650,7 @@
           sha256 = "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ibuffer-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ibuffer-tramp";
           sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32";
           name = "ibuffer-tramp";
         };
@@ -30503,7 +30671,7 @@
           sha256 = "0fwxhkx5rkyv3w5vs2swhmly9siahlww2ipsmk7v8xmvk4a63bhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ibuffer-vc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ibuffer-vc";
           sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
           name = "ibuffer-vc";
         };
@@ -30515,13 +30683,13 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20160530.146";
+        version = "20160610.2348";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el";
           sha256 = "1ppximw1j433hfp63apnsz9wgq1nj1lh5cd0zfchrkmgfyhymq7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/icicles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/icicles";
           sha256 = "15h2511gm38q14avsd86j5mnxhsjvcdmwbnhj66ashj5p5nxhr92";
           name = "icicles";
         };
@@ -30539,7 +30707,7 @@
           sha256 = "0z7v4pj0m6pwrjzyzz2xmwf6a53kmka9hxlzd1dxcpzx47pyvz3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/icomplete+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/icomplete+";
           sha256 = "0gxqkj4bjrxb046qisfz22wvanxx6bzl4hfv91rfwm78q3484slx";
           name = "icomplete-plus";
         };
@@ -30560,7 +30728,7 @@
           sha256 = "0xd0zhbabb9cx4rsapvq6qs40w4q2cav6p16vrka54rmr98544vl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/id-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/id-manager";
           sha256 = "13g5fi06hvx0x2wn1d1d8rkfq5n6wbk9g5bhx2b5sar2yw0akmwm";
           name = "id-manager";
         };
@@ -30581,7 +30749,7 @@
           sha256 = "1hknhbm3b5rsba2s84iwspylhzjsm91zdckz22j9gyrq37wjgyrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/idea-darkula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/idea-darkula-theme";
           sha256 = "0lanhwlhd7pbzjc047vd5sgsmi2bx66gr3inr8y57swgrfw3l8sk";
           name = "idea-darkula-theme";
         };
@@ -30602,7 +30770,7 @@
           sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/identica-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/identica-mode";
           sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
           name = "identica-mode";
         };
@@ -30623,7 +30791,7 @@
           sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/idle-highlight-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/idle-highlight-mode";
           sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
           name = "idle-highlight-mode";
         };
@@ -30644,7 +30812,7 @@
           sha256 = "0f8rxvc3dk2hi4x524l18fx73xrxy0qqwbybdma4ca67ck9n6xam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/idle-require";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/idle-require";
           sha256 = "1lr330bqj4rfh2jgn3562sliani4yw5y4j2hr6cq9cfjjp18qgsj";
           name = "idle-require";
         };
@@ -30665,7 +30833,7 @@
           sha256 = "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-at-point";
           sha256 = "0jpgq2iiwgqifwdhwhqv0cd3lp846pdqar6rxqgw9fvvb8bijqm0";
           name = "ido-at-point";
         };
@@ -30686,7 +30854,7 @@
           sha256 = "14nmldahr0pj2x4vkzpnpx0bsxafmiihgjylk5j5linqvy8q6wk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-clever-match";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-clever-match";
           sha256 = "081i6cjvqyfpgj0nvzc94zrl2v3l6nv6mhfda4zf7c8qqbvx1m8m";
           name = "ido-clever-match";
         };
@@ -30707,7 +30875,7 @@
           sha256 = "1aih8n10lcrw0bdgvlrkxzhkpxpmphw07cvbp6zd27ia25037fzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-complete-space-or-hyphen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-complete-space-or-hyphen";
           sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
           name = "ido-complete-space-or-hyphen";
         };
@@ -30728,7 +30896,7 @@
           sha256 = "13mcpc8qlv0mvabd33cah1zqybfa0hrzanp16ikbsc449zyz3889";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-completing-read+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-completing-read+";
           sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
           name = "ido-completing-read-plus";
         };
@@ -30749,7 +30917,7 @@
           sha256 = "0055dda1la7yah33xsi19j4hcdmqp17ily2dvkipm4y6d3ww8yqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-describe-bindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-describe-bindings";
           sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
           name = "ido-describe-bindings";
         };
@@ -30770,7 +30938,7 @@
           sha256 = "1s93q47cadanynvm1y4y08s68yq0l8q8vfasdk7w39vrjsxxsj3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-exit-target";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-exit-target";
           sha256 = "17vmg47xwk6yjlbcsswirl8s2q565k291ajzjglnz7qg2fwx6spi";
           name = "ido-exit-target";
         };
@@ -30791,7 +30959,7 @@
           sha256 = "0ifdwd5vnjv2iyb5bnz8pij35lc0ymmyx8j8zhpkbgjigz8f05ip";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-gnus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-gnus";
           sha256 = "14ijb8q4s846984h102h72ij713v5bj3k2vfdvr94gw1f0iya2yg";
           name = "ido-gnus";
         };
@@ -30812,7 +30980,7 @@
           sha256 = "1ip8g0r0aimhc4a1f06m711zmbs0krxn8hmayk99gk5kkz12igkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-grid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-grid-mode";
           sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
           name = "ido-grid-mode";
         };
@@ -30833,7 +31001,7 @@
           sha256 = "01p4az128k1jvd9i1gshgg87z6048cw9cnm57l8qdlw01c3h6dkx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-hacks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-hacks";
           sha256 = "05f9pdkqppnp7wafka2d2yj84gqchjd7vnrl5rcywy1l47gbxiw0";
           name = "ido-hacks";
         };
@@ -30854,7 +31022,7 @@
           sha256 = "0l69sr3g1n2x61j6sv6hnbiyk8a2qra6y2kh413qp0sfpx4fzchv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-load-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-load-library";
           sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
           name = "ido-load-library";
         };
@@ -30875,7 +31043,7 @@
           sha256 = "15iajhrgy989pn91ijcd1mq2015bkaacaplm79rmb0ggxhh8vq38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-migemo";
           sha256 = "02hbwchwx2bcwdxz7gz555699l7n9wisfikax1j6idn167n4wdpi";
           name = "ido-migemo";
         };
@@ -30896,7 +31064,7 @@
           sha256 = "0zlkq29wxd3a4vg0w6ds2jad5h1pja7ccd3l6ppl0kz1b1517qlr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-occasional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-occasional";
           sha256 = "1vdh5i9qznzd9r148a6jw9v47swf7ykwyciqfzc3ismv5q909bl2";
           name = "ido-occasional";
         };
@@ -30917,7 +31085,7 @@
           sha256 = "0i1mcpg69rkfjpis7l1106gfqlvf1z48f5j5jkjc9xqcdr5zm09c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-occur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-occur";
           sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
           name = "ido-occur";
         };
@@ -30938,7 +31106,7 @@
           sha256 = "0qvf3h2ljlbf3z36dhywzza62mfi6mqbrfc0sqfsbyia9bn1df4f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-select-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-select-window";
           sha256 = "03xqfpnagy2sk67yq7n7s6ma3im37d558zzx8sdzd9pbfxy9ij23";
           name = "ido-select-window";
         };
@@ -30959,7 +31127,7 @@
           sha256 = "149cznbybwj0gkjyvpnh4kn258kxw449m7cn95n9jbh1r45vljvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-skk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-skk";
           sha256 = "1fyzjkw9xp126bzfv1254bvyakh323iw3wdzrkd9gb4ir39k5jzw";
           name = "ido-skk";
         };
@@ -30980,7 +31148,7 @@
           sha256 = "0w3cr2yf8644i0g8w6r147vi9wanibn41sg7dzws51yb9q0y92vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-sort-mtime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-sort-mtime";
           sha256 = "1dkny9y3x49dv1vjwz78x2qhb6kdq3fa8qh1xkm30jyapvgiwdg2";
           name = "ido-sort-mtime";
         };
@@ -31001,7 +31169,7 @@
           sha256 = "0p13q8xax2h3m6rddvmh1p9biw3d1shvwwmqfhg0c93xajlwdfqi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-springboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-springboard";
           sha256 = "04jqnag8jiyfbwvc3vd9ikrsmf6cajld7dz2gz9y0zkj1k4gs7zv";
           name = "ido-springboard";
         };
@@ -31022,7 +31190,7 @@
           sha256 = "13mcpc8qlv0mvabd33cah1zqybfa0hrzanp16ikbsc449zyz3889";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-ubiquitous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-ubiquitous";
           sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
           name = "ido-ubiquitous";
         };
@@ -31043,7 +31211,7 @@
           sha256 = "1h0kwsrg0xaqmk37hij2ssi9vcvxq49bdc4s3amwc45x1i369q7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-vertical-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-vertical-mode";
           sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
           name = "ido-vertical-mode";
         };
@@ -31064,7 +31232,7 @@
           sha256 = "046ns1nqisz830f6xwlly1qgmi4v2ikw6vmj0f93jprv4vkjylpq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-yes-or-no";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-yes-or-no";
           sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
           name = "ido-yes-or-no";
         };
@@ -31085,7 +31253,7 @@
           sha256 = "1vx2g1xgxpcabr49mkl6ggzrpa3k2zhm479j6262vb64swzx33jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/idomenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/idomenu";
           sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
           name = "idomenu";
         };
@@ -31106,7 +31274,7 @@
           sha256 = "0ngqsh0ncwcr377ifvnx5j352bf1f7lhcq7qc8avcn5pwlshri4w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/idris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/idris-mode";
           sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
           name = "idris-mode";
         };
@@ -31127,7 +31295,7 @@
           sha256 = "18dca47ds5fiihijd1vv7nif44n4b4nv4za2djjfqbhbvizra1fd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ids-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ids-edit";
           sha256 = "0jzmcynr6lvsr36nblqzrjwxawyqcdz972zsv4rqkihdydpqfz7m";
           name = "ids-edit";
         };
@@ -31140,15 +31308,15 @@
     iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "iedit";
-        version = "20160530.355";
+        version = "20160612.800";
         src = fetchFromGitHub {
           owner = "victorhge";
           repo = "iedit";
-          rev = "c742ae4fa61b647cd2bce724af50f4aa80d33ff1";
-          sha256 = "02n1lmjjabqbdhq94x6xmgh2063rrh6q4k4fxc3r6dvdidx246yc";
+          rev = "607e82c7b0e95416f0554210d474bbef97b6262b";
+          sha256 = "0rpxypbk4nlw4cxzfj1zv2kn2hhi0nj6lk84jgd884lvkfw5ba2s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/iedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/iedit";
           sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
           name = "iedit";
         };
@@ -31169,7 +31337,7 @@
           sha256 = "0b86x675g95yrlc0alffx0z9fmficlwv3gpy5cy86z1xvvyh3nzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ietf-docs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ietf-docs";
           sha256 = "0wnk36z9g7lksmynd04hb2m6rx45wpxnxj1lhrlpjnzsrknhf4k3";
           name = "ietf-docs";
         };
@@ -31190,7 +31358,7 @@
           sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/iflipb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/iflipb";
           sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
           name = "iflipb";
         };
@@ -31211,7 +31379,7 @@
           sha256 = "1b4r4h8yrs8zkyr1hnnx2wjrmm39wbqxfhyxpjb5pxi4zk3fh4rj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ignoramus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ignoramus";
           sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
           name = "ignoramus";
         };
@@ -31229,7 +31397,7 @@
           sha256 = "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/igrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/igrep";
           sha256 = "1vyhrziy29q6w8w9vvanb7d29r1n7nfkznbcd62il991n48d08i3";
           name = "igrep";
         };
@@ -31248,7 +31416,7 @@
           sha256 = "11pss3hfxkfkyi273zfajdj43shdl6pn739zfv9jbm75v7m9bz6f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/igv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/igv";
           sha256 = "01igm3cb0lncmcyy72mjf93byh42k2hvscqhg8r7iljbxm58460z";
           name = "igv";
         };
@@ -31269,7 +31437,7 @@
           sha256 = "068z3ygq9p139ikm04xqhhqhc994an5isba5c7kpqs009y09xw3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/image-archive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/image-archive";
           sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
           name = "image-archive";
         };
@@ -31290,7 +31458,7 @@
           sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/image-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/image-dired+";
           sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
           name = "image-dired-plus";
         };
@@ -31311,7 +31479,7 @@
           sha256 = "0v66wk9nh0raih4jhrzmmyi5lbysjnmbv791vm2230ffi2hmwxnd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/image+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/image+";
           sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
           name = "image-plus";
         };
@@ -31332,7 +31500,7 @@
           sha256 = "0f3xdqhq9nprvl8bnmgrx20h08ddkfak0is29bsqwckkfgn7pmqp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/imakado";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/imakado";
           sha256 = "18mj0vpv3dybfpa8hl9jwlagsivbhgqgz8lwb8cswsq9hwv3jgd3";
           name = "imakado";
         };
@@ -31353,7 +31521,7 @@
           sha256 = "15lflvpapm5749qq7jzdwbd0isb89i6df3np4wn9y9gjl7y92wk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/imapfilter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/imapfilter";
           sha256 = "0i893kqj6yzadhza800r6ri7fihl01r57z8yrzzh3d09qaias5vz";
           name = "imapfilter";
         };
@@ -31374,7 +31542,7 @@
           sha256 = "0md20p0pkk7s9fnh4a6j808iri79lq70sq30hcy97pjrafrqfkky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/imenu-anywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/imenu-anywhere";
           sha256 = "1ylqzdnd3nzcpyyd6rh6i5q9mvf8c99rvpk51fzfm3yq2kyw4dbq";
           name = "imenu-anywhere";
         };
@@ -31395,7 +31563,7 @@
           sha256 = "1j0p0zkk89lg5xk5qzdnj9nxxiaxhff2y9iv9lw456kvb3lsyvjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/imenu-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/imenu-list";
           sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
           name = "imenu-list";
         };
@@ -31413,7 +31581,7 @@
           sha256 = "00w88d37mg2hdrzpw5cxrgqz5jbf7rylmir95hs8j1cm8fk787bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/imenu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/imenu+";
           sha256 = "1v2h3xs5pnv7z5qphkn2y5pa1p8pivrknkw7xihm5yr4a4dqjv5d";
           name = "imenu-plus";
         };
@@ -31434,7 +31602,7 @@
           sha256 = "1y57xp0w0c6hg3gn4f1l3612a18li4gwhfa4dy18fy94gr54ycpx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/imenus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/imenus";
           sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
           name = "imenus";
         };
@@ -31455,7 +31623,7 @@
           sha256 = "1q53r3f3x0hpzryxd1v1w3qgs54p384q0azi7xj2gppi1q49sa42";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/imgix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/imgix";
           sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
           name = "imgix";
         };
@@ -31476,7 +31644,7 @@
           sha256 = "0nzgfj083im8lc62ifgsh1pmbw0j9wivimjgih7k6ny3jgw834rs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/imgur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/imgur";
           sha256 = "0hr2zz7nq65jig2036g5sa8q2lhb42jv40ijikcz8s4f5v3y14i7";
           name = "imgur";
         };
@@ -31496,7 +31664,7 @@
           sha256 = "1mx9f8pwnbrm6q9ngdyv64aqkw1izj83m0mf7zqlpww7yfhv1q9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/immortal-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/immortal-scratch";
           sha256 = "0rxhaqivvjij59hhv3mh4wwrc0bl0xv144j1i237xhlvhxk6nnn6";
           name = "immortal-scratch";
         };
@@ -31517,7 +31685,7 @@
           sha256 = "0rbamm9qvipgswxng8g1d7rbdbcj7sgwrccg7imcfapwwq7xhj4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/immutant-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/immutant-server";
           sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
           name = "immutant-server";
         };
@@ -31538,7 +31706,7 @@
           sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/impatient-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/impatient-mode";
           sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg";
           name = "impatient-mode";
         };
@@ -31559,7 +31727,7 @@
           sha256 = "1pv29qxiz9yqfp67fjj4mk8bqxs5y4qwcpx4kvznpfzdcwsza53j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/import-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/import-js";
           sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha";
           name = "import-js";
         };
@@ -31580,7 +31748,7 @@
           sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/import-popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/import-popwin";
           sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
           name = "import-popwin";
         };
@@ -31593,15 +31761,15 @@
     indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "indent-guide";
-        version = "20151119.1617";
+        version = "20160607.818";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "indent-guide";
-          rev = "0ef4813c538d5afba210681a8e81848b0927d421";
-          sha256 = "1p54w9dwkc76nvc4m0q9a0lh4bdxp4ad1wzscadayqy8qbrylf97";
+          rev = "feb207cb5610f351c7cdcf266e0c99117b2f786c";
+          sha256 = "0ykddzily3b6c6k7fvq274pqdjf3934n8p3nrmnsw6c93i1ndd4f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/indent-guide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/indent-guide";
           sha256 = "029fj9rr9vfmkysi6lzpwra92j6ppw675qpj3sinfq7fqqlicvp7";
           name = "indent-guide";
         };
@@ -31622,7 +31790,7 @@
           sha256 = "1zsw68zzvjjh93cldc0w83k67hzcgi226vz3d0nzqc9sczqk8civ";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/indicators";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/indicators";
           sha256 = "1rhmz8sfi2gnv72sbw6kgyzidk43mnp05wnscw9vjvz9v0vwirss";
           name = "indicators";
         };
@@ -31643,7 +31811,7 @@
           sha256 = "0kv0aj444i2rzksvcfz8sw0yyig3ca3m05agnhw9jzr01y05yl1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/indy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/indy";
           sha256 = "118n3n07h1vx576fdv6v5a94aa004q0gmy9hlsnrswpxa30ahnw7";
           name = "indy";
         };
@@ -31664,7 +31832,7 @@
           sha256 = "1632q7zbqqs5nvvxly3b2fj9b9q9mgxwh5sspamj7442s7i0j645";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inf-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inf-clojure";
           sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
           name = "inf-clojure";
         };
@@ -31685,7 +31853,7 @@
           sha256 = "14kf3zvms1w8cbixhpgw3m2xxc2r87i57gmx00jwh89282i6kgsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inf-mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inf-mongo";
           sha256 = "09hf3jmacsk4hl0rxk35cza8vjl0xfmv19dagb8h8fli97fb65hh";
           name = "inf-mongo";
         };
@@ -31706,7 +31874,7 @@
           sha256 = "1z5ns94xgj2dkv2sc2ckax6bzwdxsm19pkvni24ys2w7d5nhajzr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inf-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inf-php";
           sha256 = "011sc6f0ka7mmik8z0df8qk24mf6ygq22jy781f2ikhjh94gy83d";
           name = "inf-php";
         };
@@ -31727,7 +31895,7 @@
           sha256 = "12qjz6bp6p6yh5nxin6w7snil9954mhd4kfnk0wwbijpd1lqw73l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inf-ruby";
           sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
           name = "inf-ruby";
         };
@@ -31748,7 +31916,7 @@
           sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inflections";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
           name = "inflections";
         };
@@ -31766,7 +31934,7 @@
           sha256 = "068y1p44ynimxfrqgrrhrj4gldf661dr0kbc9p7dqm1mw928hxmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/info+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/info+";
           sha256 = "0flpmi8dsaalg14xd86xcr087j51899sm8ghsa150ag4g4acfggr";
           name = "info-plus";
         };
@@ -31787,7 +31955,7 @@
           sha256 = "19kc6a8jkx22rg9xp862pqfhv0an7q6fs7v7i2kxp3ji55aq001w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inform7-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inform7-mode";
           sha256 = "0fpnf9rgizsfz9pn06k87v4s0dr7z1pn0gdxfi6hnnv68qni8hg3";
           name = "inform7-mode";
         };
@@ -31808,7 +31976,7 @@
           sha256 = "03a655qzcwizv9hvfcp47466axsrq0h049fdd79xk6zmans5s6fj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/init-loader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/init-loader";
           sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
           name = "init-loader";
         };
@@ -31829,7 +31997,7 @@
           sha256 = "0vbqmz9kcdxwwsid1fclwakhcq268jhbwqc5hgpywp8w2b83mjs1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/init-open-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/init-open-recentf";
           sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
           name = "init-open-recentf";
         };
@@ -31850,7 +32018,7 @@
           sha256 = "1qvkxpxdv0n9qlzigvi25iw485824pgbpb10lwhh8bs2074dvrgq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/initsplit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/initsplit";
           sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
           name = "initsplit";
         };
@@ -31871,7 +32039,7 @@
           sha256 = "063v3a783si5fi8jrnysss60qma1c3whvyb48i10qbrrrx750cmv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inkpot-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inkpot-theme";
           sha256 = "0w4q74w769n88zb2q7x326cxji42278lf95wnpslgjybnaxycgw7";
           name = "inkpot-theme";
         };
@@ -31892,7 +32060,7 @@
           sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inline-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inline-crypt";
           sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
           name = "inline-crypt";
         };
@@ -31913,7 +32081,7 @@
           sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inlineR";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inlineR";
           sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
           name = "inlineR";
         };
@@ -31934,7 +32102,7 @@
           sha256 = "198pgj0xsfyp8s1kkjjp48w7j3i5cf6zsp46vdwiifj64yfmq7yi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/insert-shebang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/insert-shebang";
           sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
           name = "insert-shebang";
         };
@@ -31955,7 +32123,7 @@
           sha256 = "112s3c0ii8zjc6vlj2im2qd2pl3hb95pq4zibm86gjpw428wd8iy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/insfactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/insfactor";
           sha256 = "0c6q1d864qc78sqk9iadjpd01xc7myipgnf89pqa2z75yprndvyn";
           name = "insfactor";
         };
@@ -31975,7 +32143,7 @@
           sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/instapaper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/instapaper";
           sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
           name = "instapaper";
         };
@@ -31996,7 +32164,7 @@
           sha256 = "0mvhydb4lfm2kazmb7fab8zh7sd8l9casghn8wl42mqji3v7lfwh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/interaction-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/interaction-log";
           sha256 = "1r9qbvgssc2zdwgwmmwv5kapvmg1y3px7268gkiakkfanw3kqk6j";
           name = "interaction-log";
         };
@@ -32017,7 +32185,7 @@
           sha256 = "06x47lfpad24arc2zyvdcdg222pyndxsc66m376rgj23s7wlr5hd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/interleave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/interleave";
           sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
           name = "interleave";
         };
@@ -32030,15 +32198,15 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20160604.947";
+        version = "20160608.1339";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "0d5cd31556a24190860449426105f3466f22cb6c";
-          sha256 = "0wm6hk6plmvn31wkh58n7wnjpxibw6x2rj5npda5lckliaican8p";
+          rev = "a2f59694fbd08ba066930d49b8616325ea88b78e";
+          sha256 = "003zv7vsawywgq1myvzhlhlkq2bg43q6551c2g98wxv2rxfj4mhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/intero";
           sha256 = "15n7ipsq8ylmq4blsycpszkx034j9sb92vqvaz30j5v307fmvs99";
           name = "intero";
         };
@@ -32059,7 +32227,7 @@
           sha256 = "1zv6m24ryls9hvla3hf8wzp6r7fzbxa1lzr1mb0wz0s292l38wjz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/interval-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/interval-list";
           sha256 = "0926z3lxkmpxalpq7hj355cjzbgpdiw7z4s8xdrpa1pi818d35zf";
           name = "interval-list";
         };
@@ -32080,7 +32248,7 @@
           sha256 = "0fqnn9xhrc9hkaiziafjgg288l6m05416z9kz8l5845fnqsb7pb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/interval-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/interval-tree";
           sha256 = "13zynac3h50x68f1ja72kqdrapjks2zmgqd4g7qwscq92mmh60i9";
           name = "interval-tree";
         };
@@ -32101,7 +32269,7 @@
           sha256 = "10xpxmbzhmi0lmby2rpmxrbr3qf1vlbif2inmfsvkj85wyh8a7rp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/io-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/io-mode";
           sha256 = "1fpiml7lvbl4s2xw4wk2y10iifvfza24kd9j8qvi1bgd85qkx42q";
           name = "io-mode";
         };
@@ -32122,7 +32290,7 @@
           sha256 = "1ard88kc13c57y9zdkyr012w8rdrwahz8a3fb5v6hwqymg16m20s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/io-mode-inf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/io-mode-inf";
           sha256 = "0hwhvf1qwkmzzlzdda1flw6p1jjh9rzxsfwm2sc4795ac2xm6dhc";
           name = "io-mode-inf";
         };
@@ -32143,7 +32311,7 @@
           sha256 = "1rz5wf19lg1lnm0h73ynhb0vl3c99k7vpipay2f8jls24pv60bra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ioccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ioccur";
           sha256 = "1a9iy6x4lkm4wgkcb0pv86c2kvpq8ymrc4ssp109r67kwqw7lrr6";
           name = "ioccur";
         };
@@ -32164,7 +32332,7 @@
           sha256 = "14zfxa8fc7h4rkz1hyplwf4q2lga3l5dd7a2xq5kk0kvf2fs4mk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/iodine-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/iodine-theme";
           sha256 = "05mnq0bgcla0pxsgywpvcdgd4sk2xr7bjlp87l0dx8j121vqripj";
           name = "iodine-theme";
         };
@@ -32185,7 +32353,7 @@
           sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/iplayer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/iplayer";
           sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
           name = "iplayer";
         };
@@ -32206,7 +32374,7 @@
           sha256 = "0skyd9c7pz68v17aj3h47ralszbmc4gqg552q8jpimcjd1lacc7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ipretty";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ipretty";
           sha256 = "1zysip6cb8s4nzsxiwk052gq6higz2xnd376r9wxmgj7w8him2c4";
           name = "ipretty";
         };
@@ -32227,7 +32395,7 @@
           sha256 = "1cy9xwhswj9vahg8zr16r2crm2mm3vczqs73gc580iidasb1q1i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ir-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ir-black-theme";
           sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
           name = "ir-black-theme";
         };
@@ -32248,7 +32416,7 @@
           sha256 = "1ch610b3d0x3nxglp749305syliivamc108rgv9if4ihb67gp8b5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/iregister";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/iregister";
           sha256 = "0iq1nlj5czi4nblrszfv3grkl1fni7blh8bhcfccidms8v9r3mdm";
           name = "iregister";
         };
@@ -32266,7 +32434,7 @@
           sha256 = "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/irfc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/irfc";
           sha256 = "0186l6zk5l427vjvmjvi0xhwk8a4fjhsvw9kd0yw88q3ggpdl25i";
           name = "irfc";
         };
@@ -32279,15 +32447,15 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20160531.2118";
+        version = "20160611.1317";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "6636e2ef4816d0cfa8771259a68f7385d056000c";
-          sha256 = "0lchahb15j77maabav729ins3dxw7991zq4p8an1yx7dh86r32wp";
+          rev = "84f9c9f0644036c754ee4724d094aa4fa246e17f";
+          sha256 = "0n149zag7ja3rzm38ml7pjf95rzpi2d1halqh7jm53ffjrzj1jav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/irony";
           sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
           name = "irony";
         };
@@ -32308,7 +32476,7 @@
           sha256 = "01fjpfixfcca01a5fnnpd2wga4j30p0kwhbai25prvib4qcp1kqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/irony-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/irony-eldoc";
           sha256 = "03m0h13jd37vfvn4mavaq3vbzx4x0lklbs0mbc29zaz8pwqlcwz6";
           name = "irony-eldoc";
         };
@@ -32329,7 +32497,7 @@
           sha256 = "17d0816awadvsw1qc7r0p6ira75jmgxaj9hsk9ypayxsaf6ynyrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/isearch-dabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/isearch-dabbrev";
           sha256 = "1hl7zl5vjcsk3z452874g4nfcnmna8m2242dc9cgpl5jddzwqa7x";
           name = "isearch-dabbrev";
         };
@@ -32347,7 +32515,7 @@
           sha256 = "00m4kh2j4a2rqlagz4b5wdhnrk266whbncwkjbxx0rlxzvsi5skh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/isearch+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/isearch+";
           sha256 = "1rzlsf08nmc3p3vhpwbiy8cgnnl2c10xrnsr2rlpv0g2kxkrd69r";
           name = "isearch-plus";
         };
@@ -32365,7 +32533,7 @@
           sha256 = "1i1ypganr2ivwgi0vgjihgk1s4yglwj8nbqnqjiiwdywf8g5hcmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/isearch-prop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/isearch-prop";
           sha256 = "1z9y88b23m4ffil8p3wcq61q1fiyqjxphyd3wacs5fnc53mdzad9";
           name = "isearch-prop";
         };
@@ -32386,7 +32554,7 @@
           sha256 = "09z49850c32x0rchxg203cxg504xi2b6cjgnd0i4axcs5fmq7gv9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/isearch-symbol-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/isearch-symbol-at-point";
           sha256 = "0j5fr7qdvpd5b096h5a83fz8sh9wybdnsgix6v94gv8lkzdsqkr8";
           name = "isearch-symbol-at-point";
         };
@@ -32407,7 +32575,7 @@
           sha256 = "022j39r2vvppnh3p5rp9i4cgc3lg24ksjcmcjmbmna1vf624izn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/isend-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/isend-mode";
           sha256 = "0sk80a08ny9vqw94klqfgii297qm633000wlcldha76ip8viikdv";
           name = "isend-mode";
         };
@@ -32428,7 +32596,7 @@
           sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/isgd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/isgd";
           sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
           name = "isgd";
         };
@@ -32449,7 +32617,7 @@
           sha256 = "0992lzgar0kz9i1sk5vz17q9qzfgl8fkyxa1q0hmhgnpjf503cnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/iss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/iss-mode";
           sha256 = "1my4vi1x07hg0dva97i685lx6m6fcbfk16j1zy93zriyd7z5plkc";
           name = "iss-mode";
         };
@@ -32470,7 +32638,7 @@
           sha256 = "1az986mk8j8hyvr1mi9hirixwcd73jcqkjsw4xy34vjbwxi122r9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/itail";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/itail";
           sha256 = "0mcyly88a3c15hl3wll56agpdsyvd26r501h0v64lasfr4k634m7";
           name = "itail";
         };
@@ -32491,7 +32659,7 @@
           sha256 = "1174f75p3rkq812gl2rs1x51nqbz4fqxwsbrd7djh1vkd2zii3aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/itasca";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/itasca";
           sha256 = "01075ad0sb5q7aql6j5wmjdk2qhdgbbm5xb0ikrnl7rzc1afvv6j";
           name = "itasca";
         };
@@ -32512,7 +32680,7 @@
           sha256 = "006lw8zjxz0702wlrs0nb0ijwh5air3yc3cam7dbkyy7mh632vhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/iterator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/iterator";
           sha256 = "17q10fw6y0icsv6vv9n968bwmbjlihrpkkyw62d1kfxhs9yw659z";
           name = "iterator";
         };
@@ -32533,7 +32701,7 @@
           sha256 = "12nqpzcmz724wpk8p16lc3z26rxma3wp6pf6dvrsqagnlixrs9si";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ivariants";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ivariants";
           sha256 = "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw";
           name = "ivariants";
         };
@@ -32554,7 +32722,7 @@
           sha256 = "1926pyfsbr6j7cn3diq8ibs0db94rgsf0aifvbqrqp4grs85pkva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ivs-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ivs-edit";
           sha256 = "0gzhvzrfk17j2vwlg82f5ifk4dcfc1yv7barcij38ckran8cqmb2";
           name = "ivs-edit";
         };
@@ -32567,15 +32735,15 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20160603.1710";
+        version = "20160612.934";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "c960de51ce4e868daedb91e523ff6267a3113c3a";
-          sha256 = "0zlcfyw7wi5djg54bzxnyqnqsf5pa2c3v96bas76n08k9fazk9m8";
+          rev = "97cf30dc9cb5473a1d6b0ff67950be556eb3de31";
+          sha256 = "1yff395x7m4vdmw6qzb45dn3ksfxpmxcssmhm992zbbv33hygbjn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ivy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ivy";
           sha256 = "0xf5p91r2ljl93wbr5wbgnb4hzhs00wkaf4fmdlf31la8xwwp5ci";
           name = "ivy";
         };
@@ -32596,7 +32764,7 @@
           sha256 = "1zrs1gk95mna1kipgrq8mfhk0gqimvsb4b583f900fh86019nn1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ivy-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ivy-bibtex";
           sha256 = "0qni48s09lgzqr98r49dhrzpfqp9yfwga11h7vhqclscjvlalpc2";
           name = "ivy-bibtex";
         };
@@ -32609,15 +32777,15 @@
     ivy-erlang-complete = callPackage ({ dash, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20160603.821";
+        version = "20160608.1054";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "39bff0acdbf2de779879cca860973a86d192a864";
-          sha256 = "07qwa1rz1q1kvvhsbkr3jr3jfchg46av9nw9m2x6j19d8y5m8jxh";
+          rev = "c030286d66d84a85d7eb1c5337fef6353e50025b";
+          sha256 = "1kxyfma97mcrp0rbj511mbik05y3xr94p4p77d3df2dd1nk6v3y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ivy-erlang-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ivy-erlang-complete";
           sha256 = "10r1497jp0k4hasdmih1d7qv4w4435af5rib2wl6x4jx98s5vzvh";
           name = "ivy-erlang-complete";
         };
@@ -32638,7 +32806,7 @@
           sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ivy-gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ivy-gitlab";
           sha256 = "0gbwsmb6my0327f9j96s20mybnjaw9yaiwhs3sy3vav0qww91z1y";
           name = "ivy-gitlab";
         };
@@ -32655,11 +32823,11 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "c960de51ce4e868daedb91e523ff6267a3113c3a";
-          sha256 = "0zlcfyw7wi5djg54bzxnyqnqsf5pa2c3v96bas76n08k9fazk9m8";
+          rev = "97cf30dc9cb5473a1d6b0ff67950be556eb3de31";
+          sha256 = "1yff395x7m4vdmw6qzb45dn3ksfxpmxcssmhm992zbbv33hygbjn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ivy-hydra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ivy-hydra";
           sha256 = "1xv8nfi6dzhx868h44ydq4f5jmsa7rbqfa7jk8g0z0ifv477hrvx";
           name = "ivy-hydra";
         };
@@ -32680,7 +32848,7 @@
           sha256 = "069alh9vs6is3hvbwxbwr9g8qq9md5c92wg5bfswi99yciqdvc4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ix";
           sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
           name = "ix";
         };
@@ -32701,7 +32869,7 @@
           sha256 = "0bcm3y3qvsrk7gd23xfzz5bgcnm3h4l63w9hv8cr9n86sm8475m1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/iy-go-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/iy-go-to-char";
           sha256 = "10szn9y7gl8947p3f9w6p6vzjf1a9cjif9mbj3qdqx4vbsl9mqpz";
           name = "iy-go-to-char";
         };
@@ -32722,7 +32890,7 @@
           sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/j-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/j-mode";
           sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
           name = "j-mode";
         };
@@ -32739,10 +32907,10 @@
         src = fetchgit {
           url = "git://git.code.sf.net/p/emacs-jabber/git";
           rev = "98dc8e429ba6f79065f1c9fc3878d92314d4b510";
-          sha256 = "138mj06dd057nw617n5lanzg3q8y0iyq4c7cc3378a3sj4nmqkcr";
+          sha256 = "0v1w7hk0s0a971248chi4nzsppjwrhxsfjbvi4yklnylm2hm2y3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jabber";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jabber";
           sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
           name = "jabber";
         };
@@ -32763,7 +32931,7 @@
           sha256 = "0yv86nadp6dfzl05vhk8c1kahg2pcrhfmd3mnfjrngp7ksac5lyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jabber-otr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jabber-otr";
           sha256 = "114z5bwhkza03yvfa4nmicaih2jdq83lh6micxjimpddsc8fjgi0";
           name = "jabber-otr";
         };
@@ -32783,7 +32951,7 @@
           sha256 = "1a33z07m9rh42pbcjv7sd640gf6jjzs4yn6idx52g8i5vzns0dkh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jack-connect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jack-connect";
           sha256 = "1ssl126wihaf8m2f6ms0l5ai6pz5wn348a09k6l0h3jfww032g1q";
           name = "jack-connect";
         };
@@ -32804,7 +32972,7 @@
           sha256 = "0p6pfxbl98kkwa3lgx82h967w4p0wbd9s96gvs72d74ryan07ij1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jade-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jade-mode";
           sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
           name = "jade-mode";
         };
@@ -32825,7 +32993,7 @@
           sha256 = "1gnj8vmpxds2wdkz49swiby5vq2hvbf64q5hhvwymfdvwlk54v55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jammer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jammer";
           sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
           name = "jammer";
         };
@@ -32846,7 +33014,7 @@
           sha256 = "1mwm9wpnxqq3nw7fl0jf40a92ha51yd95vvr58zllhbxdpy3q9pv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/japanese-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/japanese-holidays";
           sha256 = "0pxpkikkn2ys0kgf3lbrdxv8iym50h5ik2xzza0qk7cw1v93jza9";
           name = "japanese-holidays";
         };
@@ -32867,7 +33035,7 @@
           sha256 = "1lrsm282lhp7pf0gwr3aad2228lvpqnqs1qdv2xk0zljqnqc0bhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/japanlaw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/japanlaw";
           sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
           name = "japanlaw";
         };
@@ -32888,7 +33056,7 @@
           sha256 = "0xmv7gw5xms6nhjcl51cw33yvjgw0c6bpnlyca3195x7g34sg1zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jape-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jape-mode";
           sha256 = "1gd685r86h0kr36msw81gfgwv7d35hihz6h0jkc6vd22wf6qc3ly";
           name = "jape-mode";
         };
@@ -32909,7 +33077,7 @@
           sha256 = "1p7w3hq2cyn1245q0zn8m7hpjs8nbp7kqfmd2gzi2k209czipy21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jar-manifest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jar-manifest-mode";
           sha256 = "0kx358m3p23r8m7z45454i62ijmdlf4mljlbqc20jkihfanr6wqd";
           name = "jar-manifest-mode";
         };
@@ -32930,7 +33098,7 @@
           sha256 = "1zcrxijcwqfs6r1cd6w4jq8g3ly0a69nf0cbx93w5v86x2kjpz0l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jasminejs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jasminejs-mode";
           sha256 = "1a70j3aglrwmaw9g8m99sxad2vs53y4swxh97gqjsgx1rrx03g52";
           name = "jasminejs-mode";
         };
@@ -32951,7 +33119,7 @@
           sha256 = "1bv0al89wlwdv3bhasxnwhsv84phgnixclgrh4l52385rjn8v53f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jaunte";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jaunte";
           sha256 = "0chqiai7fv1idga71gc5dw4rdv1rblg5rrbdijh3glyi8yfr4snf";
           name = "jaunte";
         };
@@ -32972,7 +33140,7 @@
           sha256 = "1wk9i43b147bjcvhq27vcqxi6y1yl6w3n4i2sw3krk4vxcm1mwnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/java-imports";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/java-imports";
           sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98";
           name = "java-imports";
         };
@@ -32993,7 +33161,7 @@
           sha256 = "0w67vjpazbrgd9j5xzsrj3m45iw6lyqkgxx1ap5afvgyn5hqhkih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/java-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/java-snippets";
           sha256 = "0bsmp6sc3khdadkmwqy8khz8kzqijcsv70gimm2cs1kwnbyj6pfp";
           name = "java-snippets";
         };
@@ -33014,7 +33182,7 @@
           sha256 = "16gywcma1s8kslwznlxwlx0xj0gs5g31637kb74vfdplk48f04zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/javadoc-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/javadoc-lookup";
           sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
           name = "javadoc-lookup";
         };
@@ -33035,7 +33203,7 @@
           sha256 = "070r4mg4v937n4h2bmzdbn3vsmmq7ijz69nankqs761jxv5gcwlg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/javap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/javap-mode";
           sha256 = "19p39l4nwgxm52yimy4j6l43845cpk8g5qdrldlwfxd7dvay09ay";
           name = "javap-mode";
         };
@@ -33056,7 +33224,7 @@
           sha256 = "1430xwd86fdlv1gzkdlp9a0x3w4blbplw24z0m7y8b0j9rhl4fka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jaword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jaword";
           sha256 = "05pzh99zfl8n3p6lxdd9abr52m24hqcb105458i1cy0ra840bf4d";
           name = "jaword";
         };
@@ -33077,7 +33245,7 @@
           sha256 = "0dikmd1w6jh152hvawgvzlpv87xqnf669a8x427rbshnbj2bly64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jazz-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jazz-theme";
           sha256 = "0ad8kvrmd3gyb8wfghcl4r3kwzplk5gxlw3p23wsbx6c2xq6xr7g";
           name = "jazz-theme";
         };
@@ -33098,7 +33266,7 @@
           sha256 = "1gns0y05kyxl2fcyiawgdx2hi0vslz97kvirbckg19id50cv9ac1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jbeans-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jbeans-theme";
           sha256 = "0y7ccycfnpykgzr88968w7dl45qazf8b9zlf7ydw3ghkl4f6lbwl";
           name = "jbeans-theme";
         };
@@ -33119,7 +33287,7 @@
           sha256 = "01dcxf47qlp089sf3b23kzaad7zrxzgcxf4s2awcj69ips8zkbik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jdee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jdee";
           sha256 = "1yn8vszj0hs2jwwd4x55f11hs2wrxjjvxpngsj7lkcwax04kkvq3";
           name = "jdee";
         };
@@ -33140,7 +33308,7 @@
           sha256 = "1xkzf7p3ws5s5i8aymz60c4vhifchj68595878nc3yrk5zzlhyjr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jedi";
           sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
           name = "jedi";
         };
@@ -33161,7 +33329,7 @@
           sha256 = "1xkzf7p3ws5s5i8aymz60c4vhifchj68595878nc3yrk5zzlhyjr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jedi-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jedi-core";
           sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
           name = "jedi-core";
         };
@@ -33182,7 +33350,7 @@
           sha256 = "1pgi5vnwz5agrpvy7nwg3gv2nfbbmimhk8dxkg81k6yf1iiqxcap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jedi-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jedi-direx";
           sha256 = "1y4n4c2imnm3f1q129bvbi4gzk0iazd8qq959gvq9j9fl1aziiz1";
           name = "jedi-direx";
         };
@@ -33203,7 +33371,7 @@
           sha256 = "0rx72rid7922mhw21j85kxmx0fhpkmkv9jvxmj9izy01xnjbk00c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jekyll-modes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jekyll-modes";
           sha256 = "1305f1yg1mamyw3bkzrk5q3q58ihs8f5k9vjknsww5xvrzz3r1si";
           name = "jekyll-modes";
         };
@@ -33224,7 +33392,7 @@
           sha256 = "08ywfmsjv3vjqy95hx095kasy8knh3asl7mrlkgmv9wjwnxw45zs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jenkins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jenkins";
           sha256 = "0ji42r7p3f3hh643839xf74gb231vr7anycr2xhkga8qy2vwa53s";
           name = "jenkins";
         };
@@ -33245,7 +33413,7 @@
           sha256 = "0jayhv8j7b527dimhvcs0d7ax25x7v50dk0k6apisqc23psvkq66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jenkins-watch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jenkins-watch";
           sha256 = "0brgjgbw804x0gf2vq01yv6bd0ilp3x9kvr1nnsqxb9c03ffmb2m";
           name = "jenkins-watch";
         };
@@ -33266,7 +33434,7 @@
           sha256 = "164wm83av3p2c9dkhpmqrb7plq9ngmnsa5aly3a1xam1cds22hp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jg-quicknav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jg-quicknav";
           sha256 = "1pxyv1nbnqb0s177kczy6b6q4l8d2r52xqhx2rdb0wxdmp6m5x9c";
           name = "jg-quicknav";
         };
@@ -33287,7 +33455,7 @@
           sha256 = "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jinja2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jinja2-mode";
           sha256 = "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx";
           name = "jinja2-mode";
         };
@@ -33305,7 +33473,7 @@
           sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jira";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jira";
           sha256 = "0cf5zgkxagvka5v6scgyxqx4mz1n7lxbynn3gl2a4s9s64jycsy6";
           name = "jira";
         };
@@ -33326,7 +33494,7 @@
           sha256 = "1ack7dmapva3wc2gm22prd5wd3cmq19sl4xl9f04a3nk2msr6ksx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jira-markup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jira-markup-mode";
           sha256 = "0f3sw41b4wl0aajq0ap66942rb2015d9iks0ss016jgzashw7zsp";
           name = "jira-markup-mode";
         };
@@ -33347,7 +33515,7 @@
           sha256 = "0mh7990zqrprsa1g9jzpqm666pynlqd2nh9z236zyzykf8d8il8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jist";
           sha256 = "11m9li1016cfkm4931h69d7g1dc59lwjl83wy3yipswdg3zlw0ar";
           name = "jist";
         };
@@ -33368,7 +33536,7 @@
           sha256 = "1idby2rjkslw85593qd4zy6an9zz71yzwqc6rck57r54xyfs8mij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jknav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jknav";
           sha256 = "0c0a8plqrlsw8lhmyj9c1lfkj2b48cjkbw9pna8qcizvwgym9089";
           name = "jknav";
         };
@@ -33389,7 +33557,7 @@
           sha256 = "1a0091r1xs3fpvg1wynh53xibdsiaf2khz1gp6s8dc45z8r0bclx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jonprl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jonprl-mode";
           sha256 = "0763ad65dmpl2l5lw91mlppfdvrjg6ym45brhi8sdwwri1xnyv9z";
           name = "jonprl-mode";
         };
@@ -33410,7 +33578,7 @@
           sha256 = "08wffbljnaxz2sh72vsqpq1lc47mnh4d47fl71dvw4pqs50zp8v0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jq-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jq-mode";
           sha256 = "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin";
           name = "jq-mode";
         };
@@ -33431,7 +33599,7 @@
           sha256 = "0gh2bgmsbi9lby89ssvl49kpz07jqrfnyg47g6b9xmf5rw42s1z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jquery-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jquery-doc";
           sha256 = "0pyg90izdrb9mvpbz9nx21mp8m3svqjnz1jr8i7wqgfjxsxdklxj";
           name = "jquery-doc";
         };
@@ -33452,7 +33620,7 @@
           sha256 = "1f1zad423q5adycbbh62094m622gl8ncwbr8vxad1a6zcga70cgi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/js-comint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
           name = "js-comint";
         };
@@ -33473,7 +33641,7 @@
           sha256 = "12kwjkhw5x6jb79m49gbypb6br482bpi73788h71lgl5i3g95s5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/js-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/js-doc";
           sha256 = "0nafqgb4kf8jgrb7ijfcvigq8kf043ki89h61izda4hccm3c42pk";
           name = "js-doc";
         };
@@ -33486,15 +33654,15 @@
     js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-closure";
-        version = "20160527.1800";
+        version = "20160605.1939";
         src = fetchFromGitHub {
           owner = "jart";
           repo = "js2-closure";
-          rev = "c0115ab7a4a5dca71e2c637727c97d1ed1db17ab";
-          sha256 = "0p4iqbjzja0lfgcjhqa4z2kld0j5l4n9rbqfyfpj5g4bb1l3lzy4";
+          rev = "37409e4ad1925e48b633c1d424caa2fe94eb9d49";
+          sha256 = "1yjgi0glh4fb4k7z5n216sbfzmxrxnnspmq2r5j6ag7b59qamyym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/js2-closure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/js2-closure";
           sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
           name = "js2-closure";
         };
@@ -33515,7 +33683,7 @@
           sha256 = "1gad5a18m3jfhnklsj0ka3p2wbihh1yvpcn7mwlmm7cjjxcaly9g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/js2-highlight-vars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/js2-highlight-vars";
           sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
           name = "js2-highlight-vars";
         };
@@ -33528,15 +33696,15 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20160529.206";
+        version = "20160611.206";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "bc46db59d4966ce98fecbf0d466bdc9e1d90d167";
-          sha256 = "0m5a4dqp7cy1322zv2ir27zpg16s7sd25z3j39338nq5hpfrqk0w";
+          rev = "bb0acf5972e8ff505cb37a38ea9edf11cb1bd741";
+          sha256 = "1y20jaannwygafnqywhh6jfzknlm75da07vpmvjshn7s60fhvbq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/js2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/js2-mode";
           sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
           name = "js2-mode";
         };
@@ -33557,7 +33725,7 @@
           sha256 = "0yzlcnana3ildshzmv60vfgfjkmxki42r7waxsmphjz2hcknbmfg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/js2-refactor";
           sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
           name = "js2-refactor";
         };
@@ -33578,7 +33746,7 @@
           sha256 = "18c0s3i21b77pi5y86zi7jg9pwxc0h5dzznjiyrig0jab0cksln5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/js3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/js3-mode";
           sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
           name = "js3-mode";
         };
@@ -33599,7 +33767,7 @@
           sha256 = "1bqsv2drhcs8ia7nxss33f80p2mhcl4mr1nalphzw6s1f4mq2sgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jscs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jscs";
           sha256 = "1yw251f6vpj2bikjw79arywprk8qnmmfcki99mvwnqhsqlv1a8iv";
           name = "jscs";
         };
@@ -33620,7 +33788,7 @@
           sha256 = "0h9gx5cl3lashk0n8pv9yzb0mm8dyziddfbwfqfm70638p93ylhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jsfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jsfmt";
           sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
           name = "jsfmt";
         };
@@ -33641,7 +33809,7 @@
           sha256 = "10wx67lap7zhyzk9xd2cs8kcm0didyc9gccdi1q6sw1axs25i98i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/json-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/json-mode";
           sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
           name = "json-mode";
         };
@@ -33662,7 +33830,7 @@
           sha256 = "05bjyw0hkpiyfadsx3giawykbj4qinfr1ilzd0xvx8akzq2ipq0y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/json-reformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/json-reformat";
           sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
           name = "json-reformat";
         };
@@ -33683,7 +33851,7 @@
           sha256 = "0cbqhijv2zv9mhnjxadr2kbz5b6jcvciwmza22jkwds0nkn2snmp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/json-rpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/json-rpc";
           sha256 = "1v1pfmm9g18p6kgn27q1m1bjgwbzvwfm0jbsxp8gdsssaygky71k";
           name = "json-rpc";
         };
@@ -33704,7 +33872,7 @@
           sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/json-snatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/json-snatcher";
           sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
           name = "json-snatcher";
         };
@@ -33725,7 +33893,7 @@
           sha256 = "07yd7sxb5f2mbm2nva7b2nwyxxkmsi2rdd5qig0bq1b2mf3g5l83";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jss";
           sha256 = "050hskqcjz5kc8nni255vj3hc9m936w1rybvg5kqyz4p4lpzj00k";
           name = "jss";
         };
@@ -33746,7 +33914,7 @@
           sha256 = "16jgmabcqrjb3v9c6q711jqn9dna88bmzm4880mdry69ixwcydxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jst";
           sha256 = "0hp1f7p6m1gfv1a3plavzkzn87dllb5g2xrgg3mch4qsgdbqx65i";
           name = "jst";
         };
@@ -33767,7 +33935,7 @@
           sha256 = "1g648r0wrd8m5ggl5jrplmj7jmr68bh2ykyii5wv30zfba97r1sh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jsx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jsx-mode";
           sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
           name = "jsx-mode";
         };
@@ -33786,7 +33954,7 @@
           sha256 = "03w5y9c1109kpsn6xnxdaz3maiwbvxywqshc1l5wngfc85jwiv8y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jtags";
           sha256 = "0in5ybgwmghlpa5d7wz0477ba6n14f1mwp5dxcl4y11f1lsq041r";
           name = "jtags";
         };
@@ -33799,15 +33967,15 @@
     judge-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "judge-indent";
-        version = "20160603.1321";
+        version = "20160609.1522";
         src = fetchFromGitHub {
           owner = "yascentur";
           repo = "judge-indent-el";
-          rev = "74ec1c752496c5fa98ebc5773bcdb9e986e4983a";
-          sha256 = "039qc8klb7ysvyl10zqk50ji44yn44cfw7f5l90nrd5mr2pihnvr";
+          rev = "f76c012284abc296681167d7b33d5e61f3ac7cec";
+          sha256 = "0547jy339ql31wym066pi79k520agdq062xblyvj0bi91j0rqld3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/judge-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/judge-indent";
           sha256 = "1gakdhnlxfq8knnykqdw4bizb5y67m8xhi07zannd7bsfwi4k6rh";
           name = "judge-indent";
         };
@@ -33828,7 +33996,7 @@
           sha256 = "1394z087h07zw86xzi4kr87j0yn3v3r7pzjbnf3hgivjmz2w48bj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/julia-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/julia-mode";
           sha256 = "0m49v67fs5yq0q3lwkcfmrzsjdzi1qrkfjyvjcdwnfmp29w14kq6";
           name = "julia-mode";
         };
@@ -33849,7 +34017,7 @@
           sha256 = "056pyq31fq86fskwhqny8n6jzavgcjv979kkg9hwbz7h90zvf9q4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/julia-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/julia-shell";
           sha256 = "0182irlvk6nn71zk4j8xjgcqp4bxi7a2dbj44frrssy6018cd410";
           name = "julia-shell";
         };
@@ -33870,7 +34038,7 @@
           sha256 = "1f0kai4cz3r25fqlnryyvnyf80cf57xa655dvv1rx8si3xd20x4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jumblr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jumblr";
           sha256 = "1wnawz1m6x95iyzac453p55h7hlr5q0ry5437aqqx0bw7gdwg3dp";
           name = "jumblr";
         };
@@ -33891,7 +34059,7 @@
           sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jump";
           sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
           name = "jump";
         };
@@ -33912,7 +34080,7 @@
           sha256 = "1dgghswf6s7h6h04mhfnsh2m0ld8qqk70l0dq3cxhdjzqx16vnms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jump-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jump-char";
           sha256 = "0l8zvfwpngkgcxl1a36jwwxdh23hi390mikz7xrq63w5zwm0007n";
           name = "jump-char";
         };
@@ -33933,7 +34101,7 @@
           sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jump-to-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jump-to-line";
           sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
           name = "jump-to-line";
         };
@@ -33954,7 +34122,7 @@
           sha256 = "0ykzvy8034mchq6ffyi7vqnwyrj6gnqqgn39ki81pv97qh8hh8yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jumplist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jumplist";
           sha256 = "06xjg1q8b2fwfhfmdkb76bw2id8pgqc61fmwlgri5746jgdmd7nf";
           name = "jumplist";
         };
@@ -33975,7 +34143,7 @@
           sha256 = "0k91cdjlpil8npc4d3zsgx2gk41crl7qgm9r85khcgxs59kmkniw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jvm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jvm-mode";
           sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
           name = "jvm-mode";
         };
@@ -33996,7 +34164,7 @@
           sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kaesar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kaesar";
           sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
           name = "kaesar";
         };
@@ -34017,7 +34185,7 @@
           sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kaesar-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kaesar-file";
           sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
           name = "kaesar-file";
         };
@@ -34038,7 +34206,7 @@
           sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kaesar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kaesar-mode";
           sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
           name = "kaesar-mode";
         };
@@ -34059,7 +34227,7 @@
           sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kakapo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kakapo-mode";
           sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
           name = "kakapo-mode";
         };
@@ -34078,7 +34246,7 @@
           sha256 = "14g0f51jig8b1y6zfaw7b1cp692lddqzkc0ngf4y89sw9gbmsh3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kanban";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kanban";
           sha256 = "1sif2ayb8fq5vjz9lpkaq40aw9wiciz84yipab2qczszlgw1l1hb";
           name = "kanban";
         };
@@ -34099,7 +34267,7 @@
           sha256 = "0rxf44kszxazkpjmccz3wnks7si3g8vsfi2lamwynmksk8sw5d7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kanji-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kanji-mode";
           sha256 = "0nnkv7lp7ks9qhkbhz15ixm53grc2q0xfspzykxi9c4b59kypcq5";
           name = "kanji-mode";
         };
@@ -34120,7 +34288,7 @@
           sha256 = "0vqjbv3pqlbyibqylfsqqjzkvjhdg01hlxszfblpg72fziyzcci5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kaomoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kaomoji";
           sha256 = "1p61pbqf2lnwr6ryxxc4jkd5bmlgknrc27lg89h3b4pw7k39cqy1";
           name = "kaomoji";
         };
@@ -34141,7 +34309,7 @@
           sha256 = "12v242kfcx849j8w95v2g7djh9xqbx8n033iaxyavfxnz0pp7zdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/karma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/karma";
           sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
           name = "karma";
         };
@@ -34162,7 +34330,7 @@
           sha256 = "1kkzs7nrcr74qn1m456vaj52a9j3ah4biakimz06hls415l56yk9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kerl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kerl";
           sha256 = "0f8n7cm5c432pwj28bcpv2jj5z3br3k164xj6nwfis3dvijwsgss";
           name = "kerl";
         };
@@ -34180,7 +34348,7 @@
           sha256 = "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/key-chord";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/key-chord";
           sha256 = "0cr9lx1pvr0qc762nn5pbh8w93dx1hh1zzf806cag2b9pgk6d4an";
           name = "key-chord";
         };
@@ -34201,7 +34369,7 @@
           sha256 = "1is7s50lgn77lxxwgakiaywx6jqdfg8045d18m4zn3ilxg6k8ljf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/key-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/key-combo";
           sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
           name = "key-combo";
         };
@@ -34222,7 +34390,7 @@
           sha256 = "143nfs8pgi5yy3mjq7nirffplk4vb8kik4q7zypynh2pddip30a4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/key-intercept";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/key-intercept";
           sha256 = "1z776jbpjks5bir6bd0748mlrmz05nf0jy9l4hlmwgyn72dcbx16";
           name = "key-intercept";
         };
@@ -34235,15 +34403,15 @@
     key-leap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "key-leap";
-        version = "20160109.2137";
+        version = "20160610.1203";
         src = fetchFromGitHub {
           owner = "MartinRykfors";
           repo = "key-leap";
-          rev = "62877ecc6b0eadac5185e4b7c3c51b4762263142";
-          sha256 = "14xk0crl25alcckkcg0wx7gwb65hmicfn01db1zip8swk249g9w3";
+          rev = "5add9fd38fdf46cc0306c27f721195ba6cf6ecf1";
+          sha256 = "02f7mxhhw1y9j5nxfjcm0p1qczsk6wx0b3k0d7gn9chq9gablsp3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/key-leap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/key-leap";
           sha256 = "0z1fhpf8g0c4rh3bf8dfmdgyhj5w686kavjr214czaga0x7mwlwj";
           name = "key-leap";
         };
@@ -34264,7 +34432,7 @@
           sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/key-seq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/key-seq";
           sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
           name = "key-seq";
         };
@@ -34285,7 +34453,7 @@
           sha256 = "0xgm80dbg45bs3k8psd3pv49z1xbvzm156xs55gmxdzbgxbzpazr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/keychain-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/keychain-environment";
           sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
           name = "keychain-environment";
         };
@@ -34306,7 +34474,7 @@
           sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/keydef";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/keydef";
           sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
           name = "keydef";
         };
@@ -34327,7 +34495,7 @@
           sha256 = "1dhdk4f6q340n0r9n8jld2n2fykp7m40x23n7sw4wpm8g151gxin";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/keyfreq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/keyfreq";
           sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
           name = "keyfreq";
         };
@@ -34348,7 +34516,7 @@
           sha256 = "17bfxn1bl2by3vnp24hnk6qjxx6av1fayrsw9hlldwhgp4ayhy48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/keymap-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/keymap-utils";
           sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
           name = "keymap-utils";
         };
@@ -34369,7 +34537,7 @@
           sha256 = "0cm6naqlwk65xy9lwnn5r7m6nc1l7ims2ckydmyzny5ak8y5jbws";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/keyset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/keyset";
           sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
           name = "keyset";
         };
@@ -34382,15 +34550,15 @@
     keyword-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keyword-search";
-        version = "20160526.923";
+        version = "20160608.738";
         src = fetchFromGitHub {
           owner = "keyword-search";
           repo = "keyword-search";
-          rev = "5a84e5ae765eca54e6dc479e099fb3082007529b";
-          sha256 = "0qysz45vvk87n0pc21qfcfj3mbj2ibnz8m0ywj3dhr1damb89g4g";
+          rev = "d40633712cf4dbb1bdf95d8262b5a4138b29e049";
+          sha256 = "0g42yr331piv3r18ymz4kb8jqmslimq3xamkyqdn702xljmb2pad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/keyword-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/keyword-search";
           sha256 = "0wvci1v8pblfbdslfzpi46c149y8pi49kza9jf33jzhj357lp5qa";
           name = "keyword-search";
         };
@@ -34411,7 +34579,7 @@
           sha256 = "0xq835xzywks4b4kaz5i0pp759i23kibs5gkvvxasw0dncqh7j5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kfg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kfg";
           sha256 = "0vvvxl6a4ac27igwmsgzpf0whf9h2pjl9d89fd9fizad6gi8x1fs";
           name = "kfg";
         };
@@ -34432,7 +34600,7 @@
           sha256 = "0s2hb2lvfmcvm3n1fg4biaafc1p7j7w990d7w15gicaw6rr2j4nr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kibit-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kibit-helper";
           sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
           name = "kibit-helper";
         };
@@ -34453,7 +34621,7 @@
           sha256 = "1d1kygn2l675rigz29hjmqkh0x7061ax0a60v5mjn9q87y4jd760";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kill-or-bury-alive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kill-or-bury-alive";
           sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
           name = "kill-or-bury-alive";
         };
@@ -34474,7 +34642,7 @@
           sha256 = "0yrc09k64rv5is4wvss938mkj2pkvbr98lr3ahsi7p0aqn7s444v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kill-ring-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kill-ring-search";
           sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
           name = "kill-ring-search";
         };
@@ -34495,7 +34663,7 @@
           sha256 = "05rbh5hkj3jsn9pw0qa4d5a5pi6367vdqkijcn9k14fdfbmyd30x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/killer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/killer";
           sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
           name = "killer";
         };
@@ -34516,7 +34684,7 @@
           sha256 = "1cr4i66lws6yhyxmyx5jw6d5x7i75435mafkkych4nfa0mv4vicd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kite";
           sha256 = "04x92qcvx428l2cvm2nk9px7r8i159k0ra0haq2sjncjr1ajhg9m";
           name = "kite";
         };
@@ -34537,7 +34705,7 @@
           sha256 = "0ralsdjzj09g6nsa04jvyyzr6cgsi0d7gi1ji77f52m31dl0b8cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kite-mini";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kite-mini";
           sha256 = "1g644406zm3db0fjyv704aa8dbd20v1apmysb3mmh2vldbch4iyh";
           name = "kite-mini";
         };
@@ -34554,11 +34722,11 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "04f9ae82a2da3a1ff8a63bb336bc8bc7f0d1031b";
-          sha256 = "1r88zrd0wgavw55fxx7y0pi0a61izw4hm86n027vc4m4cpxrar17";
+          rev = "f593c5a40fce166d0ae8a287056435c97ee7082a";
+          sha256 = "1555cfmvfll6w4c6s6nnwyyrgk32lv675r3ycbpyps3d1qpcws9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kivy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kivy-mode";
           sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
           name = "kivy-mode";
         };
@@ -34579,7 +34747,7 @@
           sha256 = "1ld3ccg8q7hmjrj60rxvmmfy4dpm2lvlshjqdf9ifgjzp221g4vb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kixtart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kixtart-mode";
           sha256 = "079bw4lgxbmk65rrfyy8givs8j5wsyhpcjjw915ifkg577gj87qp";
           name = "kixtart-mode";
         };
@@ -34600,7 +34768,7 @@
           sha256 = "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/know-your-http-well";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/know-your-http-well";
           sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
           name = "know-your-http-well";
         };
@@ -34621,7 +34789,7 @@
           sha256 = "0yr4yxwxgxp5pm9f8gaqlikxp26inv01inq0ya42dzam5yphkafw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kolon-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kolon-mode";
           sha256 = "0wcg8ph3mk4zcmzqpvl2w6rfgvrfvhmgwb14y8agh9b7v5d9xwj3";
           name = "kolon-mode";
         };
@@ -34642,7 +34810,7 @@
           sha256 = "1bh2zpprh2zwhfgdw131lm0j7zm0hmnb0zqcahps104xna9s5x60";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kooten-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kooten-theme";
           sha256 = "1kkk8nl1xykc4c487icmjrc2xsv8i4s2r5h5gbcpyrk2myqi4179";
           name = "kooten-theme";
         };
@@ -34652,6 +34820,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kotlin-mode";
+        version = "20160610.2140";
+        src = fetchFromGitHub {
+          owner = "gregghz";
+          repo = "kotlin-mode";
+          rev = "ed5bb641a967df6464b5c43a688d8fc3febe13c1";
+          sha256 = "1xacd53c2yhbc0m27kp61ax7lmas00pp25bhlkjxvyhmcdv6fsjq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kotlin-mode";
+          sha256 = "0g7z5zk7pgd73qlpcpij0b8csyvd8v9n4djdqnn39rwnbk69gcbb";
+          name = "kotlin-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/kotlin-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     kpm-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kpm-list";
@@ -34663,7 +34852,7 @@
           sha256 = "0hbzr5x9ykzrbwzfsf6rc4pbiw9m59ny3cgcx26nbi6ijbjl2fxj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kpm-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kpm-list";
           sha256 = "0022bhy1mzngjmjydyqnmlgnhww05v4dxsfav034r8nyyc7677z0";
           name = "kpm-list";
         };
@@ -34684,7 +34873,7 @@
           sha256 = "11axxmhdpwgrcyjz200pf5bqzjw9wz4085r8p1n2vr5gx98374fr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kroman";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kroman";
           sha256 = "0y9ji3c8kndrz605n7b4w5xq0qp093d61hxwhblm3qrh3370mws7";
           name = "kroman";
         };
@@ -34705,7 +34894,7 @@
           sha256 = "1kbmlhfxbp704mky8v69lzqd20bbnqijfnv110yigsy3kxi7hdrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ksp-cfg-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ksp-cfg-mode";
           sha256 = "0azcn4qvziacbw1qy33fwdaldw7xpzr672vzjsqhr0b2vg9m2ipi";
           name = "ksp-cfg-mode";
         };
@@ -34726,7 +34915,7 @@
           sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kurecolor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kurecolor";
           sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
           name = "kurecolor";
         };
@@ -34747,7 +34936,7 @@
           sha256 = "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kv";
           sha256 = "1vzifi6zpkmsh1a3c2njrw7mpfdgyjvpbz3bj42j8cg3vwjnjznb";
           name = "kv";
         };
@@ -34768,7 +34957,7 @@
           sha256 = "0irbfgip493hyh45msnb7climgfwr8f05nvc97bzaqggnay88scy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kwin";
           sha256 = "1pxnyj81py3ygadmyfrqndb0jkk6xlbf0rg3857hsy3ccblzm7ki";
           name = "kwin";
         };
@@ -34781,15 +34970,15 @@
     labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "labburn-theme";
-        version = "20160519.1036";
+        version = "20160610.1059";
         src = fetchFromGitHub {
           owner = "ksjogo";
           repo = "labburn-theme";
-          rev = "2e54e5d7fdb0ec5a728e40ccddaae523dad502a6";
-          sha256 = "14v7w85mkbdymz8nsl1phdpn3agpr47f2qang1wp7syzsbsfcjd4";
+          rev = "7005190df3f1d745d314271b1a525d2850b7ff3a";
+          sha256 = "1czvsimbhmqgf7nzs29xbd4w65sdqr0nxjb00ipsr6xhqqj9sm4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/labburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/labburn-theme";
           sha256 = "09qqb62hfga88zka0pc27rc8i43cxi84cv1x8wj0vvzx6mvic1lm";
           name = "labburn-theme";
         };
@@ -34807,7 +34996,7 @@
           sha256 = "01vs0v17l76zwyrblf9c6x0xg5fagd4qv8pr1fwfw7kl64hb9aa2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lacarte";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lacarte";
           sha256 = "0a0n1lqakgsbz0scn6617rkkkvzwranzlvkzw9q4zapiz1s9xqp9";
           name = "lacarte";
         };
@@ -34828,7 +35017,7 @@
           sha256 = "135k7inkvdz51j7al3nndaamrkyn989vlv1mxcp8lwx8cgq0rqfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lang-refactor-perl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lang-refactor-perl";
           sha256 = "02fv25d76rvxqzxs48j4lkrifdhqayyb1in05ryyz2pk9x5hbax9";
           name = "lang-refactor-perl";
         };
@@ -34849,7 +35038,7 @@
           sha256 = "0svci7xs4iysv8ysf93g382arip0xpgi0fllw8xx2vrd70sz7lff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/langdoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/langdoc";
           sha256 = "19i6ys58wswl5ckf33swl6lsfzg4znx850br4icik15yrry65yj7";
           name = "langdoc";
         };
@@ -34870,7 +35059,7 @@
           sha256 = "1rj0j4vxfwss0w6bwh591w5mbyzjg5rkbwyjaphyi6p7wq5w6np1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/langtool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/langtool";
           sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
           name = "langtool";
         };
@@ -34891,7 +35080,7 @@
           sha256 = "1cqbdgk3sd0xbw76qrhlild9dvgds3vgldq0rcl200kh7y8l6g4k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/latest-clojure-libraries";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/latest-clojure-libraries";
           sha256 = "1vnm9piq71nx7q1843izm4vydfjq1564ax4ffwmqmlpisqzd6wq5";
           name = "latest-clojure-libraries";
         };
@@ -34912,7 +35101,7 @@
           sha256 = "07aavdr1dlw8hca27l8a0i8cs5ga1wqqdf1v1iyvjz61vygld77a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/latex-extra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/latex-extra";
           sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
           name = "latex-extra";
         };
@@ -34933,7 +35122,7 @@
           sha256 = "0cxmvadkiqhvhmvmx3vvwxasw7wll8abhviss7wgizwqf4i2p3v4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/latex-math-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/latex-math-preview";
           sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
           name = "latex-math-preview";
         };
@@ -34953,7 +35142,7 @@
           sha256 = "0h9hncf2ghfkd3i3342ajj1niykhfr0aais3j6sjg1vkm16xbr3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/latex-pretty-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/latex-pretty-symbols";
           sha256 = "1f2s2f64bmsx89a3crm4skhdi4pq9w18z9skxw3i3ydaj15s8jgl";
           name = "latex-pretty-symbols";
         };
@@ -34974,7 +35163,7 @@
           sha256 = "1bvhrh9xfl7p474b8jcczw255d2pjmrz5b60wis0lmmxdljplrfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/latex-preview-pane";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/latex-preview-pane";
           sha256 = "1id1l473azmc9hm5vq5wba8gad9np7sv38x94qd2zkf8b78pzkbw";
           name = "latex-preview-pane";
         };
@@ -34995,7 +35184,7 @@
           sha256 = "10i4r81pm95990d4yrabzdm49gp47mqpv15h4r4sih10p1kbn83h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/latex-unicode-math-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/latex-unicode-math-mode";
           sha256 = "1p9gpp28vylibv1s95bzfgscznw146ybgk6f3qdbbnafrcrmifcr";
           name = "latex-unicode-math-mode";
         };
@@ -35016,7 +35205,7 @@
           sha256 = "0ciycsqzyj6ld60c7sfqjq59ln3jvk3w9vy606kqzpcvj01ihmv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/launch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/launch";
           sha256 = "043gwz583pa1wv84fl634p1v86lcsldsw7qkjbm6y678q5mms0m6";
           name = "launch";
         };
@@ -35037,7 +35226,7 @@
           sha256 = "154z7bhb7qagvl3dlgrlsxdg4chz2863ijglg47xs3yhjp5ypanj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/launchctl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/launchctl";
           sha256 = "07fq445cjpv4ndi7hnjmsrmskm2rlp6ghq0k3bcbjxl21smd9vs9";
           name = "launchctl";
         };
@@ -35058,7 +35247,7 @@
           sha256 = "1mg923rs2dk104bcr461dif3mg42r081ii8ipnnr588w7il0xh7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lavender-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lavender-theme";
           sha256 = "1x7mk3dpk44fkzll6xmh2dw270cgb3a9qs3h8bmiq2dw0wrcwcd1";
           name = "lavender-theme";
         };
@@ -35079,7 +35268,7 @@
           sha256 = "03mv2r6k9syr7bk4vmdafmpa8kz19hv5h68ahj2bmdcmwlvwhkf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ldap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ldap-mode";
           sha256 = "0lkfpbzsry9jigrx5zp14bkrvqnavnk4y3s0whnbigc4fgpf94rq";
           name = "ldap-mode";
         };
@@ -35100,7 +35289,7 @@
           sha256 = "1hp65aai2bp5l7b3dhr6bz042xcikkk8vssirzibdw5qq6zqzgxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ledger-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ledger-mode";
           sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s";
           name = "ledger-mode";
         };
@@ -35121,7 +35310,7 @@
           sha256 = "0yrrlwmxg1wy65bqyacjpzd5ksljgp41x4zyizl7h0zx9rmqcdvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/leerzeichen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/leerzeichen";
           sha256 = "0h7zpskcgkswr110vckfdbxggz5b3g9grk1j1cbd98pmrpgfqrvp";
           name = "leerzeichen";
         };
@@ -35142,7 +35331,7 @@
           sha256 = "05zpc8b2pyjz76fvmgr7zkl56g6nf6hi4nmxdg6gkw8fx6p8i19f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/legalese";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/legalese";
           sha256 = "18rkvfknaqwkmhsjpgrf2hknrb2zj61aw8rb4907gsbs9rciqpdd";
           name = "legalese";
         };
@@ -35163,7 +35352,7 @@
           sha256 = "0n6jrm5ilm5wzfrh7yjxn3sr5m10hwdm55b179ild32lh4795zj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lemon-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lemon-mode";
           sha256 = "0jdf3556kmv55jh85ljqh2gdx0jl2b8zgvpz9a4kf53xifk3lqz5";
           name = "lemon-mode";
         };
@@ -35184,7 +35373,7 @@
           sha256 = "0ab84qiqaz3swiraks8lx0y1kzwylpy9wz2104xgnpwnc5169z65";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lenlen-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lenlen-theme";
           sha256 = "1bddkcl9kzj3v071qpzmxzjwywqfj5j6cldz240qgp5mx685r0a9";
           name = "lenlen-theme";
         };
@@ -35197,15 +35386,15 @@
     lentic = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild, s }:
     melpaBuild {
         pname = "lentic";
-        version = "20160526.2222";
+        version = "20160607.2231";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "lentic";
-          rev = "6b4737219e788c936e12b526c367e339f938b7b2";
-          sha256 = "0kj3nxbn55skkwg88ijw0fr2yfv0n94487z9j7vysqhlg9ra3bl8";
+          rev = "bbbfa78a0deda2a7cc3a4e67c79d43e002ddc014";
+          sha256 = "0pzrv948bphf89k54sq9vxv0h30ily1ajy04ff13lsc1l62b7mgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lentic";
           sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
           name = "lentic";
         };
@@ -35226,7 +35415,7 @@
           sha256 = "0c6wkfz6sdcs4aglvx6h3slhma2vbj7idckwzvp8ji6s7p1mavlv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lentic-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lentic-server";
           sha256 = "1y9idhf9qcsw3dbdj7rwa7bdrn1q0m3bg3r2jzwdnvkq8aas1w56";
           name = "lentic-server";
         };
@@ -35247,7 +35436,7 @@
           sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/less-css-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/less-css-mode";
           sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
           name = "less-css-mode";
         };
@@ -35268,7 +35457,7 @@
           sha256 = "06hggcbz98qhfbvp0fxn89j98d0mmki4wc4k8kfzp5fhg071chbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/letcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/letcheck";
           sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
           name = "letcheck";
         };
@@ -35281,15 +35470,15 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20160601.2126";
+        version = "20160608.1741";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "03295c1e088ac4b2f321468b22d44233aafc20b2";
-          sha256 = "1am3888833r5ab4fphi17d4pk9gpvdd28rcxv9zz7jjxbhfrnyn4";
+          rev = "dc18ab060847d4f259f69cb566bcdcef61a2b67b";
+          sha256 = "18y2mr959saxgyq5ab75kzdxaxkw75p06wygd307l7hgsakpkzci";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/leuven-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/leuven-theme";
           sha256 = "0pm5majr9cmj6g4zr7vb55ypk9fmfbvxx78mgmgignknbasq9g9a";
           name = "leuven-theme";
         };
@@ -35307,7 +35496,7 @@
           sha256 = "0m94z18i1428bispxi285flvjf22kjm33s4sm0ad11m0w0jizir6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/levenshtein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/levenshtein";
           sha256 = "1iypnz0bw3baqxa9gldz8cikxvdhw60pvqp00kq5p3v4x3xcy4z2";
           name = "levenshtein";
         };
@@ -35328,7 +35517,7 @@
           sha256 = "167ayfl1k8dnajw173hh67nbwbk4frmjc4fzc515q67m9d7m5932";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lexbind-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lexbind-mode";
           sha256 = "1hs9wg45mwp3fwi827rc4g0gjx4fk87zlibq3id9fcqic8q7nrnl";
           name = "lexbind-mode";
         };
@@ -35349,7 +35538,7 @@
           sha256 = "0czsp57z2yxnx43fb3qp4qj0iib3715dlqkhb936c3v63m1fx76a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lfe-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lfe-mode";
           sha256 = "0smncyby53ipm8yqslz88sqjafk0x6r8d0qwk4wzk0pbgfyklhgs";
           name = "lfe-mode";
         };
@@ -35367,7 +35556,7 @@
           sha256 = "077cy2clllrvabw44wb1pzcqz97r3y92j7cb9lnhd9pix0wpcq6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lib-requires";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lib-requires";
           sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx";
           name = "lib-requires";
         };
@@ -35388,7 +35577,7 @@
           sha256 = "039awlam3nrgkxrarcapfyc2myvc77aw7whrkcsjjybzylpzv0pr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/libmpdee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/libmpdee";
           sha256 = "0z4d8y8jlsjw20b31akkaikh5xl0c05lj77d2i1xbgzam4iixma0";
           name = "libmpdee";
         };
@@ -35409,7 +35598,7 @@
           sha256 = "11c3vmxyddx7zm8fpxmzhq2xygyijbszinfiwllgb4l738bxwljb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lice";
           sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
           name = "lice";
         };
@@ -35430,7 +35619,7 @@
           sha256 = "04dik8z2mg6qr4d3fkd26kg29b4c5crvbnc1lfsrzyrik7ipvsi8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/light-soap-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/light-soap-theme";
           sha256 = "09p4w51d5szhi81a6a3l0r4zd4ixkrkzxldr938bcmj0qmj62iyk";
           name = "light-soap-theme";
         };
@@ -35451,7 +35640,7 @@
           sha256 = "0rkx0hk3y79rwhjqs3wvgxhg1rj83mxbqkhhm3jfawp8c1av4f40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lingr";
           sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
           name = "lingr";
         };
@@ -35472,7 +35661,7 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/link";
           sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
           name = "link";
         };
@@ -35493,7 +35682,7 @@
           sha256 = "0w6n6m766vr7d2i5jw30dkq9326r1mx02n222vm8z1mxydkw1n3i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/link-hint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/link-hint";
           sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
           name = "link-hint";
         };
@@ -35514,7 +35703,7 @@
           sha256 = "01yv6239z90hvncwmm9g5nh4xvyxv2ig3h4hsmxdn4kacfxvc84n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/linphone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/linphone";
           sha256 = "0q7mw1npxq24szhwswc93qz5h6magcxw63ymba7hwhif6my65zx7";
           name = "linphone";
         };
@@ -35535,7 +35724,7 @@
           sha256 = "1pvgp76n2qnm01l5f9mkb9yqwfxag9x23wwqbsna66rmvsag69w0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/linum-off";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/linum-off";
           sha256 = "1yilsdsyxlzmh64dpzirzga9c7lhp1phps9cdgp2898zpnzaclay";
           name = "linum-off";
         };
@@ -35556,7 +35745,7 @@
           sha256 = "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/linum-relative";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/linum-relative";
           sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
           name = "linum-relative";
         };
@@ -35577,7 +35766,7 @@
           sha256 = "01ycjy3amzbplp3zf0x5fahsja92gyg2252xhzcyiazmhaz7gkrd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/liso-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/liso-theme";
           sha256 = "014a71dnhnr0dr36sl2h8ffp6il9nasij31ahqz0bjgn4r16s5gy";
           name = "liso-theme";
         };
@@ -35598,7 +35787,7 @@
           sha256 = "0ah4nnjgjw7z7j9wz76zyq88rdmina9aw5adhn9b9pwr9s5frfkz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lisp-extra-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lisp-extra-font-lock";
           sha256 = "1xchqwhav9x7b02787ghka567fihdc14aamx92jg549c6d14qpwk";
           name = "lisp-extra-font-lock";
         };
@@ -35616,7 +35805,7 @@
           sha256 = "1m07gb3v1a7al0h4nj3914y8lqrwzi8fwb1ih66nxzn6kb0qj3mf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lispxmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lispxmp";
           sha256 = "02gfbyng3dh2445jfkasxzjc9dlk02dafbfkjm40iwmb8h0fzji4";
           name = "lispxmp";
         };
@@ -35629,15 +35818,15 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "lispy";
-        version = "20160529.1515";
+        version = "20160612.847";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "2f52a009ace570d2f365138442a66572adfc5c7d";
-          sha256 = "1zy0vgzi31lkb393ciw0zp3sjddl84j211fx0xmv7p307m5354s9";
+          rev = "91a0d9376ed87e4cf3d624ba9293cfa1553a999f";
+          sha256 = "0909wi6g5fqqc6c5lmdprp6zmm8fs0df9dlg6qchbcasj0y42kcb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lispy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lispy";
           sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
           name = "lispy";
         };
@@ -35658,7 +35847,7 @@
           sha256 = "0n0mk01h9c3f24gzpws5xf6syrdwkq4kzs9mgwl74x9l0x904rgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lispyscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lispyscript-mode";
           sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
           name = "lispyscript-mode";
         };
@@ -35679,7 +35868,7 @@
           sha256 = "1szbs16jlxfj71986dbg0d3j5raaxcwz0xq5ar352731r5mdcqw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/list-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/list-environment";
           sha256 = "1zdhrlp8vk8knjwh56pws6dyn003r6avjzvhghlkgnw9nfrdk57h";
           name = "list-environment";
         };
@@ -35700,7 +35889,7 @@
           sha256 = "02l7q5376ydz6a8i9x74bsx5bbxz8xkasmv1lzvf79d3jbg28l1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/list-packages-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/list-packages-ext";
           sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
           name = "list-packages-ext";
         };
@@ -35719,7 +35908,7 @@
           sha256 = "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/list-processes+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/list-processes+";
           sha256 = "10x7hkba2bmryyl68w769fggw65dl4f3a9g0gqdzmkdj80rcipky";
           name = "list-processes-plus";
         };
@@ -35740,7 +35929,7 @@
           sha256 = "1pr7vmjmyildg44n7psg0zmj8a3kfsw5xmgh600fhs95wqxn3sag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/list-register";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/list-register";
           sha256 = "0kza9xfhmxc8qia5yixx5z2y9j4wb1530rcvgxn545b903fs55kv";
           name = "list-register";
         };
@@ -35761,7 +35950,7 @@
           sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/list-unicode-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/list-unicode-display";
           sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
           name = "list-unicode-display";
         };
@@ -35782,7 +35971,7 @@
           sha256 = "0ql159v7sxs33yh2l080kchrj52vk34knz50cvqi3ykpb7djg3sz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/list-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/list-utils";
           sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
           name = "list-utils";
         };
@@ -35803,7 +35992,7 @@
           sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lit-mode";
           sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
           name = "lit-mode";
         };
@@ -35824,7 +36013,7 @@
           sha256 = "1nbz119ldwjvkm3xd9m0dx820lc177frz5mn585fsd7kqdbkam99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/litable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/litable";
           sha256 = "073yw3ivkl093xxppn5vqyh69jhfc97al505mnyn34fwdj5v8fji";
           name = "litable";
         };
@@ -35834,22 +36023,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    litecoin-ticker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    litecoin-ticker = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "litecoin-ticker";
-        version = "20160604.1225";
+        version = "20160612.211";
         src = fetchFromGitHub {
           owner = "llcc";
           repo = "btcbox-ticker";
-          rev = "e3338f8badd1a6959f6082ed5aae100189c2b96e";
-          sha256 = "17c0kyhw5aasckb7ghb7s6fnz3sz5pl2s1jqk2mn9h9b8rflbayc";
+          rev = "3d8047c736e4ee0b8638953f8cc63eaefad34106";
+          sha256 = "03iggfi3r5xjh9yhhpr1pgyayriycyybf8qnrhqkqcamh77kq21f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/litecoin-ticker";
-          sha256 = "14gak0av8wljmyq9lcf44dc2bvlfjb86filanqh0wkf2swpbdw85";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/litecoin-ticker";
+          sha256 = "14pjizgdckqhm31ihbz35j8g95jdpmf1rd4l5zz38fyx12zbcpx5";
           name = "litecoin-ticker";
         };
-        packageRequires = [];
+        packageRequires = [ json ];
         meta = {
           homepage = "https://melpa.org/#/litecoin-ticker";
           license = lib.licenses.free;
@@ -35866,7 +36055,7 @@
           sha256 = "1wxysnsigjw40ykdwngg0gqfaag0dx6zg029i2zx25kl3gr1lflc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/literate-coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/literate-coffee-mode";
           sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
           name = "literate-coffee-mode";
         };
@@ -35887,7 +36076,7 @@
           sha256 = "1v37bii372w2g3pl09n5dcrk6y7glhpg8qiv17zsk9jy3ps2xm1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/literate-starter-kit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/literate-starter-kit";
           sha256 = "1n2njf007fmrmsb8zrgxbz1cpxmr5nsp8w41yxa934iqc7qygkjy";
           name = "literate-starter-kit";
         };
@@ -35908,7 +36097,7 @@
           sha256 = "1j0qa96vlsqybhp0082a466qb1hd2b0621306brl9pfl5srf5jsj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/live-code-talks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/live-code-talks";
           sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
           name = "live-code-talks";
         };
@@ -35929,7 +36118,7 @@
           sha256 = "147k3d8hj6wgjmdfv3cnnpwsz0bs7j167zdv74qpx6nq03qrwpv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/live-py-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/live-py-mode";
           sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
           name = "live-py-mode";
         };
@@ -35950,7 +36139,7 @@
           sha256 = "1qxw7i23z6c4yimrzpaqna8j39rashgbswdv4m0x4qg4sqc7szdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lively";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lively";
           sha256 = "0qnyqlhqmmfq2f47zmy29hn6wqrx5yvsax8kn63nmxw380gw1z18";
           name = "lively";
         };
@@ -35971,7 +36160,7 @@
           sha256 = "0kqjz0i0zapyhh8z57cvc8ifiizngix3ca01mjnvyq3zxg1bqrsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/livescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/livescript-mode";
           sha256 = "1fdfhp39zr2mhy5rd6mwqv5fwd8xaypdqig7v3ksv77m5zq7cmmj";
           name = "livescript-mode";
         };
@@ -35992,7 +36181,7 @@
           sha256 = "178ldzpk8a9m9abn8xlplxn5jgcca71dpkp82bs5g7bsccp3rx6p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/livid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/livid-mode";
           sha256 = "0jy16m6injqznx4gmxzvhys480pclw9g07z4qll2dna37177ww9d";
           name = "livid-mode";
         };
@@ -36008,11 +36197,11 @@
         version = "20150910.1544";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "f5adc997c205056d78b48785a2b486b0442e712a";
-          sha256 = "11kcgck57p73igvjhm3sx5jwqh89y0hxxm6v4b31512z0kh2ipg8";
+          rev = "de9d1e0d13e5649793dc6f94e3ebc892768a7518";
+          sha256 = "1nj8xjgkrniiq27lwdiys2v3kks6p07knzhh407cfm37y8g0g0i1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/llvm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/llvm-mode";
           sha256 = "0j3zsd0shd7kbi65a2ha7kmr0zy3my05378swx6m5m9x7miyr4y7";
           name = "llvm-mode";
         };
@@ -36033,7 +36222,7 @@
           sha256 = "0izrli7f20iq1pz1r1l0kshzpz7vl4p1gyn2n5mdjv5lbpq7cykb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/load-relative";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/load-relative";
           sha256 = "0j8ybbjzhzgjx47pqqdbsqi8n6pzqcf6zqc38x7cf1kkklgc87ay";
           name = "load-relative";
         };
@@ -36054,7 +36243,7 @@
           sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/load-theme-buffer-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/load-theme-buffer-local";
           sha256 = "13829yrh36qac7gpxanizlk4n7av99ngvv06y6mmi5rq06a4hjx4";
           name = "load-theme-buffer-local";
         };
@@ -36075,7 +36264,7 @@
           sha256 = "0i0ainawjvfl3qix329hx01x7rxyfin2xgpjk7y5dgmh4p3xhv94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/loc-changes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/loc-changes";
           sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
           name = "loc-changes";
         };
@@ -36096,7 +36285,7 @@
           sha256 = "1npz90zf91wqf35bqd3zmkh0b538i69w8ygc78x5w2x5005aqr0p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/loccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/loccur";
           sha256 = "06pv2i05yzjzal4q21krbnp9rp4bsainxcwvpc98020vsmms0z8h";
           name = "loccur";
         };
@@ -36117,7 +36306,7 @@
           sha256 = "1cdnm270kzixa0kpis0xw2ybkw8lqh7kykc7blxkxjrr9yjvbawl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lodgeit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lodgeit";
           sha256 = "1ax2w5yxscycjz90g4jdbhd64g9sipzxpfjs7gq3na77s5dcjzsq";
           name = "lodgeit";
         };
@@ -36138,7 +36327,7 @@
           sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/log4e";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/log4e";
           sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
           name = "log4e";
         };
@@ -36158,7 +36347,7 @@
           sha256 = "15x6368pk4bbvhbd6cqnazcxfdz0b3f70029x0884a5797janln5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/log4j-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/log4j-mode";
           sha256 = "06lam4iqxlbl9ib2n2db2nj6jbjzrw2ak8r99n6w4s3fny1q3yxx";
           name = "log4j-mode";
         };
@@ -36179,7 +36368,7 @@
           sha256 = "0lj3i9i3mg17xws13gzx8myc6d7djgsj47yx4kaq5hycgkni1p7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/logalimacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/logalimacs";
           sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
           name = "logalimacs";
         };
@@ -36200,7 +36389,7 @@
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/logito";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/logito";
           sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
           name = "logito";
         };
@@ -36221,7 +36410,7 @@
           sha256 = "05px3zc3is7k2jmh7mal0al5zx5cqvn1bzmhgqq02pp6lwsx5xqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/logstash-conf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/logstash-conf";
           sha256 = "03i2ilphf3fdjag7m9z5gi23n6ik36qn42mzc22432m4y3c7iksh";
           name = "logstash-conf";
         };
@@ -36242,7 +36431,7 @@
           sha256 = "0xjfm39pk1z2wj6rr9v9jzsxy5p2vdi4rinzfpl719lcknpvzkw3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/logview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
           name = "logview";
         };
@@ -36263,7 +36452,7 @@
           sha256 = "0pyfgywmmnlz1arvdxwyw96gr6xcg2sp3bqjli8xfcl8i0nww4kb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lolcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lolcode-mode";
           sha256 = "0dxdqr3z5bw0vcfxhhhc1499vrfk1xqwxshr0kvlhdalpf59rqiw";
           name = "lolcode-mode";
         };
@@ -36284,7 +36473,7 @@
           sha256 = "0767s606d2iv9k1ffc4bmmkxammbysf9z7306cycbd3jrqdsakrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/look-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/look-dired";
           sha256 = "0dddx5nxr519wqdgrbglh0pqjl3alg4ddmank42g4llzycy61wsd";
           name = "look-dired";
         };
@@ -36302,7 +36491,7 @@
           sha256 = "0sl6hqggi6qn2qp9khw11qp5hamngwxrrwx98k3pwpj9kgicdpgp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/look-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/look-mode";
           sha256 = "0y3wjfjx0g5jclmv9m3vimv7zd18pk5im7smr41qk09hswi63yqj";
           name = "look-mode";
         };
@@ -36323,7 +36512,7 @@
           sha256 = "1wmd7s3dk9krgmhs4f92mig18vx6y551n45ai7cvj92f4fbrsd08";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/loop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/loop";
           sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
           name = "loop";
         };
@@ -36344,7 +36533,7 @@
           sha256 = "0grzl4kqpc1x6569yfh9xdzzbgmhcskxwk6f7scjpl32acr88cmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lorem-ipsum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lorem-ipsum";
           sha256 = "0p62yifbrknjn8z0613wy2aaknj44liyrgbknhpa0qn0d4fcrp4h";
           name = "lorem-ipsum";
         };
@@ -36365,7 +36554,7 @@
           sha256 = "179r4pz3hlb5p6bjfhdikkx1zvh09ln5dbw3c3rmlyww1q7v26yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/love-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/love-minor-mode";
           sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
           name = "love-minor-mode";
         };
@@ -36386,7 +36575,7 @@
           sha256 = "03k7nqk6vz8949pj77lsmw2rrzip7xnfp5nyy18y5d8rvifrcdgw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lua-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lua-mode";
           sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
           name = "lua-mode";
         };
@@ -36407,7 +36596,7 @@
           sha256 = "0mv73s89n59m44szc37086wq55py5sx0lc0jxncfybawhsqyd0ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lush-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lush-theme";
           sha256 = "03kqws8dzm0ay5k86f4v7g2g2ygwk4fzmz2vyzhzhbsj8hrniq9p";
           name = "lush-theme";
         };
@@ -36428,7 +36617,7 @@
           sha256 = "1r1xfn0dyc4m49064g9n6hpwn4r763kpbg3dgprsv30i5ska61qa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lusty-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lusty-explorer";
           sha256 = "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps";
           name = "lusty-explorer";
         };
@@ -36449,7 +36638,7 @@
           sha256 = "090gk0il4yyypzjbh2qrjdaldwf90fi30impmh4zcfl73bic5q9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lxc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lxc";
           sha256 = "1rv1ybmbjx7n3cavx21nzmvckw63q3jmjsfdr2pcgavrr2ck6lka";
           name = "lxc";
         };
@@ -36470,7 +36659,7 @@
           sha256 = "1rrfvshl6zbsrswg5hrvq1p0rd9vacqwbr4s44kln7vg4ybcgr24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/m-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/m-buffer";
           sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc";
           name = "m-buffer";
         };
@@ -36491,7 +36680,7 @@
           sha256 = "119c77s3qp1vqc5m2yf7m4s81aphkhsvsnwqmpq6xl08r3592zxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/macro-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/macro-math";
           sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
           name = "macro-math";
         };
@@ -36509,7 +36698,7 @@
           sha256 = "07iw9iarz6z9n6vnhqqljfjpvq6vb97ca2hwj9v0k5k8mafdqg7d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/macros+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/macros+";
           sha256 = "0aihszxsjnc93pbbkmkr1iwzvii3jw8yh1f6dpnjykgvb328pvqi";
           name = "macros-plus";
         };
@@ -36530,7 +36719,7 @@
           sha256 = "0g9bnq4p3ffvva30hpll80dn3i41m51mcvw3qf787zg1nmc5a0j6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/macrostep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/macrostep";
           sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
           name = "macrostep";
         };
@@ -36551,7 +36740,7 @@
           sha256 = "1flamyk7z3r723cczqra0f4yabc6kmgwjaw2bvs3kisppqmmz72g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mag-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mag-menu";
           sha256 = "1r1yisjnqxl9llpf91rwqp4q47jc4qp32xnkl8wzsgr0r2qf5yk2";
           name = "mag-menu";
         };
@@ -36572,7 +36761,7 @@
           sha256 = "109j4czb71qg9jlnflzph0qmbxyfajddmg0yqwhl368pa29alvrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magic-filetype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magic-filetype";
           sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
           name = "magic-filetype";
         };
@@ -36593,7 +36782,7 @@
           sha256 = "1gmhb8g1pl4qqk1d32hlvmhx2jqfsn3hkc4lkzhgk1n3qzfrq4hf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magic-latex-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magic-latex-buffer";
           sha256 = "0xm4vk4aggyfw96cgya5cp97jzx5ha0xwpf2yfh7c3m8d9cca4y8";
           name = "magic-latex-buffer";
         };
@@ -36606,15 +36795,15 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20160602.1848";
+        version = "20160611.449";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "7ceca0af16ab4a7c16298b11640fc331f17b29f2";
-          sha256 = "0sdg30lcisrc1y2n6hjra3c7v6s7xjfbp8ay6mj3x7ynjqp7a65c";
+          rev = "1ce3bc98729bf12a0aae2bb4718d5019e823a842";
+          sha256 = "0gv2yan74k8hacasl498sm5pcqj39ymj2gqnzgwwynxfxpl2l6pd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit";
           sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q";
           name = "magit";
         };
@@ -36642,7 +36831,7 @@
           sha256 = "19w8143c4spa856xyzx8fylndbj4s9nwn27f6v1ckqxvm5l0pph0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-annex";
           sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
           name = "magit-annex";
         };
@@ -36663,7 +36852,7 @@
           sha256 = "0nkxxhxkhy314jv1l3hza84vigl8q7fc8hjjvrx58gfgsfgifx6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-filenotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-filenotify";
           sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7";
           name = "magit-filenotify";
         };
@@ -36684,7 +36873,7 @@
           sha256 = "1j3jsrp0qpaa2xd98d1g9z0zc4b93knwajrlnlsc7l6g0vlfsddb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-find-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-find-file";
           sha256 = "1y66nsq1hbv1sb4n71gdxv7p1rz37vd9lkf7zl7avy0dchs499ik";
           name = "magit-find-file";
         };
@@ -36705,7 +36894,7 @@
           sha256 = "0mms0gxv9a3ns8lk5k2wjibm3088y1cmpr3axjdh6ppv7r5wdvii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-gerrit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-gerrit";
           sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
           name = "magit-gerrit";
         };
@@ -36726,7 +36915,7 @@
           sha256 = "1cnvfvf8c2f1jvxxl4qggzwhk082q0hfljhfm1znhc5qxh1vyc4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-gh-pulls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-gh-pulls";
           sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
           name = "magit-gh-pulls";
         };
@@ -36747,7 +36936,7 @@
           sha256 = "0bx5j0zskpyfz76px8lr74d4x0gcqwd0ghvbvyj957g2n1bqxr2a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-gitflow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-gitflow";
           sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
           name = "magit-gitflow";
         };
@@ -36768,7 +36957,7 @@
           sha256 = "01ifl1bg3sd5d4b5ms9kyw074as8bkzqpwhxppp79ml46vp1np2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-p4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-p4";
           sha256 = "19p7h3a21jjr2h52ika14lyczdv6z36gl7hk1v17bffffac8q069";
           name = "magit-p4";
         };
@@ -36781,15 +36970,15 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20160530.545";
+        version = "20160606.1941";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "7ceca0af16ab4a7c16298b11640fc331f17b29f2";
-          sha256 = "0sdg30lcisrc1y2n6hjra3c7v6s7xjfbp8ay6mj3x7ynjqp7a65c";
+          rev = "1ce3bc98729bf12a0aae2bb4718d5019e823a842";
+          sha256 = "0gv2yan74k8hacasl498sm5pcqj39ymj2gqnzgwwynxfxpl2l6pd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-popup";
           sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
           name = "magit-popup";
         };
@@ -36810,7 +36999,7 @@
           sha256 = "075gxm4shbh5zfr17zpfn35w8ndgz9aqz6y3wws23wa4ff2n8kdc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-rockstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-rockstar";
           sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
           name = "magit-rockstar";
         };
@@ -36831,7 +37020,7 @@
           sha256 = "163a1rddl54jgxm5dygnbp1pz1as4hhjszan1rcabvzcfnfdpakj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-stgit";
           sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
           name = "magit-stgit";
         };
@@ -36852,7 +37041,7 @@
           sha256 = "0r3nkrisyjawjwbm74yi6fqiwcqzlfkypsdscfhii0q50ky8plph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-svn";
           sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
           name = "magit-svn";
         };
@@ -36873,7 +37062,7 @@
           sha256 = "06fbjv3zd92lvg4xjsp9l4jkxx2glhng3ys3s9jmvy5y49pymwb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-topgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-topgit";
           sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
           name = "magit-topgit";
         };
@@ -36894,7 +37083,7 @@
           sha256 = "1pq6ckxp3dcb2f6xfsd4jwd43r9d0920m30ammp39glgc39p9lsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magma-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magma-mode";
           sha256 = "1gq6yi51h1h7ivrm1xr6nfrpabx8ylbk0waaw04gnw3bb54dmmvc";
           name = "magma-mode";
         };
@@ -36915,7 +37104,7 @@
           sha256 = "1hqz26zm4bdz5wavna4j9yia3ns4z19dnszl7k0lcpgbgmb0wh8y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magnatune";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magnatune";
           sha256 = "0fmxlrq5ls6fpbk5fv67aan8gg1c61i1chfw5lhf496pwqzq901d";
           name = "magnatune";
         };
@@ -36936,7 +37125,7 @@
           sha256 = "06sjwl0bk648wnnrmyh6qgnlqmxypjmy0gkfl6kpv01r8vh7x2q5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/main-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/main-line";
           sha256 = "06rihx9h2h8ayrirbx74d9qdf26laz9yxffvxyldzm9hymlbzadd";
           name = "main-line";
         };
@@ -36957,7 +37146,7 @@
           sha256 = "1s4sm59wz03yz4srqzav7myq6p0gmijw5zj2kbpvxfanlr8b2rb1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/majapahit-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/majapahit-theme";
           sha256 = "04k2smrya27rrjlzvnl3a6llg8vj8x4mm9qyk4kwrmckhd6jd68s";
           name = "majapahit-theme";
         };
@@ -36978,7 +37167,7 @@
           sha256 = "1ky3scyjb69wi76xg6a8qx4ja6lr6mk530bv5gmhj7fxbq8b3x5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/make-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/make-color";
           sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
           name = "make-color";
         };
@@ -36999,7 +37188,7 @@
           sha256 = "00j5n9pil1qik4mrzvam4rp6213w8jm4qw7c4z8sxpq57xa0b679";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/make-it-so";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/make-it-so";
           sha256 = "0a8abz54mb60mfr0bl9ry8yawq99vx9hjl4fm2sivns58qjgfy73";
           name = "make-it-so";
         };
@@ -37020,7 +37209,7 @@
           sha256 = "0w3kar52yf8clf9801c4jzfrixi10clc8fs8ni2d4pzhdwwca2zw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/maker-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/maker-mode";
           sha256 = "03q09jxmhwqy7g09navj08z9ir0rbh7w26c1av7hwhmq4i6xwg8a";
           name = "maker-mode";
         };
@@ -37041,7 +37230,7 @@
           sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/makey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/makey";
           sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
           name = "makey";
         };
@@ -37062,7 +37251,7 @@
           sha256 = "0hlxs9gi2vml2id9q0r1r0xdm0zshjzc1w3phjf2ab0aa3hl5k6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/malabar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/malabar-mode";
           sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
           name = "malabar-mode";
         };
@@ -37083,7 +37272,7 @@
           sha256 = "04j7x7kkilfrk4i76aizkdhmghi9a5hc63mj6mhm8x0v1c4f15lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/malinka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/malinka";
           sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
           name = "malinka";
         };
@@ -37104,7 +37293,7 @@
           sha256 = "18x3cssfn81k8hg4frj7dhzphg784321z51wbbvn3bjhq7s6j3a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mallard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mallard-mode";
           sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
           name = "mallard-mode";
         };
@@ -37125,7 +37314,7 @@
           sha256 = "0qk7i47nmyp4llwp6x0i1i5dk82ck26iyz1sjvvlihaw8a5akny2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mallard-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mallard-snippets";
           sha256 = "0437qd7q9i32pmhxaz3vi2dnfpj4nddmzgnqpwsgl28slhjw2hv8";
           name = "mallard-snippets";
         };
@@ -37146,7 +37335,7 @@
           sha256 = "1lfq4hsq2n33l58ja5kzy6bwk9jxbcdsg6y8gqlk71lcslzqldrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/man-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/man-commands";
           sha256 = "1yl7y0k24gydldfs406v1n523q46m9x6in6pgljgjnjravc67wnq";
           name = "man-commands";
         };
@@ -37167,7 +37356,7 @@
           sha256 = "10wl7kc76dyijrmdlcl5cx821jg7clsj35r22955mbbgh7zl1x07";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/manage-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/manage-minor-mode";
           sha256 = "11jdj8kd401q0y8bbyyn72f27f51bckqid10dnh64z8w7hv59cw6";
           name = "manage-minor-mode";
         };
@@ -37188,7 +37377,7 @@
           sha256 = "0ycivlbv2jxb06cpbnffdhnbisnm9vd6ysg7zynyr2pbzhf6vc37";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mandoku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mandoku";
           sha256 = "1pg7ir3y6yk92kfs5agbxapcxf7gy60m353rjv8g3kfkx5zyh3mv";
           name = "mandoku";
         };
@@ -37209,7 +37398,7 @@
           sha256 = "0pd6bh7wrrh59blp86a2jl2vi4qkzx49z0hy7dkc71ccg0wjsgz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/map-progress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/map-progress";
           sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
           name = "map-progress";
         };
@@ -37230,7 +37419,7 @@
           sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/map-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/map-regexp";
           sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
           name = "map-regexp";
         };
@@ -37251,7 +37440,7 @@
           sha256 = "1qf724y1zq3z6fzm23qhwjl2knhs49nbz0vizwf8g9s51bk6bny2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/marcopolo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/marcopolo";
           sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
           name = "marcopolo";
         };
@@ -37272,7 +37461,7 @@
           sha256 = "1x3anvy3hlmydxyfzr1rhaiy502yi1yz3v54sg8wc1w7jrvwaj29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mark-multiple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mark-multiple";
           sha256 = "179wd9g0smm76k92n7j2vgg8gz5wn9lczrns5ggq2yhbc77j0gn4";
           name = "mark-multiple";
         };
@@ -37293,7 +37482,7 @@
           sha256 = "0k4zvbs09mkr8vdffv18s55rn9cyxldzav9vw04lm7v296k94ivz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mark-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mark-tools";
           sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
           name = "mark-tools";
         };
@@ -37314,7 +37503,7 @@
           sha256 = "0lqxl8myshmk99hnj94ivz8xrpbgsf8dmjivkf35x58k06drbn4f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/markdown-mac-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markdown-mac-link";
           sha256 = "075hmv3mchxbawyxzm9r2hjdy4xislh8590bn077w5rscha8d713";
           name = "markdown-mac-link";
         };
@@ -37327,15 +37516,15 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20160527.1135";
+        version = "20160611.245";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "437713de8b6ce18485fdc9733d38cf125c56fee9";
-          sha256 = "16bw1pzxy28540r3lrgkd0nk1dcfbg3cj9rh8y6qj56ybx48d6kr";
+          rev = "0b907b9a89171d642f9c55e86a6cb7f21135afc9";
+          sha256 = "1sc7f7vgkpadis5swwhhfz0pc64484nnnmpia25zqxljmfajr56j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/markdown-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markdown-mode";
           sha256 = "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14";
           name = "markdown-mode";
         };
@@ -37356,7 +37545,7 @@
           sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/markdown-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markdown-mode+";
           sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
           name = "markdown-mode-plus";
         };
@@ -37377,7 +37566,7 @@
           sha256 = "1i5gr3j9dq41p2zl4bfyvzv6i5z7hgrxzrycmbdc3s7nja36k9z4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/markdown-preview-eww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markdown-preview-eww";
           sha256 = "0j6924f84is41dspib68y5lnz1f8nm7pqyhv47alxra50cjrpxnx";
           name = "markdown-preview-eww";
         };
@@ -37390,15 +37579,15 @@
     markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }:
     melpaBuild {
         pname = "markdown-preview-mode";
-        version = "20160215.1749";
+        version = "20160604.1759";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "markdown-preview-mode";
-          rev = "ff75e31a57f62156441d66d5c4033ad204d49a87";
-          sha256 = "1yi5hsgf8hr7v1wyn3bw650g3ysbglwn5qfrmb6yl3s08lvi1vlf";
+          rev = "625c041efda1fa5e621c510770586baea1fd6a72";
+          sha256 = "1r0aqy78671k4cgf6y6rilch0vrhcj22ff7bvpwpba7imb8mf1cj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/markdown-preview-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markdown-preview-mode";
           sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
           name = "markdown-preview-mode";
         };
@@ -37419,7 +37608,7 @@
           sha256 = "0l687bna8rrc49y1fyn1ldjcwh290qgvi3p86c63yj4xy24fmdm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/markdown-toc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markdown-toc";
           sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
           name = "markdown-toc";
         };
@@ -37429,6 +37618,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    markdownfmt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "markdownfmt";
+        version = "20160609.1441";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "emacs-markdownfmt";
+          rev = "af83cd00fafcaa837ffdb50d1fa2b0ac952f16c0";
+          sha256 = "1alkjvs21wlai742qgcm0bgf3z3c0f10xgalz48gi4vmwn6in7r7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markdownfmt";
+          sha256 = "1wzsw90z988bm94cw4jw5gzjcicgiz4qgn1nsdm8nim9rp43bj17";
+          name = "markdownfmt";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/markdownfmt";
+          license = lib.licenses.free;
+        };
+      }) {};
     markup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markup";
@@ -37440,7 +37650,7 @@
           sha256 = "1i95b15mvkkki2iq8hysdr7jr1d5nix9jjkh7jz0alvaybqlsnqi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/markup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markup";
           sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf";
           name = "markup";
         };
@@ -37461,7 +37671,7 @@
           sha256 = "1w6i1m7xdr9cijnmdj35cl99r12vl83qws0qlfhrgvisilshnr27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/markup-faces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markup-faces";
           sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
           name = "markup-faces";
         };
@@ -37482,7 +37692,7 @@
           sha256 = "1ygznmqb3fqy94p8qi71i223m7cpw3f596pkls2ybjlbpb4psjcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/marmalade";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/marmalade";
           sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
           name = "marmalade";
         };
@@ -37503,7 +37713,7 @@
           sha256 = "017k109nfif5mzkj547py8pdnzlr4sxb74yqqsl944znflq67blr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/marmalade-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/marmalade-client";
           sha256 = "0llwqwwxrf7qdkpdb03ij0iinll0vc9qr557zyr3bn5zb4fad1sq";
           name = "marmalade-client";
         };
@@ -37524,7 +37734,7 @@
           sha256 = "0fwhhzfd6vgpaf5mrw90hvm35j2kzhk9h3gbrwd7y7q08nrmsx9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/marshal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/marshal";
           sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
           name = "marshal";
         };
@@ -37545,7 +37755,7 @@
           sha256 = "1j1282bvsjj71nhswpz0nr11gc7nzxvr113ara49ya58vqhm42gb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/material-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/material-theme";
           sha256 = "1d259avldc5fq121xrqv53h8s4f4bp6b89nz2rvjhygz7f8hargq";
           name = "material-theme";
         };
@@ -37566,7 +37776,7 @@
           sha256 = "0k1ayv0a9g778b50jni3hh70pg6axmq34wl8x3zgphadgms1w9dd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/math-symbol-lists";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/math-symbol-lists";
           sha256 = "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27";
           name = "math-symbol-lists";
         };
@@ -37587,7 +37797,7 @@
           sha256 = "1chyxi096krjbi9zgbrnrkvwgmn4wygnia9m57m0jh4arlbm28la";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/math-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/math-symbols";
           sha256 = "0sx9cgyk56npjd6z78y9cldbvjl5ipl7k1nc1sylg1iggkbwxnqx";
           name = "math-symbols";
         };
@@ -37607,7 +37817,7 @@
           sha256 = "1yfh1j85lnjn58dhrb54wz4ggkbl5gw6wnbx8abknryjyg6c483a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/matlab-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/matlab-mode";
           sha256 = "1bybc5xv5hbjh8afmh03qda5g3m2wcgsk6lgj6jkyyxzdfxqkrck";
           name = "matlab-mode";
         };
@@ -37627,7 +37837,7 @@
           sha256 = "0z79l8md683vvc51fz0nmbazb6i7hklkm0asglflr96pldil50l8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/matrix-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/matrix-client";
           sha256 = "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6";
           name = "matrix-client";
         };
@@ -37648,7 +37858,7 @@
           sha256 = "1sn9bdaq3mf2vss5gzmxhnp9fz43cakxh36qjdgqrvx302nlnv52";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/maude-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/maude-mode";
           sha256 = "1w5v3r905xkwchkm2gzvzpswba5p2m7hqpyg9fzq2ldlr8kk7ah3";
           name = "maude-mode";
         };
@@ -37669,7 +37879,7 @@
           sha256 = "1xn2yyr8mr90cynbxgv0h5v180pzf0ydnjr9spg34mrdicqlki6c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/maven-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/maven-test-mode";
           sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
           name = "maven-test-mode";
         };
@@ -37690,7 +37900,7 @@
           sha256 = "0g9kpsg6623nmxnshj49q8k952xybrkmqqy6m892m8wnm22pjdz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/maxframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/maxframe";
           sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
           name = "maxframe";
         };
@@ -37708,7 +37918,7 @@
           sha256 = "0w8clp96jblsc9v87404zpc280ms0d644in34jdgjc5r33f4i0g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mb-depth+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mb-depth+";
           sha256 = "031hh227rh7l818p3di4h34i4698yynw5g9a5sl2hj47c0734q6w";
           name = "mb-depth-plus";
         };
@@ -37729,7 +37939,7 @@
           sha256 = "1pi5yi76781pckvqgqabmkvq081npzkzl3r97f1wbcndvpfvv8jx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mb-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mb-url";
           sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
           name = "mb-url";
         };
@@ -37750,7 +37960,7 @@
           sha256 = "1zywygdgnp2zr8fxqhl0cbrgbl43931k936b9imhqi96p6622pb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mbe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mbe";
           sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
           name = "mbe";
         };
@@ -37771,7 +37981,7 @@
           sha256 = "1vr85fdlb4zwgid1v00ndppla9fqqk25g2x2f5alm69pfqssr75z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mbo70s-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mbo70s-theme";
           sha256 = "1abx2rw09xxp122ff7i9sry5djd4l6vn4lfzxs92rknjzkyc40pb";
           name = "mbo70s-theme";
         };
@@ -37792,7 +38002,7 @@
           sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mc-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mc-extras";
           sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
           name = "mc-extras";
         };
@@ -37813,7 +38023,7 @@
           sha256 = "1j8gp3byanf1mq8sc4hv838rgcywlv35d8q1vjwzsjaznvz8hvc3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/md-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/md-readme";
           sha256 = "1krq0f79jjrlihr2aqq87pxdqixv2zdjw4hm732sz79g996yxyw3";
           name = "md-readme";
         };
@@ -37834,7 +38044,7 @@
           sha256 = "136lh39hakwx46rd1gsmsfhsj78mrpamid766v2vjx9rkkprk0zv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/meacupla-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/meacupla-theme";
           sha256 = "09q88q2xghj5vn5y3mjrcparfwdzavkgjyg2ay55h7wf5f2zpw2d";
           name = "meacupla-theme";
         };
@@ -37855,7 +38065,7 @@
           sha256 = "0kzmvsbzqrkrlnr5sf1xwazm9zyzbrflb4d1jrkp206q9yk439cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mediawiki";
           sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
           name = "mediawiki";
         };
@@ -37876,7 +38086,7 @@
           sha256 = "0bilwhvprzk634sk5hnxilrvrl0yv593swzznch0p38hqxl585ld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mellow-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mellow-theme";
           sha256 = "0kl1psykx7akxwabszk4amszh3zil8ia4bfbjjvr6h9phgx66pb0";
           name = "mellow-theme";
         };
@@ -37897,7 +38107,7 @@
           sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/melpa-upstream-visit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/melpa-upstream-visit";
           sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
           name = "melpa-upstream-visit";
         };
@@ -37918,7 +38128,7 @@
           sha256 = "0pjqax3pi6pb650yb8iwa4brwwl6cdka7jym3cfkpppyy782dm0q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/memento";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/memento";
           sha256 = "0f8ajhj677r2kxszmad6h1j1b827ja0vaz2my1vx145y3gf160b8";
           name = "memento";
         };
@@ -37939,7 +38149,7 @@
           sha256 = "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/memoize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/memoize";
           sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6";
           name = "memoize";
         };
@@ -37960,7 +38170,7 @@
           sha256 = "1jd4rjv812iv7kp4wyxdz8sk7j0442m8x2ypk6hiqis0braxnspm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/memolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/memolist";
           sha256 = "1whajbwmz1v01dirv795bhvs27vq9dh0qmj10dk2xia7vhn42mgh";
           name = "memolist";
         };
@@ -37981,7 +38191,7 @@
           sha256 = "11hyydc13jdai6lkxx8nqf8xljh0gx7fcmywhik4f1hf3pdv7i2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mentor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
           name = "mentor";
         };
@@ -37999,7 +38209,7 @@
           sha256 = "0v3n0227fmdk6hshnc1x1sxqci0pi3954nqy5ym4k9bmvw3cyxlg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/menu-bar+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/menu-bar+";
           sha256 = "181jxjnzdckmvpsdknhm21xwimvsp0qxn8azfn58dz41gl4xcg90";
           name = "menu-bar-plus";
         };
@@ -38020,7 +38230,7 @@
           sha256 = "0vk1b9gjhjq47jhjhwh6h2x2cl2w7pz4018s6c444paw46gmgkln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/merlin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/merlin";
           sha256 = "177cy9xcrjckxv8gvi1zhg2ndfr8cmsr37inyvpi5dxqy6d6alhp";
           name = "merlin";
         };
@@ -38038,7 +38248,7 @@
           sha256 = "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/message-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/message-x";
           sha256 = "0z12alizwrqp5f9wq3qllym9k5xljh904c9qhlfhp9biazj6yqwj";
           name = "message-x";
         };
@@ -38059,7 +38269,7 @@
           sha256 = "1x425ah3ymjyp3pxvyzyp4gd8zrjx8lgdzprml8qvf1yk82iv45l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/meta-presenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/meta-presenter";
           sha256 = "0f70cfa91wavchlx8d9hdlgq90cmnylhbg2dbw603rzjkyvslp5d";
           name = "meta-presenter";
         };
@@ -38080,7 +38290,7 @@
           sha256 = "0n4nv1s25z70xfy3bl1wy467abz3agj4qmpx4rwdwzbarnqp9ps3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/metafmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/metafmt";
           sha256 = "1ca102al7r3k2g92b4jkqv53crnmxy3z7cz31w1rprf41s69mn75";
           name = "metafmt";
         };
@@ -38101,7 +38311,7 @@
           sha256 = "1rascpmv17dksyn9y0llmjb8r4484x5ax54w6r83k1x7ha1iacx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/metascript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/metascript-mode";
           sha256 = "1kgs4ki0s6bxx2ri6zxmsy2b2w56gnr9hjkr6302wcmp3qy7clwn";
           name = "metascript-mode";
         };
@@ -38122,7 +38332,7 @@
           sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/metaweblog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/metaweblog";
           sha256 = "10kwqnfafby4ap0572mfkkdssr13y9p2gl9z3nmxqjjy04fkfi8b";
           name = "metaweblog";
         };
@@ -38143,7 +38353,7 @@
           sha256 = "1rkipcv53p7zra3gbjc77ywyxn8d1kx2gniyfqq16d2p2jw0lbzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mew";
           sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
           name = "mew";
         };
@@ -38164,7 +38374,7 @@
           sha256 = "0bhllmyk1r9y63jw5gx10v09791w33lc54qs31gcxbnss094l6py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mexican-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mexican-holidays";
           sha256 = "0awf4vv6mbp1xr92nsgdn513g4adqhp21k12q4fbm85b2l3jlspb";
           name = "mexican-holidays";
         };
@@ -38177,15 +38387,15 @@
     mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mhc";
-        version = "20160520.441";
+        version = "20160526.918";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "mhc";
-          rev = "32d17a332cdfbe63654d47456efaa19a51a2f03f";
-          sha256 = "1n3rx9hx7v6zbzb443r2c8292sfbcgvm3a4477awxizxnikyxdbq";
+          rev = "55e8d96deb72d2c659c2e64522260c0fc59a9f59";
+          sha256 = "1xis4d0bikz6cvdp7fiflagi9f0zkxldrj3fwhp9w4mfx120nc08";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mhc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mhc";
           sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
           name = "mhc";
         };
@@ -38206,7 +38416,7 @@
           sha256 = "0l7xfana2cb894w5qi6wwx7w9k89c3i8k40fpsd93sm3hgi5ryii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mic-paren";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mic-paren";
           sha256 = "042dzp0nal18nxq94qlwwksh0nnypsyc0yykmc6l3kayp9pv4hw7";
           name = "mic-paren";
         };
@@ -38227,7 +38437,7 @@
           sha256 = "0r6l6iqn5z9wp4w58flnls7kk6300qlxyy04fw0np00nvwsy4qvp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/micgoline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/micgoline";
           sha256 = "0xixcy006my2s0wn0isiag0b4rm38kswa5m0xnhg5n30qjjfzf4i";
           name = "micgoline";
         };
@@ -38248,7 +38458,7 @@
           sha256 = "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/midje-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/midje-mode";
           sha256 = "0069hwy5cyrsv5b1yvjhmjasywbmc8x3daq9hkzidy3a2fmqgqv3";
           name = "midje-mode";
         };
@@ -38269,7 +38479,7 @@
           sha256 = "1az4mnmanhz9ga0g46jf33w8axcw8lnrb9lmszajwv7y5j9nk7yr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/migemo";
           sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
           name = "migemo";
         };
@@ -38290,7 +38500,7 @@
           sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/milkode";
           sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
           name = "milkode";
         };
@@ -38310,7 +38520,7 @@
           sha256 = "1b2kn4c90hl07lzdg10wamd4lq8f24wmaj4zvr728pwyga99b2av";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/minesweeper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/minesweeper";
           sha256 = "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag";
           name = "minesweeper";
         };
@@ -38331,7 +38541,7 @@
           sha256 = "14dqa37z96nhmrhiczri0cyrzmjc3larw8sszvdal9prj47363sh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mingus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mingus";
           sha256 = "0vw09qk56l792706vvp465f40shf678mcmdh7iw8wsjix4401bzi";
           name = "mingus";
         };
@@ -38352,7 +38562,7 @@
           sha256 = "1n4b039448826w2jcsv4r2iw3v2vlrsxw8dbci8wcfigmkbfc879";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/minibuf-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/minibuf-isearch";
           sha256 = "0n36d152lc53zj9jy38b0c7hlww0z6hx94y3x2njy6cmh3p5g8nh";
           name = "minibuf-isearch";
         };
@@ -38373,7 +38583,7 @@
           sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/minibuffer-complete-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/minibuffer-complete-cycle";
           sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
           name = "minibuffer-complete-cycle";
         };
@@ -38394,7 +38604,7 @@
           sha256 = "011kg76zr4hfhi2gngnc7jlmp0l0nvhmlgyc0y9bir2jbjf4yyvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/minibuffer-cua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/minibuffer-cua";
           sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
           name = "minibuffer-cua";
         };
@@ -38415,7 +38625,7 @@
           sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/miniedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/miniedit";
           sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
           name = "miniedit";
         };
@@ -38436,7 +38646,7 @@
           sha256 = "1sj5sq932w079y3vy55q5b6wybwrzz30y092iq1mpfg5xvl42sbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/minimal-session-saver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/minimal-session-saver";
           sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
           name = "minimal-session-saver";
         };
@@ -38449,15 +38659,15 @@
     minimal-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "minimal-theme";
-        version = "20140410.101";
+        version = "20160608.1222";
         src = fetchFromGitHub {
           owner = "ikame";
           repo = "minimal-theme";
-          rev = "2cc688c1705eeb77fe1deeea35bfce378081f238";
-          sha256 = "1iy1z2kwnbzxhz5r4gsy4zm0l3xbwy314dqxliprbl8n2m9w0lmz";
+          rev = "430e0d3fc2044c16aa9f10961841febbd60df285";
+          sha256 = "1rmcvdydgwppma1v2yajz6yzhns8bh3gdb09338jlk0nkp1akpfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/minimal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/minimal-theme";
           sha256 = "0l4xj5q06h5fk634d6v3idm0zniq8grz4rjm6qzi7b4jr9sc60gm";
           name = "minimal-theme";
         };
@@ -38478,7 +38688,7 @@
           sha256 = "0m37gjrcsjsvprq8w19qw5ivd4l1xb12609ixvbv1k21b15s1x38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/minitest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/minitest";
           sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
           name = "minitest";
         };
@@ -38499,7 +38709,7 @@
           sha256 = "0808cl5ixvmhd8pa6fc8rn7wbxzvqjgz43mz1pambj89vbkzmw1c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/minizinc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/minizinc-mode";
           sha256 = "1blb6mbyqvmdvwp477p1ggs3n6rzi9sdfvi0v1wfzmd7k749b10c";
           name = "minizinc-mode";
         };
@@ -38517,7 +38727,7 @@
           sha256 = "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/minor-mode-hack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/minor-mode-hack";
           sha256 = "1f2wy25iphk3hzjy39ls5j04173g7gaq2rdp2grkawfhwx0ld4pj";
           name = "minor-mode-hack";
         };
@@ -38538,7 +38748,7 @@
           sha256 = "12k9ii4090dn03xvgqisl4zl4qi33054zxyfkqzzpa9wv72h4knc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mip-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mip-mode";
           sha256 = "1wx5zg4kimd29vqipbzm4vjphn0mldri12g6b18kc290nhgj22ar";
           name = "mip-mode";
         };
@@ -38556,7 +38766,7 @@
           sha256 = "0sc4l0prwmakxmdq22xd5mj8ddwhzrs034zmx2swi2k3s07x15id";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/misc-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/misc-cmds";
           sha256 = "0bylb84icddgznmim18fwq1mhh3qz8yh8ch6lpadf9p3h420qgcl";
           name = "misc-cmds";
         };
@@ -38574,7 +38784,7 @@
           sha256 = "1549qcz5c4l6zjl09j1573i00qdgdl41nvnl5hhqg39gi4nz4c9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/misc-fns";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/misc-fns";
           sha256 = "1spjbkcac33lyfsgkd6z186a3432x9nw3akmx194gaap2863xcam";
           name = "misc-fns";
         };
@@ -38595,7 +38805,7 @@
           sha256 = "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mkdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mkdown";
           sha256 = "1b2vi8q6jhq1xv7yr5f3aiyp1w8j59w19vxys0pv6bqr2gra07i1";
           name = "mkdown";
         };
@@ -38616,7 +38826,7 @@
           sha256 = "1lcc2p9qz70kpykgx82isv0qiqlsajp4vvcj6bvag92d7h9yk9bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mmm-jinja2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mmm-jinja2";
           sha256 = "0579sv77dyzishhcw4xxi444inwy4jgh9vmxwd856nd05j3cyc7z";
           name = "mmm-jinja2";
         };
@@ -38636,7 +38846,7 @@
           sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mmm-mako";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mmm-mako";
           sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
           name = "mmm-mako";
         };
@@ -38657,7 +38867,7 @@
           sha256 = "04rapmqblfjvmdccm9kqi8gn0him1x2q7hjwsyb8mg4lwxcd7qp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mmm-mode";
           sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
           name = "mmm-mode";
         };
@@ -38678,7 +38888,7 @@
           sha256 = "0l5lpyiygikm9rwgk6jgx23wmc26hvhnqn9964d60l5a4b9fam74";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mmt";
           sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
           name = "mmt";
         };
@@ -38699,7 +38909,7 @@
           sha256 = "1dh92hzpicfvrlg6swrw4igwb771xbsmsf7hxp1a4iry4w8dk398";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mo-git-blame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mo-git-blame";
           sha256 = "1dp9pxhggappb70m5hyp8sxlnh06y996adabq7x6qvm745mk6f0x";
           name = "mo-git-blame";
         };
@@ -38720,7 +38930,7 @@
           sha256 = "0k0scl9z35d8x4ikxm2db1frpbx151p2m181fa1armxbd9lbfvnn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mo-vi-ment-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mo-vi-ment-mode";
           sha256 = "1pg889mgpv0waccm135mlvag7q13gzfkzchv2532jngwrn6amqc7";
           name = "mo-vi-ment-mode";
         };
@@ -38741,7 +38951,7 @@
           sha256 = "04hbd7mv29v3fv4ld0b3skrir0wp9dix2n5nbqp63fj6n5i4cyyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mobdebug-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mobdebug-mode";
           sha256 = "19k0c7igqsqvib6hx0nssig4l5f959dlr4wijd1hp5h1hmcb5vv8";
           name = "mobdebug-mode";
         };
@@ -38762,7 +38972,7 @@
           sha256 = "12i4na064z9cxhxgs9mh056j5r1rxpmmis9jfllcpsx4nhs9i9hp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mocha";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mocha";
           sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx";
           name = "mocha";
         };
@@ -38783,7 +38993,7 @@
           sha256 = "1f8h5c9vvwynq92b1ii5hdpqmf52l5j443ir5hdbiigq30wkwlhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mocha-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mocha-snippets";
           sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds";
           name = "mocha-snippets";
         };
@@ -38804,7 +39014,7 @@
           sha256 = "0dngznaraphpc5amn9n120la7ga3rj7h67pnnal6qwflh5rqcmss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mocker";
           sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
           name = "mocker";
         };
@@ -38825,7 +39035,7 @@
           sha256 = "0yf5lwd95j55dkrkplsgnynq37ww0g97vw517j9q7spn7dqnq5f6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/modalka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/modalka";
           sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
           name = "modalka";
         };
@@ -38846,7 +39056,7 @@
           sha256 = "1xpskmmmc8xgz0n35fdq7k8ms21pjwd3m9zk9gshf2gyzcsb4mx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mode-icons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mode-icons";
           sha256 = "1dqcry27rz7afyvjg7345wysp6wmh8fpj32ysk5iw5i7v5scf6kf";
           name = "mode-icons";
         };
@@ -38867,7 +39077,7 @@
           sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mode-line-debug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mode-line-debug";
           sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
           name = "mode-line-debug";
         };
@@ -38885,7 +39095,7 @@
           sha256 = "0qikw44mj209xycchxqifbn9vwyd4zd2d25w8m134cnkhbbjmf5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/modeline-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/modeline-char";
           sha256 = "1cb6pm69db0jbksmc4mkawf643i74is9v7ka34pv3mb21nj095qp";
           name = "modeline-char";
         };
@@ -38903,7 +39113,7 @@
           sha256 = "1r4zq355h570hk7qq0ik121bwsr4hjnhacal4d4h119d11gq2p8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/modeline-posn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/modeline-posn";
           sha256 = "0dngfcbcdh22fl6nd47dhg9z9iivj67six67zjr9j1cbngp10dwk";
           name = "modeline-posn";
         };
@@ -38916,15 +39126,15 @@
     modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "modern-cpp-font-lock";
-        version = "20160601.2150";
+        version = "20160609.5";
         src = fetchFromGitHub {
           owner = "ludwigpacifici";
           repo = "modern-cpp-font-lock";
-          rev = "d9b625482b82de118ab23a6acd1dbdec87c425c7";
-          sha256 = "1514zz5lgvxw688k8iidw7jwf3dk3ml02q8277369dnqq514p9bj";
+          rev = "8d4c6773ef707e79b1dea6c318088fa414907279";
+          sha256 = "0bfqchi46v7320xy8dc0b96axbykqy9qjmsvb1f7rb4k66krlhzd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/modern-cpp-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/modern-cpp-font-lock";
           sha256 = "0h43icb5rqbkc5699kdy2mrjs5448phl18jch45ylp2wy2r8c2qj";
           name = "modern-cpp-font-lock";
         };
@@ -38945,7 +39155,7 @@
           sha256 = "0ri841cwx2mx8ri50lhvifmxnysdc022421mlmklql0252kn775l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/modtime-skip-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/modtime-skip-mode";
           sha256 = "1drafwf4kqp83jp47j2ddl2n4a92zf1589fnp6c72hmjqcxv3l28";
           name = "modtime-skip-mode";
         };
@@ -38958,15 +39168,15 @@
     moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "moe-theme";
-        version = "20160322.915";
+        version = "20160607.736";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "moe-theme.el";
-          rev = "d7c4aa29ca55a394e6ebf698fda93215c0df1123";
-          sha256 = "1567k0zacdf9zlmypb8fywz49n37hm8p60vrq2jqql8n8nq325gq";
+          rev = "36445fafc1dc1fb30d30eacf11329019f29e7199";
+          sha256 = "1pbvi7g2f196w9cmzr389k1zs8s2wzxqskdjxilfpzilrzcb7zyb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/moe-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/moe-theme";
           sha256 = "1nqvj8spvffgjvqlf25rcm3dc6w1axb6qlwwsjhq401a6xhw67f6";
           name = "moe-theme";
         };
@@ -38987,7 +39197,7 @@
           sha256 = "1hqa59pdrnwfykyl58lr8pfbh2f13sygvmrh707hbwc2aii0jjv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/molokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/molokai-theme";
           sha256 = "0srdh3yx7j6xs7rgpzmsyzz6ds00kq887rs2sfa0nvk0j0ga6baf";
           name = "molokai-theme";
         };
@@ -39008,7 +39218,7 @@
           sha256 = "0z8mcfhj425hb91fkj1pyg3apw1kf4mgy8lx6n1sc8zmib38py0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mongo";
           sha256 = "103zkslqdihjyl81688fvkq96rzk3an1vf3gz8rlmmz5anbql8ai";
           name = "mongo";
         };
@@ -39029,7 +39239,7 @@
           sha256 = "1p9p0yp68wb7f1qf0c02fk7ayb7dw6gv57368ksa6nw76w58hhfm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/monky";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/monky";
           sha256 = "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz";
           name = "monky";
         };
@@ -39050,7 +39260,7 @@
           sha256 = "1sxhpvxapzgrwvzibkg7zd3ppmfcz5rhrbvg73b8rggjg4m5snyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/monochrome-theme";
           sha256 = "191ikqns1sxcz6ca6xp6mb2vyfj19x19cmcf17snrf46kmx60qk9";
           name = "monochrome-theme";
         };
@@ -39071,7 +39281,7 @@
           sha256 = "02fyhijyn9awa5ag57kyk637vy9pfdica58zhdv24vqd4m81yby3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/monokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/monokai-theme";
           sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
           name = "monokai-theme";
         };
@@ -39084,15 +39294,15 @@
     monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monroe";
-        version = "20160421.1340";
+        version = "20160610.1257";
         src = fetchFromGitHub {
           owner = "sanel";
           repo = "monroe";
-          rev = "f497e134f754ee62178eb41844fce3ffe204d50a";
-          sha256 = "0jac2i5hwdi65rrif0xq86wsimxlpwcfbzsv7fjhc5f16bs6dmnk";
+          rev = "e254ccb93b414d46ebbb5524f059c359b43547c0";
+          sha256 = "15c5hfhdjax8vmhlvkjyypi4mxw8fiwv38rkna14aix5cv16arsj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/monroe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/monroe";
           sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
           name = "monroe";
         };
@@ -39113,7 +39323,7 @@
           sha256 = "0bz35m0drjl12f9y42a79nnzxz5ahf5m7c2l2nfz8fyif270ph1y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/moonscript";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/moonscript";
           sha256 = "1fi4hg5gk5zpfkrk0hqghghkzbbi33v48piq2i085i4nc6m3imp0";
           name = "moonscript";
         };
@@ -39134,7 +39344,7 @@
           sha256 = "0kjqdm6kzhgjmfdj4n95ivffw1wqf4r3gk62fvhfi4w29g7wd16j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/morlock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/morlock";
           sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
           name = "morlock";
         };
@@ -39155,7 +39365,7 @@
           sha256 = "10mf96r75558scn71pri71aa8nhp6hmnb5rwjxlh5dlf80r5dfd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mote-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mote-mode";
           sha256 = "1lg5z5d0d35sh21maiwmgzvc31iki9yg6x0awy5xrfsains7ykn9";
           name = "mote-mode";
         };
@@ -39176,7 +39386,7 @@
           sha256 = "17570labnwdnwca2cg4ga0mrrm00n0h3wlxry823k5yn3k93rnj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/motion-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/motion-mode";
           sha256 = "1lfsc8ayiz2v3dfn8c0mmfch8vpzqyddxw8kscan2lzl2lcj50h0";
           name = "motion-mode";
         };
@@ -39194,7 +39404,7 @@
           sha256 = "0rakxcpqdx175hic3ykwbd5if53dvvf0sxhq0gplpsybpqvkimyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mouse+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mouse+";
           sha256 = "1fv7jnqzskx9iv92dm2pf0mqy2accl0svjl2kkb6v273n1day3f8";
           name = "mouse-plus";
         };
@@ -39215,7 +39425,7 @@
           sha256 = "05pzplb3gmlnlvn2azbxdlf4vrkvk8fc9dkgi2nq4shysnh4c9v7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mouse-slider-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mouse-slider-mode";
           sha256 = "0aqxjm78k7i8c59w6mw9wsfw3rail1pg40ac1dbcjkm62fjbh5hy";
           name = "mouse-slider-mode";
         };
@@ -39233,7 +39443,7 @@
           sha256 = "1831jpi06hi5v2jdjgs83jma7fp8xiqdmvvwxfyp2zpbfwi1lkb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mouse3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mouse3";
           sha256 = "1rppn55axjpqwqm2lq4dvwi3z7xkd5jkyqi1x8jqgcsfc9w6m777";
           name = "mouse3";
         };
@@ -39254,7 +39464,7 @@
           sha256 = "0baynb6gq04rxh10l6rn0myrhg7c7fwqaryiiyddp4jy7llf83c8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/move-dup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/move-dup";
           sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
           name = "move-dup";
         };
@@ -39275,7 +39485,7 @@
           sha256 = "1i8nbxmxi9yblik7ma3wm19sajk1pgpw83mj990vhj1yl1k7m136";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/move-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/move-text";
           sha256 = "04bfrkanafmbrdyw06ciw9kiyn7h3kpikxk3clx2gc04jl67hzgy";
           name = "move-text";
         };
@@ -39292,11 +39502,11 @@
         src = fetchFromGitHub {
           owner = "retroj";
           repo = "mowedline";
-          rev = "058d5fad71c9895ab36cf83b3f0a0b722054cb19";
-          sha256 = "179mc70x3dvj0cz6yyhs00ndh0xvk71gmiscln9y0f1ngxr5h338";
+          rev = "41b9fab11d38d8c0898a3646ec7f0ed8b525f33f";
+          sha256 = "01rh5fniislcxrvn8ar37f59vnbkzjm45vdkbvk8nbkl5adk6smi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mowedline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mowedline";
           sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
           name = "mowedline";
         };
@@ -39317,7 +39527,7 @@
           sha256 = "1g06i3d8xv8ja6nfww4k60l3467xr1s9xsk7i6dbicq0lf8559h9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/moz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/moz";
           sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
           name = "moz";
         };
@@ -39338,7 +39548,7 @@
           sha256 = "0fssn33ld6xhjlwg1dbrjg8sa0pjmglq0dw792yrmvm4fj0zjph8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/moz-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/moz-controller";
           sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
           name = "moz-controller";
         };
@@ -39359,7 +39569,7 @@
           sha256 = "1l1qds7mzn7cx0ijdwcdihqbmidwh16a96v4la9ris07k5fxqiph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mozc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mozc";
           sha256 = "0nslh4xyqpvzdxcgrd1bzaqcdz77bghizh6n2w6wk46cflir8xba";
           name = "mozc";
         };
@@ -39380,7 +39590,7 @@
           sha256 = "0cpcldizgyr125j7lzkl8l6jw1hc3fb12cwgkpjrl6pjpr80vb15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mozc-im";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mozc-im";
           sha256 = "1gqzmm712npj36qfi506zgl0ycd6k7l5m46c7zz2z2lb6jpssw10";
           name = "mozc-im";
         };
@@ -39401,7 +39611,7 @@
           sha256 = "1mbpkjc6sk7qqmgsmr5a5l2ycwnqp8bkwgikdavgs6hnal10bkmn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mozc-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mozc-popup";
           sha256 = "1n43lwflxzzyskxgzg19rg3hiqqkf5l7vfgaydryf4sk8480x687";
           name = "mozc-popup";
         };
@@ -39422,7 +39632,7 @@
           sha256 = "1vwciy6hcbcyid41bykibx6ii1y9ln7kdxn7cjwfjrgd3kl9wg19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mozc-temp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mozc-temp";
           sha256 = "0x1bsa1py0kn73hzbsb4ijl0bqng8nib191vgn6xq8f5cx55044d";
           name = "mozc-temp";
         };
@@ -39443,7 +39653,7 @@
           sha256 = "11c8pr3s77aq34ic32lnsialwh8bw3m78kj838xl2aab2pgrlny2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mpages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mpages";
           sha256 = "11scjjwwrpgaz6i4jq9y7m864nfak46vnbfb0w15625znz926jcs";
           name = "mpages";
         };
@@ -39464,7 +39674,7 @@
           sha256 = "09731mwm23b6ic53366lnxy2p7dfd245yh75gaf6ijfa22jks7gb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mpg123";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mpg123";
           sha256 = "184ip9pvv4zkfxnrzxbfajjadc9f4dz4psn33f9x3sfh7s1y4nw8";
           name = "mpg123";
         };
@@ -39485,7 +39695,7 @@
           sha256 = "193j90sgn1zgl00mji86wll4djj57vk5arhwbmhhf5b1qx3wpbhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mpv";
           sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
           name = "mpv";
         };
@@ -39506,7 +39716,7 @@
           sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/msvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/msvc";
           sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
           name = "msvc";
         };
@@ -39527,7 +39737,7 @@
           sha256 = "1gxspy50gh7j4sysvr17fvvp8p417ww39ii5dy0fxncfwczdsa19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mu-cite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mu-cite";
           sha256 = "0ap21sw4r2x774q2np6rhrxh2m2rf3f6ak3k71iar159chx32y6q";
           name = "mu-cite";
         };
@@ -39548,7 +39758,7 @@
           sha256 = "0ndxf39w1ndqys455ydhy1f1d12pfza62wrqja8xxh5s7s2x67h9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mu4e-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mu4e-alert";
           sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
           name = "mu4e-alert";
         };
@@ -39569,7 +39779,7 @@
           sha256 = "00ylq8ay7j21winii1g3c3hcaihcnq209mngs7g1cgykh1fpbblg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mu4e-maildirs-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mu4e-maildirs-extension";
           sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
           name = "mu4e-maildirs-extension";
         };
@@ -39590,7 +39800,7 @@
           sha256 = "0f5hc6mgq0hg1wwnvqd4fp7ck58lcavvgqjggz9zlhrjgkmynjxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/multi";
           sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
           name = "multi";
         };
@@ -39611,7 +39821,7 @@
           sha256 = "1aswpv1m02n26620hgkcfd38f06bzmmijlr9rs5krv6snq5gdb8g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/multi-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/multi-compile";
           sha256 = "16fv0hpwcjw1771zlbgznph0fix9fbm6yqj2rcz1f9l26iih6apz";
           name = "multi-compile";
         };
@@ -39629,7 +39839,7 @@
           sha256 = "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/multi-eshell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/multi-eshell";
           sha256 = "1i0mvgqxsc99dwp9qcdrijqxsxflrbxw846rgw89p1jfs8mp4l7d";
           name = "multi-eshell";
         };
@@ -39650,7 +39860,7 @@
           sha256 = "08zyplahyfr6wa145fsggqyn5nh8x4nx98znz82g38pyh8yn2i1j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/multi-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/multi-line";
           sha256 = "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp";
           name = "multi-line";
         };
@@ -39670,7 +39880,7 @@
           sha256 = "0lcx73vzm7zwvzzc53pfb5y16bhvq9cm9fdy63d3242s8v834z3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/multi-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/multi-project";
           sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x";
           name = "multi-project";
         };
@@ -39688,7 +39898,7 @@
           sha256 = "062c52xd469jdmsq4fvdhsmgfjrlanv0bb1w5vglz7bsn68d2bim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/multi-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/multi-term";
           sha256 = "1va4ihngwv5qvwps3m9jj0150gbrmq3zllnyq1hbx5ap8hjrhvdx";
           name = "multi-term";
         };
@@ -39709,7 +39919,7 @@
           sha256 = "0mc4kkgwnwfk27wwc21nw5ly7qcsl7y5bd8wf2y8r6pxhvwran4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/multi-web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/multi-web-mode";
           sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
           name = "multi-web-mode";
         };
@@ -39730,7 +39940,7 @@
           sha256 = "1ispa0wxpkydm0cyj4scyyacfrbilrip5v8bsrcqfc6qs597z8rf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/multicolumn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/multicolumn";
           sha256 = "1ylnc3s4ixvnqn7g2p6nzz8x29ggqc703waci430f1rp1lsd3q09";
           name = "multicolumn";
         };
@@ -39751,7 +39961,7 @@
           sha256 = "065l04ylplng1vgykkbn2vnkcs3sn1k2cikx1ha2q8wmgx6bkvai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/multifiles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/multifiles";
           sha256 = "0m0pi2qjis9p6z9cd8hlxm1r88ynwmd2ks8wg65sffffwsdbg4kz";
           name = "multifiles";
         };
@@ -39764,15 +39974,15 @@
     multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multiple-cursors";
-        version = "20160523.2143";
+        version = "20160609.2211";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "multiple-cursors.el";
-          rev = "be149f9121840561b7a2df17a7a3b1838a1b1f4c";
-          sha256 = "0h91jg8mhzxk5ir67a9bl4bl74w3m24xdjgqsjac6ffaf6vc3jhm";
+          rev = "2ccfc74bf4c00b15c44972843486d35403aab474";
+          sha256 = "0pw0l5qnv878r16q3vxl6c69ik0l15w72bf0vn9dr922y8vcl824";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/multiple-cursors";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/multiple-cursors";
           sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
           name = "multiple-cursors";
         };
@@ -39793,7 +40003,7 @@
           sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mustache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mustache";
           sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g";
           name = "mustache";
         };
@@ -39814,7 +40024,7 @@
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mustache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mustache-mode";
           sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
           name = "mustache-mode";
         };
@@ -39835,7 +40045,7 @@
           sha256 = "19qd34dcfspv621p4y07zhq2pr8pwss3lcssm9sfhr6w2vmvgcr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mustang-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mustang-theme";
           sha256 = "0771l3x6109ki914nwpfz3fj7pbvpcg9vf485mrccq2wlxymr5dr";
           name = "mustang-theme";
         };
@@ -39856,7 +40066,7 @@
           sha256 = "170qhbbvcv9dg6jzfd9r95in5m8z1k647mn0gaqflfj0hvq5hwgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mustard-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mustard-theme";
           sha256 = "0izxhivhmv49dja4wy9n0ipd41xdzdza2ql7pfa7ny35ji5hskik";
           name = "mustard-theme";
         };
@@ -39877,7 +40087,7 @@
           sha256 = "0w9blrm3596hmip8jg2hlz9sl31ci89b90jglmg4ipldgrgj3ly6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mutant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mutant";
           sha256 = "0m5l5r37zb0ig96757ldyl9hbb01lknzqf08ap6dsmdwr1zayvp1";
           name = "mutant";
         };
@@ -39895,7 +40105,7 @@
           sha256 = "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/muttrc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/muttrc-mode";
           sha256 = "0ym6rfrhrmpnlqhkxv9ck5893qm0yhswslvgc9vb4nl9hyc1b5jn";
           name = "muttrc-mode";
         };
@@ -39916,7 +40126,7 @@
           sha256 = "1jg3xrk44lspxli0zr02jcsl8phj0ns7ly3dkd7rx2wgsk69ari3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mvn";
           sha256 = "0bpg9zpyfdyn9xvrbmq4gb10hd701mc49np8arlmnilphb3fdgzs";
           name = "mvn";
         };
@@ -39937,7 +40147,7 @@
           sha256 = "0qdlbyq47gr65yq5ri8s9lxw4wp9fmyqc2prkh560d4hkvw60aw3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mwe-log-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mwe-log-commands";
           sha256 = "05z2ax9mgyxldd3ds44xnh9f5w5q4ziy4rxmnfiqjykan2f5hnkn";
           name = "mwe-log-commands";
         };
@@ -39958,7 +40168,7 @@
           sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mwim";
           sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
           name = "mwim";
         };
@@ -39979,7 +40189,7 @@
           sha256 = "0cf0c9g9k2lk1ifi2dlw7c601sh1ycxf3fgl2hy5wliyd6l9rf86";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/myanmar-input-methods";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/myanmar-input-methods";
           sha256 = "1yg8zy2z18pbyr507ms2b162c0819rna1ilwyp6hb3iv2zjw45sd";
           name = "myanmar-input-methods";
         };
@@ -40000,7 +40210,7 @@
           sha256 = "0a9a6hmv8vjmp6h9mnzin9vc0sncg79v5z72pasvbrplfxijzan0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mykie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mykie";
           sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
           name = "mykie";
         };
@@ -40021,7 +40231,7 @@
           sha256 = "18ml0qz3iipm9w36zvwz77cbbrg885jgvzk6z4a33xcfp524xhma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mynt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mynt-mode";
           sha256 = "17s0wdwgh2dcpww6h3qszc9dcs7ki00xkyisvsfn4xqajrmmp75b";
           name = "mynt-mode";
         };
@@ -40042,7 +40252,7 @@
           sha256 = "0q5809hq22hyzxx5xr2hwwf3jh3qlpf3mkbl3fxqq93gm16plh1i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mysql2sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mysql2sqlite";
           sha256 = "1jblrbw4rq2jwpb8d1dyna0fiv52b9va3sj881cb17rqx200y3nd";
           name = "mysql2sqlite";
         };
@@ -40063,7 +40273,7 @@
           sha256 = "18wqgjn38jxzsbivmf2fkcq3r1y4lffh3dbpv1jj7s9qn91pyp6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/myterminal-controls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/myterminal-controls";
           sha256 = "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2";
           name = "myterminal-controls";
         };
@@ -40084,7 +40294,7 @@
           sha256 = "1lp1bx9110vqzjww94va8pdks39qvqzl8rf0p8na1q0qn06rnk9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/n3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/n3-mode";
           sha256 = "0hasxq39phgyc259dgxskhqxjsp0yi98vx1bs8ynvwa26la4ddzh";
           name = "n3-mode";
         };
@@ -40105,7 +40315,7 @@
           sha256 = "1pd6c0jc1zxx3i3nk4qdx7gdf1qn8sc9jgqd72pkkpzvdwv998cp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/n4js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/n4js";
           sha256 = "0x7smxs91ffriyxx2df61fh1abpl39gqy4m62k77h7xb6fg7af6m";
           name = "n4js";
         };
@@ -40123,7 +40333,7 @@
           sha256 = "0zq13qjqfpxjba1bhdqqxkvgxq1dxyb7hd1bpnk6cbhsxr6mr50i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/naked";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/naked";
           sha256 = "06p6dzhn34dva3677mrvwq2a2x3bhw7f486y654hszla7i75pilq";
           name = "naked";
         };
@@ -40144,7 +40354,7 @@
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/name-this-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/name-this-color";
           sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
           name = "name-this-color";
         };
@@ -40165,7 +40375,7 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nameframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nameframe";
           sha256 = "0iq8cfii39ha8sxn9w7kyfvys8kwyax8g4l0pkl05q0a0s95padp";
           name = "nameframe";
         };
@@ -40186,7 +40396,7 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nameframe-perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nameframe-perspective";
           sha256 = "0wgr90m2pazc514slgdl1lin4mr3xxizasc82k7qinvdvdja515x";
           name = "nameframe-perspective";
         };
@@ -40207,7 +40417,7 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nameframe-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nameframe-projectile";
           sha256 = "11z64wy8mnnrjmgfs2sjbv3mh136aki8r5f89myx861nfx18hc3k";
           name = "nameframe-projectile";
         };
@@ -40228,7 +40438,7 @@
           sha256 = "1g8852c68ca4b4wf781aiyhbgk2a3g39jw1mijzpp0lmmnsbmmwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nameless";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nameless";
           sha256 = "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq";
           name = "nameless";
         };
@@ -40249,7 +40459,7 @@
           sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/names";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/names";
           sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
           name = "names";
         };
@@ -40270,7 +40480,7 @@
           sha256 = "157hhb253m6a9l5wy6x8w5ar3x0qz1326l7a0npxif6pma0dd140";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/namespaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/namespaces";
           sha256 = "02pb7762khxpah4q6xg8r7dmlv1kwyzinffi7pcaps6ycj29q2fr";
           name = "namespaces";
         };
@@ -40291,7 +40501,7 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nand2tetris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nand2tetris";
           sha256 = "1zg9xx7mj8334m2v2zqqfkr5vkj4dzqbj8y13qk6xhzb7qkppyqd";
           name = "nand2tetris";
         };
@@ -40312,7 +40522,7 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nand2tetris-assembler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nand2tetris-assembler";
           sha256 = "1761kgrflipxba8894cnx90ks7f3ba4nj6ci515zzxcx9s45mfyy";
           name = "nand2tetris-assembler";
         };
@@ -40332,7 +40542,7 @@
           sha256 = "1nzkamy53kl1g4y1jm7j5zgpkdsyg5ykp8zp1f0bg5mhy8mmf75w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nanowrimo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nanowrimo";
           sha256 = "1nhyj38qyn1x6a5rbrwhcxwfwzyqqjm3dvksdnmam6vfwn3s2r31";
           name = "nanowrimo";
         };
@@ -40353,7 +40563,7 @@
           sha256 = "0mxf61ky1dd7r2qd4j7k6bdppmkilkq5l9gv257a12539wkw5yq2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/naquadah-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/naquadah-theme";
           sha256 = "1aml1f2lgn530i86218nrc1pk3zw5n3qd2gw4gylwi7g75i0cqn1";
           name = "naquadah-theme";
         };
@@ -40371,7 +40581,7 @@
           sha256 = "1lyszm94pd3jxs73v7k0aaazm0sd2rpz2pphcdag7lk7k6vppd9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/narrow-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/narrow-indirect";
           sha256 = "10aq4gssayh3adw8yz2lza1xbypyffi8r03lsc0kiis6gd9ibiyj";
           name = "narrow-indirect";
         };
@@ -40392,7 +40602,7 @@
           sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/narrow-reindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/narrow-reindent";
           sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
           name = "narrow-reindent";
         };
@@ -40413,7 +40623,7 @@
           sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/narrowed-page-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/narrowed-page-navigation";
           sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
           name = "narrowed-page-navigation";
         };
@@ -40434,7 +40644,7 @@
           sha256 = "0d8bfz41ry5bvkz2894dqkk3244n7xcjk3pf58fcsagvmmkkln7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nasm-mode";
           sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
           name = "nasm-mode";
         };
@@ -40455,7 +40665,7 @@
           sha256 = "0kfqpji6z3ra8sc951vmm1bzyhkws7vb5q6djvl45wlf1wrgkc4p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nav";
           sha256 = "0ly1fk4ak1p8gkz3qmmxyslcjgicnfm8bpqqgndvwcznp8pvpjml";
           name = "nav";
         };
@@ -40476,7 +40686,7 @@
           sha256 = "07wjicbvzg7cz983hv0p2qw1qlln07djigkmbqfpwvg3fk50fdyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nav-flash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nav-flash";
           sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
           name = "nav-flash";
         };
@@ -40497,7 +40707,7 @@
           sha256 = "0vmrh8y8q7zch48iz9lk4n0b3s1b8zp3wki3906s709b5ajfvk7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/navi-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/navi-mode";
           sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
           name = "navi-mode";
         };
@@ -40518,7 +40728,7 @@
           sha256 = "15l2zmm8bp4ip8m1hfxkvswfwa29pg72kisfya2n5v900r184a4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/navi2ch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/navi2ch";
           sha256 = "13xwvyy27dz1abjkkazm3s1p6cw32l2klr1bnln02w0azkbdy7x3";
           name = "navi2ch";
         };
@@ -40539,7 +40749,7 @@
           sha256 = "0g7rmvfm0ldv0d2x7f8k761mgmi47siyspfi1ns40ijhkpc15x8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/navorski";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/navorski";
           sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
           name = "navorski";
         };
@@ -40560,7 +40770,7 @@
           sha256 = "0gbv5fv401z58ycbqlivqamf5kp3x6krhi36q7q0m4gvy448xz0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ncl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ncl-mode";
           sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9";
           name = "ncl-mode";
         };
@@ -40581,7 +40791,7 @@
           sha256 = "178gjv7kq97p9i4naxql7xabvmchw5x8idkpyjqqky3b24v5wkis";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nclip";
           sha256 = "016jp1rqrf1baxlxbi3476m88a0l3r405dh6pmly519wm2k8pipw";
           name = "nclip";
         };
@@ -40602,7 +40812,7 @@
           sha256 = "0xij6gqa6xmjz041vmi4k1xfp7bsp51vk4x6mdy4rv7556sznrrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nemerle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nemerle";
           sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6";
           name = "nemerle";
         };
@@ -40623,7 +40833,7 @@
           sha256 = "1sf8yw1vg01r4969jk1x1k4nad4q7bf1fd8vnranxvhz9md34262";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/neotree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
           name = "neotree";
         };
@@ -40644,7 +40854,7 @@
           sha256 = "1kkflj2qnrn6kzh1l6bjl5n5507qilb22pqj3h0f2m6hfyn0sw5z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/netherlands-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/netherlands-holidays";
           sha256 = "181linsbg5wrx1z7zbj3in2d3d4zd2v7drspkj0b6l0c5yfxwayf";
           name = "netherlands-holidays";
         };
@@ -40665,7 +40875,7 @@
           sha256 = "0p00mmid04pfsna4ify3cy0b9lx431q1r5h772hihsg4f1rs2ppy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/never-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/never-comment";
           sha256 = "0sn8y57895bfpgiynnj4m9b3x3dbb9v5fwkcwmf9jr39dbf98v6s";
           name = "never-comment";
         };
@@ -40686,7 +40896,7 @@
           sha256 = "1zzsfyqwj1k4zh30gl491ipavr9pp9djwjq3zz2q3xh7jys68w8r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/newlisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/newlisp-mode";
           sha256 = "0i2d2gyzzvpr5qm2cqzbn9my21lfb66315hg9fj86ac5pkc25zrd";
           name = "newlisp-mode";
         };
@@ -40707,7 +40917,7 @@
           sha256 = "1xnx6v49i6abzbhq4fl4bp9d0pp9gby40splpcj211xsb8yiry27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nexus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nexus";
           sha256 = "1mdphgsqg6n4hryr53rk42z58vfv0g5wkar5ipanr4h4iclkf5vd";
           name = "nexus";
         };
@@ -40728,7 +40938,7 @@
           sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nginx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nginx-mode";
           sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
           name = "nginx-mode";
         };
@@ -40749,7 +40959,7 @@
           sha256 = "0hgrf628ris94pmvmgibkq6zmwrqkv9q70c5a2gsbdpqmfikj8m1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/niceify-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/niceify-info";
           sha256 = "1s9c8yxbab9zl5jx38alwa2hpp4zj5cb9a5gfm3x09jf3iw768bl";
           name = "niceify-info";
         };
@@ -40770,7 +40980,7 @@
           sha256 = "147vw3qlsply5h8cjmjzqr5dv9jzf9xlmhjnmcpyb1r7krh1l8xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/niflheim-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/niflheim-theme";
           sha256 = "1dipxwaar7rghmz7s733v035vrbijcg1dla9f7cld1gkgiq9iq36";
           name = "niflheim-theme";
         };
@@ -40791,7 +41001,7 @@
           sha256 = "04f5ff7s9ma6wrb5hyjcy7qnr6pmb013kan4f0is31n6nmsidzqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nim-mode";
           sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
           name = "nim-mode";
         };
@@ -40808,11 +41018,11 @@
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "8d65002fd5e6f2102447ab15f636cc84db3384ec";
-          sha256 = "1b63yqcn4j99r2hv10hk1qj9ls328qdxaxhiq5hvfqswkzig9ys7";
+          rev = "5739c144354c826b57042ad0968680c272a95856";
+          sha256 = "0p6gj5hip5fiv0wbiwdv7cp89x9bcb2xzfrfwm0x8a0mz653bn63";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ninja-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ninja-mode";
           sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
           name = "ninja-mode";
         };
@@ -40829,11 +41039,11 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "a8dfdc52b83eb12f174366aae173c37da66943b6";
-          sha256 = "0m9557dddn81da1l8ymcxls5id6rhbs6mc7xpzsjjk76m2kggl32";
+          rev = "9bdd949cfdc9e49f1e01460a2a73215cac3ec904";
+          sha256 = "0k1xdc2pfpgj5ys9fwbfbqksk0mqfspxca02j8hxd9py64xpflqy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nix-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nix-mode";
           sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
           name = "nix-mode";
         };
@@ -40854,7 +41064,7 @@
           sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nix-sandbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nix-sandbox";
           sha256 = "13zr0jbc6if2wvyiplay2gkd5548imfm38x1qy1dw6m2vhbzwp0k";
           name = "nix-sandbox";
         };
@@ -40875,7 +41085,7 @@
           sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nixos-options";
           sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
           name = "nixos-options";
         };
@@ -40896,7 +41106,7 @@
           sha256 = "0h00ghr5sipayfxz7ykzy7bg1p1vkbwxl5xch3x0h8j2cp1dqc3d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nlinum-relative";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nlinum-relative";
           sha256 = "15ifh5bfsarkifx6m7d5rhx6hqlnm231plkf623885kar7i85ia4";
           name = "nlinum-relative";
         };
@@ -40917,7 +41127,7 @@
           sha256 = "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nm";
           sha256 = "004rjbrkc7jalbd8ih170sy97w2g16k3whqrqwywh09pzrzb05kw";
           name = "nm";
         };
@@ -40938,7 +41148,7 @@
           sha256 = "0gzxcq0gki89dz9ad26683zhq1nif3wdz185cdplwy68z9szbdx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nnir-est";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nnir-est";
           sha256 = "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv";
           name = "nnir-est";
         };
@@ -40948,6 +41158,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "no-littering";
+        version = "20160609.1946";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "no-littering";
+          rev = "6e4c239f58645d6cee3ed4aa180ae484f677a7ab";
+          sha256 = "1j5agcq56mphpbpxdaklvl1y2689sfny4l6wknvrwxnqyl48yzkb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/no-littering";
+          sha256 = "129nyml8jx3nwdskcr2favbi3x6f74dblc6yw8vijw32w8z14k2l";
+          name = "no-littering";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/no-littering";
+          license = lib.licenses.free;
+        };
+      }) {};
     noccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "noccur";
@@ -40959,7 +41190,7 @@
           sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/noccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/noccur";
           sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
           name = "noccur";
         };
@@ -40980,7 +41211,7 @@
           sha256 = "1a1pp3sd5g4wkhywb5jfchcdpjsjb0iyhk2sxvd0gpc4kk4zh6xs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/noctilux-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/noctilux-theme";
           sha256 = "15ymyv3rq0n31d8h0ry0l4w4r5a8as0q63ajm9wb6yrxxjl1imfp";
           name = "noctilux-theme";
         };
@@ -41001,7 +41232,7 @@
           sha256 = "1cgmq00ackabwcl4h0n2bb8y08wz0ir5rzca2q3sk4asly6d02m7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/node-resolver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/node-resolver";
           sha256 = "1ng4rgm8f745fajqnbjhi2rshvn6icwdpbh5dzpzhim1w9kb3bhh";
           name = "node-resolver";
         };
@@ -41022,7 +41253,7 @@
           sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nodejs-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nodejs-repl";
           sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
           name = "nodejs-repl";
         };
@@ -41043,7 +41274,7 @@
           sha256 = "0g70gnmfi8n24jzfci9nrj0n9bn1qig7b8f9f325rin8h7x32ypf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/noflet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/noflet";
           sha256 = "0vzamqb52n330mi6rydrd4ls8nbwh5s42fc2gs5y15zakp6mvhr3";
           name = "noflet";
         };
@@ -41062,7 +41293,7 @@
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nose";
           sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
           name = "nose";
         };
@@ -41074,14 +41305,14 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20160519.1253";
+        version = "20160605.1332";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "b9bf3f44eacd42ce53885c79f9dad8d82c76f13d";
-          sha256 = "0zqfr98227lxmhgfhcspn27qigbifhf52dl3lxl9gb5id8wmr316";
+          rev = "57bd4cf3221a56f8fd8a27af541d6cc8b4011b62";
+          sha256 = "045yda0zrl9y2ggyk7r7x74h1s4fz84zj8pfdkp6rymjvknm2qf2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/notmuch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/notmuch";
           sha256 = "173d1gf5rd4nbjwg91486ibg54n3qlpwgyvkcy4d30jm4vqwqrqv";
           name = "notmuch";
         };
@@ -41102,7 +41333,7 @@
           sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/notmuch-labeler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/notmuch-labeler";
           sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
           name = "notmuch-labeler";
         };
@@ -41120,7 +41351,7 @@
           sha256 = "0mmdf3z9299hbs3wr8hqgpmg74sb2xm0rxyh38sjcqmk8f310rqh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/novice+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/novice+";
           sha256 = "0r4w4c6y4fny8k0kipzqjsn7idwbi9jq6x9yw51d41ra3pkpvfzf";
           name = "novice-plus";
         };
@@ -41141,7 +41372,7 @@
           sha256 = "0jahr1380919p272srym1pp16ifdz69fn1m45ppglm54q4a741d8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/noxml-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/noxml-fold";
           sha256 = "11dninxxwhflf2qrmvwmrryspd9j6m95kdlmyx59ykqvw8j0siqc";
           name = "noxml-fold";
         };
@@ -41162,7 +41393,7 @@
           sha256 = "1nwj1ax2qmmlab4lik0b7japhqd424d0rb995dfv89p99gp8vmvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nrepl-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nrepl-eval-sexp-fu";
           sha256 = "17g4nih9kz2483ylp651lwfxkvmaj7wpinpgnifwbciyrplfvx2j";
           name = "nrepl-eval-sexp-fu";
         };
@@ -41183,7 +41414,7 @@
           sha256 = "1129r3rzmfbl8nxjz71xnlyaszhhldawj467zbl36brdadp014n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nrepl-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nrepl-sync";
           sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
           name = "nrepl-sync";
         };
@@ -41204,7 +41435,7 @@
           sha256 = "1w80mbwlvmpd5ff7vy84z61b27klzh9z4wa6m2g7cy674fw4r1xp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nsis-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nsis-mode";
           sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
           name = "nsis-mode";
         };
@@ -41225,7 +41456,7 @@
           sha256 = "17nj8bkqw34hsbb8b51rl6221hlpxw265h2cwxqf64cswm22y313";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nu-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nu-mode";
           sha256 = "0nzv3p62k8yyyww6idlxyi94q4d07nis7ydypar8d01jfqlrybkn";
           name = "nu-mode";
         };
@@ -41246,7 +41477,7 @@
           sha256 = "045m83rdqryjpqh6y9s6x0yf9fw9xrwmxbm4qgg8ka164x9szv0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/number";
           sha256 = "1nwcdv5ibirxx3sqadh6mnpj40ni3wna7wnjh343mx38dk2dzncf";
           name = "number";
         };
@@ -41267,7 +41498,7 @@
           sha256 = "1i0yymsx8kin28bkrgwkk9ngsmjh0gh5j4hb0k03bq4fy799f2xx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nummm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nummm-mode";
           sha256 = "10khhc6q0zjzrhsv4fgfdbs7qcwi1bgkwq4yqzidqcdndsailyh0";
           name = "nummm-mode";
         };
@@ -41288,7 +41519,7 @@
           sha256 = "0prag0ks511ifa5mdpqmizp5n8190dxp4vdr81ld9w9xv7migpd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nvm";
           sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
           name = "nvm";
         };
@@ -41309,7 +41540,7 @@
           sha256 = "199ii1658k4sp5krha77n9l5jblyvnvvvr28g2nbc74lfybckjwq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nyan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nyan-mode";
           sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
           name = "nyan-mode";
         };
@@ -41330,7 +41561,7 @@
           sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nyan-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nyan-prompt";
           sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
           name = "nyan-prompt";
         };
@@ -41351,7 +41582,7 @@
           sha256 = "0xs6787a4v7djgd2zz2v1pk14x27mg2ganz30j9f0gdiai7da6ch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/o-blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/o-blog";
           sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
           name = "o-blog";
         };
@@ -41372,7 +41603,7 @@
           sha256 = "058dyk1c3iw0ip8n8rfpskvqiriqilpclkzc18x73msp5svrh3lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/oauth";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/oauth";
           sha256 = "18z3i5brxm60z373cwx2sa3hx7v38a5s62gbs9b0lxb20ah4p9rz";
           name = "oauth";
         };
@@ -41392,7 +41623,7 @@
           sha256 = "0z15n7cpprbhiamq26240g5bqsiw5mgyzdisi7j6hpybyk2zyl9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-axiom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-axiom";
           sha256 = "12cmzhgzk8314y6nvzdjwidalccz6h440lil83c1h4lz4ddlwmf6";
           name = "ob-axiom";
         };
@@ -41413,7 +41644,7 @@
           sha256 = "1nzli8wk3nd05j2z2fw511857qbawirhg8mfw21wqclkz8zqn813";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-browser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-browser";
           sha256 = "1yqbzmmazamgf8fi8ipq14ffm8h1pp5d2lkflbxjsagdq61hirxm";
           name = "ob-browser";
         };
@@ -41434,7 +41665,7 @@
           sha256 = "01l8zvnfpc1vihnpqj75xlvjkk2hkvxpb1872jdzv2k1na2ajfxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-coffee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-coffee";
           sha256 = "16k8r9rqz4mayxl85pjdfsrz43k2hwcf8k7aff8wnic0ldzp6ivf";
           name = "ob-coffee";
         };
@@ -41455,7 +41686,7 @@
           sha256 = "1xbczyqfqdig5w6jvx2kg57mk16sbiz5ysv445v83wqk0sz6nc9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-cypher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-cypher";
           sha256 = "1ygmx0rjvxjl8hifkkwrkk9gpsmdsk6ndb6pg7y78p8hfp5jpyq3";
           name = "ob-cypher";
         };
@@ -41476,7 +41707,7 @@
           sha256 = "0kx95lvkvg6h6lhs9knlp8rwi05y8y0i8w8vs7mwm378syls0qk0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-diagrams";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-diagrams";
           sha256 = "1r1p9l61az1jb5m4k2dwnkp9j8xlcb588gq4mcg796vnbdscfcy2";
           name = "ob-diagrams";
         };
@@ -41497,7 +41728,7 @@
           sha256 = "0qknm1h2ijnzs1km51hqwpnv5083m9ngi3nbxd90r7d6vva5fhhk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-elixir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-elixir";
           sha256 = "1l5b9hww2vmqnjlsd6lbjpz9walck82ngang1amfnk4xn6d0gdhi";
           name = "ob-elixir";
         };
@@ -41518,7 +41749,7 @@
           sha256 = "1pa7zclci87rd4fx731z37pdbdjabmknbr0xmdk1g92g0hjhk2rb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-go";
           sha256 = "09d8jrzijf8gr08615rdmf366zgip43dxvyihy0yzhk7j0p3iahj";
           name = "ob-go";
         };
@@ -41539,7 +41770,7 @@
           sha256 = "00mnpnlsd774z87ziqmaq9h4rbxmf197cm2kk4v6s15rs3np617m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-http";
           sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
           name = "ob-http";
         };
@@ -41560,7 +41791,7 @@
           sha256 = "071ma803l6ixg12brbc8p2bxnvl2skmr8r913pz07qh0n8k83zqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-ipython";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-ipython";
           sha256 = "06llf365k8m81ljmlajqvxlh84qg6h0flp3m6gb0zx71xilvw186";
           name = "ob-ipython";
         };
@@ -41581,7 +41812,7 @@
           sha256 = "01cjwg27m0iqndkwwl0v5w8vvk270xvi81za3y5hyrmb7dq6bfy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-kotlin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-kotlin";
           sha256 = "19g4s9dnipg9aa360mp0affmnslm6h7byg595rnaz6rz25a3qdpx";
           name = "ob-kotlin";
         };
@@ -41602,7 +41833,7 @@
           sha256 = "1mk7qcf4svf4yk4mimcyhbw5imq3zps2vh2zzq9gwjcn17jnplhn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-lfe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-lfe";
           sha256 = "11cpaxk9wb27b9zhyns75dqpds4gh3cbjcvia4p2bnvmbm8lz4y8";
           name = "ob-lfe";
         };
@@ -41623,7 +41854,7 @@
           sha256 = "11cdf5nfmn5cc1i4kqxq0hks8d19sf5rwavpfmz39xysbnr65s68";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-lua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-lua";
           sha256 = "13ailb285bs9sm9qmjrpq0wjk7sp3w019p94pzrwmzqf52y1dapg";
           name = "ob-lua";
         };
@@ -41644,7 +41875,7 @@
           sha256 = "15mzra45jcihgvddv69yxpml34hy15yz2hxcxz6a4la8vk6mw3ky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-ml-marklogic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-ml-marklogic";
           sha256 = "1y5cgba7gzlmhdrs0k7clgrxixdl4najj5271x1m023jch7bz7xl";
           name = "ob-ml-marklogic";
         };
@@ -41665,7 +41896,7 @@
           sha256 = "0qibnn908a59jyfslsnpjanbm85f8xw9zywsqsh37nv27ncbx0hr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-mongo";
           sha256 = "1cgmqsl5dzi8xy3sh5xsfkczl555fpd4q6kgsh9xkn74sz227907";
           name = "ob-mongo";
         };
@@ -41686,7 +41917,7 @@
           sha256 = "02vmy3nnk4yyjbp3r7zzv9sb3frv7kbj4a2a855iqa0isp8nhyfi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-php";
           sha256 = "0n6m6rpd0rsk6idhxs9qf5pb6p9ch2immczj5br7h5xf1bc7x2fp";
           name = "ob-php";
         };
@@ -41707,7 +41938,7 @@
           sha256 = "14scbds1rlmii52i0zr3s0r1wmga7qysj63c2dpinhagxa36d51n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-prolog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-prolog";
           sha256 = "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s";
           name = "ob-prolog";
         };
@@ -41728,7 +41959,7 @@
           sha256 = "1f8qz5bwz5yd3clvjc0zw3yf9m9fh5vn2gil69ay1a2n00qwkq78";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-redis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-redis";
           sha256 = "1xsz4cc8cqx03ckpcwi7dc3l6v4c5mdbby37a9i0n5q6wd4r92mm";
           name = "ob-redis";
         };
@@ -41749,7 +41980,7 @@
           sha256 = "09zxf158sspwv7j0kjjxzlymxi9ax7xpk5d5fry2jljskgn17csv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-restclient";
           sha256 = "0nv2wsqmpschym6ch8fr4a79hlnpz31jc8y2flsygaqj0annjkfk";
           name = "ob-restclient";
         };
@@ -41770,7 +42001,7 @@
           sha256 = "08p64ss3ia1gq6dsna5v3ajjwm5g9ma7yvd5y0jx91xssjqq5dja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-sagemath";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-sagemath";
           sha256 = "02ispac1y4g7p7iyscf5p8lvp92ncrn6281jm9igyiny1w6hivy7";
           name = "ob-sagemath";
         };
@@ -41791,7 +42022,7 @@
           sha256 = "0gymna48igcixrapjmg842pnlsshhw8zplxwyyn0x2yrma9fjyyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-sml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-sml";
           sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
           name = "ob-sml";
         };
@@ -41812,7 +42043,7 @@
           sha256 = "071rl0bvhwh5vqbl7n84shvzgqgwg2f5l9vb8wfs4y24hsqfgxmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-swift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-swift";
           sha256 = "19mcjfmijbajldm3jz8ij1x2p7d164mbq2ln6yb6iihxmdqnn2q4";
           name = "ob-swift";
         };
@@ -41833,7 +42064,7 @@
           sha256 = "086z3smcfn5g599967vmxj3akppyqk9d64acm8zzj76zj29xfk1k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-translate";
           sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
           name = "ob-translate";
         };
@@ -41854,7 +42085,7 @@
           sha256 = "1ycqdjqn5361pcnc95hxhjqd3y96cjjnaylrnzwhmacl38jm3vai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-typescript";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-typescript";
           sha256 = "1wpy928ndvc076jzi14f6k5fsw8had0pz7f1yjdqql4icszhqa0p";
           name = "ob-typescript";
         };
@@ -41875,7 +42106,7 @@
           sha256 = "16462cgq91jg7i97h440zss5vw2qkxgdy7gm148ns4djr2fchnf6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/oberon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/oberon";
           sha256 = "1wna7ld670r6ljdg5yx0ga0grbq1ma8q92gkari0d5czr7s9lggv";
           name = "oberon";
         };
@@ -41896,7 +42127,7 @@
           sha256 = "138c1nm579vr37dqprqsakfkhs2awm3klzyyd6bv9rhkrysrpbqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/objc-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/objc-font-lock";
           sha256 = "0njslpgdcph3p3gamrbd6pc04szks07yv4ij3p1l7p5dc2p06rs6";
           name = "objc-font-lock";
         };
@@ -41917,7 +42148,7 @@
           sha256 = "00v21iw9wwxap8jhg9035cp47fm5v2djmldq6nprv860m01xlwh1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/obsidian-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/obsidian-theme";
           sha256 = "17ckshimdma6fqiis4kxczxkbrsfpm2a0b41m5f3qz3qlhcw2xgr";
           name = "obsidian-theme";
         };
@@ -41938,7 +42169,7 @@
           sha256 = "0pnliw02crqw8hbg088klz54z6s1ih8q2lcn9mq5f12xi752hxm8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/occidental-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/occidental-theme";
           sha256 = "1ra5p8k96wvb04v69xm87jl4jlgi57v4jw2xxzkwbwxbydncnv0b";
           name = "occidental-theme";
         };
@@ -41959,7 +42190,7 @@
           sha256 = "1v1c2481v2xgnw8kgbbqhqkdd41lzvki9hm3iypbf3n0jxz8nnzy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/occur-context-resize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/occur-context-resize";
           sha256 = "0sp5v4rwqgqdj26gdkrmjvkmbp4g6jq4lrn2c3zm8s2gq0s3l6ri";
           name = "occur-context-resize";
         };
@@ -41980,7 +42211,7 @@
           sha256 = "1zj0xhvl5qx42injv0av4lyzd3jsjls1m368dqd2qnswhfw8wfn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/occur-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/occur-x";
           sha256 = "1xq1k9rq7k1zw90shbgiidwvcn0ys1d53q03b5mpvvfqhj4n0i1g";
           name = "occur-x";
         };
@@ -42001,7 +42232,7 @@
           sha256 = "155gmls6cz3zf4lcj89kzb96y7k0glx0f659jg5z0skgxq79hf48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ocodo-svg-modelines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ocodo-svg-modelines";
           sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
           name = "ocodo-svg-modelines";
         };
@@ -42018,11 +42249,11 @@
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "1c63a0780cf463c17206ca6338e1638abd27284f";
-          sha256 = "0mp53z2myf0hij3sk3ickbmc9n4n99xv4ilaz7ng4y7vmlczlyqq";
+          rev = "b2163f3f36f3f9a7574bb5de14f04574becf7e20";
+          sha256 = "1c36nilqff6p9as29ah5wr93gzrhrs9mq759rg2kspm0hhiza32s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ocp-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ocp-indent";
           sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
           name = "ocp-indent";
         };
@@ -42043,7 +42274,7 @@
           sha256 = "0dp7dhmgrq078rjhpm1cr993qjqz7qgy2z4sn73qw6j55va7d9kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/octicons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/octicons";
           sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
           name = "octicons";
         };
@@ -42064,7 +42295,7 @@
           sha256 = "0p9ph62vnw1r9dbvrjyw356a9bjnzh0hglssi97dr0qd6cs8whf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/octopress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/octopress";
           sha256 = "0zsir6chjvn5i1irmf5aj6mmb401c553r5wykq796sz7jnjhrjg0";
           name = "octopress";
         };
@@ -42085,7 +42316,7 @@
           sha256 = "1bjrgj8klg7ly63vx90jpaih9virn02bhqi16p6z0mw36q1q7ysq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/offlineimap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/offlineimap";
           sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
           name = "offlineimap";
         };
@@ -42106,7 +42337,7 @@
           sha256 = "0y9fxrsxp1158fyjp4f69r7g2s7b6nbxlsmsb8clwqc8pmmg2z82";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/oldlace-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/oldlace-theme";
           sha256 = "1pxiqqh5x4wsayqgwplzvsbalbj44zvby7x0pijdvwcnsh74znj8";
           name = "oldlace-theme";
         };
@@ -42127,7 +42358,7 @@
           sha256 = "0mlklcgakcb2nafs25hpy31jwjd9rrrxc494b5kfcw3g5b3z8q40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/olivetti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/olivetti";
           sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
           name = "olivetti";
         };
@@ -42148,7 +42379,7 @@
           sha256 = "03szb2i2xk3nq578cz1drsddsbld03ryvykdfzmfvwcmlpaknvzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/om-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/om-mode";
           sha256 = "1q2h9wjnyg7wlk913px4vj1cxqynd6xfh9ind7kjyra436yw3l4j";
           name = "om-mode";
         };
@@ -42169,7 +42400,7 @@
           sha256 = "1925mh47n4x9v780qp5l6cksl64v9mpyb87znsg93x6sxr0cvv4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/omni-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/omni-kill";
           sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
           name = "omni-kill";
         };
@@ -42190,7 +42421,7 @@
           sha256 = "1nvgh9wvgswcs3r958b579rsx540xrhlnafc6cmcd63z6yck19w0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/omni-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/omni-log";
           sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
           name = "omni-log";
         };
@@ -42211,7 +42442,7 @@
           sha256 = "1x8af8jv4n83sl4rgj0d2rpmw9g78rknm1h523f3b1a5x4kdvsz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/omni-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/omni-quotes";
           sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs";
           name = "omni-quotes";
         };
@@ -42232,7 +42463,7 @@
           sha256 = "1icdk19vwihc8mn04yxl2brql2gssn3gxd5bv7ljdd6mn5hkw500";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/omni-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/omni-scratch";
           sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
           name = "omni-scratch";
         };
@@ -42253,7 +42484,7 @@
           sha256 = "1lvnkdrav7h15p8d5ayhfsjynllwp4br1vqxmw0ppxnlyq7337n5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/omni-tags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/omni-tags";
           sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
           name = "omni-tags";
         };
@@ -42274,7 +42505,7 @@
           sha256 = "0d6kjggi2p937ydpvw3fr2cxy5vj46dmfqbkb7a9jdhnzxadnwh5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/omniref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/omniref";
           sha256 = "0lgw1knqppdg046zqx4m7nbzvsasr89wa9i4594hf46w1094dabj";
           name = "omniref";
         };
@@ -42295,7 +42526,7 @@
           sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/omnisharp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/omnisharp";
           sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
           name = "omnisharp";
         };
@@ -42325,7 +42556,7 @@
           sha256 = "01cssk6dxinfy1h431cx1yq5nbk0pc5j0h3iir2anzz1kfzbzilz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/omtose-phellack-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/omtose-phellack-theme";
           sha256 = "09nyc7sdhzy4vmngzdj6r7cv2nbbwqlcyyi2mcg5a8lml4f6fj5i";
           name = "omtose-phellack-theme";
         };
@@ -42346,7 +42577,7 @@
           sha256 = "1616bdvrf1bawcqgj7balbxaw26waw81gxiw7yspnvpyb009j66y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/on-parens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/on-parens";
           sha256 = "19kyzpkgfl0ipbcgnl8fbfbapnfdxr8w9i7prfkm6rjp6amxyqab";
           name = "on-parens";
         };
@@ -42367,7 +42598,7 @@
           sha256 = "1rrby3mbh24qd43nsb3ymcrjxh1cz6iasf1gv0a8fmivmb4f7dyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/on-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/on-screen";
           sha256 = "104jisc2bckzrajxlvj1cfx1drnjj7jhqjblvm89ry32xdnjxmqb";
           name = "on-screen";
         };
@@ -42388,7 +42619,7 @@
           sha256 = "0g2hvpnmgyy1k393prv97nqwlqc58nqf71hkrmaijw0cyy9q03nz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/one-time-pad-encrypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/one-time-pad-encrypt";
           sha256 = "0aa7qcii7yf4527nhlwwp0hbhamhyp2xg0fsscnq2m28l5d5kmn6";
           name = "one-time-pad-encrypt";
         };
@@ -42406,7 +42637,7 @@
           sha256 = "05njigqi9061d34530d76kwsdzqgk9qxnwhn9xis64w59f5nzf1h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/oneonone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/oneonone";
           sha256 = "0v4nvhzgq97zbi18jd3ds57yh1fpv57b2a1cd7r8jbxwaaz3gpg9";
           name = "oneonone";
         };
@@ -42427,7 +42658,7 @@
           sha256 = "1yqrp9icci5snp1485wb6y8mr2hjp9006ahch58lvmnq98bn7j45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/opam";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/opam";
           sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
           name = "opam";
         };
@@ -42448,7 +42679,7 @@
           sha256 = "0r5rsghqgy99jwjf3dqkw1q10smsvs242aafmz142l4ipsqr3gi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/open-junk-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/open-junk-file";
           sha256 = "0r1v9m8a5blv70fzq5miv5i57jx0bm1p0jxh0lwklam0m99znmcj";
           name = "open-junk-file";
         };
@@ -42469,7 +42700,7 @@
           sha256 = "094r6fx1s76m8anqqg2qrddidn1dp08kmv8p8md27yy9mm49d91n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/opencl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/opencl-mode";
           sha256 = "1g351wiaycwmg1bnf4s2mdnc3lb2ml5l54g19184xqssfqlx7y79";
           name = "opencl-mode";
         };
@@ -42490,7 +42721,7 @@
           sha256 = "0086pfk4pq6xmknk7a42fihcjgzkcplqqc1rk9fhwmn9j7djbq70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/openstack-cgit-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/openstack-cgit-browse-file";
           sha256 = "05dl28a4npnnzzipypfcqb21sdww715lwji2xnsabx3fb1h1w5jl";
           name = "openstack-cgit-browse-file";
         };
@@ -42509,7 +42740,7 @@
           sha256 = "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/openwith";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/openwith";
           sha256 = "05lkx3yfv2445fp07bhqv2aqz5hgf3dxp39lmz3nfxn4c9v8nkqi";
           name = "openwith";
         };
@@ -42530,7 +42761,7 @@
           sha256 = "0iw3c8sn702ziki59mvd5gxm484i7f0bwsy8fz95y08s9gknjjf9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/operate-on-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/operate-on-number";
           sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
           name = "operate-on-number";
         };
@@ -42551,7 +42782,7 @@
           sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-ac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-ac";
           sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
           name = "org-ac";
         };
@@ -42572,7 +42803,7 @@
           sha256 = "15xgkm5p30qfghyhkjivh5n4770794qf4pza462vb0xl5v6kffbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-agenda-property";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-agenda-property";
           sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
           name = "org-agenda-property";
         };
@@ -42593,7 +42824,7 @@
           sha256 = "0yzvir2gmyv9k43q3sf37lc9xcmfyaj5wh825xax7305j3b2hhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-alert";
           sha256 = "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152";
           name = "org-alert";
         };
@@ -42614,7 +42845,7 @@
           sha256 = "19axpybfdsnaj04h0mxpahzqa5r5yl5mmczd3mx5r6mnr6dgrwn9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-attach-screenshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-attach-screenshot";
           sha256 = "0108kahyd499q87wzvirv5d6p7jrb7ckz8r96pwqzgflj3njbnmn";
           name = "org-attach-screenshot";
         };
@@ -42635,7 +42866,7 @@
           sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-autolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-autolist";
           sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
           name = "org-autolist";
         };
@@ -42656,7 +42887,7 @@
           sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-beautify-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-beautify-theme";
           sha256 = "1j2gi3f72kvavdcj6xs7zng0dcnivrhc7pjzm2g4mjm5ad5s1flq";
           name = "org-beautify-theme";
         };
@@ -42677,7 +42908,7 @@
           sha256 = "084ij85pw53pzr220ql97544zkh23xb8gr81397asfdhc5wrzkqw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-bookmark-heading";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-bookmark-heading";
           sha256 = "1q92rg9d945ypcpb7kig2r0cr7nb7avsylaa7nxjib25advx80n9";
           name = "org-bookmark-heading";
         };
@@ -42698,7 +42929,7 @@
           sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-bullets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-bullets";
           sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75";
           name = "org-bullets";
         };
@@ -42719,7 +42950,7 @@
           sha256 = "0fq9d1q16fs0i3x9gs8k1n98nvh971r6g5bk2bswpfbpvndgwbi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-caldav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-caldav";
           sha256 = "0166y04gxrwnynm4jshm2kqk5jbvl5g5078dxvw18nicrgq3y4r8";
           name = "org-caldav";
         };
@@ -42740,7 +42971,7 @@
           sha256 = "01ffkk79wz2qkh9h9cjl59j34wvbiqzzxbbc9a06lh2rc946wgis";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-capture-pop-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-capture-pop-frame";
           sha256 = "0g0b3vifwg39rb0fmad7y955dcqccnm01c6m27cv2x4xfib8ik3w";
           name = "org-capture-pop-frame";
         };
@@ -42761,7 +42992,7 @@
           sha256 = "1m6bsjc2l4vx1z2cb0siqs8m1wjvi8fs67aqqx879q5rwlxbhzs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-chinese-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-chinese-utils";
           sha256 = "1dycsv0p2xzm2dg6fi5f5dkb48qnqq0qhrmvi0cdjq34j67s27ix";
           name = "org-chinese-utils";
         };
@@ -42782,7 +43013,7 @@
           sha256 = "048mcjgls405wwvn2r90cxkyw9z2nf97gif86k0gxk7yrbbkiy2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-cliplink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-cliplink";
           sha256 = "19l3k9w9csgvdr7n824bzg7jja0f28dmz6caldxh43vankpmlg3p";
           name = "org-cliplink";
         };
@@ -42803,7 +43034,7 @@
           sha256 = "1imy615qvkw6qfd6ngvillhkqbrnb5mxiqbfy4sm7wq5q76qwkm5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-clock-convenience";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-clock-convenience";
           sha256 = "1zis0fp7q253qfxypm7a69zb3w8jb4cbrbj2rk34d1jisvnn4irw";
           name = "org-clock-convenience";
         };
@@ -42824,7 +43055,7 @@
           sha256 = "0q4v216ihhwv8rlb9xc8xy7nj1p058xabfflglhgcd7mfjrsyayx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-context";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-context";
           sha256 = "19y8aln7wix9p506ajvfkl641147c5mdmjm98jnq68cx2r4wp6zz";
           name = "org-context";
         };
@@ -42845,7 +43076,7 @@
           sha256 = "0nrfvmqb70phnq0k4wbdj6z666wq6xvabg4pgv8qn62rbrw4yyhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-cua-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-cua-dwim";
           sha256 = "0ib3m41b4lh0p0xxhsmfv42qs00xm2cfwwl2cgfdjjp1s57p19xy";
           name = "org-cua-dwim";
         };
@@ -42866,7 +43097,7 @@
           sha256 = "1nqfi139cag3ll8wxk8rh59hay97vi8i0mlgnams4jla285zydj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-dashboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-dashboard";
           sha256 = "1hvhhbmyx12wsf2n1hd0hg5cy05zyspd82xxcdh04g4s9r3ikqj5";
           name = "org-dashboard";
         };
@@ -42887,7 +43118,7 @@
           sha256 = "1wrgqdrfdxc1vrcr6dsa8dcxrwj6zgjr9h1fzilwnxlzfvdilnsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-doing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-doing";
           sha256 = "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j";
           name = "org-doing";
         };
@@ -42908,7 +43139,7 @@
           sha256 = "15zrnd168n4pwa1bj5fz79hcrgw61braf0b095rsfhjh5w2sasy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-dotemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-dotemacs";
           sha256 = "1vc391fdkdqd4g0piq66zhrlgqx5s2ijv7qd1rc3a235sjb9i2n4";
           name = "org-dotemacs";
         };
@@ -42929,7 +43160,7 @@
           sha256 = "02344qyhz4bjz0rg4lmmqpn43lf03ag5v384ppczqks61rq7zpq9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-download";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-download";
           sha256 = "19yjx0qqpmrdwagp3d6lwwv7dcb745m9ccq3m29sin74f5p4svsi";
           name = "org-download";
         };
@@ -42950,7 +43181,7 @@
           sha256 = "0misv6g1cql7qc3xhy56cn79pzvn811fvhvivvq0bdx4g0hpp2fg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-dp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-dp";
           sha256 = "0fnrzpgw8l0g862j20yy4mw1wfcm2i04r6dxi4yd7yay8bw2i4yq";
           name = "org-dp";
         };
@@ -42971,7 +43202,7 @@
           sha256 = "0m5c9x0vazciq6czpg5y9nr5yzjf6nl0qp5cfajv49cw2h0cwqyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-drill-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-drill-table";
           sha256 = "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69";
           name = "org-drill-table";
         };
@@ -42992,7 +43223,7 @@
           sha256 = "0jjdsng7fm4wbhvd9naqzdfsmkvj1sf1d9rikprg1pd58azv6idx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-dropbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-dropbox";
           sha256 = "0qfvdz13ncqn7qaz03lwabzsnk62z6wqzlxlvdqv5xyllcy9m6ln";
           name = "org-dropbox";
         };
@@ -43013,7 +43244,7 @@
           sha256 = "0kqvwqmwnwg2h7r38fpjg6qlkcj9v8011df8nmsgs1w1mfdvnjsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-ehtml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-ehtml";
           sha256 = "0n82fbd7aircqg2c9m138qfv8csrv0amhya3xlwswdkqn51vn3gw";
           name = "org-ehtml";
         };
@@ -43034,7 +43265,7 @@
           sha256 = "0va8wm319vvw7w0j102mx656icy3fi4mz3b6bxira6z6xl9b92s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-elisp-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-elisp-help";
           sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
           name = "org-elisp-help";
         };
@@ -43055,7 +43286,7 @@
           sha256 = "0aa7hzn8ss6b7p24qxgwvz8w3kd2lcr98wj315c0c5zhwdrcw2rj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-eww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-eww";
           sha256 = "132asshgfpphjckd5vz1vcs18lj55mrqs1l4ggfa89rc6aj8xrca";
           name = "org-eww";
         };
@@ -43075,7 +43306,7 @@
           sha256 = "0ydsmjjc64r50qilgazmv5gzdv67vszlid67wskc2zii5ss0y01m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-fstree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-fstree";
           sha256 = "11ddkfddmsy26mmhgw24757f753ssh056v9vxn89pxp4qypxidfz";
           name = "org-fstree";
         };
@@ -43096,7 +43327,7 @@
           sha256 = "1di32pvkqbd90f4j4d07gdbba6d0fzyhw5lsynz7cl6yrh5y9cpr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-gcal";
           sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
           name = "org-gcal";
         };
@@ -43117,7 +43348,7 @@
           sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-gnome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-gnome";
           sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
           name = "org-gnome";
         };
@@ -43138,7 +43369,7 @@
           sha256 = "10jwqzs431mnwz717qdmcn0v8raklw41sbxbnkb36yrgznk8c09c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-grep";
           sha256 = "0kpgizy0zxnlmyh0prwdll62ri2c1l4sb0yrkl7yw17cr4gxmkkz";
           name = "org-grep";
         };
@@ -43159,7 +43390,7 @@
           sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-if";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-if";
           sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
           name = "org-if";
         };
@@ -43172,15 +43403,15 @@
     org-iv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, impatient-mode, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-iv";
-        version = "20160602.852";
+        version = "20160606.1440";
         src = fetchFromGitHub {
           owner = "kuangdash";
           repo = "org-iv";
-          rev = "719e3ce1ccc71b91327916c218d89ec8509bf235";
-          sha256 = "152b2syl9fs7ziw6i7p76h6s6w6idrcxfcj2pcmil8gwd0bqlq2g";
+          rev = "4da0db9434a1e5297f6f75b8ceb1d125d3a47147";
+          sha256 = "0k3irwr1i75bdn9d5aqdlxsi5a24pbnr52awfz92xw6d4xmc7x85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-iv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-iv";
           sha256 = "1akhabp6mdw1h7zms6ahlfvwizl07fwsizwxpdzi4viggfccsfwx";
           name = "org-iv";
         };
@@ -43201,7 +43432,7 @@
           sha256 = "0whv8nsla93194jjpxrhlr6g230spdxbac8ibmzmyad075vx97z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-jekyll";
           sha256 = "0jh3rla8s8prprvhnlg0psdrj7swz7v6vf2xy1m6ff66p9saiv8i";
           name = "org-jekyll";
         };
@@ -43222,7 +43453,7 @@
           sha256 = "0b5f8qkyzh4jwj3kvbaj3m4dpjbvh1fql7v1nb9bi5n7iwkv3lxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-jira";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-jira";
           sha256 = "11h7kbkf38p2xycw8hvabpaacp72xdgy8c7kzcgjb2a8qlbs5ifm";
           name = "org-jira";
         };
@@ -43243,7 +43474,7 @@
           sha256 = "0rsirs9rfgrsi667vjmag0h6m704j35mv9rg5q50p9jsa38xy78i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-journal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-journal";
           sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b";
           name = "org-journal";
         };
@@ -43264,7 +43495,7 @@
           sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-link-travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-link-travis";
           sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
           name = "org-link-travis";
         };
@@ -43285,7 +43516,7 @@
           sha256 = "0lqxzmjxs80z3z90f66f3zfrdajiamdcwpvfv5j2w40js9xz4x37";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-linkany";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-linkany";
           sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
           name = "org-linkany";
         };
@@ -43301,11 +43532,11 @@
         version = "20140107.1419";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "3fd361eb77f8c760ccfc7224d3e79d54823923d0";
-          sha256 = "15srx8cxh0qa4g7bx0fkfz49f1fkb4hjryl8ygvl800v98kcy32f";
+          rev = "65e4370d4606ac4d15bffddb97d089f06009c7ab";
+          sha256 = "10k5kvf55yxzy8zc8kpvx02sx8nc06h8xdqdh1p3bkf8hdrqpmym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-mac-iCal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-mac-iCal";
           sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
           name = "org-mac-iCal";
         };
@@ -43321,11 +43552,11 @@
         version = "20160109.2343";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "3fd361eb77f8c760ccfc7224d3e79d54823923d0";
-          sha256 = "15srx8cxh0qa4g7bx0fkfz49f1fkb4hjryl8ygvl800v98kcy32f";
+          rev = "65e4370d4606ac4d15bffddb97d089f06009c7ab";
+          sha256 = "10k5kvf55yxzy8zc8kpvx02sx8nc06h8xdqdh1p3bkf8hdrqpmym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-mac-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-mac-link";
           sha256 = "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw";
           name = "org-mac-link";
         };
@@ -43346,7 +43577,7 @@
           sha256 = "0d22q57mizw70qxbvwi4yz15jg86icqq1z963rliwss3wgpirndh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-mobile-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-mobile-sync";
           sha256 = "1cj0pxcjngiipmyl0w1p0g4wrxgm2y98a8862x1lcbali9lqbrwj";
           name = "org-mobile-sync";
         };
@@ -43367,7 +43598,7 @@
           sha256 = "0zbpzm9lni6z180s7n52x8s5by5zkq2nlhx82l2h9i7in9y4r6c3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-multiple-keymap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-multiple-keymap";
           sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
           name = "org-multiple-keymap";
         };
@@ -43388,7 +43619,7 @@
           sha256 = "132jv1zvp3yp4pa4ysl0n3a81d39cdi3nqfziz1ha1pl10qbn6wr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-octopress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-octopress";
           sha256 = "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw";
           name = "org-octopress";
         };
@@ -43409,7 +43640,7 @@
           sha256 = "10dddbs9jppqqzwwv5y6pj2szdkw3223gvzzd4pzn9biv5d9kzsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-outlook";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-outlook";
           sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
           name = "org-outlook";
         };
@@ -43430,7 +43661,7 @@
           sha256 = "1w853v4fsrvgczl2rvmy3dv9shyhv8f4bc0gqnk4r5ihmgf46a1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-page";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-page";
           sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
           name = "org-page";
         };
@@ -43460,7 +43691,7 @@
           sha256 = "022qqas919aziq4scs5j1wdbvd0qyw8kkirn2vzfb5k2fjl8z7iq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-pandoc";
           sha256 = "1r6j6rkwfv7fv7kp73gh1bdz3y5ffwk5f2wyv4mpxs885cfbsm8v";
           name = "org-pandoc";
         };
@@ -43480,7 +43711,7 @@
           sha256 = "023xsyvppq771yvxd9kqhn9lffhr83sfb0h9g405ayfjys94m2xd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-password-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-password-manager";
           sha256 = "021yhp417b9c8cjh8ynmz2fqyplpr2qvc0djxf74kd8lhn4pl397";
           name = "org-password-manager";
         };
@@ -43501,7 +43732,7 @@
           sha256 = "16z44kdsg8w1p27fsi72k8wqr35xbb0777rq7h7swv6j2jn1b6hc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-pdfview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-pdfview";
           sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
           name = "org-pdfview";
         };
@@ -43522,7 +43753,7 @@
           sha256 = "015idpk66835jdg1sbvpksyr07xk4vn17z8cng2qw87fss688ihb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-pomodoro";
           sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
           name = "org-pomodoro";
         };
@@ -43543,7 +43774,7 @@
           sha256 = "1n9magg7r7xnw16d43fh6nzjf42s70l3mxq6ph727zi4lz5ngmfm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-present";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-present";
           sha256 = "09h0cjqjwhqychyrdv1hmiyak677vgf1b94392sdsq3ns70zyjk7";
           name = "org-present";
         };
@@ -43553,22 +43784,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "org-projectile";
-        version = "20160521.14";
+        version = "20160604.2010";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "13b94ad1ac40130df0e46c53fe982734ad790447";
-          sha256 = "03f82pnaifx79v05irzdn5vhhzsv8b068dawva9w5i7x8na01k6h";
+          rev = "68549a7d52d109ecee7e37489dc27e2e53bc734d";
+          sha256 = "1v3vs9yfyssv5x3lk1rn6621sfigqb593i3nl1c0qafvg9h39y41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-projectile";
           sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
           name = "org-projectile";
         };
-        packageRequires = [ dash projectile ];
+        packageRequires = [ dash emacs projectile ];
         meta = {
           homepage = "https://melpa.org/#/org-projectile";
           license = lib.licenses.free;
@@ -43585,7 +43816,7 @@
           sha256 = "1jzp65sf1am6pz533kg1z666h4jlynvjyx1mf24gyksiiwdhypsy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-protocol-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-protocol-jekyll";
           sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
           name = "org-protocol-jekyll";
         };
@@ -43606,7 +43837,7 @@
           sha256 = "06apaa8pjrw14g2gyjpxjd6bjv1w0md4vl5jx78krcyr0bcc08mx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-random-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-random-todo";
           sha256 = "0yflppdbkfn2phd21zkjdlidzasfm846mzniay83v3akz0qx31lr";
           name = "org-random-todo";
         };
@@ -43627,7 +43858,7 @@
           sha256 = "1q3s12s0ll7jhrnd3adkaxv7ff69ppprv0pyl5f6gy8y51y63k8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-readme";
           sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
           name = "org-readme";
         };
@@ -43654,7 +43885,7 @@
           sha256 = "0q26knckq213r885i5947970qagjmb7ybs4ag0ignls4dzbqlbmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-redmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-redmine";
           sha256 = "0y2pm18nnyzm9wjc0j15v46nf3xi7a0wvspfzi360qv08i54skqv";
           name = "org-redmine";
         };
@@ -43667,15 +43898,15 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, hydra, key-chord, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20160527.2031";
+        version = "20160611.1911";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "839606e8d6248a4c719828a703a32be3edcdfb64";
-          sha256 = "0psyrdi1kd1gykvcf962fzb3240s31zg9rh4yn5kvazhk2dc1qqm";
+          rev = "be3c8e4959c05b10d0733a9ae527b5379765baa8";
+          sha256 = "12llx3cjmf6prrjzk1vwz7jjgiy5sn4x3mxdpaik9ymiv5c3f6x4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-ref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-ref";
           sha256 = "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08";
           name = "org-ref";
         };
@@ -43696,7 +43927,7 @@
           sha256 = "0as82hf81czks9fcmhy9wjwl8d4mbylrm13c02y8abp0am41r28f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-repo-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-repo-todo";
           sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
           name = "org-repo-todo";
         };
@@ -43717,7 +43948,7 @@
           sha256 = "1hn8y9933x5x6lxpijcqx97p3hln69ahabqdsl2bmzda3mxm4bn2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-rtm";
           sha256 = "1paiy5zmdlxb3a1cjk9d30mqbl60bkairw6xkix2qw36p07jwlj5";
           name = "org-rtm";
         };
@@ -43738,7 +43969,7 @@
           sha256 = "14zn0b8qs740ls1069kg2lwm0b9yc4qv525fg8km0hgi0yp8qw7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-sync";
           sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
           name = "org-sync";
         };
@@ -43759,7 +43990,7 @@
           sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-table-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-table-comment";
           sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
           name = "org-table-comment";
         };
@@ -43780,7 +44011,7 @@
           sha256 = "1qz1qhd7v6ynmvz7j1xscz85z6zwy9dcarwhbz020l4bk4g9zf94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-tfl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-tfl";
           sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf";
           name = "org-tfl";
         };
@@ -43801,7 +44032,7 @@
           sha256 = "1apd5yyr12skagma7xpzrh22rhplmhhv0pma4zf5b0i6nkxy06j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-themis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-themis";
           sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln";
           name = "org-themis";
         };
@@ -43822,7 +44053,7 @@
           sha256 = "04adkz950vvwyzy3da468nnqsknpr5kw5369w2yqhnph16cwwfxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-time-budgets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-time-budgets";
           sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
           name = "org-time-budgets";
         };
@@ -43843,7 +44074,7 @@
           sha256 = "014337wimvzy0rxh2p2c647ly215zcyhgym2hcljkdriv15cafna";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-toodledo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-toodledo";
           sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
           name = "org-toodledo";
         };
@@ -43864,7 +44095,7 @@
           sha256 = "0jh9i41zqs9rvghfjhp5nl2ycav1pj1yv2hsr6skwqdpkwggvvmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-tracktable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-tracktable";
           sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
           name = "org-tracktable";
         };
@@ -43885,7 +44116,7 @@
           sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-transform-tree-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-transform-tree-table";
           sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
           name = "org-transform-tree-table";
         };
@@ -43906,7 +44137,7 @@
           sha256 = "0b97jqskn5c2cbah3qj9bi5was31sijrp01dca36g5y53lpz7n79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-tree-slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-tree-slide";
           sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
           name = "org-tree-slide";
         };
@@ -43919,15 +44150,15 @@
     org-trello = callPackage ({ dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
     melpaBuild {
         pname = "org-trello";
-        version = "20160604.1125";
+        version = "20160604.1545";
         src = fetchFromGitHub {
           owner = "org-trello";
           repo = "org-trello";
-          rev = "49b65ea4e4dcf3c4321fd19468822591cc46122d";
-          sha256 = "1149ikd134yl6jcxswnb65xfg7axyj9kjckimnvgl9hp4q6b1vb0";
+          rev = "dfb98150207b13c7771d0c0b8209e0503cd99cd6";
+          sha256 = "1d2bi29m8kxhp46slg904frgmlc6ajqagxjrhxlbdmlxrp18s44g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-trello";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-trello";
           sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i";
           name = "org-trello";
         };
@@ -43955,7 +44186,7 @@
           sha256 = "1m2xdp6wfg11wi7s4i675c3m5qancm8bpizcf380r6vmkcdfkrdy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-vcard";
           sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
           name = "org-vcard";
         };
@@ -43976,7 +44207,7 @@
           sha256 = "08yww77697kck1ld9xcrcx8amqdh28rdc4fsavp5d3my78qk7rac";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-wc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-wc";
           sha256 = "1sa9fcy0bnn06swwq2gfrgmppd6dsbmw2mq0v73mizg3l6has1zb";
           name = "org-wc";
         };
@@ -43997,7 +44228,7 @@
           sha256 = "18idnl2hx1s5hv1xm5akd35favnjnj2pxw6h00956lrapg01d1fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-webpage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-webpage";
           sha256 = "0vwv8cv38gx8rnfskbmnaf8y8sffjqy1408655bwhjz6dp69qmah";
           name = "org-webpage";
         };
@@ -44018,7 +44249,7 @@
           sha256 = "1cagmwl3acanwc2nky7m61cawi0i0x703sjc6zlw968lacyw86wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-wunderlist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-wunderlist";
           sha256 = "08zg3wgr80rp89c53ffqzz22ws9bp62a1m74xvxa74x6nq9i4xl0";
           name = "org-wunderlist";
         };
@@ -44039,7 +44270,7 @@
           sha256 = "1bqiq27ln1pl40b9dms05nla4kf72s80g9ilvrgqflxgl36gxws7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org2blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org2blog";
           sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
           name = "org2blog";
         };
@@ -44060,7 +44291,7 @@
           sha256 = "1lvwkvzqgy9nlz7zmqfl9j8cairjfv3vknpzcqp6rzp6hkq04zk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org2issue";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org2issue";
           sha256 = "1qd5l9ga26smgp1gkc8r9ja2n974kq1jf2z876s5v0489ipa59bz";
           name = "org2issue";
         };
@@ -44081,7 +44312,7 @@
           sha256 = "1gdv1dwmwhmpcpcvf8fmsjg3mli3l27inlql13m98h7vpv7rzqvb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org2jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org2jekyll";
           sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
           name = "org2jekyll";
         };
@@ -44094,15 +44325,15 @@
     organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "organic-green-theme";
-        version = "20160531.1218";
+        version = "20160610.1334";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "organic-green-theme";
-          rev = "a3cb1839044749fccc6c7c797594db6792f507c6";
-          sha256 = "1fd4qnfga4rjzdnjc3h91x3wbab1d2gd3dm3vg1xwy3c6wqlyhgv";
+          rev = "57b86a32245f948497e64a4f32f6c62b96396b94";
+          sha256 = "0jplnbc5hhv1bd2w8dvwny00hwl5n5idyq0zri9vfavmabm7lm5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/organic-green-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/organic-green-theme";
           sha256 = "1fdj3dpcdqx0db5q8dlxag6pr2qn4yiz1hmg3c7dkmh51n85ssw2";
           name = "organic-green-theme";
         };
@@ -44123,7 +44354,7 @@
           sha256 = "0hwmr67nky9xp5xlrkp54nw6b72d29lmna28dnbgqs2i5rccbk55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/orgbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/orgbox";
           sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
           name = "orgbox";
         };
@@ -44144,7 +44375,7 @@
           sha256 = "1wxxdx3c5qacsii4kysk438cjr1hnmpir78kp6xgk9xw5g9snlnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/orgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/orgit";
           sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
           name = "orgit";
         };
@@ -44157,15 +44388,15 @@
     orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "orglink";
-        version = "20160521.1630";
+        version = "20160606.1307";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "orglink";
-          rev = "3a0f6b12a69cc9e09285d317277b0dc6e1623f8a";
-          sha256 = "07ggg2mvvmv40h3gqlcxwrxsyrpvn2pffdjrzbh7yprm5mxynbjc";
+          rev = "4e3e6d920a74fd32a57d5722f81293428e9d8a46";
+          sha256 = "0yjnnrrcvbsq41dpw8cz8gv6q3jd626y1k4fgzsimyciz9l23w11";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/orglink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/orglink";
           sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
           name = "orglink";
         };
@@ -44186,7 +44417,7 @@
           sha256 = "1w0hadpslxcjn29yxl9i37sja4qf4kp7ffjpwij5hs73r518c2z6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/orglue";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/orglue";
           sha256 = "14g4q2k9zjzipzrp5mg72s40b0rwiaixgq3rvi15wh4vvcw5xajn";
           name = "orglue";
         };
@@ -44207,7 +44438,7 @@
           sha256 = "0zh8n8jb479ilmz88kj0q5wx8a9zqkfqds0rr8jbk2rqmj6j72v3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/orgtbl-aggregate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/orgtbl-aggregate";
           sha256 = "0gnyjwn6jshs8bzdssm2xppg2s9p2x3rrhp523q39aydskc6ggc9";
           name = "orgtbl-aggregate";
         };
@@ -44228,7 +44459,7 @@
           sha256 = "1vbnp37xz0nrpyi0hah345928zsb1xw915mdb0wybq1fzn93mp1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/orgtbl-ascii-plot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/orgtbl-ascii-plot";
           sha256 = "1ssjbdprbn34nsfx1xjc382l2195rbh8mybpn31d4kcjx6fqf78h";
           name = "orgtbl-ascii-plot";
         };
@@ -44249,7 +44480,7 @@
           sha256 = "06nc82wiha11i79izqil53dkd95fl55nb5m739gyyzvx3sksb0dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/orgtbl-join";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/orgtbl-join";
           sha256 = "1kq2h0lb521z8q2xb9bsi37xzzdsa0hw4mm3qkzidi5j9fi3apf1";
           name = "orgtbl-join";
         };
@@ -44270,7 +44501,7 @@
           sha256 = "161bsmgrbdhb73k36gqb5b96mf0y0sl8q9sjg81vx86bs9sbkddw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/orgtbl-show-header";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/orgtbl-show-header";
           sha256 = "1xgqjg3lmcczdblxaka47cc1ad8p8jhyb2nqwq0qnbqw46fqjp3k";
           name = "orgtbl-show-header";
         };
@@ -44291,7 +44522,7 @@
           sha256 = "18f5b6902zqayhhcchhsvszw1kryvhkhpc5vv0s187dkj38agsv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/origami";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/origami";
           sha256 = "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr";
           name = "origami";
         };
@@ -44312,7 +44543,7 @@
           sha256 = "1iybrhp607a5rb3ynlaf8w2x9wdgdbril702z44dgcg3wxih2zy1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-browse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-browse";
           sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
           name = "osx-browse";
         };
@@ -44333,7 +44564,7 @@
           sha256 = "1ykn48src7qhx9cmpjkaqsz7h36p75kkq1h9wlcpv5fhaky2d4n4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-clipboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-clipboard";
           sha256 = "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f";
           name = "osx-clipboard";
         };
@@ -44354,7 +44585,7 @@
           sha256 = "04fh4i8mydmvq58hd60lf0dglpcjqgzpwk93wqss72kpifwh68vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-dictionary";
           sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
           name = "osx-dictionary";
         };
@@ -44375,7 +44606,7 @@
           sha256 = "1wbmqxx1qzjc5kxzkwx7c2wvq71iic1f5f29lj6ckpjn743dnb0d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-lib";
           sha256 = "12wvki8jhzqsanxv5yqzjmfx6ifwz9ab9zh6r8nss86bk8864ix4";
           name = "osx-lib";
         };
@@ -44396,7 +44627,7 @@
           sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-location";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-location";
           sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
           name = "osx-location";
         };
@@ -44417,7 +44648,7 @@
           sha256 = "1rgykby1ysbapq53lnk9yy04r9q4qirnzs2abgvz7g2qjq5fyzag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-org-clock-menubar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-org-clock-menubar";
           sha256 = "1y5qxslxl0d93f387nyj8zngz5nh1p4rzdfx0lnbvya6shfaxaf6";
           name = "osx-org-clock-menubar";
         };
@@ -44438,7 +44669,7 @@
           sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-plist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-plist";
           sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8";
           name = "osx-plist";
         };
@@ -44459,7 +44690,7 @@
           sha256 = "1j601gzizxjsvkw6bvih4a49iq05yfkw0ni77xbc5klc7x7s80hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-pseudo-daemon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-pseudo-daemon";
           sha256 = "150fxj2phj5axnh5i8ws5fv2qzzmpyisch452wgxb604p56j7vy8";
           name = "osx-pseudo-daemon";
         };
@@ -44480,7 +44711,7 @@
           sha256 = "0f4md49175iyrgzv4pijf7qbxyddcm2yscrrlh91pg410la7fysk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-trash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-trash";
           sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
           name = "osx-trash";
         };
@@ -44501,7 +44732,7 @@
           sha256 = "1jzyfvc25ls0l4kpxg6857ccynl1pzgxfif7bppz2nfmf99z4534";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/otama";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/otama";
           sha256 = "04ffyscldb2sn2n26ixrnc07ybvl7iclv2hi1kmhr5hdgxwpyjq9";
           name = "otama";
         };
@@ -44522,7 +44753,7 @@
           sha256 = "116cwlhn7s47rhivz6113lh8lvaz3bjb3ynjlbx9hyf7gq3nfnxn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/outline-magic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/outline-magic";
           sha256 = "085yayzph3y7fh6pd5sdjdkhdcvwfzcyqd6y3xlbz7wni5ac6b5f";
           name = "outline-magic";
         };
@@ -44543,7 +44774,7 @@
           sha256 = "0d9hfr4kb6rkhwacdn70bkfchgam26gj92zfyaqw77a2sgwcmwwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/outlined-elisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/outlined-elisp-mode";
           sha256 = "165sivmv5h4nvh08ampq95x6b0bkzxgrdjbxjxlq6rv00vaidn7v";
           name = "outlined-elisp-mode";
         };
@@ -44564,7 +44795,7 @@
           sha256 = "0szvynvw16vr7br95pssqkil0xnfdh46x8lgan4z9v6impdav0nf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/outorg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/outorg";
           sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
           name = "outorg";
         };
@@ -44585,7 +44816,7 @@
           sha256 = "1smfdfw0swvfbqlxi7nkrgbmfqhs0x47ky6xhgf38la1s6ivh29n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/outshine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/outshine";
           sha256 = "1ajddzcrnvfgx3xa5wm0bcll9dax52syg1p521mv0ffkld63jyfl";
           name = "outshine";
         };
@@ -44606,7 +44837,7 @@
           sha256 = "1rk5pzm5wmdq68d99hhhbq8pq37bnph0dip5j2jnfj6zsw70whr2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ov";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ov";
           sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
           name = "ov";
         };
@@ -44627,7 +44858,7 @@
           sha256 = "0pzrsag2hxg4kys57w2ragk6kfrpilaamwrzw0czi53r6vmddfdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/overseer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/overseer";
           sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
           name = "overseer";
         };
@@ -44648,7 +44879,7 @@
           sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/owdriver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/owdriver";
           sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
           name = "owdriver";
         };
@@ -44669,7 +44900,7 @@
           sha256 = "03ivnvqxc5xdcik4skk32fhr686yv2y5mj8w7v27dhyc0vdpfhvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-asciidoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-asciidoc";
           sha256 = "07b549dqyh1gk226d7zbls1mw6q4mas7kbfwkansmyykax0r2zyr";
           name = "ox-asciidoc";
         };
@@ -44690,7 +44921,7 @@
           sha256 = "1d463d7mdlr65yrq7x16nk9124fw1iphf5g238mlh4abbl6kz241";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-bibtex-chinese";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-bibtex-chinese";
           sha256 = "0h02jlzk97rd3jmdni5mggbkij61d7zn1n1ibz1jg6zb0000cj7a";
           name = "ox-bibtex-chinese";
         };
@@ -44711,7 +44942,7 @@
           sha256 = "1fr5kp9cya9mzrl18flp117dy0qlp6f684qvmyilzaqm6q8w0nia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-gfm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-gfm";
           sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q";
           name = "ox-gfm";
         };
@@ -44732,7 +44963,7 @@
           sha256 = "19h3w3fcas60jv02v7hxjmh05804sb7bif70jssq3qwisj0j09xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-html5slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-html5slide";
           sha256 = "0nqk6chg0ky98ap2higa74786prj7dbwx2a3l67m0llmdajw76qn";
           name = "ox-html5slide";
         };
@@ -44753,7 +44984,7 @@
           sha256 = "1kf2si2lyy0xc971bx5zd2j9mnz1smc9s8l0dwc6iksh2v9q8cy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-impress-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-impress-js";
           sha256 = "0p0cc51lmxgl0xv951ybdg5n8gbzv8qf0chfgigijizzjypxc21l";
           name = "ox-impress-js";
         };
@@ -44774,7 +45005,7 @@
           sha256 = "0p03xzldz5v8lx3ip2pgll0da00ldfxmhr6r3jahwp6692kxpr6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-ioslide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-ioslide";
           sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
           name = "ox-ioslide";
         };
@@ -44795,7 +45026,7 @@
           sha256 = "0csl9fcfwnpl6x3ld7xrlvgz6gwmgcd15a4zdc570w8vp26ra5k9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-jira";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-jira";
           sha256 = "0bm7i1ambd71xmy1y9jcdh52irgcsziwwb9d3y3rq0pnsqv5cpvp";
           name = "ox-jira";
         };
@@ -44816,7 +45047,7 @@
           sha256 = "1g42aq4iaq40aivncxw663hnsb2768lzc08dmsmk4lq5q9kzcjhg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-latex-chinese";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-latex-chinese";
           sha256 = "138yprik36jxhm6dnj42gaynqd84w7ya3s0kbnxhbizrfl4n4ck7";
           name = "ox-latex-chinese";
         };
@@ -44837,7 +45068,7 @@
           sha256 = "0c2m02g6csg5fqizj3zqcm88q7w17kgvgi7swcx4fzz6rixnpsji";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-mediawiki";
           sha256 = "0lijj2n4saw0xd3jaghbvx9v6a4ldl5gd8wy7s7hfcm30wb75cdb";
           name = "ox-mediawiki";
         };
@@ -44858,7 +45089,7 @@
           sha256 = "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-nikola";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-nikola";
           sha256 = "1amplnazs9igfd382djq23d8j7r0knr0hwlpasd01aypc25c82a4";
           name = "ox-nikola";
         };
@@ -44879,7 +45110,7 @@
           sha256 = "0bawigwc6v5420642xlkyxdd0i82gicx69wqlnjf6lvhfvs990is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
           name = "ox-pandoc";
         };
@@ -44900,7 +45131,7 @@
           sha256 = "0adj6gm39qw4ivb7csfh21qqqipcnw1sgm1xdqvrk86kbs9k1b2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-pukiwiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-pukiwiki";
           sha256 = "10sfbri5hv5hyx9jc1bzlk4qmzfmpfgfy8wkjkpv7lv2x0axqd8a";
           name = "ox-pukiwiki";
         };
@@ -44910,6 +45141,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ox-qmd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-qmd";
+        version = "20160606.1404";
+        src = fetchFromGitHub {
+          owner = "0x60df";
+          repo = "ox-qmd";
+          rev = "b41ffcf47af1a635596df31d4b0a704f274b5654";
+          sha256 = "1zv8kh7hlskj4g1c4k3cx0hzraal3inn75yzxs08ndvycdsn6cky";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-qmd";
+          sha256 = "1i2kdpp6prgphc1l42nz7q6vdfsbcn2vvlf10s7dfhhr8jzcyyy7";
+          name = "ox-qmd";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "https://melpa.org/#/ox-qmd";
+          license = lib.licenses.free;
+        };
+      }) {};
     ox-reveal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-reveal";
@@ -44921,7 +45173,7 @@
           sha256 = "0pmshd58945h843c5hgzcz169kfzrwmkdzh7rv1cci783z3cxxdc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-reveal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-reveal";
           sha256 = "092swxkkisvj2y18ynal8dn7wcfi7h4y6n0dlzqq28bfflarbwik";
           name = "ox-reveal";
         };
@@ -44934,15 +45186,15 @@
     ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-rst";
-        version = "20151115.843";
+        version = "20160607.1917";
         src = fetchFromGitHub {
           owner = "masayuko";
           repo = "ox-rst";
-          rev = "2bd53fa5b3af67afbf45041d7f54b3c5b71b1f10";
-          sha256 = "1js4n8iwimc86fp2adzhbhy4ixss1yqngjd8gq7pxgpgmnhd66x3";
+          rev = "958ce46c0eacb6c0dbb6e0f006487af4e01c2298";
+          sha256 = "0zwaliskikf2098a3wsqkjk40w9q2afmx33wygwaz7saxgs08jwl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-rst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-rst";
           sha256 = "1vyj6frrl7328n2x7vc3qwv3ssdhi8bp6ja5h2q4bqalc6bl1pq0";
           name = "ox-rst";
         };
@@ -44963,7 +45215,7 @@
           sha256 = "1r9c4s9f7cvxxzf9h07rg75bil0295zq1inh5i4r6za5jabkr4dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-textile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-textile";
           sha256 = "01kri7vh16xhy8x5qd6s5z08xr0q964rk6xrligdb3i6x78wfvi4";
           name = "ox-textile";
         };
@@ -44984,7 +45236,7 @@
           sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-tiddly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-tiddly";
           sha256 = "196i8lzxv2smpj5yhmiqwazn4pvc14yqyzasrgimhv3vi2xnxlfb";
           name = "ox-tiddly";
         };
@@ -45005,7 +45257,7 @@
           sha256 = "0w6963jvz1sk732nh18735dxivd6nl59jd4m26ps6l4wqhqby0db";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-trac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-trac";
           sha256 = "0f8b3i83vzxzfa91p4ahlqz6njql18xy5nk265sjxpy9zr898rsa";
           name = "ox-trac";
         };
@@ -45026,7 +45278,7 @@
           sha256 = "0yrac13xiyfxipy5qyq56jg7151wjs3xv4gpsarx4hkrxi96apbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-twbs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-twbs";
           sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
           name = "ox-twbs";
         };
@@ -45047,7 +45299,7 @@
           sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-twiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-twiki";
           sha256 = "1p1k0yg5fxcjgwpq2ix9ckh2kn69m7d5rnz76h14hw9p72cb54r0";
           name = "ox-twiki";
         };
@@ -45068,7 +45320,7 @@
           sha256 = "12jsnfppif4l548wymvakx0f2zlm63xs6kfrb49hicmk668cq4ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/p4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/p4";
           sha256 = "0215li17gn35wmvd84gnp4hkwa2jd81wz4frb1cba2b5j33rlprc";
           name = "p4";
         };
@@ -45089,7 +45341,7 @@
           sha256 = "09bn19ydyz1hncmvyyh87gczp3lmlczpm352p0107z1gw6xmpjil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pabbrev";
           sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
           name = "pabbrev";
         };
@@ -45102,15 +45354,15 @@
     package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-build";
-        version = "20160530.828";
+        version = "20160606.57";
         src = fetchFromGitHub {
           owner = "melpa";
           repo = "melpa";
-          rev = "1b56ca344ad944e03b669a9974e9b734b5b445bb";
-          sha256 = "07ni5wvds27sikcbz49bbyzssa199hvav62fd3a6v8zfz586ji73";
+          rev = "4976446a8ae40980d502186615902fc05c15ec7c";
+          sha256 = "1a33hmlwpp337bjrqflhzbllnr4qs2m23br2idrr5mp3ayagrszg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/package-build";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/package-build";
           sha256 = "0618z43j6628jjj448hcigvsfwcs7p0n4bbcmqscrb6p59b7n4wx";
           name = "package-build";
         };
@@ -45131,7 +45383,7 @@
           sha256 = "0i7f8ambcrhyqq15xwlk31jjdcii2hr37y45va8m5w6n9mkpz8c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/package-filter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/package-filter";
           sha256 = "0am73zch2fy1hfjwzk8kg0j3lgbcz3hzxjrdf0j0a9w0myp0mmjm";
           name = "package-filter";
         };
@@ -45152,7 +45404,7 @@
           sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/package+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/package+";
           sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
           name = "package-plus";
         };
@@ -45173,7 +45425,7 @@
           sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/package-safe-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/package-safe-delete";
           sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
           name = "package-safe-delete";
         };
@@ -45194,7 +45446,7 @@
           sha256 = "1pcpr8ls0sqph098lrb6n8fbsm8rq8imglfx3m8zzyw78q9hwcjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/package-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
           name = "package-utils";
         };
@@ -45215,7 +45467,7 @@
           sha256 = "1kjcb6z08bj5ysxrykgz3x6bz2122yycpjhbv875ppc5ihls88xl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/packed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/packed";
           sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
           name = "packed";
         };
@@ -45236,7 +45488,7 @@
           sha256 = "0zx72qbqy2n1r6mjylw67zb6nnchp2b49vsdyl0k5bdaq2xyqv6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pacmacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pacmacs";
           sha256 = "0w0r6z365jrglpbifb94w6c22wqi9x93qgkss9pn820hrndqbqxy";
           name = "pacmacs";
         };
@@ -45249,15 +45501,15 @@
     paganini-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "paganini-theme";
-        version = "20160529.1222";
+        version = "20160612.1237";
         src = fetchFromGitHub {
           owner = "onurtemizkan";
           repo = "paganini";
-          rev = "cbe0f88ddb613b8067f1e14f358964bc1ece9fbb";
-          sha256 = "1a3vj3wf64w5gw9a7jh36abw046yp3njms3rw8y52n6vf9gdcdci";
+          rev = "506e35c9cecfae0f9ccbb7da24d48b9d082a7901";
+          sha256 = "16g4crpgskhgfzw8fx2j4ibvpdf8qi7brxbp2nhwijdag12i4wwn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paganini-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paganini-theme";
           sha256 = "1kypkf52hjlfj75pcmjf2a60m6iwj0y1dspjwqynzz3l48i6ippm";
           name = "paganini-theme";
         };
@@ -45278,7 +45530,7 @@
           sha256 = "0mqd18w98p6z0i08xx7jga10ljh9360x6sqfyvfq6bjfi2jvxdbk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/page-break-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/page-break-lines";
           sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
           name = "page-break-lines";
         };
@@ -45299,7 +45551,7 @@
           sha256 = "1dq5ibz7rx9a7gm9zq2pz4c1sxgrm59yibyq92bvmi68lvf2q851";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pager";
           sha256 = "0s5zwimkbsivbwlyd7g8dpnjyzqcfc5plg53ij4sljiipgjh5brl";
           name = "pager";
         };
@@ -45320,7 +45572,7 @@
           sha256 = "11msqs8v9wn8sj45dw1fl0ldi3sw33v0xclynbxgmawyabfq3bqm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pager-default-keybindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pager-default-keybindings";
           sha256 = "0vqb3s1fxkl1fxxspq89344s55sfcplz26z0pbh347l1681h3pci";
           name = "pager-default-keybindings";
         };
@@ -45338,7 +45590,7 @@
           sha256 = "1qnv84y0s437xcsjxh0gs9rb36pydba3qfrihvz5pqs9g9w7m94k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/palette";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/palette";
           sha256 = "1v6dsph18rqfbvda2c25mqgdwap2a4zrg6qqq57n205zprpcwxc0";
           name = "palette";
         };
@@ -45359,7 +45611,7 @@
           sha256 = "1kbja107smdjqv82p84jx13jk1410c9vms89p1iy1jvn7s8g9fiq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/palimpsest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/palimpsest";
           sha256 = "18kklfdlcg982pdrslh0xqa42h28f91bdm7q2zn890d6dcivp6bk";
           name = "palimpsest";
         };
@@ -45380,7 +45632,7 @@
           sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pallet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pallet";
           sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
           name = "pallet";
         };
@@ -45390,6 +45642,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pandoc";
+        version = "20160607.1910";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "pandoc.el";
+          rev = "5f96efe8804cf949de2896fcb3015513275b9118";
+          sha256 = "1r1rzaidg3pd8q5alv76drv843hwj9yzkn5hsaf4qnqrkkqwly8y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pandoc";
+          sha256 = "0x81anxam7agr2v2zqgc331zs5s5zxcw54kzpanndda23n51h5cc";
+          name = "pandoc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/pandoc";
+          license = lib.licenses.free;
+        };
+      }) {};
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
@@ -45401,7 +45674,7 @@
           sha256 = "1aldnaas57saa2rdg6j3hczmf008m34dw47qzxjmn1jh6xibk357";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pandoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pandoc-mode";
           sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
           name = "pandoc-mode";
         };
@@ -45422,7 +45695,7 @@
           sha256 = "0bcqc4r0v02v99llphk8s0mj38gxk87a3jqcp8v4sb9040dkm8gd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pangu-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pangu-spacing";
           sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
           name = "pangu-spacing";
         };
@@ -45443,7 +45716,7 @@
           sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paper-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paper-theme";
           sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
           name = "paper-theme";
         };
@@ -45464,7 +45737,7 @@
           sha256 = "1vq3xjllgvzwp18mv2y1qydbbl6j1nk58vw7sm99zsf3wdpls465";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paradox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paradox";
           sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
           name = "paradox";
         };
@@ -45483,7 +45756,7 @@
           sha256 = "14k1xakdr58647cnq8ky73sh5j94jc6vls05jdxkbv681krdvqvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paredit";
           sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
           name = "paredit";
         };
@@ -45504,7 +45777,7 @@
           sha256 = "1jkpb67h96sm3fnga9hrg3kwhlp3czdv66v49a9szq174zpsnrgv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paredit-everywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paredit-everywhere";
           sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
           name = "paredit-everywhere";
         };
@@ -45525,7 +45798,7 @@
           sha256 = "15xkanrwxh3qqay3vkfqvhzs88g7nnfv9bqk509qflyhqnvc9sxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paredit-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paredit-menu";
           sha256 = "05jp4cc548x5f07k096dgizhivdpaajxq38hin831sm0p9cibm4p";
           name = "paredit-menu";
         };
@@ -45546,7 +45819,7 @@
           sha256 = "1il0gbyjnlxhk04z3lgxmvlmlhgc94rmxdf8nl5sk3gblqmr8v3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paren-completer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paren-completer";
           sha256 = "0xh17h8vmsgbrq6yf5sfy3kpia4za68f43gwgkvi2m430g15fr0x";
           name = "paren-completer";
         };
@@ -45567,7 +45840,7 @@
           sha256 = "0f128gqn170s6hl62n44i9asais75ns1mpvb4l8vzy1sc0v16c0k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paren-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paren-face";
           sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
           name = "paren-face";
         };
@@ -45588,7 +45861,7 @@
           sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/parent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/parent-mode";
           sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
           name = "parent-mode";
         };
@@ -45609,7 +45882,7 @@
           sha256 = "06xg6f74697zmn042wg259qlik2l21k4al08a06xz4gv9a83nsx6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/parse-csv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/parse-csv";
           sha256 = "0khpfxbarw0plx8kka357d8wl1vvdih5797xlld9adc0g3cng0zz";
           name = "parse-csv";
         };
@@ -45630,7 +45903,7 @@
           sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/parsebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/parsebib";
           sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
           name = "parsebib";
         };
@@ -45651,7 +45924,7 @@
           sha256 = "0npm5kv00fcnb5ajj76jp1dc84zxp7fgrkn472yxdq4hppvx0ixv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pass";
           sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
           name = "pass";
         };
@@ -45672,7 +45945,7 @@
           sha256 = "0yckh61v9a798gpyk8x2z9990h3b61lwsw0kish571pygfyqhjkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/passthword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/passthword";
           sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
           name = "passthword";
         };
@@ -45693,7 +45966,7 @@
           sha256 = "1pw401ar114wpayibphv3n6m0gz68zjmiwz60r4lbar45bmxvihx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/password-generator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/password-generator";
           sha256 = "0aahpplmiwmp6a06y6hl4zvv8lvzkmakmaazlckl5r3rqbsf24cb";
           name = "password-generator";
         };
@@ -45710,10 +45983,10 @@
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
           rev = "0b2f803fe61992af02b8820c400984b1f615a299";
-          sha256 = "11cq7wz57zc649zww720cdfa9rqyjl9gf9h0m96wfapm4mhczd1n";
+          sha256 = "011sz1rlr7mbsvn1z1kxl3psjv3g2vkbndcim5jnp1wwlc5bibh3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/password-store";
           sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
           name = "password-store";
         };
@@ -45734,7 +46007,7 @@
           sha256 = "0921xwg3d3345hiqz4c1iyqwvfyg8rv0wggcnig7xh9qivspag4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/password-vault";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/password-vault";
           sha256 = "17i556xwq6yaxv9v18l1abcpbaz6hygsa4vf4b68fc98vcy7396a";
           name = "password-vault";
         };
@@ -45755,7 +46028,7 @@
           sha256 = "1hjzpza8zmzb83sacmqcnh9a52m4x5d8xbwvcqvld1ajglv4y124";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pastebin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pastebin";
           sha256 = "0ff01vzslgdmsj1jp1m2lvnan6immd4l7vz466g1glb5nkb7qfcr";
           name = "pastebin";
         };
@@ -45776,7 +46049,7 @@
           sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pastehub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pastehub";
           sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
           name = "pastehub";
         };
@@ -45797,7 +46070,7 @@
           sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pastelmac-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pastelmac-theme";
           sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
           name = "pastelmac-theme";
         };
@@ -45817,7 +46090,7 @@
           sha256 = "1ar6rf2ykd252y8ahx0lca7xsgfs6ff287q9iij79gs9fhn4yfy5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pastels-on-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pastels-on-dark-theme";
           sha256 = "0zdr29793gg229r47yjb3plagxc9pszqyy4sx81ffp3rpdf0nlbh";
           name = "pastels-on-dark-theme";
         };
@@ -45838,7 +46111,7 @@
           sha256 = "1ffnkw8djs8kvfjd1crnaqram1vl4w3g1zhsqp74ds0mccsd6830";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/path-headerline-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/path-headerline-mode";
           sha256 = "0dwr8iyq62ad5xkh7r4kpywpypdq1wljsdzwqbq9zdr79yfqx337";
           name = "path-headerline-mode";
         };
@@ -45859,7 +46132,7 @@
           sha256 = "0wsq11qffw1lx9x79law7jrz0sxm6km83gh891ic9ak2y6j5shxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pathify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pathify";
           sha256 = "1z970xnzbhmfikj1rkfx24jvwc7f1xxw6hk7kmahxvphjxrvgc2f";
           name = "pathify";
         };
@@ -45880,7 +46153,7 @@
           sha256 = "0kkgqaxyrv65rfg2ng1vmmmrc9bm98yqpsv2pcb760287dn0l27m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paxedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paxedit";
           sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
           name = "paxedit";
         };
@@ -45901,7 +46174,7 @@
           sha256 = "138w0dlp3msjmr2x09kfcnxwhdldbz9xjfy7l6lig1x9ima0z5w6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pbcopy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pbcopy";
           sha256 = "1989pkhaha6s2rmgyswnzps92x9hhzymjz4ng4a5jda1b9snp60q";
           name = "pbcopy";
         };
@@ -45922,7 +46195,7 @@
           sha256 = "1jj5h92qakrn9d5d88dvl43b7ppw96rm11hqg3791i6k48nx1d1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pc-bufsw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pc-bufsw";
           sha256 = "01d7735ininlsjkql7dy57irgwgk4k9br8bl18wq51vgkg90i5k5";
           name = "pc-bufsw";
         };
@@ -45943,7 +46216,7 @@
           sha256 = "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pcache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pcache";
           sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
           name = "pcache";
         };
@@ -45964,7 +46237,7 @@
           sha256 = "0pwx1nbgciy28rivvrgka46zihmag9ljrs40bvscgd9rkragm4zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pcmpl-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pcmpl-args";
           sha256 = "0sry4zvr8xmzyygf2m5dms52srkd1apj3i7a3aj23qa8jvndx8vr";
           name = "pcmpl-args";
         };
@@ -45985,7 +46258,7 @@
           sha256 = "0pspxgicc0mkypp94r0jydmkjr3ngv8y4w1xpj93kp79hnvyls0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pcmpl-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pcmpl-git";
           sha256 = "12y9pg1g4i1ghnjvgfdpa6p84h4bcqrr23y9bazwl9n6aj20cmxk";
           name = "pcmpl-git";
         };
@@ -46006,7 +46279,7 @@
           sha256 = "17i5j5005dhzgwzds5jj1a7d31xvbshjc139vawwz2xip5aynji4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pcmpl-homebrew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pcmpl-homebrew";
           sha256 = "11yd18s79iszp8gas97hqpa0b0whgh7dvlyci3nd4z28467p83v8";
           name = "pcmpl-homebrew";
         };
@@ -46027,7 +46300,7 @@
           sha256 = "14pz15by9gp0307bcdv9h90mcr35ya89wbn3y13n7k0z5r45gn58";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pcmpl-pip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pcmpl-pip";
           sha256 = "19a3np5swpqvrx133yvziqnr2pvj8zi0b725j8kxhp2bj1g1c6hr";
           name = "pcmpl-pip";
         };
@@ -46048,7 +46321,7 @@
           sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pcomplete-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pcomplete-extension";
           sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
           name = "pcomplete-extension";
         };
@@ -46069,7 +46342,7 @@
           sha256 = "1dpfhrxbaqpgjzac3m9hclbzlnrxq9b8bx6za53aqvml72yzxc6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pcre2el";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pcre2el";
           sha256 = "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3";
           name = "pcre2el";
         };
@@ -46090,7 +46363,7 @@
           sha256 = "0aaprjczjf3al5vcypw1fsnz5a0xnnlhmvy0lc83i9aqbsa2y8af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pcsv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pcsv";
           sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
           name = "pcsv";
         };
@@ -46111,7 +46384,7 @@
           sha256 = "1xkkyz7y08jr71rzdacb9v7gk95qsxlsshkdsxq8jp70irq51099";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pdb-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pdb-mode";
           sha256 = "1ihkxd15kx5m5xb9yxwz8wqbmyk9iaskry9szzdz1j4gjlczb6hy";
           name = "pdb-mode";
         };
@@ -46132,7 +46405,7 @@
           sha256 = "14h8vybd0lns92mxv045mfcllhq8fj509bvf7i9vr190mxgnxv3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pdf-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pdf-tools";
           sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
           name = "pdf-tools";
         };
@@ -46153,7 +46426,7 @@
           sha256 = "1clvrmvijwpffigh5f29vnwcvffqk0nrvlz26158hip1z9x7nah3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/peacock-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/peacock-theme";
           sha256 = "0jpdq090r37d07bm52yx3x9y3gsip6fyxxq1ax1k5k0r0js45kq9";
           name = "peacock-theme";
         };
@@ -46174,7 +46447,7 @@
           sha256 = "11nv6pll0zj9dkgzlzgav39a6x3sfi7kvfhwm96fa3iy4v8bixrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/peek-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/peek-mode";
           sha256 = "07wcnh3jmp2gi9xhd3d8i2n0pr2g9kav497nnz94i85awhzf8fi4";
           name = "peek-mode";
         };
@@ -46195,7 +46468,7 @@
           sha256 = "1wy5qpnfri1gha2cnl6q20qar8dbl2mimpb43bnhmm2g3wgjyad6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/peep-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/peep-dired";
           sha256 = "16k5y3h2ip96k071vhx83avg4r4nplnd973b1271vvxbx2bly735";
           name = "peep-dired";
         };
@@ -46216,7 +46489,7 @@
           sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/peg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/peg";
           sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
           name = "peg";
         };
@@ -46236,7 +46509,7 @@
           sha256 = "0w02l91x624cgzdg33a9spgcwy12m607dsfnr1xbc1fi08np4sd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/per-buffer-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/per-buffer-theme";
           sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
           name = "per-buffer-theme";
         };
@@ -46257,7 +46530,7 @@
           sha256 = "0fzypcxxd5zlkcybz0xppf09l0vf4vsfisr2y3ijsmxhg7yrwzj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/perl-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/perl-completion";
           sha256 = "01p17mlkwjm60f14arda3ly8ng0r98nn3rly94ghn6jr7r7fv14b";
           name = "perl-completion";
         };
@@ -46278,7 +46551,7 @@
           sha256 = "11fs78b7ssz18wr35vxf6h4zpfj4l4vsikfzayq6hyqjnchv7b45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/perl6-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/perl6-mode";
           sha256 = "0af1djypd8n0n1fq10sl8mrdg27354kg9g87d6xz4q5phvi48cqv";
           name = "perl6-mode";
         };
@@ -46299,7 +46572,7 @@
           sha256 = "0wg0cpqxzfgln6xdngzspsbfirn9a5jxpgk66m0fpi33215z9q26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/perlbrew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/perlbrew";
           sha256 = "1qadwkcic2qckqy8hgrnj08ajhxayknhpyxkc6ir15vfqjk5crr8";
           name = "perlbrew";
         };
@@ -46320,7 +46593,7 @@
           sha256 = "0iw9qsqy1aszwfzfslyxz31zav4xq8pbrx0mwxqix5lvy7768ppp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/persistent-overlays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/persistent-overlays";
           sha256 = "136acbxqykvsw8a5il1zgpxr7llxmc3347847vf0jnmbzb1b472a";
           name = "persistent-overlays";
         };
@@ -46341,7 +46614,7 @@
           sha256 = "0j72rqd96dz9pp9zwc88q3358m4b891dg0szmbyvs4myp3yandz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/persistent-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/persistent-scratch";
           sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
           name = "persistent-scratch";
         };
@@ -46362,7 +46635,7 @@
           sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/persistent-soft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/persistent-soft";
           sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
           name = "persistent-soft";
         };
@@ -46375,15 +46648,15 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20160528.1838";
+        version = "20160609.2216";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "5e5c2b3306653e8d9a9ca67e6f7b77cf86e74ddb";
-          sha256 = "1rvsbyx3838va9vx3g8a3vj9pp3fin4vqkngi0dl7asddcl9mp58";
+          rev = "d1e13ca908050f895d6e6e56e28284acf040b6b3";
+          sha256 = "1lrqn476dkfm1v74z3n7dnf420sdffv14xai5lxdfcjdp136il73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/persp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/persp-mode";
           sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
           name = "persp-mode";
         };
@@ -46404,7 +46677,7 @@
           sha256 = "0b9hz253m6d58dwsjsk9d1fw0ql33m9wfvyx10ncsqbr0j0s98k5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/persp-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/persp-projectile";
           sha256 = "10l2kqjyigg98qbbpf3qf4d5bm63kkk4vp7ip8fibgj1p9gqmnxm";
           name = "persp-projectile";
         };
@@ -46417,15 +46690,15 @@
     perspective = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "perspective";
-        version = "20160220.122";
+        version = "20160609.2344";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "perspective-el";
-          rev = "c075205313b23cc816c72f1f43b846ce608a22d5";
-          sha256 = "11slq43p6gjvmi4pqwh76a26c2v6l1dmnihgaskn4g0s65qw3kqk";
+          rev = "89a8ef5e8297b113e4f732bb94336608b76e13fd";
+          sha256 = "1bdywz241kyvlxn107l2jg6vyhvvw5j4pywrarzx3pdymh9qk645";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/perspective";
           sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
           name = "perspective";
         };
@@ -46446,7 +46719,7 @@
           sha256 = "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pg";
           sha256 = "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji";
           name = "pg";
         };
@@ -46467,7 +46740,7 @@
           sha256 = "0c9d4c24ic67y07y74bv5b7vc56b6l0lbh2fbzm870r1dl5zbzcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pgdevenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pgdevenv";
           sha256 = "0za35sdwwav81wpk4jjqh56icaswwxxyg3bqqp0qiz24llb5ln1w";
           name = "pgdevenv";
         };
@@ -46488,7 +46761,7 @@
           sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ph";
           sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
           name = "ph";
         };
@@ -46509,7 +46782,7 @@
           sha256 = "0cmfb5ns335nq27iw94qxvrldpwjga0hw40da9kpdcfg0in4ya0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phabricator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phabricator";
           sha256 = "07988f2xyp76xjs25b3rdblhmijs2piriz4p0q92jw69bdvkl14c";
           name = "phabricator";
         };
@@ -46530,7 +46803,7 @@
           sha256 = "14g06ndxrqz80kdyhil6ajcqqxkfa77r1gr7vwqa9sq6jgm8dpx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phi-autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phi-autopair";
           sha256 = "1ya1bvh28qgz1zg9kdh2lzbsf0w0lx4xr42mdrjwaz3bbfa9asg4";
           name = "phi-autopair";
         };
@@ -46551,7 +46824,7 @@
           sha256 = "1rchxhp4kji5kbg8kzkzdbfy8sdbgbqd5g59cch7ia9agh5jvwyx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phi-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phi-grep";
           sha256 = "1y5lq6lq9qdydbypb1pjnxryh94a295nnqqh2x27whiwdiysirjj";
           name = "phi-grep";
         };
@@ -46572,7 +46845,7 @@
           sha256 = "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phi-rectangle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phi-rectangle";
           sha256 = "08yw04wmbgbbr60i638m0rspfwn3cp47ky5ssgjcgcmmdgg9yfvy";
           name = "phi-rectangle";
         };
@@ -46593,7 +46866,7 @@
           sha256 = "10kyq3lkhmbmj1hl9awzc0w8073dn9mbjd5skh660ljg5mmi6x62";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phi-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phi-search";
           sha256 = "0nj06ixl76dd80zg83q4bi8k224mcwb612mr4gd1xppj5k8xl03g";
           name = "phi-search";
         };
@@ -46614,7 +46887,7 @@
           sha256 = "1b44947hncw4q42fxxrz6fm21habzp4pyp0569xdwysrx2rca2fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phi-search-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phi-search-dired";
           sha256 = "1gf3vs3vrp5kbq4ixnj7adazmnqixi63qswgc2512p10gf7inf8p";
           name = "phi-search-dired";
         };
@@ -46635,7 +46908,7 @@
           sha256 = "0wr86ad0yl52im6b9z0b9pzmhcn39qg5m9878yfv1nbxliw40lcd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phi-search-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phi-search-mc";
           sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
           name = "phi-search-mc";
         };
@@ -46656,7 +46929,7 @@
           sha256 = "1k8hjnkinzdxy9qxldsyvj6npa2sv48m905d1cvxr8lyzpc5hikh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phi-search-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phi-search-migemo";
           sha256 = "0qk73s09sasm438w29j5z2bmlb60p1mgbv2ch43rgq8c6kjzg6h6";
           name = "phi-search-migemo";
         };
@@ -46677,7 +46950,7 @@
           sha256 = "1fg63g1cm9mp50sf3ldcb0pr4bvlfxx010arisxdkj102pmib2ri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phoenix-dark-mono-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phoenix-dark-mono-theme";
           sha256 = "15in299j170n0wxmkg3cx1zzx1n7r1ifraqqzfqhcnk8i8lmc939";
           name = "phoenix-dark-mono-theme";
         };
@@ -46698,7 +46971,7 @@
           sha256 = "042yw44d5pwykl177sdh209drc5f17yzhq0mxrf7qhycbjs4h8cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phoenix-dark-pink-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phoenix-dark-pink-theme";
           sha256 = "0bz6iw73d85bi12qqx6fdw3paqknrxvn0asbwjmgdcrlqrfczjlr";
           name = "phoenix-dark-pink-theme";
         };
@@ -46719,7 +46992,7 @@
           sha256 = "1l64rka9wrnwdgfgwv8xh7mq9f1937z2v3r82qcfi6il3anw4zm0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/php-auto-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/php-auto-yasnippets";
           sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
           name = "php-auto-yasnippets";
         };
@@ -46740,7 +47013,7 @@
           sha256 = "07lcibr55pk3sab9bbq2r4phadl5p28n63wkq5rkhkkjc7s9rayc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/php-boris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/php-boris";
           sha256 = "19yfbrlfqikix2lnnlbpzm6yakjhl84ix0zra2ycpvgg2pl88r0g";
           name = "php-boris";
         };
@@ -46761,7 +47034,7 @@
           sha256 = "1wk7vq80v97psxfg0pwy4mc6kdc61gm6h1vgl9p71ii6g6zvzcqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/php-boris-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/php-boris-minor-mode";
           sha256 = "1cmpd303chldss7kylpinv8qc3c78srz02a9cp9x79c8arq7apwl";
           name = "php-boris-minor-mode";
         };
@@ -46782,7 +47055,7 @@
           sha256 = "0hm6myvf91f4d2yfc7fs2xky9m8hfnimx1gkfzmn9f5pcc2l2p0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/php-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/php-eldoc";
           sha256 = "1q5fkl8crqrgxik2mxbkqv10qnqhqrazd66rgfw797s3jcchv58j";
           name = "php-eldoc";
         };
@@ -46795,15 +47068,15 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20160526.1325";
+        version = "20160606.33";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "c9fc19039648dd2a209209fa70da95435c338ee6";
-          sha256 = "082yfmwvdff808kmhd1ks3h7ysxm6mzqb0lzbh6fy5idlhgnbkkb";
+          rev = "f7b00745ee8a88babdeb06aa8b9c8e7e966de1dc";
+          sha256 = "1nzdanxnlm6yapi77x9iq4xpyvpw78cybzl6i1sf215p8lnm95rs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/php-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/php-mode";
           sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
           name = "php-mode";
         };
@@ -46824,7 +47097,7 @@
           sha256 = "0f1n0jcla157ngqshq5n8iws216ar63ynjd6743cbdrzj0v030wg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/php+-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/php+-mode";
           sha256 = "1ibcsky6la3l7gawpgx814w1acjf73b68i6wbb4p6saxhwg6adik";
           name = "php-plus--mode";
         };
@@ -46845,7 +47118,7 @@
           sha256 = "01i552ch8r8i6nzw8prwxcafzrq6xnzyc4cn36w3my1xq0k2ljvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/php-refactor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/php-refactor-mode";
           sha256 = "0gj0nv6ii7pya0hcxs8haz5pahj0sa12c2ls53c3j85in645zb3s";
           name = "php-refactor-mode";
         };
@@ -46866,7 +47139,7 @@
           sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phpcbf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phpcbf";
           sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
           name = "phpcbf";
         };
@@ -46887,7 +47160,7 @@
           sha256 = "1pmds2g7y1pcs3ivsd68zg30ih34janib0ydz4wr0mci3q52cjpy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phpunit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phpunit";
           sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
           name = "phpunit";
         };
@@ -46908,7 +47181,7 @@
           sha256 = "053jqzl0sp3dnl4919vi30xqrdcpi9jsqx5hndj1bprf7926w11d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pianobar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pianobar";
           sha256 = "16vsf2cig9qjbh9s58zb5byjmyghxbsxpzpm5hyyrv251jap1jjn";
           name = "pianobar";
         };
@@ -46929,7 +47202,7 @@
           sha256 = "0p91ysyjksbravnw3l78mshay6swgb5k1zi5bbppppk8zkmdp115";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/picolisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/picolisp-mode";
           sha256 = "1n56knbapyfs8n23arzlz27y0q4846r64krwlwh8agfqkcdw9dp5";
           name = "picolisp-mode";
         };
@@ -46950,7 +47223,7 @@
           sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pig-mode";
           sha256 = "0gmvc4rrqkn0cx8fk1sxk6phfbpf8dcba3k6i24k3idcx8rxsw3x";
           name = "pig-mode";
         };
@@ -46971,7 +47244,7 @@
           sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pig-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pig-snippets";
           sha256 = "1sqi0a2dsqgmabkrncxiyrhibyryyy25d11b15ybhlngd05wqbx2";
           name = "pig-snippets";
         };
@@ -46992,7 +47265,7 @@
           sha256 = "19i8hgzr7kdj4skf0cnv6vlsklq9qcyxcv3p33k9vgq7y4f9mah8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pillar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pillar";
           sha256 = "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js";
           name = "pillar";
         };
@@ -47013,7 +47286,7 @@
           sha256 = "0wy9c37g6m5khchlp8qvfnjgkwq4r38659adcm5prvzjgzqhlfja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pinboard-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pinboard-api";
           sha256 = "0yzvgnpkj2fhl01id36nc5pj8vyb05bllraiz3lwwcc66y98h9n0";
           name = "pinboard-api";
         };
@@ -47034,7 +47307,7 @@
           sha256 = "1wc31r5fpcia4n4vbpg7vv3rzrnjzh18yygi3kp4wvl2wzx2azqh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pinot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pinot";
           sha256 = "1kjzq02pddnkia637xz2mnjjyglyh6qzragnf7nnxbw9ayiim58i";
           name = "pinot";
         };
@@ -47055,7 +47328,7 @@
           sha256 = "0bp4raxqv34jyg3yvdcsh9lav28x376gngm9nn8vjgmq9wggzf3i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pinyin-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pinyin-search";
           sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
           name = "pinyin-search";
         };
@@ -47076,7 +47349,7 @@
           sha256 = "0wbdhd3wqha3ahyakdjj4ki3998l0fafi86l26gkir1bq2qpkmcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pinyinlib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pinyinlib";
           sha256 = "0kv67qa3825fw64qimkph2b65pilrsx5730y4c7f7c1f8giz5vxr";
           name = "pinyinlib";
         };
@@ -47097,7 +47370,7 @@
           sha256 = "0j4h6q1s2s9dw1pp22xsajchwg8nh3x4x5qxbzf19i1xbpcghw7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pip-requirements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pip-requirements";
           sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
           name = "pip-requirements";
         };
@@ -47118,7 +47391,7 @@
           sha256 = "1sbwqrk9nciqwm53sfbq3nr9f9zzpz79dmxs8yp005dk7accdlls";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pivotal-tracker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pivotal-tracker";
           sha256 = "195wcfn434yp0p93zqih1snkkg1v7nxgb4gn0klajahmyrrjq2a2";
           name = "pivotal-tracker";
         };
@@ -47139,7 +47412,7 @@
           sha256 = "0nnvf2p593gn8sbyrvczyll030xgnkxn900a2hy7ia7xh0wmvddp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pixie-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pixie-mode";
           sha256 = "16z15yh78837k548xk5widdmy6fv03vym6q54i40knmgf5cllsl8";
           name = "pixie-mode";
         };
@@ -47160,7 +47433,7 @@
           sha256 = "18rvnvm097ca4yc1nfswdv7dfqg36insnif5kfj19aa60m9qxl09";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pixiv-novel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pixiv-novel-mode";
           sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
           name = "pixiv-novel-mode";
         };
@@ -47181,7 +47454,7 @@
           sha256 = "1xkdbyhz9mgdz5zmjm4hh050klsl12w5lkckw2l77ihcxv0vjnf2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pkg-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pkg-info";
           sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
           name = "pkg-info";
         };
@@ -47202,7 +47475,7 @@
           sha256 = "077vp3fxwxj7b98ydw6iyi391w3acp73qwk6615yqdylpp66m750";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pkgbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pkgbuild-mode";
           sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
           name = "pkgbuild-mode";
         };
@@ -47223,7 +47496,7 @@
           sha256 = "0rpiyp95k14fsc5hdbnj4hs3snh0vm8a2skcplsdwkmb5j9547w1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/plan9-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/plan9-theme";
           sha256 = "0bvr877mc79s1shr82b33ipspz09jzc3809c6pkbw0jqpfid44cc";
           name = "plan9-theme";
         };
@@ -47244,7 +47517,7 @@
           sha256 = "1aahyxmjsz9i5d22654bnmis8isbf5fydh0yy03sbiybm2hlyimi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/planet-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/planet-theme";
           sha256 = "1mhbydvk7brmkgmij5gpp6l9ixcyh1g3r4fw3kpq8nvgbwknsqc9";
           name = "planet-theme";
         };
@@ -47265,7 +47538,7 @@
           sha256 = "03nw4af1lgfppsbfq945c9pcz6ynhvpzlfdx3az83zi24b10az8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/plantuml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/plantuml-mode";
           sha256 = "14imiqfgc2j9kjr3aqwzlw8xr1w5hb8i7d4ch709qky036i3lsci";
           name = "plantuml-mode";
         };
@@ -47286,7 +47559,7 @@
           sha256 = "04xnk9s5mjr55y36y07k4vnsf841pg70c9wr6vcj5s16h3fhx9nw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/platformio-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/platformio-mode";
           sha256 = "1v1pp3365wj19a5wmsxyyy5n548z3lmcbm2pwl914wip3ca7546f";
           name = "platformio-mode";
         };
@@ -47299,15 +47572,15 @@
     play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "play-routes-mode";
-        version = "20160322.1800";
+        version = "20160608.19";
         src = fetchFromGitHub {
           owner = "brocode";
           repo = "play-routes-mode";
-          rev = "d7eb682cd474d90b3a3d005290cd6d4fe9f94cae";
-          sha256 = "0slfaclbhjm5paw8l7rr3y9xxjyhkizp9lwyvlgpkd38n4pgj2bx";
+          rev = "6000f34c7836b025c31171fb7e09a28caa2033ef";
+          sha256 = "03gi5dkpwafwv36q8f77mpivhaa8vplrxhx3fj9pbywscag3771k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/play-routes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/play-routes-mode";
           sha256 = "17phqil2zf5rfvhs5v743dh4lix4v2azbf33z9n97ahs7j66y2gz";
           name = "play-routes-mode";
         };
@@ -47328,7 +47601,7 @@
           sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/plenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/plenv";
           sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
           name = "plenv";
         };
@@ -47349,7 +47622,7 @@
           sha256 = "07hspp4bkb3f5dm0l1arm0w1m04cq4glg81x4a9kf7bl601wzki2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/plim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/plim-mode";
           sha256 = "0247fpvxki5jhxw6swv7pcw0qwxrqnp75acnfss2lf984vggzhxi";
           name = "plim-mode";
         };
@@ -47370,7 +47643,7 @@
           sha256 = "1r2yxa7gqr0z9fwhx38siwjpg73a93rdmnhr4h6nm6lr32vviyxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/plsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/plsense";
           sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
           name = "plsense";
         };
@@ -47391,7 +47664,7 @@
           sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/plsense-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/plsense-direx";
           sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
           name = "plsense-direx";
         };
@@ -47409,7 +47682,7 @@
           sha256 = "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/plsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/plsql";
           sha256 = "1jvppmfdll34b8dav5dvbabfxiapv92p7lciblj59a707bbdb7l1";
           name = "plsql";
         };
@@ -47430,7 +47703,7 @@
           sha256 = "0qlxj19hj96l4lw81xh5r14ppf6kp63clikk060s9yw00q7gnl6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/plur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/plur";
           sha256 = "0nf1dc7xf2zp316rssnz8sv374akcr54hp0rb219qvgyck9bdqiv";
           name = "plur";
         };
@@ -47449,7 +47722,7 @@
           sha256 = "0x3s9fj41n6a21la762qm1si9ysv3zj5bbp6ykfskr73sxq6s9ff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pmdm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pmdm";
           sha256 = "1zmy6cbnqhsbwc5vx30mx45xn88d2186hgrl75ws7vvbl197j03b";
           name = "pmdm";
         };
@@ -47470,7 +47743,7 @@
           sha256 = "1m3rczp5jyh83gfmv4rq11ya5vqly5zf7h4h6za3s5s3n38lldyc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pocket-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pocket-api";
           sha256 = "1f5j491wbqgbx6zlb0zdajca5il0628vr9a38y0n3x0h69wm0cx5";
           name = "pocket-api";
         };
@@ -47491,7 +47764,7 @@
           sha256 = "0nqv63yy0qpxhblzmkyvla90p9a7729fqxvhkfld9jxfqpgv1xyp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/point-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/point-stack";
           sha256 = "0201gka1izqgxyivan60jbg9x1mmsw5dscxacasg97ffsciwbfr9";
           name = "point-stack";
         };
@@ -47509,7 +47782,7 @@
           sha256 = "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/point-undo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/point-undo";
           sha256 = "0by7ifj1lf0w9pp7v1j9liqjs40k8kk9yjnznxchq172816zbg3k";
           name = "point-undo";
         };
@@ -47530,7 +47803,7 @@
           sha256 = "016cjy5pnnqccjqb0njqc9jq6kf6p165nlki83b8c0sj75yxghav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pointback";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pointback";
           sha256 = "198q511hixvzc13b3ih89xs9g47rdvbiixn5baqakpmpx3a12hz4";
           name = "pointback";
         };
@@ -47551,7 +47824,7 @@
           sha256 = "0q1n4nm21vjqcmdmm19yynzn3z97q83wk9g7kkrdx0mln9vzm13p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/polymode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/polymode";
           sha256 = "0md02l7vhghvzplxa04sphimhphmksvmz079zykxajcvpm2rgwc8";
           name = "polymode";
         };
@@ -47572,7 +47845,7 @@
           sha256 = "1dlk0ypw8316vgvb7z2p7fvaiz1wcy1l8crixypaya1zdsnh9v1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pomodoro";
           sha256 = "075sbypas8xlhsw8wg3mgi3fn5yf7xb3klyjgyy8wfkgdz0269f8";
           name = "pomodoro";
         };
@@ -47593,7 +47866,7 @@
           sha256 = "1g1yw0ykwswl9dnicyi7kxskqqry40wjykshgrqhs4k09j3jnacr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pony-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pony-mode";
           sha256 = "1hgiryhpxv30bjlgv9pywzqn2ypimwzdhx03znqvn56zrwn1frnl";
           name = "pony-mode";
         };
@@ -47614,7 +47887,7 @@
           sha256 = "002jhj47b9aqrfjy8b31ccbqhah5sn9wn7dmrhm1wbbgj9rfyw6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pony-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pony-snippets";
           sha256 = "12ygvpfkzldq6s4mwbrxs4x9927i7pa7ywn7lf1r3gg4h29ar9gn";
           name = "pony-snippets";
         };
@@ -47635,7 +47908,7 @@
           sha256 = "0ks1g381sx8if93hg6ndsc1lnv1msrd8f7zf8ykk1jrsfy9mn48h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ponylang-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ponylang-mode";
           sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1";
           name = "ponylang-mode";
         };
@@ -47656,7 +47929,7 @@
           sha256 = "0n1w1adglbavqgrv16rzhym72c3q083mh0c8yl5lj7adn4nr4gr3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pophint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pophint";
           sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
           name = "pophint";
         };
@@ -47677,7 +47950,7 @@
           sha256 = "0ja1kq4pl62zxlzwv2m8zzb55lg2fl366bi9pzvxl38frvbqg8qx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/poporg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/poporg";
           sha256 = "08s42689kd78h2fmw230ja5dd3c3b4lx5mzadncwq0lj91y86kd8";
           name = "poporg";
         };
@@ -47698,7 +47971,7 @@
           sha256 = "1h1l0wh3i1ih30455l5b73w8d3pvd0p1ib0mn5i671iwk2hyxc12";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/popup";
           sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
           name = "popup";
         };
@@ -47719,7 +47992,7 @@
           sha256 = "1q9zajv6g7mi6k98kzq3498nhmdkp1z9d2b8vgzbk7745d39gm9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/popup-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/popup-complete";
           sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
           name = "popup-complete";
         };
@@ -47740,7 +48013,7 @@
           sha256 = "19mqzfpki2zlnibp2vzymhdld1m20jinxwgdhmbl6zdfx74zbz7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/popup-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/popup-imenu";
           sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
           name = "popup-imenu";
         };
@@ -47761,7 +48034,7 @@
           sha256 = "1zdwlmk3vr0mq0dxrnkqjncalnbmvpxc0lma2sv3a4czl8yv0inn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/popup-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/popup-kill-ring";
           sha256 = "1jfw669xi2983jj3hiw5lyhc0rc0318qrmqx03f7m4ylg70dgxip";
           name = "popup-kill-ring";
         };
@@ -47782,7 +48055,7 @@
           sha256 = "15vp1iqc1k9hlvam3vcw7hd2dr8wzdwrcls2zvw76jhlbybl0rbp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/popup-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/popup-switcher";
           sha256 = "1888xiqhrn7fcpjnr3smchmmqwfayfbbyvdkdb79c6drzjcvidp1";
           name = "popup-switcher";
         };
@@ -47803,7 +48076,7 @@
           sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/popwin";
           sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
           name = "popwin";
         };
@@ -47824,7 +48097,7 @@
           sha256 = "1pm4x74pw67m2izr9dir201dn5g9icgk6h2j8rqvasgx8v8krv3i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/portage-navi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/portage-navi";
           sha256 = "1wjkh8xj5120v9fz1nrpkd6x4f22ni8h2lfkd82df7kjz6bzdfwg";
           name = "portage-navi";
         };
@@ -47845,7 +48118,7 @@
           sha256 = "168hl76rhj6f5ncmrij4rd3z55228h6kb23384h2phsjw0avgf23";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pos-tip";
           sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
           name = "pos-tip";
         };
@@ -47866,7 +48139,7 @@
           sha256 = "14silfng5rbdc8hnzswjmqk705pncjlk8iphjcxcm799h44pnlcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pov-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pov-mode";
           sha256 = "1xzdmlfi5ixdh08v0ca80zkh9n3gfn4ql5pnl3jh745wbj9azxp9";
           name = "pov-mode";
         };
@@ -47887,7 +48160,7 @@
           sha256 = "1jzqav2lchr0ggckjq9rwlxwryi7m7xnmn8471zgiamd1h04ddqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pow";
           sha256 = "05wc4ylp0xjqbzrm046lcsv4aw2a6s2rfv1ra38bfr0dai6qrsrn";
           name = "pow";
         };
@@ -47908,7 +48181,7 @@
           sha256 = "07pbhqhzkvdnrggc5fc430gm0qdfmx8fhr2s0xx2g0a3hjiwbss2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/powerline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/powerline";
           sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
           name = "powerline";
         };
@@ -47929,7 +48202,7 @@
           sha256 = "1c8y4r7zdr6764kzs5bc64idv2pfjvi78lg2f1d2hp1595ia8y5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/powerline-evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/powerline-evil";
           sha256 = "0cdnmq9f06lzkj0hs948a7j5sgg6fl5f36bfnyaxgss23akbfjhr";
           name = "powerline-evil";
         };
@@ -47950,7 +48223,7 @@
           sha256 = "1ym373mjyk3vfbw2c918zgaf9m35j8bkrpcj9d8m9drf4h7a8d3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/powershell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/powershell";
           sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
           name = "powershell";
         };
@@ -47968,7 +48241,7 @@
           sha256 = "10gsdjdr8qngimqh57qxcljjnypbf38asxqb3zlfwc2ls52fc19q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pp-c-l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pp-c-l";
           sha256 = "0gbqxlrsh9lcdkrj8bqh1mpxyhdlwbaxz4ndp5s90inmisaqb83v";
           name = "pp-c-l";
         };
@@ -47986,7 +48259,7 @@
           sha256 = "0yvls8sw5rvka20xlqazl46crpkw91cy9qmj6p6y53sps1rj5wzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pp+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pp+";
           sha256 = "1ng5x7dp85y6yqj6q43h08qdnapg2j1ab8rmc47w4w79d1pryniq";
           name = "pp-plus";
         };
@@ -48007,7 +48280,7 @@
           sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ppd-sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ppd-sr-speedbar";
           sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
           name = "ppd-sr-speedbar";
         };
@@ -48028,7 +48301,7 @@
           sha256 = "0yrfd9qaz16nqcvjyjm9qci526qgkv6k51q5752h3iyqkxnss1pd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/preproc-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/preproc-font-lock";
           sha256 = "1ra0lgjv6713zym2h8pblf2ryf0f658l1khbxbwnxl023gkyj9v4";
           name = "preproc-font-lock";
         };
@@ -48049,7 +48322,7 @@
           sha256 = "1dyi9nc2q43jf87xiz9xw42irrbla2vyixifdiibh6nm9misnfj0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/preseed-generic-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/preseed-generic-mode";
           sha256 = "14vbx6y7h4vqc5kkgj4mbr9zj6gqf6ib3hh2917m203s8y87lsfl";
           name = "preseed-generic-mode";
         };
@@ -48070,7 +48343,7 @@
           sha256 = "0g2bxa7mwfkc8navbi2w28rd4f4zqphxi13kwmd2p83g3wavd99v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/prettify-greek";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/prettify-greek";
           sha256 = "1izl6r6i3zbhd7r7lz2k42yyz6qcng11wfmb7lx4883dj00flsl7";
           name = "prettify-greek";
         };
@@ -48088,7 +48361,7 @@
           sha256 = "1fn24399wsn12453py0hw2vbbkrkakiwi06cjvjzsdk7g3326ma4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pretty-lambdada";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pretty-lambdada";
           sha256 = "16v5fgifz672c37xyzv557mm6za4rldvdrb26vdymxqg4fy62fd6";
           name = "pretty-lambdada";
         };
@@ -48109,7 +48382,7 @@
           sha256 = "0lrxd87p62s16bcp9r7hj1dnn67mgy2akslq4m9vb0xc7qckwr7y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pretty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pretty-mode";
           sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
           name = "pretty-mode";
         };
@@ -48130,7 +48403,7 @@
           sha256 = "1n0594msgy53ia58gjfkm3z3cnmq52wrq5992fm28s4jgazbgdfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pretty-sha-path";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pretty-sha-path";
           sha256 = "0qqsg383391dnsk46xm8plq7xmdmnis3iv7h7dmchpzd99bkm9lq";
           name = "pretty-sha-path";
         };
@@ -48151,7 +48424,7 @@
           sha256 = "1f00l9f6an1mh8yhf629mw0p37m4jcpl8giz47xbdyw1k6bqn830";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pretty-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pretty-symbols";
           sha256 = "0d1ad2x4md0n3fad3s2355wm8hl311qdhih1gkdqwdaj4i1d6gvb";
           name = "pretty-symbols";
         };
@@ -48172,7 +48445,7 @@
           sha256 = "0zng64f5vwnpkf9fk59yv1ndc646q608a6awr1y9qk0mhzbfzhqm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/private";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/private";
           sha256 = "1glpcwcyndyn683q9mg99hr0h3l8pz7rrhbnfak01v826d5cnk9g";
           name = "private";
         };
@@ -48193,7 +48466,7 @@
           sha256 = "1pxr5a9ik09k0f58lawhxiv179n5j8q24zhrs9vjk93yskl1ydwn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/private-diary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/private-diary";
           sha256 = "0dgnf375c00nlkp66kbkzsf469063l03b9miiplbhd63zshlv1i1";
           name = "private-diary";
         };
@@ -48214,7 +48487,7 @@
           sha256 = "0nly5h0d6w8dc08ifb2fiqcn4cqcn9crkh2wn0jzlz4zd2x75qrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/proc-net";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/proc-net";
           sha256 = "0562x2s3kk9vlaavak4lya1nlmn4mwlzlc7nw1l3687q023z4hmv";
           name = "proc-net";
         };
@@ -48235,7 +48508,7 @@
           sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/processing-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/processing-mode";
           sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
           name = "processing-mode";
         };
@@ -48256,7 +48529,7 @@
           sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/processing-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/processing-snippets";
           sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
           name = "processing-snippets";
         };
@@ -48277,7 +48550,7 @@
           sha256 = "0yy4ximahmj3kbxn6bhag853vyy56g1n007qnd8hjsl1xawlin5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/prodigy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/prodigy";
           sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
           name = "prodigy";
         };
@@ -48298,7 +48571,7 @@
           sha256 = "0hx7rxa3smdippcpj4j63k0r5l4wflllb0vpnwwknc9j93r7042b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/professional-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/professional-theme";
           sha256 = "1l8nisn2c124cpylyahr76hfpdim2125zrns2897p466l5wcxcx5";
           name = "professional-theme";
         };
@@ -48319,7 +48592,7 @@
           sha256 = "1szxsbk470fg3jp70r20va9hnnf4jj0mb7kxdkn6rd7ky6w34lwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/prognth";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/prognth";
           sha256 = "0hr5a3s0ij4hvn424v885z7pcs62yqm9mamw5b096hgjxgjf6ylm";
           name = "prognth";
         };
@@ -48340,7 +48613,7 @@
           sha256 = "1yklm43d0ppyf4simhqab6m892z4mmxs2145lzw6kpizixavcv00";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/programmer-dvorak";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/programmer-dvorak";
           sha256 = "1w8r35hkl6qy9a89l0m74x9q2vcc4h2hvmi3r2hqcy2ypkn5l5bv";
           name = "programmer-dvorak";
         };
@@ -48361,7 +48634,7 @@
           sha256 = "04l4m3kxbwvyw9xy6cwakrdxxdswrrs7sya8zn6m738aawbr1mcd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/project-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/project-explorer";
           sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
           name = "project-explorer";
         };
@@ -48380,7 +48653,7 @@
           sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/project-local-variables";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/project-local-variables";
           sha256 = "0mrf7p420rmjm8ydwc5blpxr6299pdg3sy3jwz2zz0420gkp0ihl";
           name = "project-local-variables";
         };
@@ -48401,7 +48674,7 @@
           sha256 = "1fvjap0bsyw5q92q50wk8c81yv4g8nqb6jdlnarf80glwk50avrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/project-persist";
           sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
           name = "project-persist";
         };
@@ -48422,7 +48695,7 @@
           sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/project-persist-drawer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/project-persist-drawer";
           sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
           name = "project-persist-drawer";
         };
@@ -48442,7 +48715,7 @@
           sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/project-root";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/project-root";
           sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
           name = "project-root";
         };
@@ -48463,7 +48736,7 @@
           sha256 = "1364d941qs2m4193xk8x5v77bzk75qywm9jl2h2hw5wxgjdqii5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
           name = "projectile";
         };
@@ -48484,7 +48757,7 @@
           sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projectile-codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projectile-codesearch";
           sha256 = "0jgvs9is59q45wh2a7k5sb6vj179ixqgj5dlndj9r6fh59qgrzdk";
           name = "projectile-codesearch";
         };
@@ -48505,7 +48778,7 @@
           sha256 = "09zyzfqy1i3i8knvh1ajr5jcidjx3jpsyx8qarxfr5kv16pwyfvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projectile-direnv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projectile-direnv";
           sha256 = "1s5dapdcblcbcqyv8df26v8wxl8bhrs9ybl5h5qbzz49gigd8nqh";
           name = "projectile-direnv";
         };
@@ -48526,7 +48799,7 @@
           sha256 = "1pqmyfz0vil30x739r18zpw9n76297ckisimq2g0xl1irhynsvbk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projectile-hanami";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projectile-hanami";
           sha256 = "0qi9i4wdggrmihf1j42fqrf38psmb33rlafg3y6da5r7lpn03j1a";
           name = "projectile-hanami";
         };
@@ -48547,7 +48820,7 @@
           sha256 = "0g4slcaj5waka5sz0plnn0clnl9750wzj3bi7zfcycb2g7xhncwg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projectile-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projectile-rails";
           sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
           name = "projectile-rails";
         };
@@ -48568,7 +48841,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projectile-sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projectile-sift";
           sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
           name = "projectile-sift";
         };
@@ -48589,7 +48862,7 @@
           sha256 = "0lr3vx1byf0i9jdzbyrvvzyzi1nfddvw5r9f9wm7gpfp5l8772la";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projectile-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projectile-speedbar";
           sha256 = "0dli4gzsiycivh8dwa00lfpbimyg42qygfachzrhi8qy5413pwlp";
           name = "projectile-speedbar";
         };
@@ -48610,7 +48883,7 @@
           sha256 = "0y8zbywin99nhcrs5nzx4d179r84rdy39admajpi0j76v0b9pwl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projector";
           sha256 = "0hrinplk607wcc2ibn05pl8ghikv9f3zvymncp6nz95jw9brdapf";
           name = "projector";
         };
@@ -48631,7 +48904,7 @@
           sha256 = "0hvvlh24157qjxz82sbg22d4cbrf95xyx202cybp0n1vyxsmjcmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projekt";
           sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
           name = "projekt";
         };
@@ -48652,7 +48925,7 @@
           sha256 = "1sxxy0s96sgm6i743qwjs0qjpsdr03gqc1cddvvpxbryh42vw9jn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projmake-mode";
           sha256 = "192gvmhcz1anl80hpmcjwwd08dljyrap9sk6qj0y85mcnaafm882";
           name = "projmake-mode";
         };
@@ -48673,7 +48946,7 @@
           sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/prompt-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/prompt-text";
           sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
           name = "prompt-text";
         };
@@ -48694,7 +48967,7 @@
           sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/prop-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/prop-menu";
           sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
           name = "prop-menu";
         };
@@ -48715,7 +48988,7 @@
           sha256 = "0lch20njy248w7bnvgs7jz0zqasskf5dakmykxwpb48llm6kx95v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/propfont-mixed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/propfont-mixed";
           sha256 = "19k0ydpkiviznsngwcqwn4k30r6j8w34pchgpjlsfwq1bndaai9y";
           name = "propfont-mixed";
         };
@@ -48736,7 +49009,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/prosjekt";
           sha256 = "1fn7ii1bq7bjkz27hihclpvx0aabgwy3kv47r9qibjl2jin97rck";
           name = "prosjekt";
         };
@@ -48753,11 +49026,11 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "20b532544fde1dff34429b52db95c3a96409b73c";
-          sha256 = "10rvcpg931cw3aq9bian05yjrwm8361zi9kd8c95bvb53ni572ki";
+          rev = "088c5c491e7a1c95c7b8eb55f119a8a999c81dc1";
+          sha256 = "04z9vwzx8rzpkyh10qgm2l7g32qi9930mnzhdklwqrljv8d8rkvw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/protobuf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/protobuf-mode";
           sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
           name = "protobuf-mode";
         };
@@ -48770,15 +49043,15 @@
     psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20160525.1137";
+        version = "20160609.1757";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "f2c76c163e3ea66e2266006e09e999e0a12ebe79";
-          sha256 = "0cq6j1q96zdl2afa6sm66ac6rb378mwfw01dba9hg96zqqxf20dl";
+          rev = "af44f9a4d2cbe84fdfae5e286a06d0207229d21c";
+          sha256 = "19afnh3jf6mn43c09yzmsx2a3l7kra4f6igqrlrcbb53yq3f3lkj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/psc-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/psc-ide";
           sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9";
           name = "psc-ide";
         };
@@ -48799,7 +49072,7 @@
           sha256 = "08j31bg5vwgirv5n5fsw7w6gncrkpwpjlj2m00dhj8wbvhp503sn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/psci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/psci";
           sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
           name = "psci";
         };
@@ -48820,7 +49093,7 @@
           sha256 = "1fpcb4qpd11mbv733iklnbjg7g4ka05mf5wpa2k6kr3fbvndkx37";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/psession";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/psession";
           sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
           name = "psession";
         };
@@ -48841,7 +49114,7 @@
           sha256 = "1jz1g0igpnsjn2r144205bffj10iyp8izm8678mzkhnricxkn0d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/psvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/psvn";
           sha256 = "1wdww25pjla7c8zf04mvgia1ws8cal9rb7z8g3vn2s3gp68py12n";
           name = "psvn";
         };
@@ -48854,15 +49127,15 @@
     psysh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "psysh";
-        version = "20160509.1608";
+        version = "20160610.2311";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "psysh.el";
-          rev = "4b1d33acc0ae2e22f1ebcda31f90e68ef0b9ad90";
-          sha256 = "0ng0nkr5azbz90jix5y9m9ri8l5jyps3jmgz3wvzd9k99grrik76";
+          rev = "3a4479a0ca30524332dbb136d03acad713deaabc";
+          sha256 = "1vx7psvqchrd3zyxrji8y0fpkrw0q2fc74g66jki5s46xvid0nai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/psysh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/psysh";
           sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5";
           name = "psysh";
         };
@@ -48883,7 +49156,7 @@
           sha256 = "0ca8j7xlqxbidqfz2iarwn7qq4v12pwvsq6vzj2473n2g1c09xzj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pt";
           sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
           name = "pt";
         };
@@ -48904,7 +49177,7 @@
           sha256 = "0yr04yj72dkj520wzzj4a1mk0w653bb8alz15v92mlj5lc8kdjm8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pug-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pug-mode";
           sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85";
           name = "pug-mode";
         };
@@ -48917,15 +49190,15 @@
     puml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "puml-mode";
-        version = "20160324.2325";
+        version = "20160606.816";
         src = fetchFromGitHub {
           owner = "skuro";
           repo = "puml-mode";
-          rev = "b31063125b16441cd88af75bb46de8575a0c626f";
-          sha256 = "1qszv1xc0h5hj13znxxbqk362m8ada59p0gxss78r2c9k61r5ql4";
+          rev = "f5ff58bb4f995f353899c878bb519349a7b4a08a";
+          sha256 = "06gc27hgvc3n93ljv8bmblh305jghwg4afxc49rsgds4krrd2rl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/puml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/puml-mode";
           sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
           name = "puml-mode";
         };
@@ -48946,7 +49219,7 @@
           sha256 = "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/punctuality-logger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/punctuality-logger";
           sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
           name = "punctuality-logger";
         };
@@ -48967,7 +49240,7 @@
           sha256 = "1viw95y6fha782n1jw7snr7xc00iyf94r4whsm1a2q11vm2d1h21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pungi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pungi";
           sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
           name = "pungi";
         };
@@ -48988,7 +49261,7 @@
           sha256 = "131si1wqv0wvdgwbw58y8w90v6z3nd5rf293144brv9d8853icpy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/punpun-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/punpun-theme";
           sha256 = "1l7nphh8v7w5w790cwmnp6nw5rciwhgzkvynkrvpiv9chhacx0xg";
           name = "punpun-theme";
         };
@@ -49009,7 +49282,7 @@
           sha256 = "1ly7gkxlkfgx3nzw35f7rwx7x9w6jrhql15jgsrh9slcw3q2rksl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/puppet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/puppet-mode";
           sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
           name = "puppet-mode";
         };
@@ -49030,7 +49303,7 @@
           sha256 = "0k2plyvd6842yryzrfadbf4h7a9hrjvkcvixclbca2bkvfik3864";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/purescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/purescript-mode";
           sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
           name = "purescript-mode";
         };
@@ -49051,7 +49324,7 @@
           sha256 = "15myw5rkbnnpgzpiipm5xl4cyzymv8hh66x9al4aalb5nf52dckc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/purple-haze-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/purple-haze-theme";
           sha256 = "0ld8k53823786y6f0dqcp0hlqlnmy323vdkanjfs5wg5ib60az1m";
           name = "purple-haze-theme";
         };
@@ -49072,7 +49345,7 @@
           sha256 = "0qm2xv762cz196aqs445crqrmsks8hpwzpaykzn0chlvdk0m5cv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/purty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/purty-mode";
           sha256 = "0gbbwl5kg74jf1i1zsr40zg3gw43qmz1l87k0r578v1xvyqmhm1i";
           name = "purty-mode";
         };
@@ -49093,7 +49366,7 @@
           sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pushbullet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pushbullet";
           sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
           name = "pushbullet";
         };
@@ -49114,7 +49387,7 @@
           sha256 = "10g4imxgpv7a0j40qkx7xf2qnyz80ypd0mv0lf47n9dwln5byln3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/px";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/px";
           sha256 = "0xjmz18m2dslh6yq5z32r43zq3svfxn8mhrfbmihglyv2mkwxw44";
           name = "px";
         };
@@ -49135,7 +49408,7 @@
           sha256 = "1iw94m1bvsmadlj16f8ymwx0q6f9lqysy7by76hkpiwqqhd2i8rv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/py-autopep8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/py-autopep8";
           sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
           name = "py-autopep8";
         };
@@ -49156,7 +49429,7 @@
           sha256 = "05803wi7rj73sy9ihkilr6pcn72szfsvgf2dgbdpnqra508rxyb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/py-gnitset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/py-gnitset";
           sha256 = "0f6ivq4ignb4gfxw2q8qvigvv3fbvvyr87x25wcaz6yipg1lr18r";
           name = "py-gnitset";
         };
@@ -49177,7 +49450,7 @@
           sha256 = "1416hbc64gwn9c8g9lxfx58w60ysi0x8rbps6mfxalavdhbs20sv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/py-import-check";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/py-import-check";
           sha256 = "1261dki0q44sw9h0g1305i2fj1dg9xgwzry50jbn2idcrqg4xf7k";
           name = "py-import-check";
         };
@@ -49198,7 +49471,7 @@
           sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/py-isort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/py-isort";
           sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
           name = "py-isort";
         };
@@ -49219,7 +49492,7 @@
           sha256 = "14gppb354wzbbqv0zp1675p84n07rll9n4i6lncd9bvv1flqsxy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/py-smart-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/py-smart-operator";
           sha256 = "1n0bdr9z2s1ikhmfz642k94gjzb88anwlb61mh27ay8wqdgm74c4";
           name = "py-smart-operator";
         };
@@ -49240,7 +49513,7 @@
           sha256 = "1s39407z3rxz10r5sshv2vj7s23ylkhg59ixasgnpjk82gl4igpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/py-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/py-test";
           sha256 = "1mbwbzg606winf5af7qkg6a1hg79lc7k2miq4d3mwih496l5sinb";
           name = "py-test";
         };
@@ -49261,7 +49534,7 @@
           sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/py-yapf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/py-yapf";
           sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
           name = "py-yapf";
         };
@@ -49282,7 +49555,7 @@
           sha256 = "09glwrb9q65qdm4yd0mbi5hwdy2434zm8699ywhs6hqpjacadlmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pycarddavel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pycarddavel";
           sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
           name = "pycarddavel";
         };
@@ -49303,7 +49576,7 @@
           sha256 = "0qap6iz865l43mixga7541c2z9kdx8zkkdcgdlgn6n8pyv8iz7qs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pycoverage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pycoverage";
           sha256 = "1jaanmpnawk0r6zfzx18crqml7lv412l2l0iabp345xvfvsh8h1m";
           name = "pycoverage";
         };
@@ -49324,7 +49597,7 @@
           sha256 = "1m0jb5pk1a1ww5jx2y5nz21by4dh7nlnhdn6bigz53ra449rrxii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pydoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pydoc";
           sha256 = "0sf52cb80yiridsl1pffdr3wpbgxrn2l8vnq03l70djckild477n";
           name = "pydoc";
         };
@@ -49344,7 +49617,7 @@
           sha256 = "1mzyr6yznkyv99x9q8zx2f270ngjh8s94zvnhcbhidi57inpd1nh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pydoc-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pydoc-info";
           sha256 = "0l80g0rzkk3a1wrw2riiywz9wdyxwr5i64jb2h5r8alp9qq1k7mf";
           name = "pydoc-info";
         };
@@ -49365,7 +49638,7 @@
           sha256 = "049wgwygdaa0p8p4pl37wkc06nam9ph17i9gzcg7w0hfwghjrc5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pyenv-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pyenv-mode";
           sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
           name = "pyenv-mode";
         };
@@ -49386,7 +49659,7 @@
           sha256 = "1sclhzv3w9fg54dg4qhlfbc0p1z5clyr8phrckhypvlwfgbar4b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pyenv-mode-auto";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pyenv-mode-auto";
           sha256 = "1l7h4fas1vshkh4skxzpw7v2a11s1hwnb20n6a81yh701pbikqnd";
           name = "pyenv-mode-auto";
         };
@@ -49407,7 +49680,7 @@
           sha256 = "1rp8zchvclh29rl9a1i82pcqghnhpaqnppaydxc2qx23y9pdgz9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pyfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pyfmt";
           sha256 = "112kjsp763c2plhqlhydpngrabhc58ya7cszvi4119xqw2s699g6";
           name = "pyfmt";
         };
@@ -49428,7 +49701,7 @@
           sha256 = "05qx1p19dw3nr264shihfn33k579hd0wf4cxki5cqrxi7xzpjgrc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pyimpsort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pyimpsort";
           sha256 = "0kdk3bmryfzvwf8vshfszbih8mwncf4xlb0n0n0yjn0p1n98q99k";
           name = "pyimpsort";
         };
@@ -49445,11 +49718,11 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "b3eda4369f5b217840bc8911fdf2725e8f1408c8";
-          sha256 = "1l2xic1b66vbp23zpwks6gb4iz50v3c68hvvcdnvl8w19fl080ig";
+          rev = "af34cd5c981efc3ce2e1248fb7d6286697f58037";
+          sha256 = "1iykk4kd4d3zrvjhmjg7smmj6ywyi9abwq1sl94g0ymr2f0irakj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pylint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pylint";
           sha256 = "1138a8dn9y4ypbphs1zfvr8gr4vdjcy0adsl4xfbgsls4kcdwpxx";
           name = "pylint";
         };
@@ -49470,7 +49743,7 @@
           sha256 = "0bg8pqqia9l39ac3s9xrnlyrg1pj2w00vc742qpjdk5349lazdl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pytest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pytest";
           sha256 = "0ssib65wa20h8r6156f392l481vns5fcax6w70hcawmn84nficdh";
           name = "pytest";
         };
@@ -49491,7 +49764,7 @@
           sha256 = "1cnjdgw3x6yb5k06z57xifywlg0kdx9ai4f1ajc0wx9aax8r5gav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/python-cell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/python-cell";
           sha256 = "07i3vyci52jvslq28djwkgx1r157wvxd99rvqlxnmmsl5yj4k1jf";
           name = "python-cell";
         };
@@ -49512,7 +49785,7 @@
           sha256 = "1qckn5bi1ib54hgqbym5qqwzvbv70ria1w3c2x543xlr0l7zga6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/python-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/python-django";
           sha256 = "02whx8g8r02mzng7d7bnbkz5n7gyzp5hcnmvd6a3lq106c0h7w9k";
           name = "python-django";
         };
@@ -49533,7 +49806,7 @@
           sha256 = "0nlhfxiirs90g8sx3zwf36idnj1nbasrdm0qhpdqs6k6vkndfbgk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/python-docstring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/python-docstring";
           sha256 = "1vi30y71vflsbprp5j4phbp7x1j24vxn9d6sifaddari0g0zxpfw";
           name = "python-docstring";
         };
@@ -49554,7 +49827,7 @@
           sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/python-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/python-environment";
           sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
           name = "python-environment";
         };
@@ -49575,7 +49848,7 @@
           sha256 = "0zk6014dzfrb3y3nhs890x082xf044w0a8nmy6rlrj375lvhfn99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/python-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/python-info";
           sha256 = "0kvpz1r2si94rs1iajn1ffmx7a5bgyjnzri36ajdgd5gcgh41dhy";
           name = "python-info";
         };
@@ -49596,7 +49869,7 @@
           sha256 = "0rk3p1crxxbajvx5d3a38p5ma2zi17pf86xp27y9pyg0bfh2cp14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/python-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/python-mode";
           sha256 = "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k";
           name = "python-mode";
         };
@@ -49617,7 +49890,7 @@
           sha256 = "1shz8qha2cqv89hz27aazwd6qbf4qnz17h6hh8in5qxgfsndi7pp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/python-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/python-x";
           sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
           name = "python-x";
         };
@@ -49638,7 +49911,7 @@
           sha256 = "16sp3mg5jzx89lgr3kr61fqw1p9gc5zxq2mi9rpgqi5hkkcpnpgj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pythonic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pythonic";
           sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
           name = "pythonic";
         };
@@ -49659,7 +49932,7 @@
           sha256 = "1fqp3khz8rl0frg6kaqj53p0w07ricbnl2xw57c4w776jnmc0npa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pyvenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pyvenv";
           sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
           name = "pyvenv";
         };
@@ -49680,7 +49953,7 @@
           sha256 = "0ggivlaj29rbbhkjpf3bf7vr96xjzffas0sf5m54qh6nyz6nnha5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/qiita";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/qiita";
           sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
           name = "qiita";
         };
@@ -49701,7 +49974,7 @@
           sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/qml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/qml-mode";
           sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
           name = "qml-mode";
         };
@@ -49722,7 +49995,7 @@
           sha256 = "0vhzwr2adkprjibi3x4lnsvjxishysma7fhpwzgg28l21qjqc0nm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/quack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/quack";
           sha256 = "1l7jw8sx2llbzp3sg5755qdhhyq8jdaggxzzn7icjxxrmj1ji6ii";
           name = "quack";
         };
@@ -49743,7 +50016,7 @@
           sha256 = "0y7mdizx6km3000cqjrirlgwzkq56asnzl8n1bl56pk5d9grfx9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/quasi-monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/quasi-monochrome-theme";
           sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
           name = "quasi-monochrome-theme";
         };
@@ -49764,7 +50037,7 @@
           sha256 = "1kkzy7p0y9iakcl2nciby9x6jll53h56h3kimqc3q9riswihyncq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/quelpa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/quelpa";
           sha256 = "1g53fcy837hpyn9lnmmri0h4c5va61vszhblz4caadqq265hknvs";
           name = "quelpa";
         };
@@ -49785,7 +50058,7 @@
           sha256 = "00wnvyw2daiwwd1jyq1ag5jsws8k8jxs3lsj73dagbvqnlywmkm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/quelpa-use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/quelpa-use-package";
           sha256 = "0p09w419kldgl913hgqfzyv2pck27vqq2i1xsx7g29biwgnp9hl9";
           name = "quelpa-use-package";
         };
@@ -49806,7 +50079,7 @@
           sha256 = "0kh63nzdzwxksn2ar2i1ds7n96jga2dhhc9gg27p1g2ca66fs6h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/quick-buffer-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/quick-buffer-switch";
           sha256 = "1fsnha3x3pgq582libb3dmxb93aagv1avnc0rigpfd7hv6bagj40";
           name = "quick-buffer-switch";
         };
@@ -49827,7 +50100,7 @@
           sha256 = "1cp3z05qjy7qvjjv105ws1j9qykx8sl4s13xff0ijwvjza6ga44c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/quick-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/quick-preview";
           sha256 = "18janbmhbwb6a46fgc1sxl9ww591v60y3wgh2wqh62vdy4ix3bd9";
           name = "quick-preview";
         };
@@ -49848,7 +50121,7 @@
           sha256 = "13svdvww8dbv75lg66xhca6xi08k7k44rsx2ckdf82j9i52y5lw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/quickref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/quickref";
           sha256 = "0jahi84ra9g7h0cvz3c02zkbkknrzgv48zq32n72lkxl958swqn1";
           name = "quickref";
         };
@@ -49861,15 +50134,15 @@
     quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quickrun";
-        version = "20160307.1218";
+        version = "20160611.1534";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-quickrun";
-          rev = "ce788ae2272f00aec4740f8507807117163f803b";
-          sha256 = "0czmv7bdsayckg854jfpmaqs4qj9pdhhn0gsqkfa510d7qz032bj";
+          rev = "b38ef226edbf7cfc22c4463bd8526d140e6439c3";
+          sha256 = "1cwly4s7xcdr73hqqxbzpfjbpndpfnlhy3awpv7d31a1k1qr5r40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/quickrun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/quickrun";
           sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy";
           name = "quickrun";
         };
@@ -49890,7 +50163,7 @@
           sha256 = "14q7x341gqcxn3bq72wmfxipqmj2dh35kxcrwjkyghbsbd43rv8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/quiet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/quiet";
           sha256 = "1jq65jpx0rlkc0dzy55gs37ybpjzvcv06ahwiw1lk2n92g4pi96a";
           name = "quiet";
         };
@@ -49911,7 +50184,7 @@
           sha256 = "0dhljmdlg4p832w9s7rp8vznkpjkwpg8k9hj95cn2h76c0afwz3j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/r-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/r-autoyas";
           sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
           name = "r-autoyas";
         };
@@ -49932,7 +50205,7 @@
           sha256 = "1d128mamvwpjnk2dazhcxvfjw3lf0ix56l85gwsb377v05pn3wzf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/racer";
           sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
           name = "racer";
         };
@@ -49945,15 +50218,15 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20160603.2248";
+        version = "20160611.434";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "392f30640a922147f97a481d9a9df2f69221913b";
-          sha256 = "1l04p8rql7z5x26ndagvfc1zayz9hyaa06n80x3x6d8gh2kikk8x";
+          rev = "0d646a54ccfb50620d47708a175ec8d7d08e27c9";
+          sha256 = "1psgc3x82ac6dxjqr3wb1nzkhrb2hfr69h7q29xmik3libixrrjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/racket-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/racket-mode";
           sha256 = "04sr55zrgwyi48sj4ssm4rmm327yxs7hvjhxclnkhaaigrmrv7jb";
           name = "racket-mode";
         };
@@ -49974,7 +50247,7 @@
           sha256 = "00x09vjd3jz5f73qkf5v1y402zn8vl8dsyfwlq9z646p18ba7gyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/railgun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/railgun";
           sha256 = "1a3fplfipk1nv3py1sy0p2adf3w1h4api01h2j5rjlq2jw06kyr0";
           name = "railgun";
         };
@@ -49995,7 +50268,7 @@
           sha256 = "1fh8wsb0pa2isr1kgh3v9zmmxq1nlmqwqk4z34dw5wpaiyihmk84";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rails-log-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rails-log-mode";
           sha256 = "0h7gfg0c5pwfh18qzg1mx7an9p958ygdfqb54s85mbkv8x3rh1a0";
           name = "rails-log-mode";
         };
@@ -50016,7 +50289,7 @@
           sha256 = "0cqp2vns7gq377bm6q9n5q0ra1d5yy2x2aiw9q1hswk82xpibj9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rails-new";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rails-new";
           sha256 = "0wgbm6qxqkpsbzj9wccicsphajaii07dl27b8x2vidsyw6ambj5h";
           name = "rails-new";
         };
@@ -50037,7 +50310,7 @@
           sha256 = "021x1l5kzsbm0qj5a3bngxa7ickm4lbwsdz81a2ks9pi1ivmw205";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/railscasts-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/railscasts-theme";
           sha256 = "1z5m8ccx2k18gbzqvg0051mp2myy2qncf4xvv47k80f83pk2hw6r";
           name = "railscasts-theme";
         };
@@ -50058,7 +50331,7 @@
           sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rainbow-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rainbow-blocks";
           sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
           name = "rainbow-blocks";
         };
@@ -50079,7 +50352,7 @@
           sha256 = "0vs9pf8lqq5p5qz1770pxgw47ym4xj8axxmwamn66br59mykdhv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rainbow-delimiters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rainbow-delimiters";
           sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
           name = "rainbow-delimiters";
         };
@@ -50100,7 +50373,7 @@
           sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rainbow-identifiers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rainbow-identifiers";
           sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
           name = "rainbow-identifiers";
         };
@@ -50121,7 +50394,7 @@
           sha256 = "1wcs8j8rdls0n3v8zdpk2n5riwzz2yvjf6b70a5bj7p20gyafhj2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rake";
           sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
           name = "rake";
         };
@@ -50142,7 +50415,7 @@
           sha256 = "13pkp80cv1v3pjff1588cgyx18a31i668lwywll5dk4fxl4zdjvb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rally-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rally-mode";
           sha256 = "1vzsh5855bzln3p3235yccl2azpndpc4rh95zrx6p1k62h2kv0y1";
           name = "rally-mode";
         };
@@ -50163,7 +50436,7 @@
           sha256 = "0fmajgqf9j21qn7h35sky5di8cnma432g0ki9d5m41byxp9y1bdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rand-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rand-theme";
           sha256 = "0h0n1lsxnl12mjrjpra62vblrg8kbp1hk7w1v6makj074d037j2h";
           name = "rand-theme";
         };
@@ -50184,7 +50457,7 @@
           sha256 = "1z25xmz8pl3rsfahw6ay8wx5wbnlxabnzr2dq20m0i5jyci8lqll";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/random-splash-image";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/random-splash-image";
           sha256 = "1j454jy4ia2wrgi3fxzjfdqi3z8x13hq8kh62lnb84whs7a1nhik";
           name = "random-splash-image";
         };
@@ -50205,7 +50478,7 @@
           sha256 = "1k7kw97wavf9wk8qvsz1h65b7fa9h7k90l0ys9am1n3hn9g86n4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ranger";
           sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
           name = "ranger";
         };
@@ -50226,7 +50499,7 @@
           sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rase";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rase";
           sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
           name = "rase";
         };
@@ -50247,7 +50520,7 @@
           sha256 = "0dd9yhxwwk16xkwld9c3hpf9bw8zzc1lyvisp0vn6vcd240j02w0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rats";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rats";
           sha256 = "0jhwiq9yzwpyqhk3c32vqx8nryingzh58psxbzjl3812b7xdqphr";
           name = "rats";
         };
@@ -50268,7 +50541,7 @@
           sha256 = "0yd0rs6fnc6lsfi7pivw5sivh698055r8ifj9vrxb82dcx2y6v2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rbenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rbenv";
           sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
           name = "rbenv";
         };
@@ -50289,7 +50562,7 @@
           sha256 = "0q5giixk6pv82cf34a0mxmnzh2gdiyq6dzv4ypkkdpz6wsm2ffhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rbt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rbt";
           sha256 = "1mrb6v8zybvhh242vvq0kdvg6cvws7gabfhcydrw5g2njhyqkygm";
           name = "rbt";
         };
@@ -50310,7 +50583,7 @@
           sha256 = "0xdyrp0zs2v2glpfwlajmj97wygwi0y492zbp6rp3caa5bj3j4z2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rcirc-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rcirc-alert";
           sha256 = "0lyd3gz1sflp93xb7xbvk1gh69w468ync1p144avyh2pybl40q4a";
           name = "rcirc-alert";
         };
@@ -50331,7 +50604,7 @@
           sha256 = "1mpk5rzsil298q3ppv5v9jrn274v71jffyz0jihrksh1wbjzwhlx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rcirc-alertify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rcirc-alertify";
           sha256 = "13448bykmy0jqcajhn2gjiar3m8cingyr8394vxybp2m1zvv0pws";
           name = "rcirc-alertify";
         };
@@ -50352,7 +50625,7 @@
           sha256 = "173lhi48dwfp9k7jmgivhcc9f38snz5xlciyjhrafpadq1pir497";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rcirc-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rcirc-color";
           sha256 = "1a8qqwdc0gw6m1xsnwrj3xldp05p7pabyj6l4bccpg3vf5wbgkn5";
           name = "rcirc-color";
         };
@@ -50373,7 +50646,7 @@
           sha256 = "0d99x7dfw5xrn62knvs65lvn6xyy7399xwqyy47bs4n81v25aqbh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rcirc-groups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rcirc-groups";
           sha256 = "1iws3f8vkwrflcj6ni8nmf1wcw1jrlnssm76kzzhag77ry3iswgx";
           name = "rcirc-groups";
         };
@@ -50394,7 +50667,7 @@
           sha256 = "1k4knsrca626pikgaalqbqwy7im4wz1vrmzzhdrdb4lhdz6sq3q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rcirc-notify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rcirc-notify";
           sha256 = "0mwhzkbzhpq4jws05p7qp0kbay8kcblb9xikznm0i8drpdyc617v";
           name = "rcirc-notify";
         };
@@ -50415,7 +50688,7 @@
           sha256 = "1kwn33rxaqik5jls66c2indvswhwmxdmd60n7a1h9siqm5qhy9d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rcirc-styles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rcirc-styles";
           sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
           name = "rcirc-styles";
         };
@@ -50436,7 +50709,7 @@
           sha256 = "1ss0y7lwd9bi8nzmhvpfn24vl4xsjk2xclhvfz602c9k18k18qza";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rdf-prefix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rdf-prefix";
           sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
           name = "rdf-prefix";
         };
@@ -50457,7 +50730,7 @@
           sha256 = "08l96bhghmnckar4i6afj9csqglasmpmby1r7j38ic9bp37z2yqd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rdp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rdp";
           sha256 = "0lj3idwv4fxz8pi8mnxkbhwhzaa1gs6ib4nzly3fc6yiix9ampkz";
           name = "rdp";
         };
@@ -50478,7 +50751,7 @@
           sha256 = "00j0iqa37yzd7xrgd8xcgpgmjcarhn0yx4zpbnr7z7kzmg24ywa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/react-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/react-snippets";
           sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73";
           name = "react-snippets";
         };
@@ -50499,7 +50772,7 @@
           sha256 = "0kg18ybgwcxhv5fiya5d3wn5w9si4914q946gjannk67d6jcq08g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/readability";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/readability";
           sha256 = "0kg91ma9k3p5ps467jjz2lw13rv1l8ivwc3zpg6c1rl474ds0qqv";
           name = "readability";
         };
@@ -50520,7 +50793,7 @@
           sha256 = "1j5b5xapflwzh8a297gva0l12ralwa9vl5z3bb75c9ksjkhi4nm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/readline-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/readline-complete";
           sha256 = "1qymk5ypv6ljk8x49z4jcifz7c2dqcg5181f4hqh67g1byvj2277";
           name = "readline-complete";
         };
@@ -50541,7 +50814,7 @@
           sha256 = "1kghhps8mqys5l59qwzv3fgy1fvb15cnyaxmk29v818a6khjc5l2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/real-auto-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/real-auto-save";
           sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
           name = "real-auto-save";
         };
@@ -50554,15 +50827,15 @@
     realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20160604.643";
+        version = "20160612.1522";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "ef21fa276799f7fbcd2a3d473646a24b0ecf08b4";
-          sha256 = "0gpv0abbn8ymqa6xr79h3q1m3c6hjfd08vixx6yx2mhs62w425b6";
+          rev = "b71750a1a38400db91a45d530623b2924f5e9fae";
+          sha256 = "1xdsvbihp7gk7d77wyydcrwwgp9f3350677pslk176q2zcxj9r0v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/realgud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/realgud";
           sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15";
           name = "realgud";
         };
@@ -50583,7 +50856,7 @@
           sha256 = "01wa8jwwlx5qmn5w83r3ak74hjp89zyhsx13c4ijqfns7d92xjd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/realgud-byebug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/realgud-byebug";
           sha256 = "1m4pqnvnnfzq7b9bv5fkz70pifklddwqrwbwnrfyiawx9vdgrpz9";
           name = "realgud-byebug";
         };
@@ -50604,7 +50877,7 @@
           sha256 = "0jxi5a6mlgwjj14gfajs951180m8r8m4vqx09xz1yyc9qq8ywfk9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/realgud-old-debuggers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/realgud-old-debuggers";
           sha256 = "0iwi1byfwcpviaizdw9wzdcjlbk35ql4wfzj0ynh331g0hmibhs9";
           name = "realgud-old-debuggers";
         };
@@ -50625,7 +50898,7 @@
           sha256 = "1dgxlmdzp1m6xr94nkvh6whvg23yq2d3v6k95vacx0khfbc16w17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/realgud-pry";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/realgud-pry";
           sha256 = "1p5ijig5rczndcykllq0vy6w4askwl0yd8b5fqg7yl5yx45r8xgs";
           name = "realgud-pry";
         };
@@ -50646,7 +50919,7 @@
           sha256 = "1ip22z48vj6a6xh54s26ss10pxhqrdm5k9h28i1vgv5x75kqgxii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/realgud-rdb2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/realgud-rdb2";
           sha256 = "0wqvgb3h2b0ys76sq2z462cjv0fajqc41f7wqvf53wfcs2zw4l9y";
           name = "realgud-rdb2";
         };
@@ -50667,7 +50940,7 @@
           sha256 = "1xh9nxqfg9abcl41ni69rnwjfgyfr0pbl55dzyxsbh6sb36r3h8z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rebox2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rebox2";
           sha256 = "06ra50afjqac9ck1s9gaxy0sqxcb612wzd28s4q4imicqpgfxzjw";
           name = "rebox2";
         };
@@ -50685,7 +50958,7 @@
           sha256 = "15kwkphrlxq6nbmqm95sxv4rykl1d35sjm59ncy07ncqm706h33l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/recentf-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/recentf-ext";
           sha256 = "1m54w1n3ci5j7i1jhw6cs7dgzmxrj1hsrrarqlrd1d4iqhixjzbq";
           name = "recentf-ext";
         };
@@ -50706,7 +50979,7 @@
           sha256 = "0wk28blnfks987iby0p3qpd4nxnz6sqn4fx8g59gyddjhav51lri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/recompile-on-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/recompile-on-save";
           sha256 = "0bg2p7pk4jlpqc7lg48mxd6zkwnx15r0r7lmsxgx9dv1ilfwrmgn";
           name = "recompile-on-save";
         };
@@ -50727,7 +51000,7 @@
           sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/recover-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/recover-buffers";
           sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
           name = "recover-buffers";
         };
@@ -50748,7 +51021,7 @@
           sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rect+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rect+";
           sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
           name = "rect-plus";
         };
@@ -50769,7 +51042,7 @@
           sha256 = "0i336qakdkvxgyhjfq6b957xqlll156i1a8g1f5xap46v35d6gh3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rectangle-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rectangle-utils";
           sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
           name = "rectangle-utils";
         };
@@ -50790,7 +51063,7 @@
           sha256 = "1mj7lyadzn3bwig3f9zariq5z4fg6liqnjvfd34yx88xc52nwf33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/recursive-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/recursive-narrow";
           sha256 = "1bx8l8wjxrkv949c73dp93knbn1iwnblcm8iw822mq2mgbgwsa7f";
           name = "recursive-narrow";
         };
@@ -50811,7 +51084,7 @@
           sha256 = "1rjpf23a8rggjmmxvm1997d3xz03kz84xams486b9ky0n2v02d57";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/redis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/redis";
           sha256 = "1awnilb8bk0izp6yw0187ybh9slf1hc51014xvvmj90darxby79a";
           name = "redis";
         };
@@ -50829,7 +51102,7 @@
           sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/redo+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/redo+";
           sha256 = "1alfs7k5mydgvzsjmdifcizqgrqjrk2kbh3mabai7nlrwi47w9n2";
           name = "redo-plus";
         };
@@ -50842,15 +51115,15 @@
     redpen-paragraph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "redpen-paragraph";
-        version = "20160512.1522";
+        version = "20160611.843";
         src = fetchFromGitHub {
           owner = "karronoli";
           repo = "redpen-paragraph.el";
-          rev = "cbfef789d474258df85ff58b24e2ab54acd11cc4";
-          sha256 = "1j9zvkfxccwzr8adxikw450xv0kc2a4j8rskbfqlmsylrpniszqm";
+          rev = "1f6c0e6c9179f49a311ee1215605ef7712fb3091";
+          sha256 = "0in2g0ijlngb6kah46r7xvarvqwdxanf8c7wwkhm0jkb120a12jf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/redpen-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/redpen-paragraph";
           sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
           name = "redpen-paragraph";
         };
@@ -50867,10 +51140,10 @@
         src = fetchgit {
           url = "http://www.foldr.org/~michaelw/projects/redshank.git";
           rev = "f98e68f532e622bcd464292ca4a9cf5fbea14ebb";
-          sha256 = "14p39gl4bvicqxf6rjzsyixv8ac6ib2vk680zbi7l55a1kdwaism";
+          sha256 = "1jdkgvd5xy9hl5q611jwah2n05abjp7qcy9sj4k1z11x0ii62b6p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/redshank";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/redshank";
           sha256 = "07s4gja1w8piabkajbzrgq77mkdkxr0jy9bmy2qb9w2svfsyns9b";
           name = "redshank";
         };
@@ -50891,7 +51164,7 @@
           sha256 = "1c9ngm95b8rqg11m5w69031d8lgyvh9xpnr4h5r6yyg7836hdk2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/redtick";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/redtick";
           sha256 = "1a9rviz0hg6vlh2jc04g6vslyf9n89xglcz9cb79vf10hhr6igrb";
           name = "redtick";
         };
@@ -50912,7 +51185,7 @@
           sha256 = "08kzi2jcfqnlanqzvbk5gq1if7k8qc9gmz5bmvd2mvmx6z436398";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/refheap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/refheap";
           sha256 = "0pzark1db9k2pavd5sn89a28gd9j5jlkx3wkhwfzln3y5c1wnvdk";
           name = "refheap";
         };
@@ -50933,7 +51206,7 @@
           sha256 = "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/regex-dsl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/regex-dsl";
           sha256 = "129sapsmvcqqqgcr9xlmxwszsxvsb4nj9g2fxsl4y6r383840jbr";
           name = "regex-dsl";
         };
@@ -50954,7 +51227,7 @@
           sha256 = "1wr12j16hckvc8bxxgxw280frl12h23cp44sxg28lczl16d9693l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/regex-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/regex-tool";
           sha256 = "1nd23vjij5h5gk5l7hbd5ks9ljisn054wp138jx2v6i51izxvh2v";
           name = "regex-tool";
         };
@@ -50975,7 +51248,7 @@
           sha256 = "02kfi3c6ydnr7xw611ck66kfjyl5w86dr9vfjv3wjl6ad9jya4zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/region-bindings-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/region-bindings-mode";
           sha256 = "141q4x6rilidpnsm9s78qks9i1v6ng0ydhbzqi39xcaccfyyjb69";
           name = "region-bindings-mode";
         };
@@ -50996,7 +51269,7 @@
           sha256 = "0gsh0x1rqxvzrszdyna9d8b8w22mqnd9yqcwzay2prc6rpl26g1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/region-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/region-state";
           sha256 = "1iq2x1w8lqjjiwjja7r3qki6drvydnk171k9fj9g6rk7wslknz8x";
           name = "region-state";
         };
@@ -51017,7 +51290,7 @@
           sha256 = "01k3v4yiilz1k6drv7b2x6zbjx6dlz7cch8rq63mwc7v8kvdnqmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/register-channel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/register-channel";
           sha256 = "037i2fgxxsfb85vd6xk17wyh7ny6fqfixvb0a18lf8m1hib1gyhr";
           name = "register-channel";
         };
@@ -51037,7 +51310,7 @@
           sha256 = "0dl7lnf5318b0a842qgs5mg2s1c0i4vsl9ji6801z6w53mc46cgv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/related";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/related";
           sha256 = "098rd8rvlx9shbh05zdw7lnrawfkbk4cfan1i963h994538sda1w";
           name = "related";
         };
@@ -51058,7 +51331,7 @@
           sha256 = "0100maanb1v0hl4pj8ykzlqpr3cvs6ldak5japndm5yngzp6m8ks";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/relative-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/relative-buffers";
           sha256 = "131182yb0pr0d6jibqd8aag4w8hywdyi87ldp77b95gw4bqhr96i";
           name = "relative-buffers";
         };
@@ -51079,7 +51352,7 @@
           sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/relative-line-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/relative-line-numbers";
           sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
           name = "relative-line-numbers";
         };
@@ -51100,7 +51373,7 @@
           sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/relax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/relax";
           sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
           name = "relax";
         };
@@ -51121,7 +51394,7 @@
           sha256 = "0w40cx58c0hmc0yzs8maq1389hwha0qwfbz76pc6kpcx14v1gkhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/remark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/remark-mode";
           sha256 = "1zl8k3h4acbgb3hmjs2b4a14g0s0vl3xamrqxrr742zmqpr1h0w0";
           name = "remark-mode";
         };
@@ -51142,7 +51415,7 @@
           sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/repeatable-motion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/repeatable-motion";
           sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
           name = "repeatable-motion";
         };
@@ -51163,7 +51436,7 @@
           sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/repl-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/repl-toggle";
           sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
           name = "repl-toggle";
         };
@@ -51184,7 +51457,7 @@
           sha256 = "0w9ry16crcgc6aiq0xwzf7b301kkw6i44jc0dhfj621bhgmf30aj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/replace-from-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/replace-from-region";
           sha256 = "1p77sajghqkjd7k83nma4qpz682la3zg716jdsnpcwcw0qk9ybcb";
           name = "replace-from-region";
         };
@@ -51205,7 +51478,7 @@
           sha256 = "169p85rmgashm0g26apkxynmypqk9ndh76kvh572db5kqb8ix0c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/replace-pairs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/replace-pairs";
           sha256 = "0l9674rba25wh6fskvfwkhv99lwlszb177hsfzx39s6b4hshvlsb";
           name = "replace-pairs";
         };
@@ -51223,7 +51496,7 @@
           sha256 = "1a59nqrs62xzdpi7as00byf3jamr1zsz8jmf0w4mqag4bp79cd40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/replace+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/replace+";
           sha256 = "1imsgr3v8g2p2mnkzp92ga3nvckr758pblmlha8gh8mb80089krn";
           name = "replace-plus";
         };
@@ -51244,7 +51517,7 @@
           sha256 = "178y1cmpdb2r72igx8j4l7pyhs1idw56j6hg5h8r9a2p99lkgjjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/replace-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/replace-symbol";
           sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
           name = "replace-symbol";
         };
@@ -51265,7 +51538,7 @@
           sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/repo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/repo";
           sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
           name = "repo";
         };
@@ -51286,7 +51559,7 @@
           sha256 = "03yvgb2iiqp90jncrh5ji5l3v5q86rcqb757x1n2x4xkpjjsxa19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/req-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/req-package";
           sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
           name = "req-package";
         };
@@ -51307,7 +51580,7 @@
           sha256 = "1knhm4hicijviz759834zmafcw2l2b04g4dddqg7j38knn8pzrx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/request";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/request";
           sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji";
           name = "request";
         };
@@ -51328,7 +51601,7 @@
           sha256 = "1knhm4hicijviz759834zmafcw2l2b04g4dddqg7j38knn8pzrx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/request-deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/request-deferred";
           sha256 = "1dcxqnzmvddk61dzmfx8vjbzd8m44lscr3pjdp3r7211zhwfk40n";
           name = "request-deferred";
         };
@@ -51349,7 +51622,7 @@
           sha256 = "1bfj2zjn3x41jal6c136wnwkgmag27bmrwbfwdylafc7qqk6dflv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/requirejs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/requirejs";
           sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
           name = "requirejs";
         };
@@ -51370,7 +51643,7 @@
           sha256 = "02wva5q8mvc0a5kms2wm1gyaag2x3zd6fkkpl4218nrbb0mbficv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/requirejs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/requirejs-mode";
           sha256 = "00bl5dz56f77hl9wy3xvjhq81641mv9jbskcd8mcgcz9ycj9g5k2";
           name = "requirejs-mode";
         };
@@ -51391,7 +51664,7 @@
           sha256 = "1ps9l6q6hgzzaywkig0gjjdlsir9avxghynzx9a3q6h0fpdkpgrj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/resize-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
           name = "resize-window";
         };
@@ -51412,7 +51685,7 @@
           sha256 = "1a2myx5isiwr29yhplmv07bisc8rvrabzz9dn239jf4gvr8x89ry";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/restart-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/restart-emacs";
           sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
           name = "restart-emacs";
         };
@@ -51425,15 +51698,15 @@
     restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "restclient";
-        version = "20160525.1405";
+        version = "20160608.1056";
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "3e44dccaefeef18de24fd882a29bdff3cd40e050";
-          sha256 = "0wyrqkrcxlgpby3bvg4wzqkz5bq3v3bga7skasmncpvq51imhwp1";
+          rev = "a4d70f43d6d8742382329eae4757c8731cf967b1";
+          sha256 = "07w0ys3z978l15gd4pwqf4456xhmj9xcg0b3chz01p9w4fx82fz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/restclient";
           sha256 = "0wzp8i89a4hwm7qyxvdk10frknbqcni0isnp8k63nhq7c30s7md4";
           name = "restclient";
         };
@@ -51450,11 +51723,11 @@
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "3e44dccaefeef18de24fd882a29bdff3cd40e050";
-          sha256 = "0wyrqkrcxlgpby3bvg4wzqkz5bq3v3bga7skasmncpvq51imhwp1";
+          rev = "a4d70f43d6d8742382329eae4757c8731cf967b1";
+          sha256 = "07w0ys3z978l15gd4pwqf4456xhmj9xcg0b3chz01p9w4fx82fz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/restclient-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/restclient-helm";
           sha256 = "0cpf02ippfr9w6kiw3kng8smabv256ff388322hhn8a8icyjl24j";
           name = "restclient-helm";
         };
@@ -51475,7 +51748,7 @@
           sha256 = "1z4ackggrw428f9f7bd02by4fw34bwndv2i4v7cj80c533mfwy9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/restclient-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/restclient-test";
           sha256 = "0g26z5p9fq7fm6bgrwaszya5xmhsgzcn1p7zqr83w74fbw6bcl39";
           name = "restclient-test";
         };
@@ -51496,7 +51769,7 @@
           sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/reveal-in-osx-finder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/reveal-in-osx-finder";
           sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
           name = "reveal-in-osx-finder";
         };
@@ -51514,7 +51787,7 @@
           sha256 = "1h27kg2k8f6smbqxandmvg859qk66jydbbbiwwjmk7316k66w8qa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/reveal-next";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/reveal-next";
           sha256 = "0fp6ssd4fad0s2pbxbw75bnx7fcgasig8xvcx7nls8m9p6zbbmh2";
           name = "reveal-next";
         };
@@ -51535,7 +51808,7 @@
           sha256 = "002ywhjms8ybk7cma2p2i11z3fz6kb0w8mlafysm911rvcq2hg5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/reverse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/reverse-theme";
           sha256 = "163kk5qnz9bk3l2fam79n264s764jfxbwqbiwgid8kw9cmk0v776";
           name = "reverse-theme";
         };
@@ -51556,7 +51829,7 @@
           sha256 = "0lzsy68k7sm9d3r8lzhzx9alc1f0cgfclry40pa4x0ilkcr7ysch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/review-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/review-mode";
           sha256 = "0wapicggkngpdzi0yxc0b24s526fs819rc2d6miv6ix3gnw11n0n";
           name = "review-mode";
         };
@@ -51577,7 +51850,7 @@
           sha256 = "037sac5fvz6l2zgzlf8ykk4jf9zhj7ybzyz013jqzjj47a6sn1r1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/revive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/revive";
           sha256 = "1l7c6zq3ga2k1488qb0hgxlk08p3vrcf0sx116c1f8z8nf4c8ny5";
           name = "revive";
         };
@@ -51598,7 +51871,7 @@
           sha256 = "0zmby92mjszh77r5wh8sccqv3a5bb9sfhac8g55nasavw8hfplvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/reykjavik-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/reykjavik-theme";
           sha256 = "1f0q2gfzkmpd374jryrd1lgg8xj6rwdq181jhppj3rfjizgw4l35";
           name = "reykjavik-theme";
         };
@@ -51616,7 +51889,7 @@
           sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rfringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rfringe";
           sha256 = "171gzfciz78l6b653acgfailxpwmh8m1dm0dzpg0b1k0ny3aiwf6";
           name = "rfringe";
         };
@@ -51637,7 +51910,7 @@
           sha256 = "1qlpv5lzj4yfyjgdykhm6q9izg6g0z5pf5nmynj42vsx7v8bhy1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rhtml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rhtml-mode";
           sha256 = "038j5jkcckmhlq3vz4h07s5y2scljh1fdn9r614hiyxwgk48lc35";
           name = "rhtml-mode";
         };
@@ -51658,7 +51931,7 @@
           sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rich-minority";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rich-minority";
           sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
           name = "rich-minority";
         };
@@ -51679,7 +51952,7 @@
           sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rigid-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rigid-tabs";
           sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
           name = "rigid-tabs";
         };
@@ -51700,7 +51973,7 @@
           sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rinari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rinari";
           sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
           name = "rinari";
         };
@@ -51721,7 +51994,7 @@
           sha256 = "01mfiyq4cr2qdmvaxid8a094p20w97n2nsiy9vyng77vcmv36sd5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rings";
           sha256 = "1ncsb4jip07hbrf1l4j9yzn3l0kb63ylhzzsb4bb2yx6as4a66k7";
           name = "rings";
         };
@@ -51742,7 +52015,7 @@
           sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rnc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rnc-mode";
           sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q";
           name = "rnc-mode";
         };
@@ -51763,7 +52036,7 @@
           sha256 = "0fwxn6pplyh5frwwqk46zq38nj5m2sl1idk1va2jqwnj5r407g78";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/robe";
           sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
           name = "robe";
         };
@@ -51784,7 +52057,7 @@
           sha256 = "0dimmdz4aqcif4lp23nqxfg7kngzym2yivn6h3p7bn1821vgzq9s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/robots-txt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/robots-txt-mode";
           sha256 = "1q3fqaf9nysy9bhx4h9idgshxr65hfwnx05vlwazx7jd6bq6kxfh";
           name = "robots-txt-mode";
         };
@@ -51805,7 +52078,7 @@
           sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/roguel-ike";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/roguel-ike";
           sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
           name = "roguel-ike";
         };
@@ -51826,7 +52099,7 @@
           sha256 = "0f90m47d1qyl16bq7gqz0xxx38jfgjay7s404q8ikwkvjhg3p85y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rope-read-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rope-read-mode";
           sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
           name = "rope-read-mode";
         };
@@ -51847,7 +52120,7 @@
           sha256 = "13xrjd5p2zq0r8ifbqbrgjfm0jj09nyxcbhk262jr6f171rf0y2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rotate";
           sha256 = "0dygdd24flbgqp049sl4p8rymvv8h881hz9lvz8hnfwq687yyclx";
           name = "rotate";
         };
@@ -51868,7 +52141,7 @@
           sha256 = "04jbnm9is2cis75h40znqzjvyjq27ncr2vfank6zglzi4fhxsl0r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/roy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/roy-mode";
           sha256 = "0ch0hamvw4gsqs2pap0h6w4cj6n73jqa75if0ymh73hk5i3acm8g";
           name = "roy-mode";
         };
@@ -51889,7 +52162,7 @@
           sha256 = "01rb6qfsk4f33nkfdzvvjkw96ip1dv0py8i30l8ix9cqbk07svsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rpm-spec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rpm-spec-mode";
           sha256 = "01vggdv8sac4p0szwk7xgxcglmd5a1hv5q0ylf8zcp1lsyyh8ypd";
           name = "rpm-spec-mode";
         };
@@ -51910,7 +52183,7 @@
           sha256 = "0i5qwbhhdnspgs2y67kkgbk9zq6fx2j509q92mgfzbvjnf54h1r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rpn-calc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rpn-calc";
           sha256 = "04dj2r4035k0c3x6iyjydshzmq381d60pmscp2hg5m7sp7bqn5xs";
           name = "rpn-calc";
         };
@@ -51931,7 +52204,7 @@
           sha256 = "0xkr1qn8fm3kv5c11janq5acp1q02abvxc463zijvm2qk735yl4d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rsense";
           sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
           name = "rsense";
         };
@@ -51952,7 +52225,7 @@
           sha256 = "1mlcr4br831cbxd90z61kynvir704mafv4avas44bzk8m1m188kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rspec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rspec-mode";
           sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
           name = "rspec-mode";
         };
@@ -51965,15 +52238,15 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20160602.744";
+        version = "20160610.933";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "a7fd295e83d61d14416e17c33af9e4d44728d2c3";
-          sha256 = "1nwc4dxw2sf6swqf2xmv2yapznlz7s85hpj7ghqh9iacnw77yrjv";
+          rev = "645fe7244582d6df3606b3f351b3a97ef1b666dd";
+          sha256 = "02jhchk2pdd9s611vi5bywxh0gjxcmbl4wica1n0mjg4dnkh0f80";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rtags";
           sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
           name = "rtags";
         };
@@ -51994,7 +52267,7 @@
           sha256 = "1gqvp0h5zy2023gdzf7pw28rl27lzml87vpbi1zaw4bmj82zgh3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rtm";
           sha256 = "1ni2610svxziq1gq6s6igkhqyafvgn02gnw7jbm3ir7ks4w2imzf";
           name = "rtm";
         };
@@ -52015,7 +52288,7 @@
           sha256 = "1y5z0kr4qwd4fyvhk0rhpbbp6dw2jpzrawx62jid5539wrdjcabk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rubocop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rubocop";
           sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
           name = "rubocop";
         };
@@ -52028,14 +52301,14 @@
     ruby-additional = callPackage ({ emacs, fetchsvn, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "ruby-additional";
-        version = "20091002.645";
+        version = "20160607.1057";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "55119";
-          sha256 = "07j1lclp6jqhyzfw8h4a21kx39nz946h6lgmn959rvckhkijr514";
+          rev = "55390";
+          sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/50e8d089f4e163eb459fc602cb90440b110b489f/recipes/ruby-additional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-additional";
           sha256 = "0h0cxik8lp8g81bvp06mddikkk5bjdlch2wffcvsvi01is408w4w";
           name = "ruby-additional";
         };
@@ -52053,7 +52326,7 @@
           sha256 = "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-block";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-block";
           sha256 = "0jfimjq1xpwxkxya452kp27h0fdiy87aj713w3zsm04k7l6i12hm";
           name = "ruby-block";
         };
@@ -52074,7 +52347,7 @@
           sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-compilation";
           sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
           name = "ruby-compilation";
         };
@@ -52095,7 +52368,7 @@
           sha256 = "1cy5zmdfwsjw8jla8mxjm1cmvrv727fwq1kqhjr5nxj0flwsm4x1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-dev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-dev";
           sha256 = "0mf2ra3p5976qn4ryc2s20vi0nrzwcg3xvsgppsc0bsirjw2l0fh";
           name = "ruby-dev";
         };
@@ -52111,11 +52384,11 @@
         version = "20150424.1652";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "55275";
-          sha256 = "1chnrkchfp156f2ri5y55sgrd6v6znb0iz9nmajhrz5i3i3hncdi";
+          rev = "55390";
+          sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-electric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-electric";
           sha256 = "04j04dsknzb7xc8v6alawgcbymdfmh27xnpr98yc8b05nzafw056";
           name = "ruby-electric";
         };
@@ -52136,7 +52409,7 @@
           sha256 = "1x4nvrq5nk50c1l3b5wcr4g1n5nmwafcz1zzc12qzsl5sya7si55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-end";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-end";
           sha256 = "1cnmdlkhm8xsifbjs6ymvi92gdnxiaghb04h10qg41phj6v7m9mg";
           name = "ruby-end";
         };
@@ -52157,7 +52430,7 @@
           sha256 = "15b2rs6m4d511qqkc2gc8k15mbqzrgv6s3hpypajl8nvqa79xnyd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-factory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-factory";
           sha256 = "0v8009pad0l41zh9r1wzcx1h6vpzhr5rgpq6rb002prxz2lcbd37";
           name = "ruby-factory";
         };
@@ -52178,7 +52451,7 @@
           sha256 = "080hmrh7pgpaj33w1rkhcqb1yp70w4cap0rq9hsxaaajj0sn47z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-guard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-guard";
           sha256 = "0hwxhirdvaysw9hxcgfdf0l12wilr6b9f9w91pk1hfwfi1w0lfwr";
           name = "ruby-guard";
         };
@@ -52199,7 +52472,7 @@
           sha256 = "0knl8zrd4pplnzk5z19cf9rqdfr3ymzfssrwp6jhndjzjdwvc2bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-hash-syntax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-hash-syntax";
           sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
           name = "ruby-hash-syntax";
         };
@@ -52220,7 +52493,7 @@
           sha256 = "1r2f5jxi6wnkmr1ssvqgshi97gjvxvf3qqc0njg1s33cy39wpqq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-interpolation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-interpolation";
           sha256 = "07idndxw8vgfrk5zfmjjhmixza35mqxwjhsrbjrq5yy72i5ivznp";
           name = "ruby-interpolation";
         };
@@ -52241,7 +52514,7 @@
           sha256 = "13008ih4hwa80bn2dbgj551knbvgpriz5sb241rkf7mifmlfzgsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-refactor";
           sha256 = "0nwinnnhy72h1ihjlnjl8k8z3yf4nl2z7hfv085gwiacr6nn2rby";
           name = "ruby-refactor";
         };
@@ -52262,7 +52535,7 @@
           sha256 = "0ajqqkf43k7kgsnzi9m8il1l48n2slqd7csya8varnlm8g4p79gy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-test-mode";
           sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
           name = "ruby-test-mode";
         };
@@ -52283,7 +52556,7 @@
           sha256 = "0jd9acycpbdd90hallrl0k5055rypp502qv4c6i286p7f9is4kvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-tools";
           sha256 = "0zpk55rkrqyangyyljxzf0n1icgqnpdzycwack5rji556h5grvjy";
           name = "ruby-tools";
         };
@@ -52304,7 +52577,7 @@
           sha256 = "1ddf5jydpc43wgvw4a669wifij71b4r8zfazcqfdpyfh1j4m591b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/runner";
           sha256 = "09apmk22swj05z77ziij31jj6b3g221qv3mw3mymffzxn5ap2rbx";
           name = "runner";
         };
@@ -52325,7 +52598,7 @@
           sha256 = "18w6gkpxp0g7rzvnrk8vvr267y768dfik447ssq8jpz3jlr5jnq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/runtests";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/runtests";
           sha256 = "0m9rqjb5c0yqr2wv5dsdiba21knr63b5pxsqgbkbybi15zgxcicb";
           name = "runtests";
         };
@@ -52346,7 +52619,7 @@
           sha256 = "1yamcsqshxzniaq8hn6a2hmfp9x84g5k6n04fgpfs3wxmrh8cqx8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rust-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rust-mode";
           sha256 = "1i1mw1v99nyikscg2s1m216b0h8svbzmf5kjvjgk9zjiba4cbqzc";
           name = "rust-mode";
         };
@@ -52367,7 +52640,7 @@
           sha256 = "0c22cxa4f6plz67vxmp1zgaylkfrky313cj0zybn9akrbcxpbc34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rustfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rustfmt";
           sha256 = "1znav2pbax0rsvdl85mmbgbmxy7gnrm4nx54ij1ff6yd831r5jyl";
           name = "rustfmt";
         };
@@ -52388,7 +52661,7 @@
           sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rvm";
           sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
           name = "rvm";
         };
@@ -52409,7 +52682,7 @@
           sha256 = "1bq402bhxqc9ph2da2nmd80s28dzd406gbawxr3kgrv0sll167bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/s";
           sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
           name = "s";
         };
@@ -52430,7 +52703,7 @@
           sha256 = "06ng960fj2ivnwb0hrn0qic5x8hb0sswjzph01zmwhbfnwykhr85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/s-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/s-buffer";
           sha256 = "07kivgzv24psjq1240gwj9wkndq4bhvjh38x552k90m9v6jz8l6m";
           name = "s-buffer";
         };
@@ -52451,7 +52724,7 @@
           sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sackspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sackspace";
           sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
           name = "sackspace";
         };
@@ -52472,7 +52745,7 @@
           sha256 = "1124akipvrcmkd66slklgap2jdvb8iksldd8sjvg9n25kp0wd0vr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sage-shell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sage-shell-mode";
           sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx";
           name = "sage-shell-mode";
         };
@@ -52493,7 +52766,7 @@
           sha256 = "1hl227bmjch0vq7n47mwydkyxnd6wkbz9klk3c4398qmc2qxm5kn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/salt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/salt-mode";
           sha256 = "1r5k7022vxgj3p5l16y839lff85z0m9hpifq59knij61g9hxadsp";
           name = "salt-mode";
         };
@@ -52514,7 +52787,7 @@
           sha256 = "1r6b6n2bzjznjfimgcm0vnmln4sbyasm4icmdgbpzahdmbkfzq3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sane-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sane-term";
           sha256 = "0iz63b62x5jrz7c23i850634k4bk73kg1h4wj1ravx3wlgvzs8y8";
           name = "sane-term";
         };
@@ -52535,7 +52808,7 @@
           sha256 = "1zvsv2j3hqrj9vlm4mspfnm9nwah0lhizamyx43xykd7xk0z8hkw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sass-mode";
           sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
           name = "sass-mode";
         };
@@ -52556,7 +52829,7 @@
           sha256 = "169mbr83zlawjnn2p9yzx7rrg33bb78gb1i7lklagn73ca2pr0b5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sauron";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sauron";
           sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
           name = "sauron";
         };
@@ -52577,7 +52850,7 @@
           sha256 = "0rxcg60lxaabdx9gjj17sfxnr09694viphlhhk355dcc4v5ngbdm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/save-load-path";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/save-load-path";
           sha256 = "1cl9kkv996m2irm9i5n7f020zqzvrsv9dyscc16ca9jsn16msww2";
           name = "save-load-path";
         };
@@ -52598,7 +52871,7 @@
           sha256 = "00jvl1npc889f3isi7cbdzwvf9x4rq67zgl7br8npxf8jlc2mwhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/save-visited-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/save-visited-files";
           sha256 = "1pmjz27dlp5yrihgsy8q1bwbhkkj3sn7d79ccvljvzxg5jn1grkd";
           name = "save-visited-files";
         };
@@ -52619,7 +52892,7 @@
           sha256 = "0h8bl28p5xrs9daapcjkslm066a4hqlb764i5nz1db0lwrvr0csm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/savekill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/savekill";
           sha256 = "14hfqia7d2v1dn1wdwsphrrkq9hc57721irms9s9vinign0pqx7h";
           name = "savekill";
         };
@@ -52640,7 +52913,7 @@
           sha256 = "1gkzgcnh5ib4j5206mx8gbwj5ykay19vqlfg9070m2r09d1a55qf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/say-what-im-doing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/say-what-im-doing";
           sha256 = "1hgh842f7gs2sxy7s6zq57nsqy4jjlnjcga6hwzcx0kw3albgz7x";
           name = "say-what-im-doing";
         };
@@ -52653,15 +52926,15 @@
     sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20160517.36";
+        version = "20160606.1859";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "6cc666e1822b6e0a33c7afc428308ed399b5a405";
-          sha256 = "1lvf7y1n63p8jvnp6ppwmxq2s6h9sk45319576f3s28ixsfa6cp2";
+          rev = "972c22a0c5f80fec5b42c63152da4a63e43da214";
+          sha256 = "00ai9fl3xnkp5i5yri6fdy4anvv0pxj0f5lybl6niymzg6dy3bcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sbt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sbt-mode";
           sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
           name = "sbt-mode";
         };
@@ -52682,7 +52955,7 @@
           sha256 = "0zpv269ddhcwxqkk4bv7jms8g5n4bbkhcn2529q8x36hmsbwb4dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scad-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scad-mode";
           sha256 = "04b4y9jks8sslgmkx54fds8fba9xv54z0cfab52dy99v1301ms3k";
           name = "scad-mode";
         };
@@ -52703,7 +52976,7 @@
           sha256 = "13x00dls59zshz69260pnqmx6ydrjg8p2jdjn1rzgf5dsmwfy3sc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scad-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scad-preview";
           sha256 = "0wcd2r60ibbc2mzpq8fvyfc1fy172rf9kzdj51p4jyl51r76i86z";
           name = "scad-preview";
         };
@@ -52724,7 +52997,7 @@
           sha256 = "1ayqdmnp38wvhi3a8r8wivn4z8v6irbz0kwqvgsnpq6m2s3jsbz9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scala-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scala-mode";
           sha256 = "12x377iw085fbkjb034dmcsbi7hma17zkkmbgrhkvfkz8pbgaic8";
           name = "scala-mode";
         };
@@ -52745,7 +53018,7 @@
           sha256 = "0m7hanpc2skmsz783m0212xd10y31gkj5n6w8gx9s989l1y4i1b8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scf-mode";
           sha256 = "0acbrw94q6cr9b29mz1wcbwi1g90pbm7ly2xbaqb2g8081r5rgg0";
           name = "scf-mode";
         };
@@ -52758,15 +53031,15 @@
     scheme-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scheme-complete";
-        version = "20160503.139";
+        version = "20160604.1433";
         src = fetchFromGitHub {
           owner = "ashinn";
           repo = "scheme-complete";
-          rev = "a85aa166633f1d0fac936f727726ee6014d6791b";
-          sha256 = "0kd5g76vpxip5ijddaqvp3w3lxr9hy9vaiphrcvvlqjr3xwignnc";
+          rev = "bc7f0bd687c9a6625393053fb6490b4f37c82505";
+          sha256 = "0xa0md847v3qizvf22jrb1rwynrdp7dbxv32rf4vl8yjsh44wspn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scheme-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scheme-complete";
           sha256 = "1mp9gssd2fx3ra2bjd7w311hwmflhybr5x574qb12603gjkgrp1h";
           name = "scheme-complete";
         };
@@ -52787,7 +53060,7 @@
           sha256 = "09cvrphrnbj8avnlqqv6scjz17cn6zm6mzghjn3vxfr4hql66rir";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scheme-here";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scheme-here";
           sha256 = "04lmkf3zc396anlp9s9irdkqavsc0lzlpzprswd4r2kp4xp7kcks";
           name = "scheme-here";
         };
@@ -52808,7 +53081,7 @@
           sha256 = "0ark720g0nrdqri5bjdpss6kn6k3hz3w3zdvy334wws05mkb17y4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scion";
           sha256 = "17qmc7fpvbamqkzyk8jspp2i0nw93iya4iwddvas7vdpjy7mk81d";
           name = "scion";
         };
@@ -52829,7 +53102,7 @@
           sha256 = "164dn5615bxvya4n58lly9r739va1xzm00wyfg4shcwgnwm3byqb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sclang-extensions";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sclang-extensions";
           sha256 = "00nirxawsngvlx7bmf5hqg2wk0l1v5pi09r6phzd0q8gyq3kmbbn";
           name = "sclang-extensions";
         };
@@ -52850,7 +53123,7 @@
           sha256 = "0vbcghgapwdf3jgjnjdla17dhf5mkmwapz4a8fmlr7sw1wqvj857";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sclang-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sclang-snippets";
           sha256 = "0q1bh316v737a0hm9afijk1spvg144cgrf45jm0bpd60zhiv7bb2";
           name = "sclang-snippets";
         };
@@ -52871,7 +53144,7 @@
           sha256 = "1jgg116rhhgs5qrngrmqi8ir7yj1h470f57dc7fyijw0ly5mp6ii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scpaste";
           sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
           name = "scpaste";
         };
@@ -52892,7 +53165,7 @@
           sha256 = "0ykhr24vpx3byn2n346nqqvmwcg34hk22s3lpdx7lpnkrn5z41aq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scratch";
           sha256 = "1c6vxpd9c24d2flzwgvzqz0wr70xzqqs3f59pp897h0f7j91im5d";
           name = "scratch";
         };
@@ -52913,7 +53186,7 @@
           sha256 = "0ng0by647r49mia7vmjqc97gwlwgs8kmaz0lw2y54jdz8m0bbngp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scratch-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scratch-ext";
           sha256 = "031wxz10k1q4bi5hywhcw1vzi41d5pv5hc09x8jk9s5nzyssvc0y";
           name = "scratch-ext";
         };
@@ -52934,7 +53207,7 @@
           sha256 = "030mcq0cmamizvra8jh2x76f71g5apiavwb10c28j62rl0r5bisk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scratch-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scratch-log";
           sha256 = "1yp3p0dzhmqrd0krqii3x79k4zc3p59148cijhk6my4n1xqnhs69";
           name = "scratch-log";
         };
@@ -52955,7 +53228,7 @@
           sha256 = "0dq5hqx452vgxi5rsbagm2ckfdzxvc4aw5y1053vhky4i9x6yc72";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scratch-message";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scratch-message";
           sha256 = "1dl9d4gvicwnb662ir9azywjmmm7xv4d0sz42z7mmwy8hl9hi91b";
           name = "scratch-message";
         };
@@ -52976,7 +53249,7 @@
           sha256 = "00b4r8bqlxc29k18vig0164d5c9fp5bp5q26d28lwr4f0s4a71d2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scratch-palette";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scratch-palette";
           sha256 = "0m6hc2amwnnii4y189kkridhapl9jipkmadvrmwvspgy3lxhlafs";
           name = "scratch-palette";
         };
@@ -52997,7 +53270,7 @@
           sha256 = "1yvmfiv1s83r0jcxzbxyrx3b263d73lbap6agansmrhkxp914xr1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scratch-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scratch-pop";
           sha256 = "0s7g1fbnc5hgz8gqmp1lynj5g7vvxisj7scxx5wil9qpn2zyggq1";
           name = "scratch-pop";
         };
@@ -53018,7 +53291,7 @@
           sha256 = "10hmy0p4pkrzvvyisk4rjc6hqqyk2sir1rszqgmkhrdywl010vlc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scratches";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scratches";
           sha256 = "0409v1wi10q48rrh8iib6dw9icmswfrpjx9x7xcma994z080d2fy";
           name = "scratches";
         };
@@ -53036,7 +53309,7 @@
           sha256 = "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/screenshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/screenshot";
           sha256 = "0aw2343as38y26r2g7wpn1rq1n6xpw4y5c7ir8qh1crkc1y513hs";
           name = "screenshot";
         };
@@ -53057,7 +53330,7 @@
           sha256 = "0zv1xjjn7pklkla7g26mxmv3148plx8ilw4yqjmc2ghi4br8p0bk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scrooge";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scrooge";
           sha256 = "1gisyfzawrgg55jbwrbnri314f6zd38di19iwy0b2dim8in4sjpg";
           name = "scrooge";
         };
@@ -53078,7 +53351,7 @@
           sha256 = "113pi7nsaksaacy74ngbvrvr6qcl7199xy662nj58bz5307yi9q0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scss-mode";
           sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
           name = "scss-mode";
         };
@@ -53099,7 +53372,7 @@
           sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/search-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/search-web";
           sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
           name = "search-web";
         };
@@ -53120,7 +53393,7 @@
           sha256 = "0zs08vxmjb3y4dnfq6djnrhmkgyhhwd5zylrjisrd4y7f089fyh4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/searchq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/searchq";
           sha256 = "0flsc07v887pm62mslrv7zqnhl62l6348nkm77mizm1592q3kjgr";
           name = "searchq";
         };
@@ -53141,7 +53414,7 @@
           sha256 = "15cjhwjiwmrfzmr74hbw5s92si2qdb8i97nmkbsgkj3444rxg239";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/seclusion-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/seclusion-mode";
           sha256 = "0ff10x6yr37vpp6ffbk1nb027lgmrydwjrb332fskwlf3xmy6v0m";
           name = "seclusion-mode";
         };
@@ -53159,7 +53432,7 @@
           sha256 = "143vg6z3aa0znmsx88r675vv5g2c13giz25dcbzazsp4wcr46wvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/second-sel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/second-sel";
           sha256 = "1nzy5ms5qf5big507kg3z5m6d6zgnsv2fswn359r2j59cval3fvr";
           name = "second-sel";
         };
@@ -53180,7 +53453,7 @@
           sha256 = "1g8avn0vxsjg3fclbgahbjwi71rb81wxd4j0fwabw70lmaqk6f8v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/seeing-is-believing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/seeing-is-believing";
           sha256 = "05aja5xycb3kpmxyi234l50h98f5m1fil6ll4f2xkpxwv31ba5rb";
           name = "seeing-is-believing";
         };
@@ -53201,7 +53474,7 @@
           sha256 = "0qd462qbqdx53xh3ddf76chiljxf6s43r28v2ix85gsig7nm5pgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/seethru";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/seethru";
           sha256 = "1lcwslkki9s15xr2dmh2iic4ax8ia0j20hjnjmkv612wv04b806v";
           name = "seethru";
         };
@@ -53222,7 +53495,7 @@
           sha256 = "1as3llcs7jgcw9pafz4mbfml1cqd1fw8yl64bb4467nmhq2p18p7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sekka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sekka";
           sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
           name = "sekka";
         };
@@ -53243,7 +53516,7 @@
           sha256 = "1c9yv1kjcd0jrzgw99q9p4kzj980f261mjcsggbcw806wb0iw1xn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/select-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/select-themes";
           sha256 = "18ydv7240vcqppg1i7n8sy18hy0lhpxz17947kxs7mvj4rl4wd84";
           name = "select-themes";
         };
@@ -53264,7 +53537,7 @@
           sha256 = "0qc2lyzmvcgld6vnlnp6a01cw0268c4hs2y7lwzaah2c8cps6n6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/selected";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/selected";
           sha256 = "0nvrfymb7wd5lcyfpxzh0rc0l3qcwrvh0l32ag7mgs7jzgvnphnx";
           name = "selected";
         };
@@ -53285,7 +53558,7 @@
           sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/selectric-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/selectric-mode";
           sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
           name = "selectric-mode";
         };
@@ -53306,7 +53579,7 @@
           sha256 = "0x4n2d7jsadwknscnwj64s5320wbj4pc0zrcm2c8xfwwgr9wl47k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/semi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/semi";
           sha256 = "01wk3lgln5lac65hp6v83d292bdk7544z23xa1v6a756nhybwv25";
           name = "semi";
         };
@@ -53327,7 +53600,7 @@
           sha256 = "13qqprxz87cv3sjlq5hj0jp0qcfm3djfgasga8cc84ykrcc47p9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sendto";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sendto";
           sha256 = "00ifasqpmggr4bhdyymzr215840y0ayfnfp0mh7wj99mr6f3zfq0";
           name = "sendto";
         };
@@ -53348,7 +53621,7 @@
           sha256 = "0g4jfcc5k26yh192bmmxnim9mqv993v2jjd9g9ssvnd42ihpx1n3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sensitive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sensitive";
           sha256 = "0v988k0x3mdp7ank2ihghphh8sanvv96s4sg6pnszg5hczak1vr3";
           name = "sensitive";
         };
@@ -53367,7 +53640,7 @@
           sha256 = "01qj57zpqpr4rxk9bsx828c7baac1xaa58cz22fncirdx00svn2k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sentence-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sentence-highlight";
           sha256 = "16kh6567hb9lczh8zpqwbzz5bikg2fsabifhhky8qwxp4dy07v9m";
           name = "sentence-highlight";
         };
@@ -53388,7 +53661,7 @@
           sha256 = "1slhm6cn9pp9vkz2i18sn82j5v38315s0wic7qdmk93ss72jhdvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sentence-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sentence-navigation";
           sha256 = "1p3ch1ab06v038h130fsxpbq45d1yadl67i2ih4l4fh3xah5997m";
           name = "sentence-navigation";
         };
@@ -53409,7 +53682,7 @@
           sha256 = "15vmd1qmj8a6a5mmvdcnbav6mi5rhrp39m85idzv02zm0x9x6lyc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/seoul256-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/seoul256-theme";
           sha256 = "0mgyq725x5hmhs3h8v5macv8bfkginjghhwr9kli60vdb4skgjvp";
           name = "seoul256-theme";
         };
@@ -53430,7 +53703,7 @@
           sha256 = "1np6ip28ksms6fig67scwvwj43zgblny50ccvz8aclbl0z8nxswl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sequences";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sequences";
           sha256 = "12wnkywkmxfk2sx40h90k53d5qmc8hiky5vhlyf0ws3n39zvhplh";
           name = "sequences";
         };
@@ -53449,7 +53722,7 @@
           sha256 = "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sequential-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sequential-command";
           sha256 = "03qybacgy5fs3lam73x0rds4f68s173mhbah6rr97272nikd50v1";
           name = "sequential-command";
         };
@@ -53470,7 +53743,7 @@
           sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/servant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/servant";
           sha256 = "0h8xsg37cvc5r8vkclf7d3gbf6gh4k5pmbiyhwpkbrxwjyl1sl21";
           name = "servant";
         };
@@ -53491,7 +53764,7 @@
           sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/serverspec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/serverspec";
           sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
           name = "serverspec";
         };
@@ -53512,7 +53785,7 @@
           sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/session";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/session";
           sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
           name = "session";
         };
@@ -53533,7 +53806,7 @@
           sha256 = "18igxblmrbxwhd2d68cz1bpj4524djh2dw2rwhxlij76f9v805wn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/seti-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/seti-theme";
           sha256 = "1mwkx3hynabwr0a2rm1bh91h7xf38a11h1fb6ys8s3mnr68csd9z";
           name = "seti-theme";
         };
@@ -53554,7 +53827,7 @@
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sexp-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sexp-move";
           sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
           name = "sexp-move";
         };
@@ -53575,7 +53848,7 @@
           sha256 = "1xmxms9rhys2k7cl5v0zhqm23my5jv5f0s3541j044hn55rcpig5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shackle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shackle";
           sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
           name = "shackle";
         };
@@ -53596,7 +53869,7 @@
           sha256 = "0phivbhjdw76gzrx35rp0zybqfb0fdy2hjllf72qf1r0r5gxahl8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shadchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shadchen";
           sha256 = "1r1mfmv4cdlc8kzjiqz81kpqdrwbnyciwdgg6n5x0yi4apwpvnl4";
           name = "shadchen";
         };
@@ -53617,7 +53890,7 @@
           sha256 = "0l094nrrvan8v6j1xdgb51cbjvwicvxih29b7iyga13adb9dy9j4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shader-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shader-mode";
           sha256 = "12y84fa1wc82js53rpadaysmbshhqf6wb97889qkksx19n3xmb9g";
           name = "shader-mode";
         };
@@ -53630,15 +53903,15 @@
     shakespeare-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shakespeare-mode";
-        version = "20150708.1612";
+        version = "20160609.1928";
         src = fetchFromGitHub {
           owner = "CodyReichert";
           repo = "shakespeare-mode";
-          rev = "d8c80a8bc91c970563852b723413143844b0881b";
-          sha256 = "1y9bgpz96zgjw5fvq2ma7q6392i9j1rrj5axp085ccgn7w24mii7";
+          rev = "ad5f4de2e0b51723deea2c68a2b5aa862bf38022";
+          sha256 = "1daqh496m72l71x24czvzwf92rk310lzxp16l50qxlxif7rgpr78";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shakespeare-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shakespeare-mode";
           sha256 = "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd";
           name = "shakespeare-mode";
         };
@@ -53659,7 +53932,7 @@
           sha256 = "15a8gs4lrqxn0jyfw16rc6vm7z1i10pzzlnp30x6nly9a7xra47x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shampoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shampoo";
           sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
           name = "shampoo";
         };
@@ -53677,7 +53950,7 @@
           sha256 = "0jr5sbmg4zrx2dfdrajh2didm6dxx9ri5ib9qnwhc1jlppinyi7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shell-command";
           sha256 = "1jxn721i4s1k5x1qldiynnl5khsl22x9k3whm698nzv8m786spxl";
           name = "shell-command";
         };
@@ -53698,7 +53971,7 @@
           sha256 = "1w42j5cdddr0riz1xjq3wiz5i9f71i9jdzd1l92ir0mlj05wjyic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shell-current-directory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shell-current-directory";
           sha256 = "0bj2gs96ivm5x8l7gwvfckyalr1amh4cb1v2dbl323zmrqddhgkd";
           name = "shell-current-directory";
         };
@@ -53719,7 +53992,7 @@
           sha256 = "0z04z07r7p5p05zhaka37s48y82hg2dbk0ynap4inph3frn4yyfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shell-here";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shell-here";
           sha256 = "0csi70v89bqdpbsizji6c5z0jmkx4x4vk1zfclkpap4dalmxxcsh";
           name = "shell-here";
         };
@@ -53737,7 +54010,7 @@
           sha256 = "0biqjm0fpd7c7jilgkcwp6c32car05r5akimbcdii3clllavma7r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shell-history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shell-history";
           sha256 = "1blad7ggv27qzpai2ib1pmr23ljj8asq880g3d7w8fhqv0p1pjs7";
           name = "shell-history";
         };
@@ -53750,15 +54023,15 @@
     shell-pop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shell-pop";
-        version = "20160425.1654";
+        version = "20160611.1440";
         src = fetchFromGitHub {
           owner = "kyagi";
           repo = "shell-pop-el";
-          rev = "8041cc758f02b17ba96bda0a47903540fb78d9d0";
-          sha256 = "1ddd32f3k1mqk4h88kn0m9c3xd9y6yszkzm4s23fd6d96daw4smc";
+          rev = "38e702f6980f4ac9d8a836cb8b7fe3b406aa52bd";
+          sha256 = "02ga9h8s5lh1z6nqgi4d6icsdc1z46hk713vzfr3q1sdir1nbf58";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shell-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
           name = "shell-pop";
         };
@@ -53779,7 +54052,7 @@
           sha256 = "16srngml5xmpaxb0wzhx91jil0r0dmn673bwai3lzxrkmjnl748l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shell-split-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shell-split-string";
           sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
           name = "shell-split-string";
         };
@@ -53800,7 +54073,7 @@
           sha256 = "1bcrxq43a45alv6x0wms4d4nykiqz2mzk04kwk5lmf5pw3dqm900";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shell-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shell-switcher";
           sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
           name = "shell-switcher";
         };
@@ -53821,7 +54094,7 @@
           sha256 = "0ssaccdacabpja9nqzhr8x8ggfwmlian7y4p0fa6gvr7qsvjpgr9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shell-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shell-toggle";
           sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
           name = "shell-toggle";
         };
@@ -53842,7 +54115,7 @@
           sha256 = "1mc7y79h5p9cxqwsl40b1j5la5bm8b70n6fn4rx9wr4bi7rwph5i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shelldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shelldoc";
           sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
           name = "shelldoc";
         };
@@ -53863,7 +54136,7 @@
           sha256 = "0f45q8j9m0ic3l69i7qjhf0l19cprn56fxw61al4xd3wxv4pr9gy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shelltest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shelltest-mode";
           sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
           name = "shelltest-mode";
         };
@@ -53876,15 +54149,15 @@
     shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shen-elisp";
-        version = "20160602.1412";
+        version = "20160611.1418";
         src = fetchFromGitHub {
           owner = "deech";
           repo = "shen-elisp";
-          rev = "c92b998aa512660c3ff8320eb38daec265e354c1";
-          sha256 = "1rimrvl2887nwwkrvk1yw65f8cdmyykw19aqdswxv4cvww7rdbim";
+          rev = "a2b1d4616d1fb1adbac77fb87e13ae56ee9a74db";
+          sha256 = "1b4xxnxddkhhi1lb8dbx70rw6djcwhfqbwbb1qdck42916zwi3dk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shen-elisp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shen-elisp";
           sha256 = "0i6z2icpndv5g5ydmwqskl7vrmdz9qp30l5bw1l7gqr3dippjiyz";
           name = "shen-elisp";
         };
@@ -53905,7 +54178,7 @@
           sha256 = "0dlwcifw5mlski0mbvqqgmpb0jgf5i67x04s8yab1sq9rr07is57";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shift-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shift-number";
           sha256 = "1sbzkmd336d0dcdpk29pzk2b5bhlahrn083x62l6m150n2xzxn4p";
           name = "shift-number";
         };
@@ -53926,7 +54199,7 @@
           sha256 = "13zsws8gq9a8nfk4yzlvfsvqjh9zbnanmw68rcna93yc5nc634nr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shift-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shift-text";
           sha256 = "1v9zk7ycc8k1qk1cfs2y1knygl686msmlilqy5a7mh0w0z9f3a2i";
           name = "shift-text";
         };
@@ -53968,7 +54241,7 @@
           sha256 = "1l6v0zfccms341whl211dh7z6k970simnzfz1909pszrabafmy7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shm";
           sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
           name = "shm";
         };
@@ -53989,7 +54262,7 @@
           sha256 = "19p47a4hwl6h2w5ay09hjhl4kf7cydwqp8s2iyrx2i0k58az8i8i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shoulda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shoulda";
           sha256 = "0lmlhx34nwvn636y2wvw3sprhhh6q3mdg7dzgpjj7ybibvhp1lzk";
           name = "shoulda";
         };
@@ -54010,7 +54283,7 @@
           sha256 = "11kzjm12hbcdzrshq20r20l29k3555np1sva7afqrhgvd239fdq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/show-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/show-css";
           sha256 = "0sq15l58macy2affdgbimnchn491fnrqr3bbgn30k3l3xkvkmc7k";
           name = "show-css";
         };
@@ -54031,7 +54304,7 @@
           sha256 = "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/show-marks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/show-marks";
           sha256 = "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb";
           name = "show-marks";
         };
@@ -54049,7 +54322,7 @@
           sha256 = "0pq88kz5h0hzgfk8fyf3lppxalmadg5czbik824bpykp9l9gnf1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/showkey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/showkey";
           sha256 = "1m280ll07i5c6s4w0s227jygdlpvd87dq45039v0sljyxm4bfrsv";
           name = "showkey";
         };
@@ -54067,7 +54340,7 @@
           sha256 = "01ibg36lvmdk7ac1k0f0r6wyds4rq0wb7gzw26nkiwykn14gxaql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/showtip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/showtip";
           sha256 = "1fdhdmkvyz1dcy3x0im1iab6yhhh8gqvxmm6ccwr6rl1r1m5zwc8";
           name = "showtip";
         };
@@ -54088,7 +54361,7 @@
           sha256 = "1mizhbwvnsxxjz6m94qziibvhghhp8v8db3wxrq3z9gsaqqkcndn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shpec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shpec-mode";
           sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
           name = "shpec-mode";
         };
@@ -54109,7 +54382,7 @@
           sha256 = "07zzyfibs2c7w4gpvdh9003frznbg7zdnrx0nv8bvn0b68d3yz0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shrink-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shrink-whitespace";
           sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
           name = "shrink-whitespace";
         };
@@ -54130,7 +54403,7 @@
           sha256 = "00c11s664hwj1l1hw7qshygy3wb6wbd0hn6qqnyq1xr0r87nnhjs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shut-up";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shut-up";
           sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
           name = "shut-up";
         };
@@ -54151,7 +54424,7 @@
           sha256 = "0cjqh6qbbmgxd6zgqnikw6bh8wpjydydkkqs5wcmblpi5awqmnb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sibilant-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sibilant-mode";
           sha256 = "0jd6dsk93nvwi5yia3623hfc4v6zz4s2n8m1wx9bw8x6kv3h3qbq";
           name = "sibilant-mode";
         };
@@ -54172,7 +54445,7 @@
           sha256 = "102ssiz4sp7y816s1iy8i98c314jbn3sy0v87b0qgpgjiq913ffq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sicp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sicp";
           sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz";
           name = "sicp";
         };
@@ -54193,7 +54466,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sift";
           sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
           name = "sift";
         };
@@ -54214,7 +54487,7 @@
           sha256 = "1n6mjfw655a5q0ifq52yf6nyc0zxcahr47dvxg0p8x8v3f4jskvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/signal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/signal";
           sha256 = "0pvl5qxi0rjbxkpa8kk1q9vz11i9yjmph42si3n7gmm9kc28pk61";
           name = "signal";
         };
@@ -54235,7 +54508,7 @@
           sha256 = "1g4rr7hpy9r3y4vdpv48xpmy8kqvs4j64kvnhnj2rw2wv1grw78j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/signature";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/signature";
           sha256 = "11n3id1iiip99lj8c0iffbrf59s2yvmwlhqbf8xzxkhws7vwdl5q";
           name = "signature";
         };
@@ -54256,7 +54529,7 @@
           sha256 = "0vzkgrc54j4a3g90jxc7vxkqwqi3047gnn7gng65pfar0i76lzlb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/silkworm-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/silkworm-theme";
           sha256 = "1zbrjqmhf80qs3i910sixirrv42rxkqdrg2z03gnz1g885gpcn13";
           name = "silkworm-theme";
         };
@@ -54277,7 +54550,7 @@
           sha256 = "177bhvynqsdfwwqhhlh1v0pqvscy3xv6hhxi7fb42l5dmsw5b97z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simp";
           sha256 = "0x4lssjkj3fk9fw603f0sggvcj25iw0zbzsm5c949lhl4a3wvc9c";
           name = "simp";
         };
@@ -54290,15 +54563,15 @@
     simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simple-call-tree";
-        version = "20160319.1816";
+        version = "20160609.2008";
         src = fetchFromGitHub {
           owner = "vapniks";
           repo = "simple-call-tree";
-          rev = "02082ae57c492a8dfb98cb5b73f265d7c2132775";
-          sha256 = "0cj4w62b6glz7sfqj08sdlyfnnhy7z1v1gmjkvy1j0fv9i2n2z48";
+          rev = "3f6c2f8052d0c1609ee2452587dce3f0777df96e";
+          sha256 = "1d29c2wrm0mmx2airr18b330h2c66rfk6a3ydx3z2xzcw2k888pb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simple-call-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simple-call-tree";
           sha256 = "1cbv4frsrwd8d3rg8r4sylwnc1hl3hgh595qwbpx0zd3dp5na2yl";
           name = "simple-call-tree";
         };
@@ -54319,7 +54592,7 @@
           sha256 = "0jn46fk0ljqs40kz6ngp0sk6hg1334835r2rmagx4qm0mdaqy7p8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simple-httpd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simple-httpd";
           sha256 = "1g9m8dx62pql6dqz490pifcli96i5pv6sar18w4lwrfgpfisfz8c";
           name = "simple-httpd";
         };
@@ -54332,15 +54605,15 @@
     simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simple-mpc";
-        version = "20160524.2051";
+        version = "20160605.1908";
         src = fetchFromGitHub {
           owner = "jorenvo";
           repo = "simple-mpc";
-          rev = "8669258ecb153ea00853b9c4b975ee85d755ded7";
-          sha256 = "0545nnn7mni7755mxkdianmcd4rv9djfmhsdasc1ym7s619zr20i";
+          rev = "e5af3cf2035edfc56b423cd573e4254f388be753";
+          sha256 = "0vdns2flm13rlqgij4mlvd3zagv9j4jv43x5d2f09ka7cdd27a9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simple-mpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simple-mpc";
           sha256 = "05x2xyys5mf6k7ndh0l6ykyiygaznb4f8bx3npbhvihrsz9ilf8r";
           name = "simple-mpc";
         };
@@ -54359,7 +54632,7 @@
           sha256 = "01fdk790jlpxy95y67yv6944ws4zjh7gs6ymnj1yflf19ccsdsnn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simple+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simple+";
           sha256 = "12fsgjk53fq2316j8nm6wvdckpyg9hq3v65j5c52i0g0cwmx62ra";
           name = "simple-plus";
         };
@@ -54380,7 +54653,7 @@
           sha256 = "1kkhnsxr8zrb21k4ckyg69nsndwy4zdkvfw2drk4v1vnbgx8144f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simple-rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simple-rtm";
           sha256 = "1aadzaf73clhyny2qiryg6z84k34yx3ghy6pyl0px9qhqc1ak271";
           name = "simple-rtm";
         };
@@ -54401,7 +54674,7 @@
           sha256 = "0zf9wgyp0n00i00zl1lxr0d60569zgcjdnmdvgpcibvny5s1fp2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simple-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simple-screen";
           sha256 = "16zvsmqn882w320h26hjjz5lcyl9y0x4amkf2zfps77xxmkmi5n0";
           name = "simple-screen";
         };
@@ -54422,7 +54695,7 @@
           sha256 = "09286h2q9dqghgfj9a4cniz6djw7867vcy3ixs7cn4wghvhyxm8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simpleclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simpleclip";
           sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
           name = "simpleclip";
         };
@@ -54443,7 +54716,7 @@
           sha256 = "0xq4vy3ggdjiycd3aa62k94kd43zcpm8bfdgi8grwkb1lpvwq9i9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simplenote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simplenote";
           sha256 = "0rnvm3q2spfj15kx2c8ic1p8hxg7rwiqgf3x2zg34j1xxayn3h2j";
           name = "simplenote";
         };
@@ -54464,7 +54737,7 @@
           sha256 = "0k16sjbrhxbv3fj5rzjzvs03230nwlzmvw18dhdhzzblk08f28dp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simplenote2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simplenote2";
           sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
           name = "simplenote2";
         };
@@ -54485,7 +54758,7 @@
           sha256 = "0108q2b5h73rjxg9k2kmc8z6la9kgqdnz9z1x7rn61v3vbxlzqvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simplezen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simplezen";
           sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
           name = "simplezen";
         };
@@ -54506,7 +54779,7 @@
           sha256 = "0kbgxjfdf88h7hfds1kbdxx84wvkvy773r98ym1fzfm54m2kddvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/skeletor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/skeletor";
           sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
           name = "skeletor";
         };
@@ -54527,7 +54800,7 @@
           sha256 = "16757xz5ank3jsh8xglyly7pwdn5xm0yngampy1n1vgcwsp5080a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/skewer-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/skewer-less";
           sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
           name = "skewer-less";
         };
@@ -54548,7 +54821,7 @@
           sha256 = "0dwc3qaqnzjsccvr3gapip4yr17fzgv4w33ydq8hjqn8rs9rqq6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/skewer-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/skewer-mode";
           sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
           name = "skewer-mode";
         };
@@ -54569,7 +54842,7 @@
           sha256 = "1p5h1yn0rvfivq68lv92vfxb03vr81qhgzi6ppxaxmmxy83r26v0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/skewer-reload-stylesheets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/skewer-reload-stylesheets";
           sha256 = "1rxn0ha2yhvyc195alg31nk1sjghnbha33xrqwc9z3j71w211frm";
           name = "skewer-reload-stylesheets";
         };
@@ -54590,7 +54863,7 @@
           sha256 = "0gzj7cf42nhp3ac1a2gxcfbmn80z1z46zxsfr2f5xil2gjag39fx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/skype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/skype";
           sha256 = "06p5s5agajbm9vg9xxpzv817xmjw2kmcahiw4iypn5yzwhv1aykl";
           name = "skype";
         };
@@ -54611,7 +54884,7 @@
           sha256 = "00cla208vr3rm9v32hpjylrdl2gnkpbh05z8v3nzpvj5l6mrpbcv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slack";
           sha256 = "0mybjx08yskk9vi06ayiknl5ddyd8h0mnr8c0a3zr61p1x4s6anp";
           name = "slack";
         };
@@ -54632,7 +54905,7 @@
           sha256 = "108zcb7hdaaq3sxjfr9nrwzqxx71q6aygzik7l3ab854xknkjfad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slamhound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slamhound";
           sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
           name = "slamhound";
         };
@@ -54653,7 +54926,7 @@
           sha256 = "11p1pghx55a4gcn45cadw7c594134b21cdim723k2h99z14f89az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slideview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slideview";
           sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
           name = "slideview";
         };
@@ -54674,7 +54947,7 @@
           sha256 = "0vgyc2ny9qmn8f5r149y4g398mh4gnwsp4yim85z4vmdikqg8vi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slim-mode";
           sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
           name = "slim-mode";
         };
@@ -54695,7 +54968,7 @@
           sha256 = "1n0m8pvkb2i0alh8mljyd6jj54v185qpqbm3281xnc5y08zjw7v8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slime";
           sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
           name = "slime";
         };
@@ -54716,7 +54989,7 @@
           sha256 = "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slime-annot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slime-annot";
           sha256 = "14x9lzpkgkc96jsbfpahl027qh6y5azwdk0cmk9pbd1xm95kxj6n";
           name = "slime-annot";
         };
@@ -54737,7 +55010,7 @@
           sha256 = "0cc8xb2p1j2vs00h4sq6x0mwwrxkidqj4l7kg3n3150bj37v55rs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slime-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slime-company";
           sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
           name = "slime-company";
         };
@@ -54758,7 +55031,7 @@
           sha256 = "0swd9rbsag8k18njp741ljg6lmlz949i4bbz5w7bl0spcpc26fs9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slime-docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slime-docker";
           sha256 = "13zkkrpww51ndsblpyz2msiwrjnaz6yrk61jbzrwp0r7a2v0djsa";
           name = "slime-docker";
         };
@@ -54779,7 +55052,7 @@
           sha256 = "0rsh0bbhyx74yz1gjfqyi0bkqq5n3scpyh5mmc3d6dkpv8wa7bwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slime-ritz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slime-ritz";
           sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
           name = "slime-ritz";
         };
@@ -54800,7 +55073,7 @@
           sha256 = "13rm9pmshgssmydhpirri38s38z3kvkhqama40qdzqq96dsxlnjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slime-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slime-theme";
           sha256 = "1b709cplxip48a6qjdnzcn5qcgsy0jq1m05d7vc8p5ywgr1f9a00";
           name = "slime-theme";
         };
@@ -54821,7 +55094,7 @@
           sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slime-volleyball";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slime-volleyball";
           sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
           name = "slime-volleyball";
         };
@@ -54842,7 +55115,7 @@
           sha256 = "0srj0zcvzr0sjcs37zz11xz8w0yv94m69av9ny7mx8ssf4qp0pxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slirm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slirm";
           sha256 = "061xjj3vjdkkvd979fhp7bc12g5zkxqxywvcz3z9dlkgdks41ld7";
           name = "slirm";
         };
@@ -54863,7 +55136,7 @@
           sha256 = "1y1gay1h91c0690gly4qibx1my0l1zpb6s3x58lks8m21jdwfw28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slovak-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slovak-holidays";
           sha256 = "1dcw8pa3r9b7n7dc8fgzijz7ywwxb3nlfg7n0by8dnvpjq2c30bg";
           name = "slovak-holidays";
         };
@@ -54876,15 +55149,15 @@
     sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sly";
-        version = "20160522.1827";
+        version = "20160611.59";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "2dcaeed7b262f1b0f456807f03e9530915179e42";
-          sha256 = "11lc5xg8n2kw5ajsgazw3riq113azmyclm83i2lj0sqm9wyj4rhj";
+          rev = "37c16d5650ad3e3ff02a9801f16e4f9a48a1d5ef";
+          sha256 = "00v32ybg3vv2ib49dyg878ybpfbaxp2v5pmf9r71pmwrlrh8xyfh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sly";
           sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
           name = "sly";
         };
@@ -54905,7 +55178,7 @@
           sha256 = "128gb6hsb7zig4czwgwjcm58lgqk6rmj7qi17a9cz5gsnggjcwii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sly-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sly-company";
           sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
           name = "sly-company";
         };
@@ -54926,7 +55199,7 @@
           sha256 = "1fxsv83fcv5l7cndsysd8salvfwsabvd84sm7zli2ksf678774gp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sly-hello-world";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sly-hello-world";
           sha256 = "03ybjgczp6ssk4hmwd486vshlk7ql27k1lyhmvk26gmrf554z90n";
           name = "sly-hello-world";
         };
@@ -54947,7 +55220,7 @@
           sha256 = "00lw6hkxs71abjyi7nhzi8j6n55jyhzsp81ycn6f2liyp4rmqgi7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sly-macrostep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sly-macrostep";
           sha256 = "1i004mb0bg13j3zhdsjz1795dh0ry8winzvdghr1wardc9np60h7";
           name = "sly-macrostep";
         };
@@ -54968,7 +55241,7 @@
           sha256 = "1xi625pn3mg77mjvr94v6a5pjyvgjavpkdbbh1lqjx1halaa2qb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sly-named-readtables";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sly-named-readtables";
           sha256 = "11ymzbj1ji7avfjqafj9p5zx0m4y1jfjcmyanpjq1frdcz639ir9";
           name = "sly-named-readtables";
         };
@@ -54989,7 +55262,7 @@
           sha256 = "1mb78cdkmik9rwccvzl8slv4dfy8sdq69dkys7q11jyn8lfm476y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sly-quicklisp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sly-quicklisp";
           sha256 = "1hpcz84g9c6g0x8qal02xgjj02gxqz3bysyz0l59jxiga0m634v8";
           name = "sly-quicklisp";
         };
@@ -55010,7 +55283,7 @@
           sha256 = "194bdibpxpqsag86h583b62ybmfqmq4442a0czbijqwngbgjpj3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sly-repl-ansi-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sly-repl-ansi-color";
           sha256 = "0wz24kfjl6rp4qss0iq2ilav0mkg2spy2ziikypy7v0iqbssmssi";
           name = "sly-repl-ansi-color";
         };
@@ -55031,7 +55304,7 @@
           sha256 = "0r181rdnymr96kj74c73212n6157cfiq1d6hk2lfc54yl6h76zf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-comment";
           sha256 = "0lbrasdrkyj7zybz0f3xick8p0bvci5bhb2kg6pqzz9pw2iaxw12";
           name = "smart-comment";
         };
@@ -55049,7 +55322,7 @@
           sha256 = "0sm4nxynwhwypzw008fz56axai9lrphjczwzfdy7da3akan18rbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-compile";
           sha256 = "0vgxqyzl7jw2j96rmjw75b5lmjwrvzajrdvfyabss4xmv96dy2r3";
           name = "smart-compile";
         };
@@ -55070,7 +55343,7 @@
           sha256 = "1xbd42q60pmg0hw4bn2fndjwgrfgj6ggm757fyp8m08jqh0zkarn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-cursor-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-cursor-color";
           sha256 = "11875pwlx2rm8d86541na9g3yiq0j472vg63mryqv6pzq3n8q6jx";
           name = "smart-cursor-color";
         };
@@ -55091,7 +55364,7 @@
           sha256 = "19l47xqzjhhm9j3izik0imssip5ygg3lnflb9ixsz1js571aaxha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-forward";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-forward";
           sha256 = "032yc45c19fl886jmi5q04r6q47xz5rphb040wjvpd4fnb06hr8c";
           name = "smart-forward";
         };
@@ -55112,7 +55385,7 @@
           sha256 = "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-indent-rigidly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-indent-rigidly";
           sha256 = "12qggg1m28mlvkdn52dig8bwv58pvipkvn1mlc4r7w569arar44x";
           name = "smart-indent-rigidly";
         };
@@ -55133,7 +55406,7 @@
           sha256 = "0sqvm7iwdjk057fwid4kz6wj71igiqhdarj59s17pzy6xz34afhg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-mark";
           sha256 = "1vv65sa0pwl407mbxcp653kycgx8jz87n6wshias1dp9lv21pj6v";
           name = "smart-mark";
         };
@@ -55154,7 +55427,7 @@
           sha256 = "0cp04lxxg7q5c6w0knznz4pjb5h1k0h3zxhlsf6snpi7j2ay4560";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-mode-line";
           sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
           name = "smart-mode-line";
         };
@@ -55175,7 +55448,7 @@
           sha256 = "0cp04lxxg7q5c6w0knznz4pjb5h1k0h3zxhlsf6snpi7j2ay4560";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-mode-line-powerline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-mode-line-powerline-theme";
           sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
           name = "smart-mode-line-powerline-theme";
         };
@@ -55196,7 +55469,7 @@
           sha256 = "1q74b0mbhly84g252a0arbyxc720rgs9a3yqf8b8s2fpfkzb95sg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-newline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-newline";
           sha256 = "1kyk865vkgh05vzlggs3ii81v86fcbcxybfkv5rkyl3fyqpkza1w";
           name = "smart-newline";
         };
@@ -55217,7 +55490,7 @@
           sha256 = "0h559cdyln5f4ignx1r86ryi7wizys0gj03dj7lfzaxr7wkd0jaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-region";
           sha256 = "1bcvxf62bfi5lmhprma9rh670kka9p9ygbkgmv6dg6ajjfsplgwc";
           name = "smart-region";
         };
@@ -55238,7 +55511,7 @@
           sha256 = "0azhfffm1bkgjx4i3p9f6x2gmw8kc3fafzqj4vxxdibhn0nizqk8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-shift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-shift";
           sha256 = "0azahlflnh6sk081k5dcqal6nmwkjnj4dq8pv8ckwf8684zp23d3";
           name = "smart-shift";
         };
@@ -55259,7 +55532,7 @@
           sha256 = "0aighpby8khrljb67m533bwkzlsckyvv7d09cnzr1rfwxiil0ml4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-tab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-tab";
           sha256 = "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5";
           name = "smart-tab";
         };
@@ -55280,7 +55553,7 @@
           sha256 = "1s65hr7b8aggvdd1i6gkkpz6j1kqilggfnf46xvjnvdw9awmwk6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-tabs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-tabs-mode";
           sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
           name = "smart-tabs-mode";
         };
@@ -55301,7 +55574,7 @@
           sha256 = "15834lnh7dq9kz31k06ifpnc0vz86rycz0ryildi5qd2nb7s3lw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-window";
           sha256 = "1x1ncldl9njil9hhvzj5ac1l5aiyfm0f7j0d7lw8ady7xx2cy26m";
           name = "smart-window";
         };
@@ -55322,7 +55595,7 @@
           sha256 = "1bznffl17x2n0k8k6jadnqnjk4r90y50wrvqyygyc3ib414k933x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smartparens";
           sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
           name = "smartparens";
         };
@@ -55343,7 +55616,7 @@
           sha256 = "1sjwqi8w83qxihqmcm7z0vwmrz1az0y266qgj2nwfv39bri6y4i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smartrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smartrep";
           sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
           name = "smartrep";
         };
@@ -55364,7 +55637,7 @@
           sha256 = "193cxfnh263yw628ipf9gssvyq3j7mffrdmnjhvzzcsnhd1k145p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smartscan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smartscan";
           sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
           name = "smartscan";
         };
@@ -55385,7 +55658,7 @@
           sha256 = "1jcaspqrm23viigk0701711bmaqsyc5fbpkszf7bg7nvhkl4pfqy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smartwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smartwin";
           sha256 = "0rg92j0aa8qxhr91hjj2f4w8vj5w9b4d2nmkggng44nxk8zafdif";
           name = "smartwin";
         };
@@ -55406,7 +55679,7 @@
           sha256 = "1vl3nx0y2skb8sibqxvmc3wrmmd6z88hknbry348d0ik3cbr0ijx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smarty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smarty-mode";
           sha256 = "06cyr2330asy2dlx81g3h9gq0yhd4pbnmzfvmla7amh4pfnjg14v";
           name = "smarty-mode";
         };
@@ -55416,6 +55689,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    smbc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smbc";
+        version = "20160611.114";
+        src = fetchFromGitHub {
+          owner = "sakshamsharma";
+          repo = "emacs-smbc";
+          rev = "ea6963c9dcc30c7f72f248c1712111adf94c6a09";
+          sha256 = "1m6zi1wcpzjdppy5xl2qislkdv6wahxbcpybsrww4ql69y5ya6hb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smbc";
+          sha256 = "0aviqa8mk8dxxnddfskq9jgz3knqhf0frj7gq7nk6ckxkrxrgqn4";
+          name = "smbc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/smbc";
+          license = lib.licenses.free;
+        };
+      }) {};
     smblog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smblog";
@@ -55427,7 +55721,7 @@
           sha256 = "1ca8i45dj41vif2hm87ircwm9alxdm98irfi586ybrc72s24036r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smblog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smblog";
           sha256 = "1byalkpc1bcb6p4j4g1cwc4q2i7irxjcphb0hqh1b2k1zixrw5rr";
           name = "smblog";
         };
@@ -55448,7 +55742,7 @@
           sha256 = "1smv91ggvaw37597ilvhra8cnj4p71n6v5pfazii8k85kvs6x460";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smeargle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
           name = "smeargle";
         };
@@ -55469,7 +55763,7 @@
           sha256 = "0xrbkpc3w7yadpjih169cpp75gilsnx4y9akgci5vfcggv4ffm26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smex";
           sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
           name = "smex";
         };
@@ -55489,7 +55783,7 @@
           sha256 = "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sml-modeline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sml-modeline";
           sha256 = "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd";
           name = "sml-modeline";
         };
@@ -55510,7 +55804,7 @@
           sha256 = "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smooth-scroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smooth-scroll";
           sha256 = "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf";
           name = "smooth-scroll";
         };
@@ -55523,15 +55817,15 @@
     smooth-scrolling = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smooth-scrolling";
-        version = "20160526.1132";
+        version = "20160612.1041";
         src = fetchFromGitHub {
           owner = "aspiers";
           repo = "smooth-scrolling";
-          rev = "b53137fb0f6fa43e71844fb327c720acdecf5fac";
-          sha256 = "01rgv2qivi06bb56jy6l80923syrrjnn9d1z4wrz9rvyamq1g2j7";
+          rev = "dcaaabf834d20e990af0cf471e04d0948cf1ff58";
+          sha256 = "0lcp437135hxpw84vj096i3vw83ckfppdviyyf468mm02ajb4068";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smooth-scrolling";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smooth-scrolling";
           sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
           name = "smooth-scrolling";
         };
@@ -55552,7 +55846,7 @@
           sha256 = "1a097f1x9l0m4dizvnb742svlqsm6hlif73rk7qjar081sk1gjxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smotitah";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smotitah";
           sha256 = "1m5qjl3r96riljp48il8k4rb6rwys1xf1pl93d4qjhprwvz57mv2";
           name = "smotitah";
         };
@@ -55573,7 +55867,7 @@
           sha256 = "0zknryfpg4791l7d7xv9hn2fx00rmbqw3737lfm75484hr10lymz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smtpmail-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smtpmail-multi";
           sha256 = "0nc3k8ly4nx7fm3b2apga3p4svz5c9sldnlk86pz2lzra5h3b4ss";
           name = "smtpmail-multi";
         };
@@ -55594,7 +55888,7 @@
           sha256 = "1z2sdnf11wh5hz1rkrbg7fs4ha3zrbj9qnvfzq9005y89d7cs95x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smyx-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smyx-theme";
           sha256 = "1r85yxr864df5akqknl3hsrmzikr4085bqr6ijrbdj27nz00vl61";
           name = "smyx-theme";
         };
@@ -55615,7 +55909,7 @@
           sha256 = "12s3ykb2flnbl6kvjn0yy11y0g5nq2k5arpgf7pqwj4wgx0fl8nb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/snakemake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/snakemake-mode";
           sha256 = "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4";
           name = "snakemake-mode";
         };
@@ -55636,7 +55930,7 @@
           sha256 = "0m5j1v9br7vp9m2km8xccy5vv8gis0mcgwjxfc6qhnv7kbx0sx2k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/snapshot-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/snapshot-timemachine";
           sha256 = "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p";
           name = "snapshot-timemachine";
         };
@@ -55657,7 +55951,7 @@
           sha256 = "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/snippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/snippet";
           sha256 = "1lgpw69k5a82y70j7nximdj0bl5nzr4jhjr5fkx1cvz8hhvgdz6j";
           name = "snippet";
         };
@@ -55678,7 +55972,7 @@
           sha256 = "07056pnjgsgw06c67776qp7jci96iqbzlprbavzz2l1j8ywz8cwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/soft-charcoal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/soft-charcoal-theme";
           sha256 = "0i29ais1m2h9v4ghcg41zfbnaj8klgm4509nkyfkxm7wqnjd166a";
           name = "soft-charcoal-theme";
         };
@@ -55699,7 +55993,7 @@
           sha256 = "06q82v1hndvznsqg0r6jrxvgxhycg9m65kay4db4yy0gmc66v2xf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/soft-morning-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/soft-morning-theme";
           sha256 = "0lzg478ax6idzh6m5sf2ds4gbv096y0c0gn15dai19f58bs63xzr";
           name = "soft-morning-theme";
         };
@@ -55720,7 +56014,7 @@
           sha256 = "030mf8b0sf9mmzwhg85zh0ccvcg768kckwvbm0yzg7vmq1x46hjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/soft-stone-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/soft-stone-theme";
           sha256 = "05jjw9z6hqln9yj8ya2xrmjnylp7psfdj9206n30m3lwnlwx399v";
           name = "soft-stone-theme";
         };
@@ -55741,7 +56035,7 @@
           sha256 = "0xrrx1lr9gc33skcgdi5hjkdgqrhlas3p22zzkrbkmiajsgmyxdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/solarized-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/solarized-theme";
           sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
           name = "solarized-theme";
         };
@@ -55762,7 +56056,7 @@
           sha256 = "1mlhidfnvs2sph6qavzqz5qng78q2v4n5qc021958s29kx35i603";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/solidity-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/solidity-mode";
           sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx";
           name = "solidity-mode";
         };
@@ -55783,7 +56077,7 @@
           sha256 = "1ga35d3rhdf6ffd36q58ay6380gjvkmaiid4vscga3v7ca0dkhl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sonic-pi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sonic-pi";
           sha256 = "07qxm1rkw2cbxf4g2vqk3s7xnqldqkdm2zw1qh2kqjscg5gwpkqp";
           name = "sonic-pi";
         };
@@ -55804,7 +56098,7 @@
           sha256 = "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/soothe-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/soothe-theme";
           sha256 = "000hikpsmqpbb6v13az2dv319d0f7jjpkkpgi4vzv59z6cdlrlp3";
           name = "soothe-theme";
         };
@@ -55825,7 +56119,7 @@
           sha256 = "086a66jlnkiv044i4japs4czw8gfs8p0n80p42ck83zm2jnznc49";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sos";
           sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
           name = "sos";
         };
@@ -55846,7 +56140,7 @@
           sha256 = "13yn2yadkpmykaly3l3xsq1bhm4sxyk8k1px555y11qi0mfdcjhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sotclojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sotclojure";
           sha256 = "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090";
           name = "sotclojure";
         };
@@ -55867,7 +56161,7 @@
           sha256 = "01n943kycazsw9znk7cj17qjlar91i5r25p3cmxcxh75wnh4h1vj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sotlisp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sotlisp";
           sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
           name = "sotlisp";
         };
@@ -55888,7 +56182,7 @@
           sha256 = "1h6h65gwxb07pscyhhhdn11h3lx3jgyfw8v1kw5m2qfrv5kh6ylq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sound-wav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sound-wav";
           sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
           name = "sound-wav";
         };
@@ -55909,7 +56203,7 @@
           sha256 = "1m8wcm6y80gq5rrm4brd3f20kmk54s6ph26j4lz4cmilxk6gj56v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/soundcloud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/soundcloud";
           sha256 = "06cbr1h03k5ixam6lsr82lx3nh2kkp0416mlig0zfkd4b8a9mf8c";
           name = "soundcloud";
         };
@@ -55937,7 +56231,7 @@
           sha256 = "0w5ac515ymj43p5j19nhfqk0c3251c7x3i97r550g780niby1nc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/soundklaus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/soundklaus";
           sha256 = "0b63sbgwp99ff94dxrqqp2p99j268fjkkzx0g42g726hv80d4fxb";
           name = "soundklaus";
         };
@@ -55954,11 +56248,11 @@
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "fa537304a0a6f90944d797ce58bc067603b6f987";
+          rev = "0c3ccf910e108b4a69d10b56853959a6cc352018";
           sha256 = "0b0qs398kqy6jsq22hahmfrlb6v8v3bcdgi3z2kamczb0a5k0zhf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
           name = "sourcekit";
         };
@@ -55979,7 +56273,7 @@
           sha256 = "0jbny1vrv3qnam3f69yrwd6n5zngnqirc5fsa3py4bdqvlqsg2rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sourcemap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
           name = "sourcemap";
         };
@@ -56000,7 +56294,7 @@
           sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sourcetalk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sourcetalk";
           sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
           name = "sourcetalk";
         };
@@ -56021,7 +56315,7 @@
           sha256 = "1a8jp7m9zarvljg5d9c8ydir3qcmwx05c3frs696p9nwvapf6lsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/spacegray-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/spacegray-theme";
           sha256 = "0khiddpsywpv9qvynpfdmybd80lbrhm68j3py6ranxlv7p79j9dx";
           name = "spacegray-theme";
         };
@@ -56034,15 +56328,15 @@
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
-        version = "20160527.1418";
+        version = "20160610.1957";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "2d1a7bfb5bdaf24958f50b4bf93182847916af85";
-          sha256 = "1q8r95zfrh0vxna5ml2pq9b9f66clfqcl4d2qy2aizkvzyxg6skl";
+          rev = "254160f744deff2969aba2848370ed5853d41014";
+          sha256 = "1s00aixk6mpx63ibxnpmv5wxqx96fbbjzc612g0rcr7z29cv24gp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/spaceline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/spaceline";
           sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
           name = "spaceline";
         };
@@ -56063,7 +56357,7 @@
           sha256 = "1giyni1havfvh6d9gm3n0za2f4b5bg3k01pvxmnri6da12m41b9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/spacemacs-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/spacemacs-theme";
           sha256 = "0riiim6qb6x9g5hz0k3qgdymgikynlb9l07mrbfmybkv4919p992";
           name = "spacemacs-theme";
         };
@@ -56084,7 +56378,7 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/spaces";
           sha256 = "152x7fzjnjjdk9d9h0hbixdp3haqn5vdx3bq1nfqfrkvzychyr06";
           name = "spaces";
         };
@@ -56105,7 +56399,7 @@
           sha256 = "1ykqr86j17mi95s08d9fp02d7ych1331b04dcqxzxnmpkhwngyj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/spark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/spark";
           sha256 = "0dv7ixv9gw6xxhw5zm4gmv2ll4lja8hmn2pdizlqxaizpm245rkn";
           name = "spark";
         };
@@ -56126,7 +56420,7 @@
           sha256 = "1fqd3ycywxxmln2kzqwflc69xmqlvi9gwvmf7frn0rfv73w09cvp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sparkline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sparkline";
           sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
           name = "sparkline";
         };
@@ -56147,7 +56441,7 @@
           sha256 = "1bwa7vi97xlgwzyrc9cdz8i8rajlvkp4ajs8nklsqwrvzngly9lx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sparql-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
           name = "sparql-mode";
         };
@@ -56165,7 +56459,7 @@
           sha256 = "1i2z57aasljia6xd2xn1mryklc2gc9c2q1fad8wn7982sl277d10";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/speck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/speck";
           sha256 = "19h3syk4kjmcy7jy9nlsbq6gyxwl4xsi84dy66a3cpvmknm25kyg";
           name = "speck";
         };
@@ -56186,7 +56480,7 @@
           sha256 = "0v4v2nr680zgljr9k7rgf7mhy49bv5ixc8ksba3g1bbrz0qv5ny6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/speech-tagger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/speech-tagger";
           sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
           name = "speech-tagger";
         };
@@ -56203,10 +56497,10 @@
         src = fetchgit {
           url = "git://git.freebsoft.org/git/speechd-el";
           rev = "3d729817296b2ed8ad414a6aa044a8aa762259eb";
-          sha256 = "0cjw47ziv50b3i95i9y0r8rvgchawzkknv5sqr882aqqb8zgy6rc";
+          sha256 = "044fmr2053vkd8s7kzd2v9qlz6lr8k88kfnxpiwpcbn7pb198iir";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/speechd-el";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/speechd-el";
           sha256 = "07g6jwymmwkx26p3as3r370viz1cqq360cagw9ji6i0hvgrr66a0";
           name = "speechd-el";
         };
@@ -56227,7 +56521,7 @@
           sha256 = "102hjyr9ii2rmq8762irbwansbi023s7dg4a8n6lkadcvzfibmag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/speed-type";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/speed-type";
           sha256 = "14q423an7v5hhfx1x039fizxcn5hcscqf2jfn9rqifg4jpq8bq5g";
           name = "speed-type";
         };
@@ -56248,7 +56542,7 @@
           sha256 = "1wif9wf8hwxk0q09cdnrmyas7zjg8l5b8jd6sjxd40ypn6dmz2ch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sphinx-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sphinx-doc";
           sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
           name = "sphinx-doc";
         };
@@ -56261,15 +56555,15 @@
     sphinx-frontend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sphinx-frontend";
-        version = "20151122.1112";
+        version = "20160606.1720";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "sphinx-frontend";
-          rev = "a46e81ce65fd24c03acab9311b162cad21343744";
-          sha256 = "1mfp4777ppg7zg7zqj755zpfk9lmcq73hxv055ig66pz30m7x5rw";
+          rev = "e483773ac6b1366ca43128f727e2b3cc2269997f";
+          sha256 = "0k8dpqp6hzycbd504zkp7j5ar2zvf6lnn0p60i392g9pj573fnsh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sphinx-frontend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sphinx-frontend";
           sha256 = "0hdn6zjnhzyka0lzdxqfzbj3lrj767ij406zha9zw8ibbkk7cmag";
           name = "sphinx-frontend";
         };
@@ -56290,7 +56584,7 @@
           sha256 = "0ah19a68d6fda3g5zzvqz28cms0yiadykkx7p8hiid4s4mdl41hj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/spike-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/spike-theme";
           sha256 = "06pv0zzw0w12xlafyhakf09cl0hkyzis0g2bh2jn3pv4ac2kmwkp";
           name = "spike-theme";
         };
@@ -56311,7 +56605,7 @@
           sha256 = "1qdy9nc2h7mwxh7zg2p1x7yg96hxkwxqimjp6zb1119jx0s8grjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/splitjoin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/splitjoin";
           sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
           name = "splitjoin";
         };
@@ -56332,7 +56626,7 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/splitter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/splitter";
           sha256 = "02vdhvipzwnh6mlj25lirzxkc0shfzqfs1p4gn3smkxqx6g7mdb2";
           name = "splitter";
         };
@@ -56353,7 +56647,7 @@
           sha256 = "185zkdghi10yjmzxlfafjk9d9cq760432h2y5z373ksshxc3pdpa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/spotify";
           sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
           name = "spotify";
         };
@@ -56374,7 +56668,7 @@
           sha256 = "05knlca2dvpyqp9lw8dc47fl5kh2jb04q57cygkzfjjkzvywdwq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/spotlight";
           sha256 = "0mmr1spr21pi8sfy95dsgqcxn8qfsphdkfjm5w5q97lh7496z65p";
           name = "spotlight";
         };
@@ -56395,7 +56689,7 @@
           sha256 = "0anidv7w2vwsjv8rwkvhs3x51av3y8dp435456czy5yfq6i6vfbl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/spray";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/spray";
           sha256 = "11b3wn53309ws60w8sfpfxij7vnibj6kxxsx6w1agglqx9zqngz4";
           name = "spray";
         };
@@ -56416,7 +56710,7 @@
           sha256 = "0p13q8xax2h3m6rddvmh1p9biw3d1shvwwmqfhg0c93xajlwdfqi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/springboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/springboard";
           sha256 = "17rmsidsbb4p08vr07mfn25m17wnpadcwr4nxvp79glp5a0wyyib";
           name = "springboard";
         };
@@ -56437,7 +56731,7 @@
           sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sprintly-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sprintly-mode";
           sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
           name = "sprintly-mode";
         };
@@ -56458,7 +56752,7 @@
           sha256 = "11igl9n2zwwar1xg651g5v0r0w6xl0grm8xns9wg80351ijrci7x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sproto-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sproto-mode";
           sha256 = "19l6si3sx2i542r5lyr9axby9hblx76m77f17vnsjf32n3r0qgma";
           name = "sproto-mode";
         };
@@ -56479,7 +56773,7 @@
           sha256 = "03wjzk1ljclfjgqzkg6m7v8saaajgavyd0xskd8fg8rdkx13ki0l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sprunge";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sprunge";
           sha256 = "199vfl6i881aks8fi9d9w4w7mnc7n443h79p3s4srcpmbyfg6g3w";
           name = "sprunge";
         };
@@ -56500,7 +56794,7 @@
           sha256 = "0ng8q1k5kwqk01h4yzqnqgv2q7hb6qvh7rdhlvncwdh68y6bdgbl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/spu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/spu";
           sha256 = "0g7j0rz6ga6x6akiijp4vg5iymvqx5d08d60cz6dccq120fi95v8";
           name = "spu";
         };
@@ -56521,7 +56815,7 @@
           sha256 = "0kxnwmdwx25inyprldw3sjwjxvrmran6wpm80ghai374j3arkabw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sql-impala";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sql-impala";
           sha256 = "1jr9k48d0q00d1x5lqv0n971mla2ymnqmjfn8pw0s0vxkldq4ibi";
           name = "sql-impala";
         };
@@ -56542,7 +56836,7 @@
           sha256 = "17nbcaqx58fq4rz501xcqqcjhmibdlkaavmmzwcfwra7jv8hqljy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sql-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sql-indent";
           sha256 = "13s38zdd9j127p6jxbcj4d4va8mkri5dx5zh39g465mnlzx7fp8g";
           name = "sql-indent";
         };
@@ -56563,7 +56857,7 @@
           sha256 = "02jsz69j1mi082s0xfk99qrm6wskdfz20na3jc7c35f564l493hs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sql-mssql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sql-mssql";
           sha256 = "15z60d2244mxhigr52g332qzjj5ygqyl1i6c19q6vfv2z2vcvy7x";
           name = "sql-mssql";
         };
@@ -56584,7 +56878,7 @@
           sha256 = "0zlrx8sk7gwwr6a23mc22d7iinwf8p9ff16r9krqp86fyzbhnq1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sqlite";
           sha256 = "1j23rqgq00as90nk6csi489ida6b83h1myl3icxivj2iw1iikgj1";
           name = "sqlite";
         };
@@ -56602,7 +56896,7 @@
           sha256 = "0xixdddcrzx6k0s8w9rp6q7b9qjpdb4l888gmcis42yvawb1i53d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sqlplus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sqlplus";
           sha256 = "1z9pf36b1581flykis9cjv7pynnp94fm4ijzjy6hvqyj81aikxpz";
           name = "sqlplus";
         };
@@ -56615,15 +56909,15 @@
     sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sqlup-mode";
-        version = "20160531.1353";
+        version = "20160609.420";
         src = fetchFromGitHub {
           owner = "Trevoke";
           repo = "sqlup-mode.el";
-          rev = "dc85c7bbf472b535270e2ca053dbb082a09788b6";
-          sha256 = "07xz6s6c24hdgsdv96f9h91ys2v5ya4117djh7qx5lwmrnd6vi90";
+          rev = "f3a654a51da29f9ace43555018aa06696812ad6e";
+          sha256 = "08x4548mblbphnnyzahfpwc711dafp2kyw5sp01chp9h1cyr3v53";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sqlup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sqlup-mode";
           sha256 = "0ngs58iri3fwv5ny707kvb6xjq98x19pzak8c9nq4qnpw3nkr83b";
           name = "sqlup-mode";
         };
@@ -56641,7 +56935,7 @@
           sha256 = "1ffnm2kfh8cg5rdhrkqmh4krggbxvqg3s6lc1nssv88av1c5cs3i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sr-speedbar";
           sha256 = "1zq3ysz1vpc98sz2kpq307v1fp1l4ivwgrfh2kdqkkdjm4fkya23";
           name = "sr-speedbar";
         };
@@ -56662,7 +56956,7 @@
           sha256 = "02jr9cgar2r71rrrx13rj83nd19bxajmzzgj4awzn0d93i4l5qkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/srefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/srefactor";
           sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
           name = "srefactor";
         };
@@ -56683,7 +56977,7 @@
           sha256 = "1rdhdkwdhb727rj53xyxk6i00sjr58a48hfig14m12niy1k739vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ssh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ssh";
           sha256 = "1jywn8wlqzc2mfylp0kbpzxv3kwzak3vxdbjabiawqv1m4bfpk5g";
           name = "ssh";
         };
@@ -56704,7 +56998,7 @@
           sha256 = "0076g1yb8xvn6s8gz5jxiz8mn448fmab574yizgakbxaxd91s1dj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ssh-agency";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ssh-agency";
           sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8";
           name = "ssh-agency";
         };
@@ -56725,7 +57019,7 @@
           sha256 = "08nx1iwvxqs1anng32w3c2clhnjf45527j0gxz5fy6h9svmb921q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ssh-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ssh-config-mode";
           sha256 = "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb";
           name = "ssh-config-mode";
         };
@@ -56746,7 +57040,7 @@
           sha256 = "10a5havjg4yjshpfzkhgjdwbrvl44narg09ddzynczmyzm4f01wh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ssh-tunnels";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ssh-tunnels";
           sha256 = "0zlf22wg9adkhycsasv6bfim2h0cknsvihyi1q2l2l4pjdp9ypqj";
           name = "ssh-tunnels";
         };
@@ -56767,7 +57061,7 @@
           sha256 = "1f2dxlc3dsf9ay417h1l43fxjkrb0a4gg96zd3asx9v2alpzgcim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stack-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stack-mode";
           sha256 = "0s0m2lj40php7bc2i3fy9ikd5rmx4v7zbxfkp9vadmlc5s7w25gf";
           name = "stack-mode";
         };
@@ -56788,7 +57082,7 @@
           sha256 = "0nkrpx1rmzg48mi5871mgdizasv80vpald513ycx4nshyln0ymv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stan-mode";
           sha256 = "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy";
           name = "stan-mode";
         };
@@ -56809,7 +57103,7 @@
           sha256 = "0nkrpx1rmzg48mi5871mgdizasv80vpald513ycx4nshyln0ymv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stan-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stan-snippets";
           sha256 = "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85";
           name = "stan-snippets";
         };
@@ -56830,7 +57124,7 @@
           sha256 = "0jq2hn4gqp71ynk0s2i21wp975in3xv2q18xx1fwd4p0yw8h5dig";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/standoff-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/standoff-mode";
           sha256 = "127bzpm1cz103f1pb860yqrh7mr0rdaivrm9p6ssd01kchl9nskp";
           name = "standoff-mode";
         };
@@ -56851,7 +57145,7 @@
           sha256 = "1w3l8ahal9hjisny382bcw9w1nh2swpb1jzf2djww5h0i4r2h36c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/start-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/start-menu";
           sha256 = "1k1lc9i9vcl2am9afq0ksrxwsy6kppl4i0v10h0w2fq5z374rdkv";
           name = "start-menu";
         };
@@ -56872,7 +57166,7 @@
           sha256 = "0cl2y72iagmv87kg72a46a3kap2xigwnrbk2hjgvsbxv2ng5f9cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stash";
           sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
           name = "stash";
         };
@@ -56893,7 +57187,7 @@
           sha256 = "1rjp1zsbh476njjznbsxr47x4lqs4i887yi9xvwvpcb2wcwfly81";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/state";
           sha256 = "19y3n8wnbpgbpz4jxy2p7hjqxykg09arjp7s5v22yz7il3gn48l2";
           name = "state";
         };
@@ -56914,7 +57208,7 @@
           sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/status";
           sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
           name = "status";
         };
@@ -56935,7 +57229,7 @@
           sha256 = "142jamr8mi1nkjvivvkh2qgh5fch89xpg5wwi8q0b6hcqcsy8nqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/steam";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/steam";
           sha256 = "10k408spgbxi266jk8x57zwav989is16nvwg41dknz91l76v63gw";
           name = "steam";
         };
@@ -56956,7 +57250,7 @@
           sha256 = "0w1qb8r6nrxi5hbf8l4247yqq754zfbxz64pqqcnw43cxk0qd4j3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stekene-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stekene-theme";
           sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
           name = "stekene-theme";
         };
@@ -56977,7 +57271,7 @@
           sha256 = "1xc4v8a35c2vpfhza15j4f89x7vyg9bbgm7xnprij7814k8iy7p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stem";
           sha256 = "1625nbi2bmb7vzjz0s7y1cy7dp8lp83dayiib3nr2bfkv76fwkcq";
           name = "stem";
         };
@@ -56993,10 +57287,10 @@
         src = fetchgit {
           url = "git://repo.or.cz/stgit.git";
           rev = "e4e04764009f749665636c4d11e0cafd9c4971e1";
-          sha256 = "02sh1cwh9rnrpnsg56qrwl1q4ffh9719v2l8wccjqgd39krj9m65";
+          sha256 = "0s7si3f9b06d6pnpz412sjxryqpibxzvpmb3f91ziaycib69zg23";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stgit";
           sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
           name = "stgit";
         };
@@ -57014,7 +57308,7 @@
           sha256 = "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sticky";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sticky";
           sha256 = "1xjkdwphq3m4jrazsfnzrrcrqikfdxzph3jdzkpbzk3grd4af96w";
           name = "sticky";
         };
@@ -57035,7 +57329,7 @@
           sha256 = "16dxjsr5nj20blww4xpd4jzgjprzzh1nwvb810ggdmp9paf4iy0g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stickyfunc-enhance";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stickyfunc-enhance";
           sha256 = "13dh19c3bljs83l847syqlg07g33hz6sapg6j4s4xv4skix8zfks";
           name = "stickyfunc-enhance";
         };
@@ -57056,7 +57350,7 @@
           sha256 = "191sg32z1iagyxmbn49i1lpfihld9g9741cw2kj830s4vag4kinx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stock-ticker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stock-ticker";
           sha256 = "1slcjk2avybr4v9s7gglizmaxbb3yqg6s6gdbg12m3vvj3b72lfi";
           name = "stock-ticker";
         };
@@ -57077,7 +57371,7 @@
           sha256 = "1kcbkf0wbmqy9slxfqg7wsyw5n2rsaz832ibrxszb642j0l8s7pr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/strie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/strie";
           sha256 = "1ngvpbws7laqxk6mm023r5295msap12h8bh9zrsbr05yxfzhlx83";
           name = "strie";
         };
@@ -57098,7 +57392,7 @@
           sha256 = "1xm7bb3cp99ahr5jrwi0p0258qcvlbddy98wmbq00kk5pihqbzsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/string-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/string-edit";
           sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
           name = "string-edit";
         };
@@ -57119,7 +57413,7 @@
           sha256 = "06qs8v2pai3pyg0spmarssmrq06xg9q60wjj46s5xxichlw9pgcf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/string-inflection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/string-inflection";
           sha256 = "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2";
           name = "string-inflection";
         };
@@ -57140,7 +57434,7 @@
           sha256 = "1frdspm1qgksa8cpx5gkj50xk9mgz8202pgp11lqir6l3yjcj3wq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/string-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/string-utils";
           sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
           name = "string-utils";
         };
@@ -57158,7 +57452,7 @@
           sha256 = "1sa6wd2z2qkcnjprkkm9b945qz8d0l702sv9w15wl0lngbhw84na";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/strings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/strings";
           sha256 = "0n3239y7biq3rlg74m7nqimhf654w4snnw2zm7z84isgwzz2dphk";
           name = "strings";
         };
@@ -57179,7 +57473,7 @@
           sha256 = "0dxajh72wdcwdb9ydbcm19fmp0p1drmh1niq4r69jnbn8sah0zax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stripe-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stripe-buffer";
           sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
           name = "stripe-buffer";
         };
@@ -57196,10 +57490,10 @@
         src = fetchgit {
           url = "git://git.savannah.nongnu.org/stumpwm.git";
           rev = "61a7cf27e49e0779a53c018b2342f5f1c5cc70b4";
-          sha256 = "0wc2zfn0lrric9xbzdi8hj1fl3gfb2ag5fsb044zv52nkrmn2irm";
+          sha256 = "03is0690p7aw77c30j4r2b5gi5rv5f70wvpixy5qhcchlaxhaw82";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stumpwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stumpwm-mode";
           sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
           name = "stumpwm-mode";
         };
@@ -57219,7 +57513,7 @@
           sha256 = "0sw7r4sbg0vmm7gqisjdp1wansn9k64djz3p83fwmyq3qkj90ar4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stupid-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stupid-indent-mode";
           sha256 = "12y8qxxs04qzy09m734qg0857g4612qdswx2bh9jk7dp886fpd7p";
           name = "stupid-indent-mode";
         };
@@ -57240,7 +57534,7 @@
           sha256 = "0p6pfxbl98kkwa3lgx82h967w4p0wbd9s96gvs72d74ryan07ij1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stylus-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stylus-mode";
           sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
           name = "stylus-mode";
         };
@@ -57261,7 +57555,7 @@
           sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/subatomic-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/subatomic-theme";
           sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc";
           name = "subatomic-theme";
         };
@@ -57282,7 +57576,7 @@
           sha256 = "1w7mimyqc25phlww20l49wlafnxp6c7dwibvphg3vwl61g0llpq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/subatomic256-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/subatomic256-theme";
           sha256 = "1whjlkpkkirpnvvjryhlpzwphr1syz5zfyg4pb66i0db03hxwwcy";
           name = "subatomic256-theme";
         };
@@ -57303,7 +57597,7 @@
           sha256 = "10pirwc7g9vii5cyk4vg6m5g5hlap0yg9w4qy257744c67jmaxvg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/subemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/subemacs";
           sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
           name = "subemacs";
         };
@@ -57324,7 +57618,7 @@
           sha256 = "0q9p974xvswr2sijz1rs858x9sdx0rb00lkhj5cd90abn33lb260";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sublime-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sublime-themes";
           sha256 = "1nahcfcy831c7w3c69i2na0r8jsdgprffgfdvh4c41cnk4rkgdqj";
           name = "sublime-themes";
         };
@@ -57345,7 +57639,7 @@
           sha256 = "1kpq7kpmhgq3vjd62rr4qsc824qcyjxm50m49r7invgnmgd78h4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sublimity";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sublimity";
           sha256 = "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw";
           name = "sublimity";
         };
@@ -57363,7 +57657,7 @@
           sha256 = "1xxf8kgxzcwwjm96isj4zg31vw63ahivr6xch5dw8wsvk0mjks9y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/subr+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/subr+";
           sha256 = "1vrv64768f7rk58mqr4pq1fjyi5n5kfqk90hzrwbvblkkrmilmfs";
           name = "subr-plus";
         };
@@ -57384,7 +57678,7 @@
           sha256 = "09izm28jrzfaj469v6yd1xgjgvy6pmxarcy0rzn2ihn3c0z7mdg4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/subshell-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/subshell-proc";
           sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
           name = "subshell-proc";
         };
@@ -57405,7 +57699,7 @@
           sha256 = "1007xz4x1wgvxilv1qwf0a4y7hd7sqnnzwk2bdr12kfk7vq9cw2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sudden-death";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sudden-death";
           sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
           name = "sudden-death";
         };
@@ -57426,7 +57720,7 @@
           sha256 = "0bscj6nziansx846rmmrpbc4wbsngq1jg70g5ncf0f14b3achaq3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sudo-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sudo-edit";
           sha256 = "10vz7q8m0l2dyhiy9r9nj17qlwyv032glshzljzhm1n20w8y1fq4";
           name = "sudo-edit";
         };
@@ -57447,7 +57741,7 @@
           sha256 = "1ym3j9mxc8k9akk9z1m6i0gqsfcgr8k8xzz5gniw8jfarf7f4isq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sudo-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sudo-ext";
           sha256 = "1zlnz68kzdrc7p90qmzs7fsr9ry4rl259xpyv55jh5icry290z4x";
           name = "sudo-ext";
         };
@@ -57465,7 +57759,7 @@
           sha256 = "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/summarye";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/summarye";
           sha256 = "1znd96ixg1n90yjiny84igb7m8qsbiibn7s6bky8g6n2k7zzmq65";
           name = "summarye";
         };
@@ -57486,7 +57780,7 @@
           sha256 = "0mhyhkjjwszwl5wzkys9pgvgx9sps9r46k1s1hpzzf4s3vi015mc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sunny-day-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sunny-day-theme";
           sha256 = "1wsfnmmbzzyggzip66vr38yyzy27blxp91wx97bafj7jpg5cyhzw";
           name = "sunny-day-theme";
         };
@@ -57507,7 +57801,7 @@
           sha256 = "0jv1shacpxqbw6pv9rlkk8z84si85alhillhb9a2s6s36kjmybk0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sunshine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sunshine";
           sha256 = "1lxiqw7k8cpq0v6p5whgxgzqrbx3sd9174r0d4qlkrpn6rcp44vv";
           name = "sunshine";
         };
@@ -57528,7 +57822,7 @@
           sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/suomalainen-kalenteri";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/suomalainen-kalenteri";
           sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
           name = "suomalainen-kalenteri";
         };
@@ -57549,7 +57843,7 @@
           sha256 = "1frm90kssrp4s6x0g4vq4jkssh8rnrfjbgwa05igsjnsbnnfxxd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/super-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/super-save";
           sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
           name = "super-save";
         };
@@ -57570,7 +57864,7 @@
           sha256 = "0m02snzka243adhwwgriml133n4312lhdia3wdqjcq8y2mlp3331";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/supergenpass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/supergenpass";
           sha256 = "0ldy6j6l6rf72w0hl195rdnrabml2a5k91200s186k0r5aja4b95";
           name = "supergenpass";
         };
@@ -57583,15 +57877,15 @@
     suscolors-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "suscolors-theme";
-        version = "20160603.30";
+        version = "20160605.1106";
         src = fetchFromGitHub {
           owner = "TheSuspiciousWombat";
           repo = "suscolors-emacs";
-          rev = "f63434bd79dc15c96b387e360cf0cd4e48d0ffad";
-          sha256 = "0bbvhxg64mchh3kzryx8ji7vgvm981i95qfbvajzabbdj6cmnfyw";
+          rev = "15931dac6ece2a42d7be78e4d448d25d55990d54";
+          sha256 = "1av0ysw3l56sf8f0fg3mldx9ifw1rd74mw92cyvqvqx1k7na5pmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/suscolors-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/suscolors-theme";
           sha256 = "08sh20lmhqzpxb55nmqwsfv4xd6sjirh592in7s6vl52r3hl0jkh";
           name = "suscolors-theme";
         };
@@ -57612,7 +57906,7 @@
           sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/svg-mode-line-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/svg-mode-line-themes";
           sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
           name = "svg-mode-line-themes";
         };
@@ -57622,6 +57916,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    swagger-to-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "swagger-to-org";
+        version = "20160611.256";
+        src = fetchFromGitHub {
+          owner = "ahungry";
+          repo = "swagger-to-org";
+          rev = "181357c71ea24bede263f5706d8781ad65e16877";
+          sha256 = "0x1mxxvlhhs34j869cy68gy5pgmvpfliyl9vlrlwm3z8apbip9gp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/swagger-to-org";
+          sha256 = "1m40f5njxcxmc2snaz2q43b4scwgp51y761kq6klixjvafi0pv86";
+          name = "swagger-to-org";
+        };
+        packageRequires = [ cl-lib emacs json ];
+        meta = {
+          homepage = "https://melpa.org/#/swagger-to-org";
+          license = lib.licenses.free;
+        };
+      }) {};
     swap-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swap-buffers";
@@ -57633,7 +57948,7 @@
           sha256 = "1kn70570r6x0h1xfs1vr8as27pjfanyhml140yms60gdjb4ssf9r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/swap-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/swap-buffers";
           sha256 = "0ih5dhnqy3c9nlfz9m2zwy4q4jaam09ykbdqhsxx2hnwjk7p35bw";
           name = "swap-buffers";
         };
@@ -57654,7 +57969,7 @@
           sha256 = "1m0apxjcj6xhbic36il1mbbril6pw2h6d9kmsb0jhibyy6mc8r78";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/swap-regions";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/swap-regions";
           sha256 = "0gl4vr7wjh5gjskrwbqypaqyfigpgh379bm4l2gvbsbhahsmbj67";
           name = "swap-regions";
         };
@@ -57672,7 +57987,7 @@
           sha256 = "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/swbuff-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/swbuff-x";
           sha256 = "1wglcxgfr839lynwsl8i7fm70sxxjidy3ib6ibz0kgiwr41rh49y";
           name = "swbuff-x";
         };
@@ -57693,7 +58008,7 @@
           sha256 = "10blwlwg1ry9jznf1a6iss5s0z8sj9gc02ayf5qv92mgxvjhrhdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sweetgreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sweetgreen";
           sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
           name = "sweetgreen";
         };
@@ -57714,7 +58029,7 @@
           sha256 = "08397a8y8hgyzwny4z9f6kgwy8d37h0iypcjps3l6lhnk35mshv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/swift-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/swift-mode";
           sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
           name = "swift-mode";
         };
@@ -57731,11 +58046,11 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "c960de51ce4e868daedb91e523ff6267a3113c3a";
-          sha256 = "0zlcfyw7wi5djg54bzxnyqnqsf5pa2c3v96bas76n08k9fazk9m8";
+          rev = "97cf30dc9cb5473a1d6b0ff67950be556eb3de31";
+          sha256 = "1yff395x7m4vdmw6qzb45dn3ksfxpmxcssmhm992zbbv33hygbjn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/swiper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/swiper";
           sha256 = "0qaia5pgsjsmrfmcdj72jmj39zq82wg4i5l2mb2z6jlf1jpbk6y9";
           name = "swiper";
         };
@@ -57756,7 +58071,7 @@
           sha256 = "1fr9vs0574g93mq88d25nmj93hrx4d4s2d0im6wk156k2yb8ha2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/swiper-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/swiper-helm";
           sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
           name = "swiper-helm";
         };
@@ -57777,7 +58092,7 @@
           sha256 = "09ba45zbya2a72prq13pjg9pgbs86c6kayf8q2papvr9f5yv57xa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/switch-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/switch-window";
           sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
           name = "switch-window";
         };
@@ -57798,7 +58113,7 @@
           sha256 = "10ka6f86n07xlf0z7w35db0mzp2zk4xhr6jd19kjdrn2j0ynlcw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/swoop";
           sha256 = "0r265rwfbl1iyclnspxpbzf2w1q0w8dnc0wv5mz5g6hhcrr0iv6g";
           name = "swoop";
         };
@@ -57819,7 +58134,7 @@
           sha256 = "0p6pfxbl98kkwa3lgx82h967w4p0wbd9s96gvs72d74ryan07ij1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sws-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sws-mode";
           sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
           name = "sws-mode";
         };
@@ -57840,7 +58155,7 @@
           sha256 = "0d0c2i8hh0wrz8vnhxpxzwj7vlrjx6lrb3cx56pn4ny9qyqfzmw3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sx";
           sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
           name = "sx";
         };
@@ -57861,7 +58176,7 @@
           sha256 = "1q7di9s8k710nx98wnqnbkkhdimrn0jf6z4xkm4c78l6s5idjwlz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/symon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/symon";
           sha256 = "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz";
           name = "symon";
         };
@@ -57882,7 +58197,7 @@
           sha256 = "030bglxnvrkf1f9grbhd8n11j4c6sxpabpjdr1ryx522v01fvx8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/symon-lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/symon-lingr";
           sha256 = "0kyhmw25cn10b4jv2yx7bvp8zkwcswiidpk4amyaisw25820gkv1";
           name = "symon-lingr";
         };
@@ -57903,7 +58218,7 @@
           sha256 = "006siydqxqds0qqds0zxn821dk4pw14wyymyp03n594wgqzw7m8q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sync-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sync-recentf";
           sha256 = "17aji2vcw6zfd823anzwj8pcgyxamxr87bnni085jvlz0vx6gh9c";
           name = "sync-recentf";
         };
@@ -57924,7 +58239,7 @@
           sha256 = "1w0na1p9drdmbci7adj20amrabcpny9fb2v4bd967ils4f2wly75";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/syndicate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/syndicate";
           sha256 = "06nmldcw5dy2shhpk6nyix7gs57gsr5s9ksj57xgg8y2j3j0da95";
           name = "syndicate";
         };
@@ -57945,7 +58260,7 @@
           sha256 = "02xnfkmpvjicckmp9is42fnavy9pd95s99zmf1wylxdji2hhpjxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/synonymous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/synonymous";
           sha256 = "0vawa9qwvv6z1i7vzhkjdl1l9r1yham48yn5y8w8g1xyhxxp6rs5";
           name = "synonymous";
         };
@@ -57963,7 +58278,7 @@
           sha256 = "1zkrh1krhjmhb924dlihfnmjf4gigk9lqkai8aal67h90g2q2dsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/synonyms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/synonyms";
           sha256 = "0rnq97jpr047gpkxhw22jj3gw09r45vn6fwkzxnxjzcmsyk492d0";
           name = "synonyms";
         };
@@ -57984,7 +58299,7 @@
           sha256 = "1zz9rnwaclr95fpjyabv5rlhk36n2k8f1lzz6yqh964hv8i9562s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/synosaurus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/synosaurus";
           sha256 = "06a48ajpickf4qr1bc14skfr8khnjjph7c35b7ajfy8jw2zwavpn";
           name = "synosaurus";
         };
@@ -58005,7 +58320,7 @@
           sha256 = "0zi11540wwcl93xcgd2yf6b72zv01zkaqbf1jfbksg82k9038m2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/syntactic-sugar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/syntactic-sugar";
           sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
           name = "syntactic-sugar";
         };
@@ -58025,7 +58340,7 @@
           sha256 = "1wcgr6scvwwfmhhjbpq3riq0gmp4g08ffbl91fpgp72j8zrc1c6x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/syntax-subword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/syntax-subword";
           sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
           name = "syntax-subword";
         };
@@ -58046,7 +58361,7 @@
           sha256 = "1k3lh920p62ji5n5bvgxcfr6vc5ljssn9j0n4zydhh6ybk9j5f9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/syslog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/syslog-mode";
           sha256 = "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19";
           name = "syslog-mode";
         };
@@ -58067,7 +58382,7 @@
           sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/system-specific-settings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/system-specific-settings";
           sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
           name = "system-specific-settings";
         };
@@ -58080,15 +58395,15 @@
     systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "systemd";
-        version = "20160514.1615";
+        version = "20160612.643";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "systemd-mode";
-          rev = "b03e616f0d0fbd512c32afcf87a596eae509abc2";
-          sha256 = "0wqmpvqv5dbnniv7xpvmhw75h9xh3q5ndkrpzz3pk5b94drgm5s3";
+          rev = "2e1f7394f1339cfcc62c5139f902040ca61012e3";
+          sha256 = "1dwz7kkm86r9fl9igrah2ldyqszj6phygjpsh70m6207zrjp7wfi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/systemd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/systemd";
           sha256 = "1ykvm8mfi3fjvrkfcy9qn0sr9mhwm9x1svrmrd0gyqk418clk5i3";
           name = "systemd";
         };
@@ -58109,7 +58424,7 @@
           sha256 = "0343ss3y9i40y3i9rr7p7bb4k9dj950zyvdv44q1abw2xrfd2xwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/systemtap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/systemtap-mode";
           sha256 = "1l2jx6mvph0q2pdlhq7p4vwfw72rfl8k1rwi504bbkr5n5xwhhhz";
           name = "systemtap-mode";
         };
@@ -58130,7 +58445,7 @@
           sha256 = "054l3imxk9ivq361cr15q1wym07mw3s8xzjkzqlihrfvadsq37ym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ta";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ta";
           sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
           name = "ta";
         };
@@ -58151,7 +58466,7 @@
           sha256 = "0lfvgbgvsm61kv5mcjnhnfjcnr7fy1015y0hndkf9xvdlw4hahr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tab-group";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tab-group";
           sha256 = "1i5lxpf3wmqnqj9mzgcn4gp1gjxp737awrzl1dml5wnarbbj4fs9";
           name = "tab-group";
         };
@@ -58172,7 +58487,7 @@
           sha256 = "0h7sfbca1nzcjylwl7zp25yj6wxnlx8g8a50zc6sg6jg4rggi2fm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tab-jump-out";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tab-jump-out";
           sha256 = "0nlbyzym8l8g9w2xvykpcl5r449v30gal2k1dnz74rq4y8w4rh7n";
           name = "tab-jump-out";
         };
@@ -58193,7 +58508,7 @@
           sha256 = "1akvwm4dqq4ihphlsdn8d1mm08q923y2iqh15lvc0cd0hxp3ni0q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tabbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tabbar";
           sha256 = "1y376nz1xmchwns4fz8dixbb7hbqh4mln78zvsh7y32il98wzvx9";
           name = "tabbar";
         };
@@ -58214,7 +58529,7 @@
           sha256 = "1rf7qahc2h9v5r75cj8y4vn88xqgwxpdqxkh2cd1f6hy5m1p4cam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tabbar-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tabbar-ruler";
           sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
           name = "tabbar-ruler";
         };
@@ -58235,7 +58550,7 @@
           sha256 = "013gkl672vmrji03wd74azcq390lgcr71i5c5qbs0p1v4rcbvqd2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tablist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tablist";
           sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
           name = "tablist";
         };
@@ -58256,7 +58571,7 @@
           sha256 = "1dbjfq9a7a5s9c18nrp4kcda64jkg5cp8na31kxw0hjcn98dgqa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tabula-rasa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tabula-rasa";
           sha256 = "14j92inssmm61bn475gyn0dn0rv8kvfnqyl1zq3xliy7a0jn58zz";
           name = "tabula-rasa";
         };
@@ -58277,7 +58592,7 @@
           sha256 = "104n6dmiis6w2psm2rxah9hg5jwaqzna6973ijr5a5rxyp4rcsz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tagedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tagedit";
           sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
           name = "tagedit";
         };
@@ -58298,7 +58613,7 @@
           sha256 = "13zwlb5805cpv0pbr7fj5b4crlg7lb0ibslvcpszm0cz6rlifcvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/take-off";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/take-off";
           sha256 = "05vlajmirbp62rpbdwa2bimpzyl9xc331gg0lhn2rkivc0hma2ar";
           name = "take-off";
         };
@@ -58318,7 +58633,7 @@
           sha256 = "1lqkazis9pfcfdsb2lar4l1n4pd085v60xmnlkdrdllwamqachkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tango-2-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tango-2-theme";
           sha256 = "1a9qmz99h99gpd0sxqb71c08wr8pm3bzsg3p4cvf3vcirvav9lq6";
           name = "tango-2-theme";
         };
@@ -58339,7 +58654,7 @@
           sha256 = "1gfn1yyyb9p2fi17wra1yf2j96cfjw0sifgk3c0vl63h3vmiyvjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tango-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tango-plus-theme";
           sha256 = "1bx9qcwvybgd0rg8a9rag8xvb5ljrwfnm5nvq793ncvbdvq6vrh5";
           name = "tango-plus-theme";
         };
@@ -58360,7 +58675,7 @@
           sha256 = "11xb7xpmxvgv7mrjd2vlbjz3h5fa541aydv6bdxngjq6y3qn6wsp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tangotango-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tangotango-theme";
           sha256 = "05cnvyqmh5h5mqys7qs7d9knzxzmi2x0j1avp77x5l5njzzv59s2";
           name = "tangotango-theme";
         };
@@ -58373,15 +58688,15 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20160330.1550";
+        version = "20160608.1115";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "d6879082413f38c36a1d7f76e1c4dead676ce2dc";
-          sha256 = "0y9dd39wajiafh7kql870wg2da60nvls35pymhmzrvnwnbsw8pys";
+          rev = "3aad9b4f41985d8da90432885380d94c24dd772a";
+          sha256 = "04baqjk3vg09x3p5v1mnn9yn4wzb4qa2ag9jc8baabrp19xbcl2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tao-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tao-theme";
           sha256 = "0gl6zzk5ha6vl2xxf5fcnv1k42cw4axdjdcirr1c4r8jwdq3nl3a";
           name = "tao-theme";
         };
@@ -58402,7 +58717,7 @@
           sha256 = "1cdiw4p0b18zd21vasvs6hayk9rr5mz2rsgr8j0ifsamasl7vmgw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tawny-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tawny-mode";
           sha256 = "1xaw1six1n6rw1283fdyl15xcf6m7ngvq6gqlz0xzpf232c4b0kr";
           name = "tawny-mode";
         };
@@ -58423,7 +58738,7 @@
           sha256 = "1jp80qywcphql1ngd4fr24lqdfwrw0bw6q9hgq5vmzgjwfxwxwd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tbx2org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tbx2org";
           sha256 = "1yvkw65la4w12c4w6l9ai73lzng170wv4b8gry99m2bakw3wr8m8";
           name = "tbx2org";
         };
@@ -58444,7 +58759,7 @@
           sha256 = "1xpkrlfqb0np9zyxk41f3pxfkw98ii4q0xh8whq4llv5bmfxynzk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tc";
           sha256 = "13qdnfslnik4f97lz9bxayyhgcp1knh5gaqy00ps863j3vpzjb9s";
           name = "tc";
         };
@@ -58465,7 +58780,7 @@
           sha256 = "1krway6iw62dlr4ak3kj9llqh48xjf3d84nlincap7gkrw886l4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tco";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tco";
           sha256 = "0hfrzwjlgynk3mydrpmic9mckak37r22fdglrfas6zdihgrg152f";
           name = "tco";
         };
@@ -58486,7 +58801,7 @@
           sha256 = "1jyz6z5bk1gvmknphcnvjvbl329zm8m40yl0a1hfaj8fvhwyzdw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tdd-status-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tdd-status-mode-line";
           sha256 = "0z1q1aw14xq72nfx7mmvz7pr2x4960l45z02jva35zxzvb1mvsgq";
           name = "tdd-status-mode-line";
         };
@@ -58507,7 +58822,7 @@
           sha256 = "0b4cwkwkc4i8lc4j30xc9d6xskm3gqrc2dij60ya75h92aj0lj40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tea-time";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tea-time";
           sha256 = "0qypwf0pgsixq6c5avbwp81i3ayy9dd2fngzdvq14pax913q8pg1";
           name = "tea-time";
         };
@@ -58528,7 +58843,7 @@
           sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/telepathy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/telepathy";
           sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
           name = "telepathy";
         };
@@ -58549,7 +58864,7 @@
           sha256 = "1m5224k1chb788mgj7j6cbma2xh5p7avvb1ax0jdafv5lfgikka4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/telephone-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
           name = "telephone-line";
         };
@@ -58570,7 +58885,7 @@
           sha256 = "17633jachcgnibmvx433ygcfmz3j6hzli5mqbqg83r27chiq5mjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ten-hundred-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ten-hundred-mode";
           sha256 = "17v38h33ka70ynq72mvma2chvlnm1k2amyvk62c65iv67rwilky3";
           name = "ten-hundred-mode";
         };
@@ -58591,7 +58906,7 @@
           sha256 = "195jghl1c8ncl15nix275r4x61zlii90pnwgx4m9q2bnbwsz3ycm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/term-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/term-alert";
           sha256 = "02qvfhklysfk1fd4ibdngf4crp9k5ab11zgg90hi1sp429a53f3m";
           name = "term-alert";
         };
@@ -58612,7 +58927,7 @@
           sha256 = "08qiipjsqc9dfbha6r2yijjbrg2s4i2mkn6zn5616086550v3kpj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/term-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/term-cmd";
           sha256 = "0pbz9fy9rjfpzspwq78ggf1wcvjslwvj8fvc05w4g56ydza0gqi4";
           name = "term-cmd";
         };
@@ -58625,15 +58940,15 @@
     term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "term-manager";
-        version = "20160602.136";
+        version = "20160606.609";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "term-manager";
-          rev = "5ee3555c2396a4cfe9089bd7fd5f10ca96b53b3b";
-          sha256 = "0j2a20vl8ms657m3v9n4inr1v7l3mm70acqiqbpl6k3xb0fllxg2";
+          rev = "6de89f1ead467de4c867eee23bd6d748546a9d19";
+          sha256 = "0sgyzh9w8l07sizw6jv9wqwmfgnq1qnzcja9qi0bylay017v35sk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/term-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/term-manager";
           sha256 = "0ab388ki7vr1wpz81bvbl2fskq9zz5bicdf5gqfg01qzv5l75iza";
           name = "term-manager";
         };
@@ -58654,7 +58969,7 @@
           sha256 = "0ca82vj61inn41xzk36a91g73gpg38nya4r9ajc2ldjqa5z1zdj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/term+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/term+";
           sha256 = "12lvfspqmyrapmbz3x997vf160927d325y50kxdx3s6p81r7n2n8";
           name = "term-plus";
         };
@@ -58675,7 +58990,7 @@
           sha256 = "1dql2w8xkdw52zlrc2p9x391zn8wv4dj8a6293p4s08if7gg260w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/term+key-intercept";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/term+key-intercept";
           sha256 = "1564a86950xdwsrwinrs118bjsfmbv8gicq0c2dfr827v5b6zrlb";
           name = "term-plus-key-intercept";
         };
@@ -58696,7 +59011,7 @@
           sha256 = "12gfvcf7hl29xhg231cx76q04ll7cvfpvhkb0qs3qn1sqb50fs2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/term+mux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/term+mux";
           sha256 = "129kzjpi5nzagqkjfikx9i7k6489dy7d3pd7ggn59p4cnh3r2rhh";
           name = "term-plus-mux";
         };
@@ -58706,6 +59021,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    term-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }:
+    melpaBuild {
+        pname = "term-projectile";
+        version = "20160609.2237";
+        src = fetchFromGitHub {
+          owner = "IvanMalison";
+          repo = "term-manager";
+          rev = "6de89f1ead467de4c867eee23bd6d748546a9d19";
+          sha256 = "0sgyzh9w8l07sizw6jv9wqwmfgnq1qnzcja9qi0bylay017v35sk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/term-projectile";
+          sha256 = "1mzyzjxkdfvf1kq9m3c1f6y6xzj1qq53rixawmnzmil5cmznvwag";
+          name = "term-projectile";
+        };
+        packageRequires = [ emacs projectile term-manager ];
+        meta = {
+          homepage = "https://melpa.org/#/term-projectile";
+          license = lib.licenses.free;
+        };
+      }) {};
     term-run = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "term-run";
@@ -58717,7 +59053,7 @@
           sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/term-run";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/term-run";
           sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
           name = "term-run";
         };
@@ -58738,7 +59074,7 @@
           sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/termbright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/termbright-theme";
           sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
           name = "termbright-theme";
         };
@@ -58751,15 +59087,15 @@
     tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "tern";
-        version = "20160425.1559";
+        version = "20160607.1244";
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "ead32cf20d976f0490043f1b85e556c499f8c688";
-          sha256 = "1f03mrc8gm61vrz8w3rb1g5hvibyj52hjgknj6jrzhb7b84z1z9z";
+          rev = "ae87257ae7ddbef2dfef70b0bfd2818b5d9f6bb6";
+          sha256 = "1z5q3nnyb9an2w9184ig4186jvawpsz3bynar3izkc9z7ppvvwya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tern";
           sha256 = "1am97ssslkyijpvgk4nldi67ws48g1kpj6gisqzajrrlw5q93wvd";
           name = "tern";
         };
@@ -58776,11 +59112,11 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "ead32cf20d976f0490043f1b85e556c499f8c688";
-          sha256 = "1f03mrc8gm61vrz8w3rb1g5hvibyj52hjgknj6jrzhb7b84z1z9z";
+          rev = "ae87257ae7ddbef2dfef70b0bfd2818b5d9f6bb6";
+          sha256 = "1z5q3nnyb9an2w9184ig4186jvawpsz3bynar3izkc9z7ppvvwya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tern-auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tern-auto-complete";
           sha256 = "1i99b4awph50ygcqsnppm1h48hbf8cpq1ppd4swakrwgmcy2mn26";
           name = "tern-auto-complete";
         };
@@ -58801,7 +59137,7 @@
           sha256 = "00nv6j18s6983raajfcrxfg5rfz68cgf88zrdp7fhf9l0iicim1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tern-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tern-django";
           sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
           name = "tern-django";
         };
@@ -58822,7 +59158,7 @@
           sha256 = "1k0v56v7mwpb5p228c0g252szpxvpqswrmjfpk75kh32v56wp5xi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/terraform-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
           name = "terraform-mode";
         };
@@ -58843,7 +59179,7 @@
           sha256 = "1r3fmb8cshgh9pppdvydfcrzlmb9cgz4m04rgv69c5xv8clwcmbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/test-case-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/test-case-mode";
           sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
           name = "test-case-mode";
         };
@@ -58864,7 +59200,7 @@
           sha256 = "004rd6jkaklsbgka9mf2zi5qzxsl2shwl1kw0vgb963xkmk9zaz8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/test-kitchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/test-kitchen";
           sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
           name = "test-kitchen";
         };
@@ -58885,7 +59221,7 @@
           sha256 = "0i38pzqi2ih3ckfjz323d3bc3p8y9syfjr96im16wxrs1c77h814";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/test-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/test-simple";
           sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
           name = "test-simple";
         };
@@ -58906,7 +59242,7 @@
           sha256 = "1qcd7vdg63q80zwz8ziaznllq1x7micmljm72s6sh3720rb5aiz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/textile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/textile-mode";
           sha256 = "0c1l7ml9b1zipk5fhmhirrh070h0qwwiagdk84i04yvdmmcjw2nf";
           name = "textile-mode";
         };
@@ -58927,7 +59263,7 @@
           sha256 = "1b7xxz1i84azmbz8rqpxdn18avmnqlj87hfrpbngbf6pj5h9jqjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/textmate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/textmate";
           sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
           name = "textmate";
         };
@@ -58948,7 +59284,7 @@
           sha256 = "1bz5ys36wd00clq9w3ahqpras368aj2b9d4bl32qc6dyp8jfknmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/textmate-to-yas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/textmate-to-yas";
           sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
           name = "textmate-to-yas";
         };
@@ -58966,7 +59302,7 @@
           sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tfs";
           sha256 = "10szb9mni37s2blvhl1spj96narmkrv8zhrryw9q1251z8laq5v0";
           name = "tfs";
         };
@@ -58987,7 +59323,7 @@
           sha256 = "0njmn5dy773v9kmwclw1m79rh52xnxl8mswcaagni2z3dvlvw4m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/theme-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/theme-changer";
           sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
           name = "theme-changer";
         };
@@ -59008,7 +59344,7 @@
           sha256 = "1kd4mazrcy5xamkvvrwsmcx63g0gp5w4264kxbk3d25bjqcf8rmj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/theme-looper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/theme-looper";
           sha256 = "02hz9k4ybpp4i8ik2av9rg240sjgicbf6w24zn67dmw4nc4lp9c5";
           name = "theme-looper";
         };
@@ -59029,7 +59365,7 @@
           sha256 = "12kz4alyf3y2i7lkvi26hcxy55v0blsrxv5srx9fv5jhxkdz1vq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/therapy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/therapy";
           sha256 = "0y040ghb0y6aq0nchqr09vapz6h6112rkwxkqsx0v7xmqrqfjvhh";
           name = "therapy";
         };
@@ -59047,7 +59383,7 @@
           sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/thesaurus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/thesaurus";
           sha256 = "1nyjk9jr1xvdkil13ylfsgg7q2sx71za05gi8m2v5f45pbmbi50h";
           name = "thesaurus";
         };
@@ -59066,7 +59402,7 @@
           sha256 = "1nclwxb63ffbc4wsga9ngkfcxsw88za0c4663fh9x64rl4db4hn8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/thing-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/thing-cmds";
           sha256 = "133bm2cw9ar6m2amj0rrq4wbj9c3zl61gaprx0vlasxj2cyxs7yw";
           name = "thing-cmds";
         };
@@ -59084,7 +59420,7 @@
           sha256 = "0ijz0mj095wycpc3as5fiikrwazljk0c04rh089ch0mzc95g3vqq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/thingatpt+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/thingatpt+";
           sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa";
           name = "thingatpt-plus";
         };
@@ -59105,7 +59441,7 @@
           sha256 = "12zpn0sy2yg37jjjx12h3kln56241b3z09bn5zavmjfdwnr9jd0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/thingopt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/thingopt";
           sha256 = "0yvzq1z2nrldr8vhcvxqgzvh4gbrjjwfmprg59p4v5hlxvhxsb1y";
           name = "thingopt";
         };
@@ -59126,7 +59462,7 @@
           sha256 = "0rjcrvw9v2y10ahycra53bwbccpwqxxwn2c21wjj1kfs0kdwhs9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/thread-dump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/thread-dump";
           sha256 = "0dzr86jyf2j49gq40q6qd6lppa57n65n94xzpdjjbs182hxzavp2";
           name = "thread-dump";
         };
@@ -59143,11 +59479,11 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "39a09ac5e49481d39dd1bcb6757ffe182e3df20a";
-          sha256 = "12cyzzf32k1x8fnj987va0qb9amjwrg205znc6gaz87av7w8riq8";
+          rev = "a52ea350d885d4e35d210d1ace621e476bfbbae1";
+          sha256 = "0s83d72lv4yip7pk83cjvsk8nfzariwbdky2ih89hg03cy44pd5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/thrift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/thrift";
           sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
           name = "thrift";
         };
@@ -59166,7 +59502,7 @@
           sha256 = "0nyp1sp55l3mlhlxw8kyp6hxan3rbgwc4fmfs174n6hlj3zr5vg8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/thumb-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/thumb-frm";
           sha256 = "1fjjd80drm8banni909lww9zqazr1kk9m40xwwa1ln2zicaf091c";
           name = "thumb-frm";
         };
@@ -59187,7 +59523,7 @@
           sha256 = "0nypcryqwwsdawqxi7hgsv6fp28zqslj9phw7zscqqxzc3svaywn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/thumb-through";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/thumb-through";
           sha256 = "1544xw9lar199idk135z4d6i3n9w0v7g2bq7fnz0rjjw10kxvpcx";
           name = "thumb-through";
         };
@@ -59197,22 +59533,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    tide = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
+    tide = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20160528.632";
+        version = "20160605.850";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "0ca8a68619540fbb2fd9ac32f3610d79ab19193b";
-          sha256 = "0q09c31ry6l6ksfsw9zrsbg38z3xx3l2ndfvwcdabdahlk8r5y6m";
+          rev = "8c9de27b52c583ac57de2b41a82b5633c8380430";
+          sha256 = "0g9vgazw5yfcxy0hx252mp79yvdcdjwfl7jr2kkgi4f5fw7lcx92";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tide";
           sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1";
           name = "tide";
         };
-        packageRequires = [ dash emacs flycheck typescript-mode ];
+        packageRequires = [ cl-lib dash emacs flycheck typescript-mode ];
         meta = {
           homepage = "https://melpa.org/#/tide";
           license = lib.licenses.free;
@@ -59226,7 +59562,7 @@
           sha256 = "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tidy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tidy";
           sha256 = "09xb2k3k99hp3m725f31s6hlaxgl4fsaa1dylahxvdfddhbh290m";
           name = "tidy";
         };
@@ -59247,7 +59583,7 @@
           sha256 = "1iz3723sirazlrr9d5rpk4v0s1s9ajbx5j4i8jf1p54z8h7asjw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/time-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/time-ext";
           sha256 = "133vd63p8258wam4fvblhfg37w2zqy4a5c5c5nafwx0cy90sngwz";
           name = "time-ext";
         };
@@ -59268,7 +59604,7 @@
           sha256 = "0pabb260d3vcr57jqqxqk90vp2qnm63sky37rgvhv508zix2hbva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/timecop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/timecop";
           sha256 = "0kcjx3silk9vwysaawhcvpb7c82dzb2y7ns8x50jznylqg8c4zh5";
           name = "timecop";
         };
@@ -59289,7 +59625,7 @@
           sha256 = "1hidvbd1xzz9m0fc55wac1mpv4dpcf8qnw1myh3646bfvivj9c2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/timer-revert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/timer-revert";
           sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
           name = "timer-revert";
         };
@@ -59310,7 +59646,7 @@
           sha256 = "028d1sn29idznzsc95w2c1sdz3rpmf3vgk2365li0vvs99s51hi2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/timesheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/timesheet";
           sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
           name = "timesheet";
         };
@@ -59331,7 +59667,7 @@
           sha256 = "0yinzv5v82rx1jx10gdcx93rgqz5q1pz0jyghm9xg5d9j5hv317b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/timp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/timp";
           sha256 = "1vh2wsgd8bclkbzn59zqbzzfzs0xx6x82004l7vnma8z97swvhgs";
           name = "timp";
         };
@@ -59352,7 +59688,7 @@
           sha256 = "0rf177kr0qfhg8g5xrpi405dhp2va1yk170zm3f8hghi2575ciy2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tinkerer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tinkerer";
           sha256 = "0qh6pzjn98jlpxcm9zf25ga0y3d3v53275a9zgswyhz33mafd7pd";
           name = "tinkerer";
         };
@@ -59373,7 +59709,7 @@
           sha256 = "0mmz8b0fzffybc2jws9fif982zfx0l6kn1l4qxc67mf9nafbdca3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tiny";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tiny";
           sha256 = "183qczyb6c8zmdgmsjsj4hddmvnzzq4c7syslm861xcyxia94icy";
           name = "tiny";
         };
@@ -59386,15 +59722,15 @@
     tiny-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tiny-menu";
-        version = "20160601.32";
+        version = "20160607.211";
         src = fetchFromGitHub {
           owner = "aaronbieber";
           repo = "tiny-menu.el";
-          rev = "551c695b00926ab269cc651820e8ef6fa9b5134d";
-          sha256 = "1c3xxzk1xz43dzrplva4cb5m96vpk9jpgnqvhhrcz2527ba79494";
+          rev = "9820cff69d3b605813f609a0db8e6c860bfb9c72";
+          sha256 = "1l3cz16lnq5rw57m4j0x29j6nkrcxnz2ppar5xnpwlcaf600wqki";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tiny-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tiny-menu";
           sha256 = "1nngf6vsqfr9fx82mj8dl8zw0fpwf4kr74sflxxk7qxj4aw1jirk";
           name = "tiny-menu";
         };
@@ -59415,7 +59751,7 @@
           sha256 = "1n8cn6mr26hgmsm2mkbj5gs6dv61d0pap8ija4g0n1vsibfhzd8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tinysegmenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tinysegmenter";
           sha256 = "005yy2f8vghvwdcwakz5sr9n1gzk6cfyglm6d8b74y90d8fng0r6";
           name = "tinysegmenter";
         };
@@ -59436,7 +59772,7 @@
           sha256 = "1zvykanmn065rlk9hlv85vary1l6y52bsnaa51fkpckpr6dicmcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tj-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tj-mode";
           sha256 = "1i7dvxgj00p4n2fh8irgdfsjl2dpvfjjnkkv0cw71441f79p79mf";
           name = "tj-mode";
         };
@@ -59457,7 +59793,7 @@
           sha256 = "0z94m84q7j35dffpnbz1yh6axd6c787hj358bkq2qk0irsvh5n79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tldr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tldr";
           sha256 = "1f1xsmkbf4j1c876qqr9h8fgx3zxjgdfzvzf6capxlx2svhxzvc9";
           name = "tldr";
         };
@@ -59478,7 +59814,7 @@
           sha256 = "1ypbv9jbdnwv3xjsfzq8i3nmqdvziynv2rqsd6fm2r1xw0q06xd6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tmmofl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tmmofl";
           sha256 = "1idflc5ky8hwdkps1rihdqy3i6cmhrh83sxz3kgf2kqjh365yr8b";
           name = "tmmofl";
         };
@@ -59499,7 +59835,7 @@
           sha256 = "084nqdrpzgg1qpbqgvi893iglmz9dk3r0vwqxjkyxa3z3a0f5v17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/toc-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/toc-org";
           sha256 = "06mx2b0zjck82vp3i4bwbqlrzn05i2rkf8080cn34nkizi59wlbs";
           name = "toc-org";
         };
@@ -59517,7 +59853,7 @@
           sha256 = "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/todochiku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/todochiku";
           sha256 = "1iq08s5ji6hd8as80qxqkbavnjbx0kcmmjjvhjchmvv93vsn1f96";
           name = "todochiku";
         };
@@ -59538,7 +59874,7 @@
           sha256 = "0ms4mapjg9mbpmcmpn68r0mhwaibwfr4v25sin74b2281h4q7gal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/todotxt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/todotxt";
           sha256 = "13jcbkasvcczf7qnrh89ncqp6az6hm1s0ycrv7msva145n5bk1kr";
           name = "todotxt";
         };
@@ -59559,7 +59895,7 @@
           sha256 = "1k9ywi7cdgb6i600wr04r2l00423l6vr7k93qa7i7svv856nbbc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/todotxt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/todotxt-mode";
           sha256 = "1bs4air13ifx3xkhcfi80z29alsd63r436gnyvjyxlph2ip37v7k";
           name = "todotxt-mode";
         };
@@ -59580,7 +59916,7 @@
           sha256 = "1falf86mm2206szkkwiwa5yk65y12asv84j1pdbcy6n8y6hha796";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/togetherly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/togetherly";
           sha256 = "01ks160dfmgh05lx0lmyg020hba8nw49mj51dp1afcsmx4dkis2f";
           name = "togetherly";
         };
@@ -59597,11 +59933,11 @@
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "elisp";
-          rev = "df58c83a5f1e0b9889858407eae0e383bd759473";
-          sha256 = "184ghdi2m4hagddi71c1pmc408fad1cmw0q2n4k737w6j8537hph";
+          rev = "164ae0f8302c1e1938a9e30597901b1164b43f96";
+          sha256 = "1mgkwaa0q672r3lmw267ax54z4bvc3v3zji3q9asygni9bymkfyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/toggle";
           sha256 = "08lk8h2dk5s8k93j5vmxdlgg453pif8wbcx2w3xkjlh43dw1vdfq";
           name = "toggle";
         };
@@ -59622,7 +59958,7 @@
           sha256 = "1w1lmqgzn9bp59h9y9plv80y53k6qhjgfmnnlqyyqfl45z3si7kg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/toggle-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/toggle-quotes";
           sha256 = "16w453v4g7ww93bydim62p785x7w4vssp9l5liy0h3ppfmgvmxhp";
           name = "toggle-quotes";
         };
@@ -59643,7 +59979,7 @@
           sha256 = "0sgaslqxj806byidh06h5pqmqz8jzjfz9ky8jvkif3cq3a479jby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/toggle-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/toggle-test";
           sha256 = "0n8m325jcjhz8g75ysb9whsd12gpxw8598y5065j7c7gxjzv45l1";
           name = "toggle-test";
         };
@@ -59664,7 +60000,7 @@
           sha256 = "0f86aij1glmvgpbhmfpi441zy0r37zblb0q3ycgq0dp92x8yny5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/toggle-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/toggle-window";
           sha256 = "1z080jywqj99xiwbvfclr6gjkc6spr3dqjb9kq1g4971vx4w8n9g";
           name = "toggle-window";
         };
@@ -59685,7 +60021,7 @@
           sha256 = "1rp866s1b9ycjiv3h0jzrwr6p5ssfr0l8ry38kzi090c9hk84z0p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tomatinho";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tomatinho";
           sha256 = "1ad3kr73v75vjrc09mdvb7a3ws834k5y5xha3v0ldah38cl1pmjz";
           name = "tomatinho";
         };
@@ -59706,7 +60042,7 @@
           sha256 = "1b3bkla6i5nvanifxchph6ab6ldrskdf240hy4d27dkmmnr3pban";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/toml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/toml";
           sha256 = "0kqv6zkywa7kqh8kg1dzcgkbi91lwx335przdakndm1lfai38i9b";
           name = "toml";
         };
@@ -59727,7 +60063,7 @@
           sha256 = "1w9vkh6c4g80zykcy77k3r0bdc99mq8yh58bqkyd6gsr7pnp16gj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/toml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/toml-mode";
           sha256 = "0yghf2ixl3dkcaxnkr4qzxfa9k1rrac7w5qpw1jx2bvic0cfs40l";
           name = "toml-mode";
         };
@@ -59748,7 +60084,7 @@
           sha256 = "0pwbd5gzmpr6js20438870w605671930291070nhmhswvxfcdvay";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tommyh-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tommyh-theme";
           sha256 = "0nb9r407h08yxxdihxqx0c645bcz6qywbh2l654s3zfzdsqi1aj4";
           name = "tommyh-theme";
         };
@@ -59766,7 +60102,7 @@
           sha256 = "1sqflxj3hzxdlwn5qmpqm4dwik5vsyp7lypkvshcghdplxymb38a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tool-bar+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tool-bar+";
           sha256 = "07nsas600w5kxx7yzg52ax9avry8kq429mqlrs38jg5ycf3b1l6d";
           name = "tool-bar-plus";
         };
@@ -59784,7 +60120,7 @@
           sha256 = "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/top-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/top-mode";
           sha256 = "0hrjlbiz827v9yf4086wlghw64rhvvlsbzv8lzs6pprdwbpr9pdx";
           name = "top-mode";
         };
@@ -59805,7 +60141,7 @@
           sha256 = "0wv49gn1daylnjmnallpqsqy7630ynrp45agpiwi6kwyyqk1kdvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tornado-template-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tornado-template-mode";
           sha256 = "1sdv9rlhnabydws2sppsjcgqr0lg6bjapv753ksq5aaq21qsps0h";
           name = "tornado-template-mode";
         };
@@ -59826,7 +60162,7 @@
           sha256 = "188cdgic25wrb4jdgdcj070a0pxsh3m0rd9d2r6i1s1n1nalrs6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/totd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/totd";
           sha256 = "1bp07xl9yh9x6bi6cn8wz11x90jhv1rhxaig540iydjn5b0ny9m0";
           name = "totd";
         };
@@ -59847,7 +60183,7 @@
           sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tox";
           sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
           name = "tox";
         };
@@ -59867,7 +60203,7 @@
           sha256 = "1pnsky541m8kzcv81w98jkv0hgajh04hxqlmgddc1y0wbvi849j0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/toxi-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/toxi-theme";
           sha256 = "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd";
           name = "toxi-theme";
         };
@@ -59888,7 +60224,7 @@
           sha256 = "1yh9dxf986dl74sgn71qxwxsg67lr0yg1z7b9h2254lmxq0mgni6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/traad";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/traad";
           sha256 = "08gxh5c01xfbbj9g4992jah494rw3d3bbs8j79r3mpqxllkp2znf";
           name = "traad";
         };
@@ -59911,11 +60247,11 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "9a4f3c9a554f99de0eb9e5f2b3e545b3e6390918";
-          sha256 = "008fz7829mvjlid93hvs5xwwvigh5lnq2fxf2w9ghnw9lygkv5bq";
+          rev = "0564dfae13590d183889950724a7ef2e8df5b1df";
+          sha256 = "1nwdbm9dnybghcv2rjw9c8783k5r060cmxzklsn9by4l7i1x9k2r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tracking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tracking";
           sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
           name = "tracking";
         };
@@ -59936,7 +60272,7 @@
           sha256 = "1m25l1lyff4h0h4vjrcsziwbf8svqg2llvvgl8i2b4jbh7k7pk5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tracwiki-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tracwiki-mode";
           sha256 = "1k983f0lj42rxr5szpq9l9harykfn8jr13y3y6fav86zzd1fb8j0";
           name = "tracwiki-mode";
         };
@@ -59957,7 +60293,7 @@
           sha256 = "0llzfn9y3yyz2wwdbv8whx8vy2lazbnww6hjj0r621gkfxjml7wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tramp-hdfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tramp-hdfs";
           sha256 = "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b";
           name = "tramp-hdfs";
         };
@@ -59978,7 +60314,7 @@
           sha256 = "0cgx6h9a49qj7x6bgsnsa20hi1yj5k080x4x0jpn6l9bj5nqiaip";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tramp-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tramp-term";
           sha256 = "1vbdwj8q66j6h5ijqzxhyaqf8wf9rbs03x8ppfijxl5qd2bhc1dy";
           name = "tramp-term";
         };
@@ -59991,15 +60327,15 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20160528.556";
+        version = "20160612.203";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "7467dac2c44c355eed0774abfc6295a066018099";
-          sha256 = "0jgdydl7lm8ypymfpk9j3wjf10z77q52gfwhq6k1k2x0y92kh0sh";
+          rev = "01eb9f805965291953250ff2e8b5913d9d69aa86";
+          sha256 = "0fdnaxbnn0yq2cxpqbipi950gd7x6n92v1bmsmrhhkd8kznrlb3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/transmission";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/transmission";
           sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
           name = "transmission";
         };
@@ -60017,7 +60353,7 @@
           sha256 = "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/transpose-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/transpose-frame";
           sha256 = "0bqip7vckic3kfq3d31ifs1zics1djxwj2jadafj6f1agv02sdz5";
           name = "transpose-frame";
         };
@@ -60038,7 +60374,7 @@
           sha256 = "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/transpose-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/transpose-mark";
           sha256 = "1q1icp1szm1bxz9ywwyrfbsm1wmx0h4cvzywrh9q0fj1fq387qvv";
           name = "transpose-mark";
         };
@@ -60059,7 +60395,7 @@
           sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/travis";
           sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
           name = "travis";
         };
@@ -60077,7 +60413,7 @@
           sha256 = "0hffnzvzbvmzf23z9z7n7y53l5i7kza9hgfl39qqcnw4njg48llx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tree-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tree-mode";
           sha256 = "0xwyhlc5lagj46nd70l81rvb43hs08pic96grk62zknig8354c24";
           name = "tree-mode";
         };
@@ -60098,7 +60434,7 @@
           sha256 = "08484fhc69rk16g52f9bzc1kzpif61ddfchxjbj1qqqammbx11ym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/trident-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/trident-mode";
           sha256 = "0l81hs7bp46jlk41b9fk1lkvlp17fqc5hcz8k8kkal7rh7ari1fd";
           name = "trident-mode";
         };
@@ -60119,7 +60455,7 @@
           sha256 = "06wm3qwxjhzwjn9nnrqm5wwj1z5gfghg9d2qbg8w3zyqzva5dmvm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tronesque-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tronesque-theme";
           sha256 = "1bk73zawl1922aq739r3rz30flxd6nq87k8ahzbix139g7gxf19j";
           name = "tronesque-theme";
         };
@@ -60136,11 +60472,11 @@
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "emacs-trr";
-          rev = "a684e599b704f79ea3db2158cfcf46a4e778e994";
-          sha256 = "0ypznnpk8a4qh0izbmv0q8ahkdqn16vlqnmicy6hm3j2wfmrvzlx";
+          rev = "297b7ffacef79feeec8cd74823563a01a386d764";
+          sha256 = "1c29v5way2xqf6wvnc2mqprxa7kk5zh9qwzy4lqnyzllv2pwcizm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/trr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/trr";
           sha256 = "068vqsyx8riqzfrmjk8wr81f68r2y2b6ymc2vvl6vka9rprvsfwr";
           name = "trr";
         };
@@ -60161,7 +60497,7 @@
           sha256 = "1mm6rrprsmx4hc622qmllm7c81yhwbqmdr0n6020krq92zmilmlm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/truthy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/truthy";
           sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
           name = "truthy";
         };
@@ -60182,7 +60518,7 @@
           sha256 = "0gvwavsq9s4a75qz7xq9wl219fnzz085zjqpnrxxgmaqbi9m8l7a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/try";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/try";
           sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n";
           name = "try";
         };
@@ -60203,7 +60539,7 @@
           sha256 = "1bk5v9dffs65qsay0dp336s2ly065nd0cg572zz058ikwxd44zd3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tss";
           sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
           name = "tss";
         };
@@ -60224,7 +60560,7 @@
           sha256 = "1gvqxk67cf779szyg907815i4m9jzrpmn5cnsmnwd62k3r3z4nxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tt-mode";
           sha256 = "02dzyycn5znbibbz50b243bh1kcccp8xwknjqwljk00gpf196vzf";
           name = "tt-mode";
         };
@@ -60243,7 +60579,7 @@
           sha256 = "14kfnpp7fcd84ly9ng7hm5hzx2sdpn2x6d8frwbkdxfb0x81kmmf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ttl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ttl-mode";
           sha256 = "1nnn2y0n9rj3a8r85y2vp6qja5rm4drcbnj9q793zzqfjl9akqd4";
           name = "ttl-mode";
         };
@@ -60264,7 +60600,7 @@
           sha256 = "0a8f9p1im6k7mnp2bq733rfx2x246gfwpvi5ccym1y5lakx37fil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ttrss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ttrss";
           sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
           name = "ttrss";
         };
@@ -60274,22 +60610,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    tuareg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20160408.2031";
+        version = "20160608.117";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "f1eb7b500e892662a970ecdaf592c33949e43ba7";
-          sha256 = "0hscvsdp25aw7h4x8kq1ws72zx08bs2kw1s6axsi5576cl4d5yvg";
+          rev = "93b9c6cdba3a8f333cc817c3822fc76b71ff4dcd";
+          sha256 = "14l0y7gahbz1l4ag5nvswj7cl4skchvzr6r7zc1a5k000skdmv69";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tuareg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tuareg";
           sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
           name = "tuareg";
         };
-        packageRequires = [ caml ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/tuareg";
           license = lib.licenses.free;
@@ -60306,7 +60642,7 @@
           sha256 = "1xdkgvr1pnlg3nrjmma4ra80ysr8xbslvczg7cq1x1mqw6gn9xq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tumble";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tumble";
           sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
           name = "tumble";
         };
@@ -60327,7 +60663,7 @@
           sha256 = "1g7y7czan7mcs5lwc5r6cllgksrj3b9lpn1bj7khwkd1ll391jc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tumblesocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tumblesocks";
           sha256 = "11ky69icsnxwsinv2j3f4c0764wm6i9g9mlvwsdrd6w1lchq1dg9";
           name = "tumblesocks";
         };
@@ -60348,7 +60684,7 @@
           sha256 = "0y1b9zvwbw3vp41siyzj04bis939fgz3j27hc5ljjzy92kd39nzm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tup-mode";
           sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
           name = "tup-mode";
         };
@@ -60369,7 +60705,7 @@
           sha256 = "1jb6par116mm5l4z27wk6m2sfh6j9nmgrya352sdagcvjbcpnzcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/turkish";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/turkish";
           sha256 = "0pdapxjbpj3lg3hxvwjn9v51jqaiz7a8053z2bmk4485vzs34532";
           name = "turkish";
         };
@@ -60390,7 +60726,7 @@
           sha256 = "0khl4q22x6vdn87xdqqg5f535d4dqpnfbhk6qhlh187p1w7qaiq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/turnip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/turnip";
           sha256 = "1vfqv71j47fn53klz3jl8r8hscywd01kkl4w96a308sac3lhbrps";
           name = "turnip";
         };
@@ -60411,7 +60747,7 @@
           sha256 = "0wvmih2y3hy7casxx2y1w8csmzfnfgbb5ivpggr94sc86p6bg8sa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/twig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/twig-mode";
           sha256 = "1m3xjgmkqg8aj536wcg2f2hf4y6whscbsh7z7448hl4b5qjwii4n";
           name = "twig-mode";
         };
@@ -60432,7 +60768,7 @@
           sha256 = "1bj2mpiklqcangjzbnz5wz7klsfvp0x397lidvf42awn7s2aax0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/twilight-anti-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/twilight-anti-bright-theme";
           sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
           name = "twilight-anti-bright-theme";
         };
@@ -60453,7 +60789,7 @@
           sha256 = "1awqc4rvg8693myynb1d4y4dfdaxkd5blnixxs3mdv81l07zyn8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/twilight-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/twilight-bright-theme";
           sha256 = "074cqs55gwy5jlaay3m9bpdpdfb45nmlijvapz96nibl64pyk83d";
           name = "twilight-bright-theme";
         };
@@ -60474,7 +60810,7 @@
           sha256 = "0d7vd1h0rwwgrh7f9kmdgy2ni0p20da9c8ylwlg33nsb26345wfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/twilight-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/twilight-theme";
           sha256 = "1wkca66q4k94h9njsy15n83wjzn90rcbmv44x0hdwqj92yxjf3y7";
           name = "twilight-theme";
         };
@@ -60495,7 +60831,7 @@
           sha256 = "1dk2s16p33fjx29la1zg35ax1mmwmrl33ww9qmg88ssxfcdj2jr0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/twittering-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/twittering-mode";
           sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
           name = "twittering-mode";
         };
@@ -60516,7 +60852,7 @@
           sha256 = "1i826xq77nh4s7qlj63r2iznbn319l1l3fzpbjb2nj0m00bwvxl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/typed-clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/typed-clojure-mode";
           sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
           name = "typed-clojure-mode";
         };
@@ -60537,7 +60873,7 @@
           sha256 = "17q7f433x8i484scwdbfsd0vh8lshzkwjlarhqw6ic53mzakgjiq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/typescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/typescript-mode";
           sha256 = "01jyqy44ir59n9c2f6gh4xzwfmzdpnys1lw4lnsy6kirqgbsq9ha";
           name = "typescript-mode";
         };
@@ -60555,7 +60891,7 @@
           sha256 = "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/typing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/typing";
           sha256 = "0b72lbzji105wzvsi58l6pjc08qcwrm5ddf42irdxi956081pzp3";
           name = "typing";
         };
@@ -60576,7 +60912,7 @@
           sha256 = "0dkrnn9fzqv793wvd3nc7dbslayj37q5na1w1g63g32z2s8aq09j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/typing-game";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/typing-game";
           sha256 = "0k85j9bcqp0gbzdh44q5a9wlkv5mc0g0m42ziq1bzmp6993wkmy2";
           name = "typing-game";
         };
@@ -60597,7 +60933,7 @@
           sha256 = "1jv5qmp3xs37py7d9aln4jn85j65h9pp5vb2dcmd8rlszhplsrng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/typit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/typit";
           sha256 = "05m7ymcq6fgbhh93ninrf3qi7csdnf2ahhf01mkm8gxxyaqq6m4n";
           name = "typit";
         };
@@ -60618,7 +60954,7 @@
           sha256 = "0bn1bvs334wb64bli9h613zf1vzjyi0pz8bgyq1wy12qmbwwmfwk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/typo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/typo";
           sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
           name = "typo";
         };
@@ -60639,7 +60975,7 @@
           sha256 = "1v8d1pc0vjc7wz0prr5w5vp2qb19f3gcyl6jx5130plajbvv23rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ubuntu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ubuntu-theme";
           sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
           name = "ubuntu-theme";
         };
@@ -60657,7 +60993,7 @@
           sha256 = "0qy211rxrmzhwl9qfrcmfnwayysvb5rghjginbvx3wf2s6hrbpya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ucs-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ucs-cmds";
           sha256 = "1n0f0qf8w8ark78fs67aaxnqpk0km97hy59pnxwfyahgjl2qz6d1";
           name = "ucs-cmds";
         };
@@ -60678,7 +61014,7 @@
           sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ucs-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ucs-utils";
           sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
           name = "ucs-utils";
         };
@@ -60699,7 +61035,7 @@
           sha256 = "13zznakgqyy3hw385f6w40rz4agxz6fmgaxzgmrz3kjpn19bc2fa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/uimage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/uimage";
           sha256 = "0i6qpk6v4pmpk3zswygdy0dd7rxy8kl7qn8a1xanpi4aqg7wlbmd";
           name = "uimage";
         };
@@ -60712,15 +61048,15 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20160521.2001";
+        version = "20160611.1517";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "43b2e0e9bd8419d00f2500b421efb218fc2e4e36";
-          sha256 = "0zwayin4fjswl1xmbsgvkkssnx97c6h230m5a7hl4a7llx9l5c6s";
+          rev = "9cdf20147606f4a16b7128591d1b28cfc34c1c81";
+          sha256 = "0fjlacsx3krzllg5nwjyrfndd0sz16hxdbpv50mlsp0nm2nfiqv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ujelly-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ujelly-theme";
           sha256 = "0b7zgmpsdn5p3jx4kif7phxz8pb85snmmfr3yz98xf6p7h6w60gw";
           name = "ujelly-theme";
         };
@@ -60741,7 +61077,7 @@
           sha256 = "033v4ck979lhkpwblci5clacfc1xnkq03p5d1m566wff8dp5flwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ukrainian-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ukrainian-holidays";
           sha256 = "0kbfj2l1rcv74c88nabkwkcl7k9pkim835l24q61zv3i6wf9sykf";
           name = "ukrainian-holidays";
         };
@@ -60759,7 +61095,7 @@
           sha256 = "0awmzz9cfr17ggpzsgxqqhz5946l7705vvkfaiz7qx9wg0pbch18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unbound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unbound";
           sha256 = "1ys6pgb3lhx4ihhv8i28vrchp1ad37md7lnana40macf5n72d77x";
           name = "unbound";
         };
@@ -60780,7 +61116,7 @@
           sha256 = "0366h4jfi0c7yda9wcrz4zxgf2qqdd08b8z2dr8c1rkvkdd67iam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/uncrustify-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/uncrustify-mode";
           sha256 = "0amdxdfc8i99zjrw4iqmxzb47h0airs60fwmc32bc8b0ds66c3kd";
           name = "uncrustify-mode";
         };
@@ -60801,7 +61137,7 @@
           sha256 = "1860hnsbvndaahqs233adk8piz7nyj8v3b0gziv1lrnq864hrq5i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/undercover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/undercover";
           sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
           name = "undercover";
         };
@@ -60822,7 +61158,7 @@
           sha256 = "1ypxpv5vw2ls757iwrq3zld6k0s29q3kg3spcsl5ks4aqpnkxpva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/underwater-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/underwater-theme";
           sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
           name = "underwater-theme";
         };
@@ -60839,10 +61175,10 @@
         src = fetchgit {
           url = "http://www.dr-qubit.org/git/undo-tree.git";
           rev = "a3e81b682053a81e082139300ef0a913a7a610a2";
-          sha256 = "1qla7njkb7gx5aj87i8x6ni8jfk1k78ivwfiiws3gpbnyiydpx8y";
+          sha256 = "014x3gnv4l0p7jbz34dmdrcksw4dfww9lkp9d7nx5q3fsbvsx35z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/undo-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/undo-tree";
           sha256 = "0vrjxprpk854989wcp4wjb07jhhxqi25p6c758gz264z3xa8g9cr";
           name = "undo-tree";
         };
@@ -60863,7 +61199,7 @@
           sha256 = "1c0daw246ky7b1x5b8h55x79pl1pjqk1k348l487bdd8zdj4w9wx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/undohist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/undohist";
           sha256 = "0zzfzh8sf2dkz8h3kidv7zmwz2c2qq9n9qz2mab2lk0y44njzwhn";
           name = "undohist";
         };
@@ -60884,7 +61220,7 @@
           sha256 = "0fd9k5m1yw2274m2w9rkrg7vqagzf0rjbybglqi7d200b3hmjin3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unfill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unfill";
           sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
           name = "unfill";
         };
@@ -60905,7 +61241,7 @@
           sha256 = "015gjf8chd6h9azhyarmskk41cm0cmg981jif7q81hakl9av6rhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unicode-emoticons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unicode-emoticons";
           sha256 = "15s6qjhrrqrhm87vmvd6akdclzba19613im85kfkhc24p6nxyhbn";
           name = "unicode-emoticons";
         };
@@ -60926,7 +61262,7 @@
           sha256 = "0936dqxyp72if9wvn2dcci670yp1gqrmpnll9xq00skp85yq9zs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unicode-enbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unicode-enbox";
           sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
           name = "unicode-enbox";
         };
@@ -60953,7 +61289,7 @@
           sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unicode-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unicode-fonts";
           sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
           name = "unicode-fonts";
         };
@@ -60979,7 +61315,7 @@
           sha256 = "0kzcg1wxi1z424jdn7pibk9zyfyi85kligav08sl1c2hdldzya4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unicode-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unicode-input";
           sha256 = "17sf3xnl8yyx4ln4mrjlrvfinb8dvabh81l3qyr9pkn5skpgqgj8";
           name = "unicode-input";
         };
@@ -61000,7 +61336,7 @@
           sha256 = "16jgm70ldsngxldiagjkw3ragypalpiidnf82g5hss9ciybkd3j4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unicode-progress-reporter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unicode-progress-reporter";
           sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
           name = "unicode-progress-reporter";
         };
@@ -61021,7 +61357,7 @@
           sha256 = "0ny260mr1h810fvqsfj2hpd3zql4g309m60qj4vk6kmd83p5b60f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unicode-troll-stopper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unicode-troll-stopper";
           sha256 = "0a10lq0xsfyp052iw4xjbhsdkbyg25x2gk68gys4k7p6l92la0k5";
           name = "unicode-troll-stopper";
         };
@@ -61042,7 +61378,7 @@
           sha256 = "1ayb15nd5vqr0xaghrnp55kqw7bblrjipmfrag6bqpn7jk9bvbdz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unicode-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unicode-whitespace";
           sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
           name = "unicode-whitespace";
         };
@@ -61063,7 +61399,7 @@
           sha256 = "1jvr1k8zd40m1rvwmxzidz1dvr4j8cbh78nqgc3vfb410fj619gw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unidecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unidecode";
           sha256 = "0h058mvb6x53zywpwg85dzhaynlgq577yyqhrn5qqyqjg1n8lhc1";
           name = "unidecode";
         };
@@ -61084,7 +61420,7 @@
           sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unify-opening";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unify-opening";
           sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
           name = "unify-opening";
         };
@@ -61105,7 +61441,7 @@
           sha256 = "1wl9rzys1zr2c41h5i57y6hxsavix1b26f453l2izmb6r0b1dvh0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unipoint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unipoint";
           sha256 = "0fm7anwcmga9adyfwlri7x014rpvfl1r6nccyi6lrpx126wy008s";
           name = "unipoint";
         };
@@ -61126,7 +61462,7 @@
           sha256 = "1snbvhvx2csw1f314dbdwny8yvfq834plpkzx0vl4k3wddmr3a66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unison-mode";
           sha256 = "03kyr1h5pm51vn4bykj13rm4ybln266rpnxh65y2ygw8f8md88gl";
           name = "unison-mode";
         };
@@ -61147,7 +61483,7 @@
           sha256 = "0bhdqpxq6cly4b6v4ya1ksw0yfdb9g2f2ifbjn4gfcq6j4zszbdm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unkillable-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unkillable-scratch";
           sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
           name = "unkillable-scratch";
         };
@@ -61168,7 +61504,7 @@
           sha256 = "179hi6hsp2naczlcym3qxx9wbqx96bkkzvqygf3iffa0rmik4j7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/url-shortener";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/url-shortener";
           sha256 = "12r01dyk55bs01jk0ab9f24lfvm63h8kvix223pii5y9890dr6ys";
           name = "url-shortener";
         };
@@ -61189,7 +61525,7 @@
           sha256 = "0xwr0v4f64d7hi5ldig4r5yjn8h3f8by49g5820187lsp7ng2nw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/urlenc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/urlenc";
           sha256 = "0n6shh95m11162zsnf62zy1ljswdjznjilxx2dbqyqdrn7qr2dgh";
           name = "urlenc";
         };
@@ -61207,7 +61543,7 @@
           sha256 = "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/usage-memo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/usage-memo";
           sha256 = "05n50adjnavl7ag24wfjwlnbv5x55qlhmplgsm8j57gjig01nd95";
           name = "usage-memo";
         };
@@ -61228,7 +61564,7 @@
           sha256 = "19vc1hblbqlns2c28aqwjpmj8k35ih7akqi04wrqv1b6pljfy3jg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/use-package";
           sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
           name = "use-package";
         };
@@ -61249,7 +61585,7 @@
           sha256 = "0d69hckz6xbll1x2mll385kcw7mwx8cwxg1wdhphnww0s810isgp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/use-package-chords";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/use-package-chords";
           sha256 = "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass";
           name = "use-package-chords";
         };
@@ -61270,7 +61606,7 @@
           sha256 = "1vacc4l5jsyxdfcinxja3r1qyc4cskmd9xvxp6zxkjfw4x6nr71c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/utop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/utop";
           sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
           name = "utop";
         };
@@ -61291,7 +61627,7 @@
           sha256 = "0r74gw8gcbrr62rvj4anz0c3n6kwi1xpb42d3pkzlh4igblhi5zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/uuid";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/uuid";
           sha256 = "13xjnawir9i83j2abxxkl12gz3wapgbk56cps3qyfgql02bfk2rw";
           name = "uuid";
         };
@@ -61312,7 +61648,7 @@
           sha256 = "19bf6vpc2b9hfjkjanji96fflvk1lbillasnpwcb6zzyq0cs47bw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/uuidgen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/uuidgen";
           sha256 = "1qaz7hg0wsdkl0jb7v7vrkjs554i2zgpxl8xq2f8q7m4bs2m5k48";
           name = "uuidgen";
         };
@@ -61333,7 +61669,7 @@
           sha256 = "0fx18m688wfflbzwv8h3051439fwql69v1ip5q6xn958rdq4pi3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/uzumaki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/uzumaki";
           sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
           name = "uzumaki";
         };
@@ -61354,7 +61690,7 @@
           sha256 = "1661fwfx2gpxjriy3ngi9raz8c2kkk3rgg51irdi591jr2zqmw6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vagrant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vagrant";
           sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
           name = "vagrant";
         };
@@ -61375,7 +61711,7 @@
           sha256 = "138gw90wa2qyzyicig3cwhpb1xc5bh9g0vb87y91afjlykhzr6a5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vagrant-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vagrant-tramp";
           sha256 = "0ij7k27zj22sl7inx141l4dg0ymywnvyabjvaqzc0xjdj0cky5c5";
           name = "vagrant-tramp";
         };
@@ -61396,7 +61732,7 @@
           sha256 = "10vs4d8csww781j1ps3f6dczy5zzza36z7a8zqk40fg4x57ikw44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vala-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vala-mode";
           sha256 = "164dhlsiflhpdymk3q5x0bv8gpbwfp34lnkhm2x90kdakfzqf91p";
           name = "vala-mode";
         };
@@ -61417,7 +61753,7 @@
           sha256 = "0iscaz8lm4fk6w13f68ysqk8ppng2wj9fkkkq1rfqz77ws66f8nq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vala-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vala-snippets";
           sha256 = "14hmmic0px3z38dm2dg0kis6cz1p3p1hj7xaqnqjmv02dkx2mmcy";
           name = "vala-snippets";
         };
@@ -61438,7 +61774,7 @@
           sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vbasense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vbasense";
           sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
           name = "vbasense";
         };
@@ -61459,7 +61795,7 @@
           sha256 = "09h7yg44hbxv3pyazfypkvk8j3drlwz0zn8x1wj0kbsviksl1wxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vc-auto-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vc-auto-commit";
           sha256 = "1xpp7vbld3jgcr249m5h7il919kfg7d5ap3zs64i27axzdhv26zk";
           name = "vc-auto-commit";
         };
@@ -61480,7 +61816,7 @@
           sha256 = "0icc4kqfpimxlja4jgcy9gjj4myc8y84vbvacyf79lxixygpaxi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vc-check-status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vc-check-status";
           sha256 = "1kwnxa0ndfj8b211xy5d47sxkwmsay0kk8q7azfm5ag5dkg56zgi";
           name = "vc-check-status";
         };
@@ -61501,7 +61837,7 @@
           sha256 = "1zpvinbc3nrnjm931fgzrlkl31xcsg9ikh041s1fkfjkhfq0h82h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vc-darcs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vc-darcs";
           sha256 = "1xskl9wjxkbdpi0fm769ymbvya70vssi944x5252w2d3layibm6m";
           name = "vc-darcs";
         };
@@ -61522,7 +61858,7 @@
           sha256 = "0whzfzg0m03wbmqsxml8hislnbfvawcniq83hj66lbrnbivxsqj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vc-osc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vc-osc";
           sha256 = "0rp33945xk5d986brganqnn55psmlkj6glbimxakhgv9a1r85sxz";
           name = "vc-osc";
         };
@@ -61543,7 +61879,7 @@
           sha256 = "1jfis26lmghl30ydzq1xdkrrj3d85q7g44ns6kmfg119ccapllbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vcl-mode";
           sha256 = "1h0a1briinp9ka7ga3ipdhyf7yfinwvf7babv36myi720900wcq5";
           name = "vcl-mode";
         };
@@ -61564,7 +61900,7 @@
           sha256 = "0fzz26c1pdaz3i58ndhzd2520mhny487daqs21yajxi9x2m00zrl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vcomp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vcomp";
           sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
           name = "vcomp";
         };
@@ -61585,7 +61921,7 @@
           sha256 = "1lh8nv0ayl9ipl2aqc8npzz84g5q7w6v60l14v61mmk34fc23lnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vdirel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vdirel";
           sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
           name = "vdirel";
         };
@@ -61606,7 +61942,7 @@
           sha256 = "1wa03gb98x650q798aqshm43kh6gfxaz1rlyrmvka5dxgf48whmf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vector-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vector-utils";
           sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
           name = "vector-utils";
         };
@@ -61627,7 +61963,7 @@
           sha256 = "1y6vjw5qzaxr37spg5d4nxffmhiipzsrd7mvh8bs3jcfrsg3080n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/verify-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/verify-url";
           sha256 = "1gd83rb1q0kywchd0345p5axqj1sv4f5kadympx5pbp4n5p1dqb2";
           name = "verify-url";
         };
@@ -61648,7 +61984,7 @@
           sha256 = "1mp71axs3vdrdwlhgywfldvnr6a1g2qbxiywmpfmcv59n5n58p1j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vertica";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vertica";
           sha256 = "1ljjk6zrbr2k0s0iaqd9iq3j45cavijcx0rqdidliswnfllav4ng";
           name = "vertica";
         };
@@ -61669,7 +62005,7 @@
           sha256 = "044vy6yi9yfk3h2gd3a718w50py02h1b5fr0i7a08rjlq4l3srka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vertigo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vertigo";
           sha256 = "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83";
           name = "vertigo";
         };
@@ -61690,7 +62026,7 @@
           sha256 = "185a7962h94122q783ih7s8r28xifm0bcrqvkd0g4p64mijlbh3d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vhdl-capf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vhdl-capf";
           sha256 = "06dkw5ra9wnscpgrnx851vyfgr5797xd60qdimsr2v1bqd8si9km";
           name = "vhdl-capf";
         };
@@ -61711,7 +62047,7 @@
           sha256 = "1syfmx7gzphy08h2py3789xwkqwgirfg189h8s6400q9sznzm6fc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vhdl-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vhdl-tools";
           sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
           name = "vhdl-tools";
         };
@@ -61732,7 +62068,7 @@
           sha256 = "0wdm8k49zl6i6wnh7vjkswdh5m9lix56jv37xvc90inipwgs402z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vi-tilde-fringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vi-tilde-fringe";
           sha256 = "0jhwv46gjwjbs1ai65nm6k15y0q4yl9m5mawgp3n4f45dh02cawp";
           name = "vi-tilde-fringe";
         };
@@ -61753,7 +62089,7 @@
           sha256 = "1ch8lr514f9lp3wdhy1z4dqcbnqkbqkgflnchwd82r5ylzbdxy2a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/viewer";
           sha256 = "10rw3b8akd2fl8gsqf1m24zi6q4n0z68lvvv1vx9c9b7ghqcqxw1";
           name = "viewer";
         };
@@ -61774,7 +62110,7 @@
           sha256 = "1fmjcm33hvm7d9ppf8lnbdqcqda8xj332hqdm50pvl0qfj90mp94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/viking-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/viking-mode";
           sha256 = "13g6gw8yc4pgi1zjig6nlpnsh52dzmprisq95r6lx6hk0xbzrx16";
           name = "viking-mode";
         };
@@ -61795,7 +62131,7 @@
           sha256 = "11qh6fpf6269j9syf06v5wnkgi65wnn7dbyjwb6yz72rvq7ihhcz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vim-empty-lines-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vim-empty-lines-mode";
           sha256 = "17bl1g4ais73ws596mha0l8dgckfqhx9k2v9m9k0gw7kg7dcjhnb";
           name = "vim-empty-lines-mode";
         };
@@ -61816,7 +62152,7 @@
           sha256 = "13g2hin100c8h5bd7hzhyqzj02ab9c35giyv963l7y044v7sbwig";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vim-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vim-region";
           sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
           name = "vim-region";
         };
@@ -61837,7 +62173,7 @@
           sha256 = "1i407ilhmk2qrk66ygbvizq964bdk502x7lvrzs4wxwfr5y8ciyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vimgolf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vimgolf";
           sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
           name = "vimgolf";
         };
@@ -61858,7 +62194,7 @@
           sha256 = "1n8aw5g0a38irx2m93fgqll99n6w59h6nzkrmzb9747bvar4mpsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vimish-fold";
           sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
           name = "vimish-fold";
         };
@@ -61879,7 +62215,7 @@
           sha256 = "000fs2h5zcv8aq8an16r6zwwf9x1qnfs7xxn39iahiwfzvnljqp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vimrc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vimrc-mode";
           sha256 = "06hisgsn0czvzbq8m4dz86h4q75j54a0gxkg5shnr8s654d450bp";
           name = "vimrc-mode";
         };
@@ -61900,7 +62236,7 @@
           sha256 = "0rd7hyv66278dj32yva5q9z1749y84c6fwl2iqrns512j1l4kl8q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/virtualenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/virtualenv";
           sha256 = "1djqzzlbwsp9xyjqjbjwdck73wzikbpq19irzamybk90nc98wirl";
           name = "virtualenv";
         };
@@ -61921,7 +62257,7 @@
           sha256 = "05rzjlb04h7xyq7l7z87hqqcsf907p2nsxqnh7r6wm24kddfb0ab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/virtualenvwrapper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/virtualenvwrapper";
           sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i";
           name = "virtualenvwrapper";
         };
@@ -61942,7 +62278,7 @@
           sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/visible-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/visible-mark";
           sha256 = "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80";
           name = "visible-mark";
         };
@@ -61963,7 +62299,7 @@
           sha256 = "1cv8mf3l92a9p8qmkfiphk3r81f2ihg2gyw2r4jbbd5ppwbxkl0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/visual-ascii-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/visual-ascii-mode";
           sha256 = "1h0143h39dq61afswlzlgpknk0gv574x91ar6klqmnaf1snab59g";
           name = "visual-ascii-mode";
         };
@@ -61984,7 +62320,7 @@
           sha256 = "0r1iylk7r25wmlba4vlrc6k1apbkrbplb9id1h9q91wqhwdnxqal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/visual-fill-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/visual-fill-column";
           sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
           name = "visual-fill-column";
         };
@@ -62005,7 +62341,7 @@
           sha256 = "1l3p7fypl5abwmsks0ms66xxq3zc78dp9gpbvwv5pqzh8b2f4xdq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/visual-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/visual-regexp";
           sha256 = "16bdqq2j7pnjq3j6qa4rhxzidqdhyg80c7nazd93smis8rcv5d0z";
           name = "visual-regexp";
         };
@@ -62026,7 +62362,7 @@
           sha256 = "0bc44z8y1jmw7jlz785bisy36v08jichj53nwhmp2wjyv40xy321";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/visual-regexp-steroids";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/visual-regexp-steroids";
           sha256 = "1xkrzyyll8wmb67m75lfm9k8qcm068km8r1k8hcsadpkd01bx1lr";
           name = "visual-regexp-steroids";
         };
@@ -62047,7 +62383,7 @@
           sha256 = "0hb845pnh2yska6alca8hbbxh65x7g81pr7852h8fddm0qd1agkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vkill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vkill";
           sha256 = "09siqsip6d2h3jrxbdbhylkqm42dx3d2dqlkkdw3a81c7ga9lpwm";
           name = "vkill";
         };
@@ -62068,7 +62404,7 @@
           sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vlf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vlf";
           sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
           name = "vlf";
         };
@@ -62086,7 +62422,7 @@
           sha256 = "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vline";
           sha256 = "0p59xhyrv7fmcn3qi51sp8v9v2y71ray2s756zbhzgzg63h3nbjp";
           name = "vline";
         };
@@ -62107,7 +62443,7 @@
           sha256 = "0wjfpgypdii7y2zp2c3yb6pmgpcza11ds2x3dya4syn6ll7zhgz9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vmd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vmd-mode";
           sha256 = "1hd4bqgmrrznixmig5p9c3rl09r8z5d1jmmia2001i0r59wi61wb";
           name = "vmd-mode";
         };
@@ -62128,7 +62464,7 @@
           sha256 = "183pvfp5nnqpgdmfxm84qrnid0lijgk79l5lhwzmnznzkrb7bgxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/voca-builder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/voca-builder";
           sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
           name = "voca-builder";
         };
@@ -62141,15 +62477,15 @@
     volatile-highlights = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "volatile-highlights";
-        version = "20160521.506";
+        version = "20160612.355";
         src = fetchFromGitHub {
           owner = "k-talo";
           repo = "volatile-highlights.el";
-          rev = "eab9774fa301b6103c3f95fa0812e9241102c163";
-          sha256 = "0k5n241zf4h9339iwjkngcjmi1qhfgaz73376ry5lvdq48izcgkg";
+          rev = "9a20091f0ce7fc0a6b3e641a6a46d5f3ac4d8392";
+          sha256 = "1dsa6769lphyyv7yg92vkkpk395w52q4m7hdn8xy7s6lh5c6a955";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/volatile-highlights";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/volatile-highlights";
           sha256 = "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d";
           name = "volatile-highlights";
         };
@@ -62170,7 +62506,7 @@
           sha256 = "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/volume";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/volume";
           sha256 = "1r01v453bpyh561j8ja36609hy60gc30arvmz4z3c1cybhv8sk1i";
           name = "volume";
         };
@@ -62191,7 +62527,7 @@
           sha256 = "1d9rwgyvizn1zas8v98v86g5kck0m567cprpcakdawwamn155k49";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vue-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vue-mode";
           sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0";
           name = "vue-mode";
         };
@@ -62209,7 +62545,7 @@
           sha256 = "0vb5ss30mz0kqq8cscjckw647vqn6xprp2sfjcbpg2fx59z4agma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/w32-browser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/w32-browser";
           sha256 = "14vc2cipwlwwc0b5ld4x0zvydkg8nbjmp0z2x6ca0nmxw8sfsnc6";
           name = "w32-browser";
         };
@@ -62228,7 +62564,7 @@
           sha256 = "0nyara81bnd0rvgyljqrrbvjvndkngdc7qzf6scl5iz3vlglfgy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/w32browser-dlgopen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/w32browser-dlgopen";
           sha256 = "0dnvsnahnbnvjlhfmb0q6agzikv9d42fbnfrwsz6hni92937gz39";
           name = "w32browser-dlgopen";
         };
@@ -62270,7 +62606,7 @@
           sha256 = "0nvlni3iy2sq76z8d4kj5492m0w7qv96shjqkynvlj0avf528hv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wacspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wacspace";
           sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
           name = "wacspace";
         };
@@ -62291,7 +62627,7 @@
           sha256 = "0w59ix8cbbcyhh882c8vkrbh84i8d03h9w7dchr3qy233b8wcxlc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/waher-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/waher-theme";
           sha256 = "091kipkb6z6x9ic4chprim9rvnmx4yj4419ijmvpn70w69aspnb5";
           name = "waher-theme";
         };
@@ -62312,7 +62648,7 @@
           sha256 = "06d6ywc0hq6jn5ahq96qa8v8fnps464f2gjmdhsgvj8b0d0c5jl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wakatime-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wakatime-mode";
           sha256 = "1rhy2bwkqlha4bj3zmb0iassiglch7yb2kbas0bbpl3d0hdki2i8";
           name = "wakatime-mode";
         };
@@ -62333,7 +62669,7 @@
           sha256 = "09gqsssc2sk0vwfg0h4zxq9a779sdjdgvxsw7p6n2k0g4wk0phri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wand";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wand";
           sha256 = "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l";
           name = "wand";
         };
@@ -62354,7 +62690,7 @@
           sha256 = "06jqlvy2078fd8py59z5rraf2ymlkv6wizmw91vq63f87vpw71zg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wandbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wandbox";
           sha256 = "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz";
           name = "wandbox";
         };
@@ -62375,7 +62711,7 @@
           sha256 = "01zwk4rh18fmgrj75kyhkny1s3r0cmnjjnxa3ljbw1yy6q90acga";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wanderlust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wanderlust";
           sha256 = "0lq7fvqc0isv49lcm7ql6prc3hpcj5cx4kf8f4gcnfv5k8159cq9";
           name = "wanderlust";
         };
@@ -62396,7 +62732,7 @@
           sha256 = "1x472s5qr6wvla7nj5i9mas8z9qhkj4zj5qghfwn5chb9igvfkif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/warm-night-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/warm-night-theme";
           sha256 = "1nrjkrr64rry6fjya22b0lcs0f8a2ijvr87192z311y9mw5rvb29";
           name = "warm-night-theme";
         };
@@ -62417,7 +62753,7 @@
           sha256 = "0i84ndnxma8s07kf5ixqyhv5f89mzc4iymgazj5inmxhvbc7s7r2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/watch-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/watch-buffer";
           sha256 = "18sxgihmqmkrbgs66qgnrsjqbp90l93531hns31fbnif10bkx2j5";
           name = "watch-buffer";
         };
@@ -62438,7 +62774,7 @@
           sha256 = "0zw8z2r82986likz0b0zy37bywicrvz9dizzw9p52gs1lx0is1fy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wavefront-obj-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wavefront-obj-mode";
           sha256 = "0qqismh6g2fvi45q2q52lq0n9nrh95wgamlsy5j4rx4syfgzxbrk";
           name = "wavefront-obj-mode";
         };
@@ -62459,7 +62795,7 @@
           sha256 = "0p7j4hvcxfyjf0na9s3xv29dvmwq82s56lincfasd0ydcpz4fbwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wc-goal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wc-goal-mode";
           sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
           name = "wc-goal-mode";
         };
@@ -62480,7 +62816,7 @@
           sha256 = "1j1k3ab0ymr66w23z3r4yd1g6410n5y80jfyg2f9i9rdk7vq18gd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wc-mode";
           sha256 = "191dmxfpqnj7d43cr0fhdmj5ldfs7w9zg5pb2lv9wvlfl7asdid6";
           name = "wc-mode";
         };
@@ -62501,7 +62837,7 @@
           sha256 = "0irw76inj3gdmi88hiayplv6fzjjjsvvvmr121ahh3p73mb14cjd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wcheck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wcheck-mode";
           sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
           name = "wcheck-mode";
         };
@@ -62522,7 +62858,7 @@
           sha256 = "05gfc67724b0mwg8kvk3dsazx3dld50b9xjq8h1nc6jvdz3zxb9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/weather-metno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/weather-metno";
           sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
           name = "weather-metno";
         };
@@ -62543,7 +62879,7 @@
           sha256 = "03xcadplw1hg5hxw6bfrhw5xkkxk3i4105f114c6m3d2525jq4y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/web";
           sha256 = "0ynnmqw0vsf7wyhp9m5a05dfb19vkj8dnj5glhjdzjvg30dhjp3a";
           name = "web";
         };
@@ -62564,7 +62900,7 @@
           sha256 = "0j8v8p4w586wz80q9scdby6b80sbxz4lqg9zb5pbr2w8bsps8n4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/web-beautify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/web-beautify";
           sha256 = "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f";
           name = "web-beautify";
         };
@@ -62585,7 +62921,7 @@
           sha256 = "19nzjgvd2i5745283ck3k2vylrr6lnk9h3ggzwrwdhyd3m9433vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/web-completion-data";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/web-completion-data";
           sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
           name = "web-completion-data";
         };
@@ -62598,15 +62934,15 @@
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20160529.2048";
+        version = "20160611.2126";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "1445f400c154d5f9eff10311c8ac7dd935a0fe26";
-          sha256 = "1l0fr7yfb15i1jxmcf4bis6krw31s4vvckffpx3jpnkzjcxnk8is";
+          rev = "7434d8ad8c68c509e241a8bcd88d7ef451e78332";
+          sha256 = "0d3gsydg8i9ip787ii3h6ly1zv4ywbb1z66da7sppy9yfbw7snkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
           name = "web-mode";
         };
@@ -62627,7 +62963,7 @@
           sha256 = "0mbhyk7sgisx0l0xiz2xgy4jfbgwazlnxjvajsh4nysyig5rys05";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/web-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/web-server";
           sha256 = "1f0iyvwq1kq3zfxx2v596cmah7jfk2a04g2rjllbgxxnzwms29z3";
           name = "web-server";
         };
@@ -62647,7 +62983,7 @@
           sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/weblogger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/weblogger";
           sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk";
           name = "weblogger";
         };
@@ -62668,7 +63004,7 @@
           sha256 = "0ly12vy93m6jk6r62006ykjcrk966qk0ah0fk0hjxf8fx8shhsig";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/websocket";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/websocket";
           sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg";
           name = "websocket";
         };
@@ -62689,7 +63025,7 @@
           sha256 = "19hgb5knqqc4rb8yl8s604xql8ar6m9r4d379cfakn15jvwqnl98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wedge-ws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wedge-ws";
           sha256 = "07i2dr807np4fwq3ryxlw11vbc1sik1iv7x5740q258jyc9zfgll";
           name = "wedge-ws";
         };
@@ -62710,7 +63046,7 @@
           sha256 = "0vg3w18xj6i320jsivsml3mi1fdxr8dgxmn7qy2780ajy5ndxnw1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/weechat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/weechat";
           sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
           name = "weechat";
         };
@@ -62731,7 +63067,7 @@
           sha256 = "1hkhim2jfdywx6ks4qfcizycp5qsx4ms6929kbgmzzb8i7j380x6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/weechat-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/weechat-alert";
           sha256 = "026hkddvd4a6wy7s8s0lklw8b99fpjawdgi7amvpcrn79ylwbf22";
           name = "weechat-alert";
         };
@@ -62752,7 +63088,7 @@
           sha256 = "0hc5iyjpcik996ns84akrl28scndmn0gd1zfdf1nnqq6n2m5zvgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/weibo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/weibo";
           sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
           name = "weibo";
         };
@@ -62773,7 +63109,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wgrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wgrep";
           sha256 = "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4";
           name = "wgrep";
         };
@@ -62794,7 +63130,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wgrep-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wgrep-ack";
           sha256 = "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh";
           name = "wgrep-ack";
         };
@@ -62815,7 +63151,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wgrep-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wgrep-ag";
           sha256 = "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a";
           name = "wgrep-ag";
         };
@@ -62836,7 +63172,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wgrep-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wgrep-helm";
           sha256 = "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b";
           name = "wgrep-helm";
         };
@@ -62857,7 +63193,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wgrep-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wgrep-pt";
           sha256 = "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg";
           name = "wgrep-pt";
         };
@@ -62878,7 +63214,7 @@
           sha256 = "04w62davpqqqvympkr52bg54c2i45p09q9bs70p9ff5jvc6i3g76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/what-the-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/what-the-commit";
           sha256 = "0nnyb6hq6r21wf1x3q41ab48b3dmcz5lyli771a59dk1gs8qpgak";
           name = "what-the-commit";
         };
@@ -62891,15 +63227,15 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20160527.1535";
+        version = "20160610.439";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "13316578c8483740ecfe97f9f069fc364e4f97d9";
-          sha256 = "0i25y5j5qwmj3v3cd16v1c81y5bwhgar379bjy4052mfm870b90d";
+          rev = "12d2266d9d7ba24a1f0f9cad54b0153f061bef06";
+          sha256 = "01cbrdvcl07ppjwbgv8lcn198in898w6vahjyv9pinskg6dn8ydp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/which-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/which-key";
           sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
           name = "which-key";
         };
@@ -62920,7 +63256,7 @@
           sha256 = "1y75cylvqgn54h8yqahz4wi1qj5yhbs66i7x23jmbmah3q0rycab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/whitaker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/whitaker";
           sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
           name = "whitaker";
         };
@@ -62941,7 +63277,7 @@
           sha256 = "0sh92g5vd518f80klvljqkjpw4ji909439dpc3sfaccf5jiwn9xn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/white-sand-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/white-sand-theme";
           sha256 = "19qsiic6yf7g60ygjmw7kg1i28nqpm3zja8cmdh33ny2bbkwxsz5";
           name = "white-sand-theme";
         };
@@ -62962,7 +63298,7 @@
           sha256 = "15yhbyyr0ksd9ziinlylyddny2szlj35x2548awj9ijnqqgjd23r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/whitespace-cleanup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/whitespace-cleanup-mode";
           sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
           name = "whitespace-cleanup-mode";
         };
@@ -62983,7 +63319,7 @@
           sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/whole-line-or-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/whole-line-or-region";
           sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
           name = "whole-line-or-region";
         };
@@ -63001,7 +63337,7 @@
           sha256 = "18bnwwjk8jj4ns08sxhnznj0d8n1bxm2kj43r06nwyibh6ajpl7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wid-edit+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wid-edit+";
           sha256 = "1wwrsk14hc0wrvy7hm94aw6zg50n2smlqwr6frwpi7yp8y394wiv";
           name = "wid-edit-plus";
         };
@@ -63022,7 +63358,7 @@
           sha256 = "0bq39sfipad16skh5q26gp7z24kk93hgnaxb378dzfq1306kmn8q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wide-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wide-column";
           sha256 = "1kyyvq9fgaypvhiy9vbvr99xsac5vhylkbjsxn5fhylyc5n867sb";
           name = "wide-column";
         };
@@ -63043,7 +63379,7 @@
           sha256 = "0036alzp66k7w3z45lj8qzh3plxv9vwcw17wibkz90mlb27vy6yz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/widget-mvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/widget-mvc";
           sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
           name = "widget-mvc";
         };
@@ -63064,7 +63400,7 @@
           sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wiki-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wiki-nav";
           sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
           name = "wiki-nav";
         };
@@ -63085,7 +63421,7 @@
           sha256 = "02bczc1mb1cs1aryz5pw6cmpydjmxja2zj91893cz8rnfn1r031i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wiki-summary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wiki-summary";
           sha256 = "1hiyi3w6rvins8hfxd96bgpihxarmv192q96sadqcwshcqi14zmw";
           name = "wiki-summary";
         };
@@ -63106,7 +63442,7 @@
           sha256 = "1n45m8xn65a2lg8ff7m6hbqnp2j49n9sfyr924laljvhjbi37knd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wilt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wilt";
           sha256 = "0nw6zr06zq60j72qfjmbqrxyz022fnisb0bsh6xmlnd1k1kqlrz6";
           name = "wilt";
         };
@@ -63124,7 +63460,7 @@
           sha256 = "142ql6886h418f73h3wjblhnd16qvbap7mfr4g2yv4xybh88d4x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wimpy-del";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wimpy-del";
           sha256 = "10qw5lfq2392fr5sdz5a9bc6rvsg0j4dkrwvdhip1kqvajznw49x";
           name = "wimpy-del";
         };
@@ -63145,7 +63481,7 @@
           sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/win-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/win-switch";
           sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
           name = "win-switch";
         };
@@ -63163,7 +63499,7 @@
           sha256 = "0dcbnqcqw7jzwwdn0rxxlixga1zw1x3a2zbpxvd90xp7zig4f0yz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/windata";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/windata";
           sha256 = "0xq51rdanq5as6kfyi97hsqmig5g35w7xv8c96bhzyflranw7jw5";
           name = "windata";
         };
@@ -63184,7 +63520,7 @@
           sha256 = "0g69r64gyz4p3k6n8l0i1837mszycbrp23acnp0iy0y3mg67x3pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/window-end-visible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/window-end-visible";
           sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
           name = "window-end-visible";
         };
@@ -63205,7 +63541,7 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/window-jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/window-jump";
           sha256 = "1gmqb7j5fb3q3krgx7arrln5nvyg9vcpph6wlxj6py679wfa3lwr";
           name = "window-jump";
         };
@@ -63226,7 +63562,7 @@
           sha256 = "08chi9b4bap78n069aavvx3850kabk2jflrgymy4jxv08ybqikdg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/window-layout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/window-layout";
           sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
           name = "window-layout";
         };
@@ -63247,7 +63583,7 @@
           sha256 = "0n6a4kriwx7c8shvns3fcdp8l1i66bsca5mgd00p7nllnxvldhn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/window-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/window-number";
           sha256 = "1ivd701h6q48i263fxxi44haacaz8cjg562ry8dxd10rbhhsjsq0";
           name = "window-number";
         };
@@ -63268,7 +63604,7 @@
           sha256 = "1f4c6q4larifm745fr8f3w8sxs1sbs77vna29rw120jz8rnlz0jy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/window-numbering";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/window-numbering";
           sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
           name = "window-numbering";
         };
@@ -63286,7 +63622,7 @@
           sha256 = "0mqdcgk6mdxgl9if7jzgg16zqdwnsp8icrdhnygphw5m9h2dqcnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/window+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/window+";
           sha256 = "0fhzb0ay9g9qgcaxpb2qaw15dh0lfmv3x4akyipi3zx11446d06j";
           name = "window-plus";
         };
@@ -63307,7 +63643,7 @@
           sha256 = "16471dng4iknh5wa3931iz9mm8bgd6lsrnhrjkd5ava2bv484gz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/window-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/window-purpose";
           sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d";
           name = "window-purpose";
         };
@@ -63328,7 +63664,7 @@
           sha256 = "0hijf56ahbc5inn7n39nj96d948c4d05n9d5ci3g3vbl5hsyb121";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/windsize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/windsize";
           sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
           name = "windsize";
         };
@@ -63349,7 +63685,7 @@
           sha256 = "1qrbvidnmgg7jyasb28bc0z1x4a4ayzq5jmv38dsx0qs080s85wy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/winpoint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/winpoint";
           sha256 = "10ji7xd9ipmy6c2qxljqdxgqf5sb8h7lwz43mr6ixbn7v1b7pp6w";
           name = "winpoint";
         };
@@ -63370,7 +63706,7 @@
           sha256 = "1igld3zkvm3qbg1k77cn7rlxi8jqy8cvvp7z5mqwx9ifyihiwd0b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/winring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/winring";
           sha256 = "1mgr5z4h7mf677xx8md3pqd31k17qs62z9iamfih206fcwgh24k4";
           name = "winring";
         };
@@ -63386,11 +63722,11 @@
         version = "20160419.2132";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "f23c198f7086";
-          sha256 = "1nfyi9grkl9vhf8rs6r53g5f1p2wsk5jggw0m4i3z60yfflmkqi7";
+          rev = "dcf6c1298df3";
+          sha256 = "1l4al5pjipq50njdfwndnhhjs0cvgxwj8gpk8yrmx7r89ixl34wg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wisp-mode";
           sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
           name = "wisp-mode";
         };
@@ -63411,7 +63747,7 @@
           sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wispjs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wispjs-mode";
           sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
           name = "wispjs-mode";
         };
@@ -63432,7 +63768,7 @@
           sha256 = "0rzq2fbz523fyy2p6ddx9iws89sfgw3pwillw8yz965f3hxx3dj3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/with-editor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/with-editor";
           sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
           name = "with-editor";
         };
@@ -63453,7 +63789,7 @@
           sha256 = "1c7g8f3jr7bb0xxprammfg433gd63in5iiiaq8rjmc94h6hdcys3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/with-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/with-namespace";
           sha256 = "1199k1xvvv7ald6ywrh2sfpw2v42ckpcsw6mcj617bg3b5m7770i";
           name = "with-namespace";
         };
@@ -63474,7 +63810,7 @@
           sha256 = "12rfpkyjkhikjh0mihhp5h5pzbm4br68nwf8k1ja9djl77vfzv36";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wn-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wn-mode";
           sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
           name = "wn-mode";
         };
@@ -63495,7 +63831,7 @@
           sha256 = "1xna0cjgi9m87pws2h0cza67qbpdhjmdi5h4wv6v4g14nr26hi3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wolfram-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wolfram-mode";
           sha256 = "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf";
           name = "wolfram-mode";
         };
@@ -63516,7 +63852,7 @@
           sha256 = "0hacc8ha5w44cgwkipa3nwh1q5gdrcxhjkmw2gnvb1l01crgnack";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wonderland";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wonderland";
           sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
           name = "wonderland";
         };
@@ -63537,7 +63873,7 @@
           sha256 = "1b9pya342ikyxnlyxp86wx8xk6zcdws7jsqs7a9xk027prwkfngj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wordnut";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wordnut";
           sha256 = "1gqmjb2f9izra0x9ds1jyk7h204qsll6viwkvdnmxczyyc0wx44n";
           name = "wordnut";
         };
@@ -63558,7 +63894,7 @@
           sha256 = "0d2byl3si2r0zh5ih6xpsgcd9r114ry0lzg5vcf31rr2gqf0j06h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wordsmith-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wordsmith-mode";
           sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
           name = "wordsmith-mode";
         };
@@ -63579,7 +63915,7 @@
           sha256 = "1ndvwribh0i49rc6v89sfmxv5alr43995ccslviid563xn3yskii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/worf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/worf";
           sha256 = "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi";
           name = "worf";
         };
@@ -63600,7 +63936,7 @@
           sha256 = "0q32z54qafj8ap3ybx82i3fm1msmzwvpxgmkaglzhi8nccgzbn2n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/workgroups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/workgroups";
           sha256 = "1v01yr3lk6l0qn80i3r8fq3di0a8bmqjyhwx19hcgiap57xl80h8";
           name = "workgroups";
         };
@@ -63621,7 +63957,7 @@
           sha256 = "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/workgroups2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/workgroups2";
           sha256 = "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v";
           name = "workgroups2";
         };
@@ -63642,7 +63978,7 @@
           sha256 = "0i00xm4rynbp2v3gm6h46ajgj8h8nxnsjh6db1659b0hbpnah0ji";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/world-time-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/world-time-mode";
           sha256 = "10gdlz4l9iqw1zdlk5i3knysn36iqxdh3xabjq8kq04jkl7i36dl";
           name = "world-time-mode";
         };
@@ -63663,7 +63999,7 @@
           sha256 = "09fzbbrdgq19c3gylj4i0c5g070k65w943wz28mzis8b403vzh3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wrap-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wrap-region";
           sha256 = "058518smxj3j3mr6ljzh7c9x5g23d24104p58sl9nhpw0cq9k28i";
           name = "wrap-region";
         };
@@ -63684,7 +64020,7 @@
           sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/writegood-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/writegood-mode";
           sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
           name = "writegood-mode";
         };
@@ -63705,7 +64041,7 @@
           sha256 = "11a3h5v7knj8y360cxin59c1ipd9y4qsqlanrw69yb5k4816ayyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/writeroom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/writeroom-mode";
           sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
           name = "writeroom-mode";
         };
@@ -63726,7 +64062,7 @@
           sha256 = "1x2ybnv0h52i24vd1n95s4vglc6p79cyxh91a20cwza34svhz152";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ws-butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ws-butler";
           sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
           name = "ws-butler";
         };
@@ -63747,7 +64083,7 @@
           sha256 = "14f87rgvh8rmdd7gp53iaibi1liiag10si2znbhiy1hf93ssd2pq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wsd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wsd-mode";
           sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
           name = "wsd-mode";
         };
@@ -63768,7 +64104,7 @@
           sha256 = "1bq552mxlhq9sd2c9p2yir52p0jnfdav6vcdgs3xklcf89b1403m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wttrin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wttrin";
           sha256 = "0msp8lja9nz6khz3dkasv8hnhkaayqxd7m58kma03hpkcjxnaxil";
           name = "wttrin";
         };
@@ -63789,7 +64125,7 @@
           sha256 = "0ba193ilqmp7l35hhzfym4kvbnj9h57m8mwsxdj6rdj2cwrifx8r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wwtime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wwtime";
           sha256 = "0n37k23lkjgaj9wxnr41yk3mwvy62mc9im5l86czqmw5gy4l63ic";
           name = "wwtime";
         };
@@ -63810,7 +64146,7 @@
           sha256 = "0i7bgbhk4lvdkdjh6z4xs69mbdi49985j82cjikzyyskjcqd2klq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/x-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/x-dict";
           sha256 = "1w51xhiaxk50wlch262dxs2ybjvjj8qzx01xlgiimvggb8h5arlc";
           name = "x-dict";
         };
@@ -63831,7 +64167,7 @@
           sha256 = "0fks0bnil7m4m56k267f0awqnyq3vr2ywd81rsmbk1154g3acndc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/x86-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/x86-lookup";
           sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
           name = "x86-lookup";
         };
@@ -63852,7 +64188,7 @@
           sha256 = "1x3h69c2n82db8jkmd66c5i3x4rhmas5difm73msbx198w5i6lm7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xah-elisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xah-elisp-mode";
           sha256 = "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij";
           name = "xah-elisp-mode";
         };
@@ -63873,7 +64209,7 @@
           sha256 = "00ydkpkdgnj9v6dkf4pw9wj5skbq2v5y71xsr37d1fqmdzsb03g7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xah-find";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xah-find";
           sha256 = "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq";
           name = "xah-find";
         };
@@ -63886,15 +64222,15 @@
     xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20160601.1236";
+        version = "20160610.2258";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "3338f54458d58e77abbbe563e19b874901371ebf";
-          sha256 = "1n20gs4gxgsiavfdg4mrcyn8316d1dryjjj7xgd6nxm6ncwlyxkj";
+          rev = "0bb74fcddb4ce9ffbce910ce54741e300127eb51";
+          sha256 = "16q3zbd2akic86rci9pz3jnwjfk33wnijp0fs6j4g9vw9g7rldn5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xah-fly-keys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xah-fly-keys";
           sha256 = "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs";
           name = "xah-fly-keys";
         };
@@ -63915,7 +64251,7 @@
           sha256 = "0abknznp2si80zq5pc0hqr3w3pca2vrv3msm6jz1s8l8zi2hwx72";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xah-get-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xah-get-thing";
           sha256 = "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg";
           name = "xah-get-thing";
         };
@@ -63936,7 +64272,7 @@
           sha256 = "1adyww9jbjvcn9p3z9ggs3gijdmnab275a81ch8sir1xp59pfm3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xah-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xah-lookup";
           sha256 = "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc";
           name = "xah-lookup";
         };
@@ -63957,7 +64293,7 @@
           sha256 = "1wsdnqpfgk7f1dbz90k6sf13hjh0x3xjjgappfkmhcy36g7sshl7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xah-math-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xah-math-input";
           sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a";
           name = "xah-math-input";
         };
@@ -63978,7 +64314,7 @@
           sha256 = "18msj947w6msma6zm23slk2v0h92n5ych5j12zbzkzzir49sffql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xah-replace-pairs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xah-replace-pairs";
           sha256 = "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x";
           name = "xah-replace-pairs";
         };
@@ -63999,7 +64335,7 @@
           sha256 = "0dc74kqwi0hpihdbb9a9lrqb7823w6j96mah47zyd9d4rd3vx850";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xahk-mode";
           sha256 = "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9";
           name = "xahk-mode";
         };
@@ -64020,7 +64356,7 @@
           sha256 = "08hzsqf4gawcr9q2h3rxrf1igvdja84aaa821657k04kdq4dpcbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xbm-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xbm-life";
           sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
           name = "xbm-life";
         };
@@ -64041,7 +64377,7 @@
           sha256 = "0xqw0yhm08alaaqma3ymnihzyp2wg0hxsjzmrb2vmak5q1qqnkrp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xcscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xcscope";
           sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
           name = "xcscope";
         };
@@ -64062,7 +64398,7 @@
           sha256 = "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xkcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xkcd";
           sha256 = "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w";
           name = "xkcd";
         };
@@ -64083,7 +64419,7 @@
           sha256 = "0c30xh7qxg3y2p5jqkbssz5z53rx0yp64qqyy9f87qzgkcd2jd8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xml+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xml+";
           sha256 = "0xgqyfdn6kkp89zj4h54r009a44sbff0nrhh582zw5rlklypwdz1";
           name = "xml-plus";
         };
@@ -64104,7 +64440,7 @@
           sha256 = "0z3yd3dzcsd7584jchv9q55fx04ig4yjzp8ay2pa112lykv4jxxd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xml-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xml-quotes";
           sha256 = "1lmafa695xkhd90k6yiv8a57ch1jx33l1zpm39z0kj546mn6y8aq";
           name = "xml-quotes";
         };
@@ -64125,7 +64461,7 @@
           sha256 = "0g52bmamcd54acyk6i47ar5jawad6ycvm9g656inb994wprnjin9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xml-rpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xml-rpc";
           sha256 = "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js";
           name = "xml-rpc";
         };
@@ -64146,7 +64482,7 @@
           sha256 = "1nk50iwb6az01r1s2l9wwdqrz3k4ywr00q0zmd9vvi3y9v4cjah0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xmlgen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xmlgen";
           sha256 = "1mvnjqb9zxf9ml605w10v4cbbajwv9if93apr4xrh79l00scj383";
           name = "xmlgen";
         };
@@ -64167,7 +64503,7 @@
           sha256 = "178bdfwiinhf98qm88ivmgy6rd0qjx5gnckkclanybva0r8l6832";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xmlunicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xmlunicode";
           sha256 = "1ylpvx2p5l863r9qv9jdsm9rbv989c8xn0zpjl8zkcfxqxix4h4p";
           name = "xmlunicode";
         };
@@ -64188,7 +64524,7 @@
           sha256 = "0761amc73mbgaydp3iyfzgyjxp77yk440s24h69hvk87c5vn1cz3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xo";
           sha256 = "0kpbnxh8sa2dk8anrvgc7d39qap13pyjxh154gpm8xdb9zhfwl25";
           name = "xo";
         };
@@ -64209,7 +64545,7 @@
           sha256 = "09fpxr55b2adqmca8xhpy8z5cify5091fjdjyxjd1jh5wdp1658v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xquery-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xquery-mode";
           sha256 = "0b5k2ihbjm5drv4lf64ap31yj873x1fcq85y6yq1ayahn6s52rql";
           name = "xquery-mode";
         };
@@ -64230,7 +64566,7 @@
           sha256 = "1yy759qc4njc8bqh8hmgc0mq5vk5spz5syxgflqhjijk8nrvyfgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xquery-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xquery-tool";
           sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
           name = "xquery-tool";
         };
@@ -64251,7 +64587,7 @@
           sha256 = "0xs7wi29kxy2rjpimrlmigsk5sm03is4cd2snc4gsqfns769bjp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xref-js2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xref-js2";
           sha256 = "1mfyszdi1wx2lqd9fyqm0ra227dcsjs8asc1dw2li0alwh7n4xs3";
           name = "xref-js2";
         };
@@ -64272,7 +64608,7 @@
           sha256 = "171vffga2yzxqmgh77vila6x96bz1i6818f1pfaxblw1hz2ga341";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xresources-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xresources-theme";
           sha256 = "0spqa3xn3p2lmvlc5hdn7prq4vb70nkyrryx1kavha9igzhlyaga";
           name = "xresources-theme";
         };
@@ -64293,7 +64629,7 @@
           sha256 = "19l9w373ysh1avakz4pmisn0d2mpym8pdxgz7k0m1bbqqzf2war7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xterm-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xterm-color";
           sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
           name = "xterm-color";
         };
@@ -64314,7 +64650,7 @@
           sha256 = "10dsf2lgjjqvjzzyc5kwggfk511v8ypmx173bixry3djcc15dsf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xterm-frobs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xterm-frobs";
           sha256 = "02v8kh2g6a2fpxy911630zsg985hyakvqbd6v2xyfbz0vnd6i1lf";
           name = "xterm-frobs";
         };
@@ -64335,7 +64671,7 @@
           sha256 = "0ya7c73acwp29glwjd1hf19h8jij2afwmwq7a3h91qx5zdn09wvh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xterm-keybinder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xterm-keybinder";
           sha256 = "1n0zp1mc7x7z0671lf7p9r4qxic90bkf5q3zwz4vinpiw2qh88lz";
           name = "xterm-keybinder";
         };
@@ -64356,7 +64692,7 @@
           sha256 = "06cbr7y3wp7j8lnbys57g6md4fdx9xhlnxl73pj7xpfa5i2x9ifl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xterm-title";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xterm-title";
           sha256 = "08z8qg9x6vjpybbhxa8x46qnp3951miz1264fivg776y76cg3ck6";
           name = "xterm-title";
         };
@@ -64377,7 +64713,7 @@
           sha256 = "09mn8s7gzzxgs7kskld8l68zjrcgnvml3fqj69wrfq7b1g62hhxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xtest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xtest";
           sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
           name = "xtest";
         };
@@ -64398,7 +64734,7 @@
           sha256 = "0f6pvwzhncycw8gnjy24h6q1qglfgvdjfs5dzqx9s43j3yg63lzm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yabin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yabin";
           sha256 = "1kmpm2rbb43c9cgp44qwd24d90mj48k3gyiir3vb6zf6k3syrc17";
           name = "yabin";
         };
@@ -64419,7 +64755,7 @@
           sha256 = "0b252m7vb5kg5bjhpgag6nhm32cac8dhlmy4pr0kpa860lh2xlz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yafolding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yafolding";
           sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
           name = "yafolding";
         };
@@ -64440,7 +64776,7 @@
           sha256 = "0lgy9b893mq4harxh80n0n2zia00s2c6ga8p654q563idrskgz17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yagist";
           sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
           name = "yagist";
         };
@@ -64461,7 +64797,7 @@
           sha256 = "1r29x9gkj5cfcg2ac4j5vw55n1niainhl2316mfq0zpxjjp2bhwq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yahoo-weather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yahoo-weather";
           sha256 = "1kzi6yp186wfcqh5q1v9vw6b1h8x89sba6wlnacfpjbarwapfif0";
           name = "yahoo-weather";
         };
@@ -64482,7 +64818,7 @@
           sha256 = "12dd4ahg9f1493982d49g7sxx0n6ss4xcfhxwzyaqxckwzfranp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yalinum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yalinum";
           sha256 = "0jzsvkcvy2mkfmri4bzgrlgw2y0z3hxz44md83s5zmw09mshkahf";
           name = "yalinum";
         };
@@ -64503,7 +64839,7 @@
           sha256 = "1ql4bjqblij78cgasxdyr19w75xnl8cfxq047qi8r8847zy5w5wg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yaml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yaml-mode";
           sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
           name = "yaml-mode";
         };
@@ -64524,7 +64860,7 @@
           sha256 = "1xgqqgg4q3hrhiap8gmr8iifdr1mg4dl0j236b6alhrgmykbhimy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yaml-tomato";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yaml-tomato";
           sha256 = "0bja213l6mvh8ap5d04x8dik1z9px5jr52zpw1py7shw5asvp5s2";
           name = "yaml-tomato";
         };
@@ -64545,7 +64881,7 @@
           sha256 = "0pw44klm8ldsdjphybzkknv8yh23xhzwg76w3d9cqs79jkd0rw8w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yandex-weather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yandex-weather";
           sha256 = "11hspadm520cjlv1wk2bdpzg7hg2g0chbh26qijj9jgvca26x0md";
           name = "yandex-weather";
         };
@@ -64558,15 +64894,15 @@
     yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yankpad";
-        version = "20160517.1627";
+        version = "20160604.1804";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "yankpad";
-          rev = "83d1939568609236c1947368f334cb105f3c3f89";
-          sha256 = "1nm0wad4jblirc8jvaa6kyk2g00a16mmp2q0x6ks6adqhylnlzdf";
+          rev = "efbae7893c6170d92f9607d604a7eb289de1ad5e";
+          sha256 = "07g19pqx769bwly18flijryv8648k6jdw0bxhrp1dflf86cknyng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yankpad";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yankpad";
           sha256 = "1w5r9zk33cjgsmk45znfg32ym06nyqj5q3knr59jmn1fafx7a3z4";
           name = "yankpad";
         };
@@ -64584,7 +64920,7 @@
           sha256 = "0svy6zp5f22z7mblap4psh7h4i52d1qasi9yk22l39przhsrjar4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yaoddmuse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yaoddmuse";
           sha256 = "07sqcsad3k23agwwws7hxnc46cp9mkc9qinzva7qvjgs8pa9dh54";
           name = "yaoddmuse";
         };
@@ -64605,7 +64941,7 @@
           sha256 = "096ay60hrd14b459cyxxcf9g7i1ivsxg6yhc0q162px6kl1x0m2y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yard-mode";
           sha256 = "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx";
           name = "yard-mode";
         };
@@ -64626,7 +64962,7 @@
           sha256 = "0w9a6j0ndpfwaz1g974vv5jqgbzxw26l19kq51j3ah73063cavpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yari";
           sha256 = "0sch9x899mzwdacg55w5j583k2r4vn71ish7gqpghd7cj13ii66h";
           name = "yari";
         };
@@ -64647,7 +64983,7 @@
           sha256 = "08wa97hsfy1rc8ify3rz2ncfij4z6l16p4s20naygqccjv3ir6z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yascroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yascroll";
           sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
           name = "yascroll";
         };
@@ -64660,15 +64996,15 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20160531.221";
+        version = "20160612.1520";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "yasnippet";
-          rev = "e23a053b0041e4f615649b7acf8c1b2ce35fd3fb";
-          sha256 = "1lc7jjk31kp4apcf349nrjac10c2nxi4w8ws6g5brhbzxgdhr217";
+          rev = "e21420a497c1d79edc6b36ffb1f3bf1bb70f6227";
+          sha256 = "1dwj60jlbbmydp01r4y3xs8qsn1ib2b6c0gcv0ih1k50m7k4dfhn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yasnippet";
           sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
           name = "yasnippet";
         };
@@ -64689,7 +65025,7 @@
           sha256 = "0hlm31fqn53sqkvzrsah11p738mhq4l2bx4bq4nrnf92hs4xjjv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yatemplate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yatemplate";
           sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
           name = "yatemplate";
         };
@@ -64708,7 +65044,7 @@
           sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yatex";
           sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
           name = "yatex";
         };
@@ -64729,7 +65065,7 @@
           sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yaxception";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yaxception";
           sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
           name = "yaxception";
         };
@@ -64750,7 +65086,7 @@
           sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ycm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ycm";
           sha256 = "16ahgvi85ddjlrjxld14zm2vvam0m89mwskizjd5clcz0snk51sc";
           name = "ycm";
         };
@@ -64771,7 +65107,7 @@
           sha256 = "18v546yq65sf75a46k7slqh5dz12ifh30linm0m9gv65yrjpv02j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ycmd";
           sha256 = "10jqr6xz2fnrd1ihips9jmbcd28zha432h4pxjpswz3ivwjqhxna";
           name = "ycmd";
         };
@@ -64802,7 +65138,7 @@
           sha256 = "1fyvvkx6pa41bcr9cyh4yclwdzc5bs742s9fxr6wb4a5scq3hg9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yesql-ghosts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yesql-ghosts";
           sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
           name = "yesql-ghosts";
         };
@@ -64815,15 +65151,15 @@
     yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yoshi-theme";
-        version = "20160305.18";
+        version = "20160608.2323";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "yoshi-theme";
-          rev = "8e8f2f5f37c071bff36e68c83d9ca2ef80575995";
-          sha256 = "1a40kpl5b4sar15s7l8vkfm2iyr5ma3c1n6w5r4z37w5kn59bkk5";
+          rev = "660b9368f448372330722985d1c869966c034652";
+          sha256 = "13p1rzi9l4k6gjvdsls0kg0c8rdkwinfrl2ns9y5fn4pbr2lwba5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yoshi-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yoshi-theme";
           sha256 = "1kzdjs3rzg9rxrjgsk0wk75rwvbip6ixg1apcxv2c1a6biqqf2hv";
           name = "yoshi-theme";
         };
@@ -64844,7 +65180,7 @@
           sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/youdao-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/youdao-dictionary";
           sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
           name = "youdao-dictionary";
         };
@@ -64865,7 +65201,7 @@
           sha256 = "1k7m3xk5ksbr2s3ypz5yqafz9sfav1m0qk2jz1xyi3fdaw2j0w2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/z3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/z3-mode";
           sha256 = "183lzhgjj480ca2939za3rlnsbfn24mgi501n66h5wim950v7vgd";
           name = "z3-mode";
         };
@@ -64886,7 +65222,7 @@
           sha256 = "16k8hha798hrs0qfdwqdr6n7y13ffgm6jj3msrk0zl8117jhaany";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zeal-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zeal-at-point";
           sha256 = "1cz53plk5bax5azm13y7xz530qcfh0scm0cgrkrgwja2wwlxirnw";
           name = "zeal-at-point";
         };
@@ -64906,7 +65242,7 @@
           sha256 = "0xg67asvgav5js03i3bqmh7apndrn0jy5vai0bsh22pq8wgvq083";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zeitgeist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zeitgeist";
           sha256 = "0m6drp3c6hp70ypbva3ji2dndl9an1jm2zlhnpwmjxsmw47cd732";
           name = "zeitgeist";
         };
@@ -64927,7 +65263,7 @@
           sha256 = "0dnaxhsw549k54j0mgydm7qbl4pizgipfyzc15f9afsxa107rpnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zen-and-art-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zen-and-art-theme";
           sha256 = "0b2lflji955z90xl9iz2y1vm04yljghbw4948gh5vv5p7mwibgf2";
           name = "zen-and-art-theme";
         };
@@ -64948,7 +65284,7 @@
           sha256 = "1bjjmmplzjl17aqyz89s3z44vxpvik5ibv7004kp5678gf1vv5rs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zenburn-theme";
           sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
           name = "zenburn-theme";
         };
@@ -64969,7 +65305,7 @@
           sha256 = "1y3wj15kfbgskl29glmba6lzq43rcm141p4i5s180aqcw7ydp5vr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zencoding-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zencoding-mode";
           sha256 = "1fclad1dyngyg9ncfkcqfxybvy8482i2bd409cgxi9y4h1wc7ws7";
           name = "zencoding-mode";
         };
@@ -64986,10 +65322,10 @@
         src = fetchgit {
           url = "https://bitbucket.org/Soft/zenity-color-picker.el.git";
           rev = "4f4f46676a461ebc881487fb70c8c181e323db5e";
-          sha256 = "1abm0wmfkhbwdnqnvjd9r0pm7ahkcj7ip7jcz6rm49qam815g7rk";
+          sha256 = "14i2k52qz77dv04w39fyp9hfq983fwa3803anqragk608xgwpf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zenity-color-picker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zenity-color-picker";
           sha256 = "1v6ks922paacdgpv5v8cpic1g66670x73ixsy2nixs5qdw241wzl";
           name = "zenity-color-picker";
         };
@@ -65010,7 +65346,7 @@
           sha256 = "1kdsyki7i7x0ypq0iabdv1bnx0gd45acqcixvrxi3rf9j4chyvls";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zerodark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
           name = "zerodark-theme";
         };
@@ -65031,7 +65367,7 @@
           sha256 = "1gb51bqdf87yibs1zngk6q090p05293cpwlwbwzhnih9sl6wkq8x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zlc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zlc";
           sha256 = "0qw0qf14l09mcnw7h0ccbw17psfpra76qfawkc10zpdb5a2167d0";
           name = "zlc";
         };
@@ -65052,7 +65388,7 @@
           sha256 = "1xsxmvbh3xm3zh9yc6q28h48nar6pwyd51xw04b1x7amwkp8qdnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/znc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/znc";
           sha256 = "1z2kzbapgh55wwr5jp7v1wz5kpz4l7n3k94mkh3s068xag9xs6zz";
           name = "znc";
         };
@@ -65073,7 +65409,7 @@
           sha256 = "1gm3ly6czbw4vrxcslm50jy6nxf2qsl656cjwbyhw251wppn75cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zombie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zombie";
           sha256 = "0ji3nsxwbxmmygd6plpbc1lkw6i5zw4y6x3r5n2ah3ds4vjr7cnv";
           name = "zombie";
         };
@@ -65094,7 +65430,7 @@
           sha256 = "04m53hzk5n9vxh0gxi8jzpdhsdjlxnvz7hmsisr3bs99v603ha01";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zombie-trellys-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zombie-trellys-mode";
           sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
           name = "zombie-trellys-mode";
         };
@@ -65115,7 +65451,7 @@
           sha256 = "0b8m0mdxbskkqsx86i6942235i8x0pk67a7s8lhsp2anahksazla";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zone-nyan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zone-nyan";
           sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
           name = "zone-nyan";
         };
@@ -65136,7 +65472,7 @@
           sha256 = "0w550l9im3mhxhja1b7cr9phdcbvx5lprw551lj0d1lv7qvjasz0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zone-rainbow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zone-rainbow";
           sha256 = "0l51fmhvx9vsxbs62cbjgqphb691397f651nqin7cj3dfvchzh4j";
           name = "zone-rainbow";
         };
@@ -65157,7 +65493,7 @@
           sha256 = "17mrzf85ym0x5ih4l6sjdjlcmviabf8c8rpvpkd90gp9qxd8pyx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zone-select";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zone-select";
           sha256 = "05kc211invmy4ajwf71vgr2b7bdgn99c4a26m95gcjqgy3sh5xzz";
           name = "zone-select";
         };
@@ -65178,7 +65514,7 @@
           sha256 = "0m1q45pza61j0fp8cxkgmds5fyjrk0nqpwhg8m91610m3pvyc3ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zone-sl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zone-sl";
           sha256 = "04rwd6vj3abk3bzhq3swxwcq5da2n9cldrcmvnqgjr975np4cgs3";
           name = "zone-sl";
         };
@@ -65196,7 +65532,7 @@
           sha256 = "1g6dpyihwaz28ppndhkw3jzmph6pmcnfhaff926j0zr1j701sqdd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zones";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zones";
           sha256 = "08sl7i7cy22nd1jijc5l7lp75k9z83gfr8q41n72l0vxrpdasc9w";
           name = "zones";
         };
@@ -65217,7 +65553,7 @@
           sha256 = "16ni0va1adpqdnrkiwmpxwrhyanxp5jwbknii2wnbhgq62s7gv43";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zonokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zonokai-theme";
           sha256 = "1hrpgh03mp7yynqamgzkw7fa70c5pmyjfmfblkfhspnsif8j4v29";
           name = "zonokai-theme";
         };
@@ -65236,7 +65572,7 @@
           sha256 = "1whpd97yjby5zbcr4fcn0nxhqvn6k3jn8k2d15i6ss579kziwdqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zoom-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zoom-frm";
           sha256 = "111lr29zhj8w8j7dbzl58iisqxjhccxpw4spfxx08zxh4623g5mk";
           name = "zoom-frm";
         };
@@ -65257,7 +65593,7 @@
           sha256 = "13393bd5lqpbv7m3p6ihg0ghx1w4w6mrnybx4m8hcfvcn17dr3hw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zoom-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zoom-window";
           sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
           name = "zoom-window";
         };
@@ -65278,7 +65614,7 @@
           sha256 = "1hq5ycnj0kwqs25z5rm095d55r768458vc5h5dpjhka5n6c099p1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zop-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zop-to-char";
           sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
           name = "zop-to-char";
         };
@@ -65299,7 +65635,7 @@
           sha256 = "0fgwxw7r3zfv0b7xi8bx7kxff2r5hdw9gxf16kwq04fnh18nhi39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zossima";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zossima";
           sha256 = "11kmnbqv4s8arindg7cxcdhbvfxsckks332wn7aiyb3bjhcgzwjb";
           name = "zossima";
         };
@@ -65320,7 +65656,7 @@
           sha256 = "1gff44nwiqhqhppwmsn38njkph4g9bw669p95m8p2avb7x7kiybl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zotelo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zotelo";
           sha256 = "0y6s5ma7633h5pf9zj7vkazidlf211va7nk47ppb1q0iyfkyln36";
           name = "zotelo";
         };
@@ -65341,7 +65677,7 @@
           sha256 = "0qksa67aazs9vx7v14nlakr34z6l0h6mhfzi2c0vhrr0c210r6hp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zotxt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zotxt";
           sha256 = "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5";
           name = "zotxt";
         };
@@ -65362,7 +65698,7 @@
           sha256 = "1sxjpbgi7ydmrlv34l16n40qpg969wfcb6kknndrh3fgjjc3p41b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ztree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ztree";
           sha256 = "1fk5xz8qq3azc66f954x5qvym94xnv4fg6wy83ihdfwycsas7j20";
           name = "ztree";
         };
@@ -65383,7 +65719,7 @@
           sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zygospore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zygospore";
           sha256 = "0n9qs6fymdjly0i4rmx87y8gapfn5sqivsivcffi42vcb5f17kxj";
           name = "zygospore";
         };
@@ -65404,7 +65740,7 @@
           sha256 = "1wphpxnh7sisqfx7ngil3ixnjkfgwy3j2bvv33bxcwslvfggimi6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zzz-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zzz-to-char";
           sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
           name = "zzz-to-char";
         };
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index af480af6e5c2..c7866ee5b8de 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -10,7 +10,7 @@
           sha256 = "1xigpz2aswlmpcsc1f7gfakyw7041pbyl9zfd8nz38iq036n5b96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/0blayout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/0blayout";
           sha256 = "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92";
           name = "_0blayout";
         };
@@ -31,7 +31,7 @@
           sha256 = "13f4l9xzx4xm5m80kkb49zh31w0bn0kw9m5ca28rrx4aysqmwryv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/abc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/abc-mode";
           sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
           name = "abc-mode";
         };
@@ -52,7 +52,7 @@
           sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/abyss-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/abyss-theme";
           sha256 = "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c";
           name = "abyss-theme";
         };
@@ -73,7 +73,7 @@
           sha256 = "0a8widshsm39cbala17pmnk1sazazhhyqppwalysli170whk49c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-alchemist";
           sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
           name = "ac-alchemist";
         };
@@ -94,7 +94,7 @@
           sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-anaconda";
           sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
           name = "ac-anaconda";
         };
@@ -115,7 +115,7 @@
           sha256 = "12z8nq797hjy0bq5vzpcm7z7bdn0ixc3ma4cj3v51xnwmgknzk6c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-cake";
           sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl";
           name = "ac-cake";
         };
@@ -136,7 +136,7 @@
           sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-cake2";
           sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy";
           name = "ac-cake2";
         };
@@ -157,7 +157,7 @@
           sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-capf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-capf";
           sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
           name = "ac-capf";
         };
@@ -178,7 +178,7 @@
           sha256 = "12s7wy7fyk5z9q287j871gcsrvj90f4c81h39p66d99jw0cl93qj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-cider";
           sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
           name = "ac-cider";
         };
@@ -199,7 +199,7 @@
           sha256 = "1sdgpyq5p824dnxv6r7djwvhyhdmnis8k6992klr8iz7anhxzdam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-clang";
           sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
           name = "ac-clang";
         };
@@ -220,7 +220,7 @@
           sha256 = "0a3s880nswc2s6yh2v5zsmws550q917i7av8nrxc5sp1d03xqwmn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-dcd";
           sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
           name = "ac-dcd";
         };
@@ -241,7 +241,7 @@
           sha256 = "0cc3jpc4pihbyznyzvf6i3xwc2x78gb5m36ba9gkvxhabsljnlfg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-emoji";
           sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
           name = "ac-emoji";
         };
@@ -262,7 +262,7 @@
           sha256 = "0ijni3qgd68jhznhirhgcl59cr7hwfvbwgf6z120x56jmp8h01d2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-etags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-etags";
           sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
           name = "ac-etags";
         };
@@ -283,7 +283,7 @@
           sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-geiser";
           sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
           name = "ac-geiser";
         };
@@ -304,7 +304,7 @@
           sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-haskell-process";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-haskell-process";
           sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
           name = "ac-haskell-process";
         };
@@ -325,7 +325,7 @@
           sha256 = "1gw38phyaslpql7szvlpwgyfngdgd21f6lq406vq0gjwwmxgig34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-helm";
           sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
           name = "ac-helm";
         };
@@ -346,7 +346,7 @@
           sha256 = "19v9515ixg22m7h7riix8w3vyhzax1m2pbwdirp59v532xn9b0cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-html";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-html";
           sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
           name = "ac-html";
         };
@@ -367,7 +367,7 @@
           sha256 = "1zmjqnlbfchnb7n2v7ms7q06xma1lmf9ry3v6f4pfnwlmz5lsf3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-html-bootstrap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-html-bootstrap";
           sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
           name = "ac-html-bootstrap";
         };
@@ -388,7 +388,7 @@
           sha256 = "0p18wxyyc1jmcwx9y5i77s25v4jszv7cmm4bkwm4dzhkxd33kh1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-html-csswatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-html-csswatcher";
           sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
           name = "ac-html-csswatcher";
         };
@@ -409,7 +409,7 @@
           sha256 = "1acm13n59sdgvvzicscxzrr5j1x5sa5x4rc4cnkbwb28nw5a5ysm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-inf-ruby";
           sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
           name = "ac-inf-ruby";
         };
@@ -430,7 +430,7 @@
           sha256 = "16qsj3wni4xhcrjx2rnxdzq6jb7jrl4bngi4an37vgdlrx3w8m6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-ispell";
           sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
           name = "ac-ispell";
         };
@@ -451,7 +451,7 @@
           sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-mozc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-mozc";
           sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
           name = "ac-mozc";
         };
@@ -472,7 +472,7 @@
           sha256 = "16f8hvdz6y8nsfj7094yrvw194ag3w1jvz81h287vcgcvmyb7wdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-octave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-octave";
           sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
           name = "ac-octave";
         };
@@ -493,7 +493,7 @@
           sha256 = "0ca4viakvc09mvhk7d01pxnc3v3ydra6413asvdjx555njm9ic0f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-php";
           sha256 = "1dlz4cv54ynl4ql5l2sa5lazlzq6rrlbz61k20l5lcljjwvj5xja";
           name = "ac-php";
         };
@@ -525,7 +525,7 @@
           sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
           name = "ac-racer";
         };
@@ -546,7 +546,7 @@
           sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ac-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ac-slime";
           sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
           name = "ac-slime";
         };
@@ -567,7 +567,7 @@
           sha256 = "1pzh5l8dybrrmglj55nbff6065pxlbx14501p3a1qx1wvf24g1sv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-flyspell";
           sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
           name = "ace-flyspell";
         };
@@ -588,7 +588,7 @@
           sha256 = "0233ai62zhsy5yhv72016clygwp2pcg80y6kr4cjm2k1k2wwy7m9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
           name = "ace-isearch";
         };
@@ -609,7 +609,7 @@
           sha256 = "1z82a0lrb61msamqpsy7rxcgs2nfhhckkk4zw0aw49l248p2nrgs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-jump-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-jump-buffer";
           sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
           name = "ace-jump-buffer";
         };
@@ -630,7 +630,7 @@
           sha256 = "1d4bxxcnjbdr6cjr3jmz2zrnzjv5pwrypbp4xqgqyv9rz02n7ac1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-jump-helm-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-jump-helm-line";
           sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
           name = "ace-jump-helm-line";
         };
@@ -651,7 +651,7 @@
           sha256 = "1bwvzh056ls2v7y26a0s4j5mj582dmds04lx4x6iqihs04ss74bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-jump-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-jump-mode";
           sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
           name = "ace-jump-mode";
         };
@@ -672,7 +672,7 @@
           sha256 = "0yng6qayzqadk4cdviri84ghld4can35q134hm3n3j3vprhpbmca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-jump-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-jump-zap";
           sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
           name = "ace-jump-zap";
         };
@@ -693,7 +693,7 @@
           sha256 = "1mrlwkls80blispg5hdgnif42rck3iqhcm1f3khq14nm09yqwdk9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-link";
           sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
           name = "ace-link";
         };
@@ -714,7 +714,7 @@
           sha256 = "1d2g873zwq78ggs47954lccmaky20746wg0gafyj93d1qyc3m8rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-pinyin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-pinyin";
           sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
           name = "ace-pinyin";
         };
@@ -735,7 +735,7 @@
           sha256 = "1qiiivkwa95bhyym8ly7fnwwglc9dcifkyr314bsq8m4rp1mgry4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-popup-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-popup-menu";
           sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
           name = "ace-popup-menu";
         };
@@ -756,7 +756,7 @@
           sha256 = "07mcdzjmgrqdvjs94f2n5bkrf5vrq2fwzz256wbm3wzqxqkfy1q6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ace-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ace-window";
           sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
           name = "ace-window";
         };
@@ -777,7 +777,7 @@
           sha256 = "0hib4a8385q2czi1yqs0hwnva2xi7kw0bdfnrgha1hrl30rilp2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ack-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ack-menu";
           sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
           name = "ack-menu";
         };
@@ -798,7 +798,7 @@
           sha256 = "0zybch8hz3mj63i0pxynb4d76ywqcy7b4fsa4hh71c2kb0bnczb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/actionscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/actionscript-mode";
           sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
           name = "actionscript-mode";
         };
@@ -819,7 +819,7 @@
           sha256 = "0kp2aafjhqxz3mjr9hkkss85r4n51chws5a2qj1xzb63dh36liwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/adoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/adoc-mode";
           sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
           name = "adoc-mode";
         };
@@ -840,7 +840,7 @@
           sha256 = "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aes";
           sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
           name = "aes";
         };
@@ -861,7 +861,7 @@
           sha256 = "15kp99vwyi7hb1jkq3lwvqzw3v62ycixsq6y4pd1x0nn2v5p5m5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ag";
           sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
           name = "ag";
         };
@@ -882,7 +882,7 @@
           sha256 = "03mpg4ksvcc5zs540rgnf3gssyx97aiiv60lwdn3934al4125vnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aggressive-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aggressive-indent";
           sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
           name = "aggressive-indent";
         };
@@ -903,7 +903,7 @@
           sha256 = "02nkcin0piv7s93c9plhy361dbqr78m0gd19myc7qb7gnm36kzpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ahk-mode";
           sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
           name = "ahk-mode";
         };
@@ -924,7 +924,7 @@
           sha256 = "0blrpqn8wy9pwzikgzb0v6x4hk7axv93j4byfci62fh1905zfkkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/airline-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/airline-themes";
           sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
           name = "airline-themes";
         };
@@ -945,7 +945,7 @@
           sha256 = "1y5nmcrlsmniv37x7w6yhihmb335n82d96yz7xclhwg59n652pjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/alchemist";
           sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
           name = "alchemist";
         };
@@ -966,7 +966,7 @@
           sha256 = "1pk5dgjqrynap85700wdivq41bdqvwd5hkfimgmcd48l5lhj9pbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/alect-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/alect-themes";
           sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
           name = "alect-themes";
         };
@@ -987,7 +987,7 @@
           sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/alert";
           sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
           name = "alert";
         };
@@ -1008,7 +1008,7 @@
           sha256 = "1q49gfs98djwjxw2sr8q08jf5glf9d3ks9014gjjwa1dpf98mpy3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/amd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/amd-mode";
           sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
           name = "amd-mode";
         };
@@ -1038,7 +1038,7 @@
           sha256 = "1mwdlvpyxmnsf3zkqlcjln6ryd88czw5hdssz1acg2yi24k4j44d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anaconda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anaconda-mode";
           sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
           name = "anaconda-mode";
         };
@@ -1059,7 +1059,7 @@
           sha256 = "0fnxxvw81c34zhmiyr5awl92wr5941n4gklvzjc4jphaf2nhkg4w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anaphora";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anaphora";
           sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
           name = "anaphora";
         };
@@ -1080,7 +1080,7 @@
           sha256 = "0gjynmzqlqz0d57fb4np6xrklqdn11y4vjbm18rlpvmk92bgw740";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/android-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/android-mode";
           sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
           name = "android-mode";
         };
@@ -1101,7 +1101,7 @@
           sha256 = "1798nv4djhxzbin68zf6w7dbfm9sc39d0kygky52ii36arg5r1zp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/angular-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/angular-mode";
           sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
           name = "angular-mode";
         };
@@ -1122,7 +1122,7 @@
           sha256 = "0h9i0iimanbvhbqy0cj9na335rs961pvhxjj4k8y53qc73xm102a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/angular-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/angular-snippets";
           sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
           name = "angular-snippets";
         };
@@ -1143,7 +1143,7 @@
           sha256 = "18ninv1z8zdqpqnablbds4zgxgk4c1nmznlfdicj6qs738c5c30s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/annotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/annotate";
           sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
           name = "annotate";
         };
@@ -1164,7 +1164,7 @@
           sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/annoying-arrows-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/annoying-arrows-mode";
           sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
           name = "annoying-arrows-mode";
         };
@@ -1185,7 +1185,7 @@
           sha256 = "1hbddxarr40ygvaw4pwaivq2l4f0brszw73w1r50lkjlggb7bl3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ansi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ansi";
           sha256 = "0b5xnv6z471jm53g37njxin6l8yflsgm80y4wxahfgy8apipcq89";
           name = "ansi";
         };
@@ -1206,7 +1206,7 @@
           sha256 = "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ansible";
           sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
           name = "ansible";
         };
@@ -1227,7 +1227,7 @@
           sha256 = "05z379k6a7xq9d2zapf687x3f37jpmh6kfghpgxdd18v0hzca8ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ansible-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ansible-doc";
           sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
           name = "ansible-doc";
         };
@@ -1248,7 +1248,7 @@
           sha256 = "06cn81sksvl88l1g3cfgp1kf8xzfv00b31j2rf58f45zlbl5ckv9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anti-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anti-zenburn-theme";
           sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
           name = "anti-zenburn-theme";
         };
@@ -1269,7 +1269,7 @@
           sha256 = "1z6l72dn98icqsmxb3rrj6l63ijc3xgfa3vdl19yqa2rfy6ya721";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anyins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anyins";
           sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
           name = "anyins";
         };
@@ -1286,10 +1286,10 @@
         src = fetchgit {
           url = "http://repo.or.cz/r/anything-config.git";
           rev = "6b9718fba257e6c2912ba70f9895251ab1926928";
-          sha256 = "08f7qxwnvykmxwrii3nv1fnai4mqs2ir5419k0llj6mkrik0gfc6";
+          sha256 = "040znq4qv6rqjw05klriasysvsx6s6xn00ssc3acbqdqjgjk8l2a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anything";
           sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj";
           name = "anything";
         };
@@ -1310,7 +1310,7 @@
           sha256 = "01lw9159axg5w9bpdy55m4zc902zmsqvk213ky1nmgnln0fvq3rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anything-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anything-exuberant-ctags";
           sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk";
           name = "anything-exuberant-ctags";
         };
@@ -1331,7 +1331,7 @@
           sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anything-replace-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anything-replace-string";
           sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71";
           name = "anything-replace-string";
         };
@@ -1352,7 +1352,7 @@
           sha256 = "1bcvin2694ypqgiw0mqk82riq7gw6ra10vbkzng1yp9jp2qr6wmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anything-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anything-sage";
           sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3";
           name = "anything-sage";
         };
@@ -1373,7 +1373,7 @@
           sha256 = "1dxaf68przg0hh0p1zhxsq2dysp3ln178yxhbqalxw67bjy8ikny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/anzu";
           sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
           name = "anzu";
         };
@@ -1394,7 +1394,7 @@
           sha256 = "13j2r4nx2x6j3qx50d5rdnqd8nl5idxdkhizsk7ccz3v2607fbyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/apples-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/apples-mode";
           sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
           name = "apples-mode";
         };
@@ -1415,7 +1415,7 @@
           sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aproject";
           sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
           name = "aproject";
         };
@@ -1436,7 +1436,7 @@
           sha256 = "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/artbollocks-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/artbollocks-mode";
           sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
           name = "artbollocks-mode";
         };
@@ -1457,7 +1457,7 @@
           sha256 = "1yvirfmvf6v5khl7zhx2ddv9bbxnx1qhwfzi0gy2nmbxlykb6s2j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/arview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/arview";
           sha256 = "0d935lj0x3rbar94l7288xrgbcp1wmz6r2l0b7i89r5piczyiy1y";
           name = "arview";
         };
@@ -1478,7 +1478,7 @@
           sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/asilea";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/asilea";
           sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
           name = "asilea";
         };
@@ -1491,15 +1491,15 @@
     assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
     melpaBuild {
         pname = "assess";
-        version = "0.2";
+        version = "0.3.2";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "assess";
-          rev = "387e5cfe2f010fb3da7f1b670fc27c19ace99b4a";
-          sha256 = "1qfrrw6vgz93xiyy0xiaw0hh97lmv3365gm6a9cr5g0h4012z8pq";
+          rev = "4a5eee8ba9db3e61b860b8b70236e385d3cf344a";
+          sha256 = "0255sa5fzg069n1pf09sn5nypqw0ll5rmxfigw30xhh95w40nx8y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/assess";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/assess";
           sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr";
           name = "assess";
         };
@@ -1520,7 +1520,7 @@
           sha256 = "1dgw075pdzfrb5wjba7iwal8crxpxm642fkfwj8389a5hpsj7v2n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/async";
           sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
           name = "async";
         };
@@ -1541,7 +1541,7 @@
           sha256 = "1xyn8qiikng6vf5rbpfqz9ac10c69aip0w6v9l46w0qxsy8svyaj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/atom-one-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/atom-one-dark-theme";
           sha256 = "0wwnkhq7vyysqiqcxc1jsn98155ri4mf4w03k7inl1f8ffpwahvw";
           name = "atom-one-dark-theme";
         };
@@ -1562,7 +1562,7 @@
           sha256 = "0dqr1yrzf7a8655dsbcch4622rc75j9yjbn9zhkyikqjicddnlda";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aurel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aurel";
           sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
           name = "aurel";
         };
@@ -1583,7 +1583,7 @@
           sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/aurora-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/aurora-config-mode";
           sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
           name = "aurora-config-mode";
         };
@@ -1604,7 +1604,7 @@
           sha256 = "1b6g7qvrxv6gkl4izq1y7k0x0l7izyfnpki10di5vdv3jp6xg9b2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auth-password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auth-password-store";
           sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
           name = "auth-password-store";
         };
@@ -1625,7 +1625,7 @@
           sha256 = "05crb8cm7s1nggrqq0xcs2xiabjw3vh44fnkdiilq1c5cnajdcrj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-compile";
           sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
           name = "auto-compile";
         };
@@ -1646,7 +1646,7 @@
           sha256 = "04i9b11iksg6acn885wl3qgi5xpsm3yszlqmd2x21yhprndlz7gb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete";
           sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
           name = "auto-complete";
         };
@@ -1667,7 +1667,7 @@
           sha256 = "1kp2l1cgzlg2g3wllz4gl1ssn4lnx2sn26xqigfrpr8y5rj2bsfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-clang-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-clang-async";
           sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
           name = "auto-complete-clang-async";
         };
@@ -1688,7 +1688,7 @@
           sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-exuberant-ctags";
           sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
           name = "auto-complete-exuberant-ctags";
         };
@@ -1709,7 +1709,7 @@
           sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-nxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-nxml";
           sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
           name = "auto-complete-nxml";
         };
@@ -1730,7 +1730,7 @@
           sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-pcmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-pcmp";
           sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
           name = "auto-complete-pcmp";
         };
@@ -1751,7 +1751,7 @@
           sha256 = "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-complete-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-complete-sage";
           sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
           name = "auto-complete-sage";
         };
@@ -1772,7 +1772,7 @@
           sha256 = "191294k92qp8gmfypf0q8j8qrym96aqikzvyb9p03wqvbr3r1dsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-dictionary";
           sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
           name = "auto-dictionary";
         };
@@ -1793,7 +1793,7 @@
           sha256 = "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-indent-mode";
           sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
           name = "auto-indent-mode";
         };
@@ -1814,7 +1814,7 @@
           sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-package-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-package-update";
           sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
           name = "auto-package-update";
         };
@@ -1835,7 +1835,7 @@
           sha256 = "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-shell-command";
           sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
           name = "auto-shell-command";
         };
@@ -1856,7 +1856,7 @@
           sha256 = "0n3r7j83csby2s7284hy5pycynazyrkljxkn6xqn08gvxbbbdpdq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/auto-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/auto-yasnippet";
           sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
           name = "auto-yasnippet";
         };
@@ -1877,7 +1877,7 @@
           sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/autodisass-java-bytecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/autodisass-java-bytecode";
           sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
           name = "autodisass-java-bytecode";
         };
@@ -1898,7 +1898,7 @@
           sha256 = "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/autodisass-llvm-bitcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/autodisass-llvm-bitcode";
           sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
           name = "autodisass-llvm-bitcode";
         };
@@ -1919,7 +1919,7 @@
           sha256 = "0g6kd1r0wizamw26bhp5jkvpsd98rcybkfchc622b9v5b89a07nq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/autopair";
           sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
           name = "autopair";
         };
@@ -1940,7 +1940,7 @@
           sha256 = "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/avy";
           sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
           name = "avy";
         };
@@ -1961,7 +1961,7 @@
           sha256 = "1564yv9330vjymw3xnikc2lz20f65n40fbl8m1zs1gp4nlgzkk38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/avy-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/avy-menu";
           sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw";
           name = "avy-menu";
         };
@@ -1982,7 +1982,7 @@
           sha256 = "0s6m44b49jm5cnrx1pvk7rfw3zhwiw5xasdlgmlvv7wws7m5snd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/avy-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/avy-migemo";
           sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
           name = "avy-migemo";
         };
@@ -2003,7 +2003,7 @@
           sha256 = "0lmv34pi9qdh76fi3w4lrfyfhzr824nsiif4nyjvpnmrabxgk309";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/avy-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/avy-zap";
           sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
           name = "avy-zap";
         };
@@ -2024,7 +2024,7 @@
           sha256 = "0px1xggk6qyrwkma1p3d7b4z2id2gbrsxkliw3nwc1q4zndg1zr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/babel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/babel";
           sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
           name = "babel";
         };
@@ -2045,7 +2045,7 @@
           sha256 = "0hmn3jlsqgpc602lbcs9wzw0hgr5qpjdcxi2hjlc1cp27ilyscnf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/back-button";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/back-button";
           sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
           name = "back-button";
         };
@@ -2072,7 +2072,7 @@
           sha256 = "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/badwolf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/badwolf-theme";
           sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
           name = "badwolf-theme";
         };
@@ -2093,7 +2093,7 @@
           sha256 = "11rlmrjdpa3vnf0h9vcd75946q9jyf1mpbm7h12hmpj6g2pavgdd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bash-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bash-completion";
           sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
           name = "bash-completion";
         };
@@ -2114,7 +2114,7 @@
           sha256 = "1xvxz9sk9l57a4kiiavxxdp0v241mfgiy2lg5ilacq1cd6xrrhky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbcode-mode";
           sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
           name = "bbcode-mode";
         };
@@ -2135,7 +2135,7 @@
           sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbdb-";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbdb-";
           sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
           name = "bbdb-";
         };
@@ -2156,7 +2156,7 @@
           sha256 = "0fg72qnb40djyciy4gzj359lqlcbbrq0indbkzd0dj09zipkx0df";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbdb-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbdb-vcard";
           sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
           name = "bbdb-vcard";
         };
@@ -2177,7 +2177,7 @@
           sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bbdb2erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bbdb2erc";
           sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
           name = "bbdb2erc";
         };
@@ -2198,7 +2198,7 @@
           sha256 = "01d10algmi9a4xd7mzf7n3zxfs2qf5as66wx17mff5cd8dahxj1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/beeminder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/beeminder";
           sha256 = "1cb8xmgsv23b464hpchm9f9i64p3fyf7aillrwk1aa2l1008kyww";
           name = "beeminder";
         };
@@ -2219,7 +2219,7 @@
           sha256 = "1agrci37bni1vfkxg171l53fvsnjdryhf05v54wj07jngnwf3cw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/beginend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/beginend";
           sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
           name = "beginend";
         };
@@ -2240,7 +2240,7 @@
           sha256 = "1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/better-defaults";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/better-defaults";
           sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
           name = "better-defaults";
         };
@@ -2261,7 +2261,7 @@
           sha256 = "0skg8wcgdfzd59ay4fbbbdd258cm8q7v321iml46bdipzk0r5lnw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/biblio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/biblio";
           sha256 = "0ym7xvcfd7hh3qdpfb8zpa7w8s4lpg0vngh9d0ns3s3lnhz4mi0g";
           name = "biblio";
         };
@@ -2282,7 +2282,7 @@
           sha256 = "0skg8wcgdfzd59ay4fbbbdd258cm8q7v321iml46bdipzk0r5lnw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/biblio-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/biblio-core";
           sha256 = "0zpfamrb2gka41h834a05hxdbw4h55777kh6rhjikjfmy765nl97";
           name = "biblio-core";
         };
@@ -2303,7 +2303,7 @@
           sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bind-key";
           sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
           name = "bind-key";
         };
@@ -2316,15 +2316,15 @@
     bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-map";
-        version = "1.0.4";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-bind-map";
-          rev = "6f84c0254f9ef7580ee32fb66190cc694cc05629";
-          sha256 = "047qzylycx3r06dd0q9q9f37pvfigmlv59gi3wqvlg6k3gcmdvy0";
+          rev = "ffe5e636178ab9878fa8213fd1a1d4862ccb3d5f";
+          sha256 = "1h07s8g4vpq6c8sl5m6vxvd598iks160bksv0wn51680gh05f0pa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bind-map";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bind-map";
           sha256 = "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358";
           name = "bind-map";
         };
@@ -2345,7 +2345,7 @@
           sha256 = "0pmpg54faq0l886f2cmnmwm28d2yfg8adk7gp7623gx0ifggn332";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bing-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bing-dict";
           sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
           name = "bing-dict";
         };
@@ -2366,7 +2366,7 @@
           sha256 = "1r3f5d67x257g8kvdbdsl4w3y1dvc1d6s9x8bygbkvyahfi5m5hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/birds-of-paradise-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/birds-of-paradise-plus-theme";
           sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
           name = "birds-of-paradise-plus-theme";
         };
@@ -2376,6 +2376,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    bnfc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bnfc";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "jmitchell";
+          repo = "bnfc-mode";
+          rev = "1b58df1dd0cb9b81900632fb2843a03b94f56fdb";
+          sha256 = "0lmqrcy80nw6vmf81kh6q39x8pwhzrj6lbk31xpl8mvwnpqaykmn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bnfc";
+          sha256 = "0h6qhyi7vcikg7zhv8lywdz033kp27a8z1ymq5wgs4aqs184igm6";
+          name = "bnfc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/bnfc";
+          license = lib.licenses.free;
+        };
+      }) {};
     bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bog";
@@ -2387,7 +2408,7 @@
           sha256 = "0414kdwgvmz0bmbaaz7zxf83rdjzmzcvvk5b332c679hk0b9kxg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bog";
           sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
           name = "bog";
         };
@@ -2408,7 +2429,7 @@
           sha256 = "1q3ws2vn062dh7ci6jn2k2bcn7szh3ap64sgwkzdd6f1pas37fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bongo";
           sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
           name = "bongo";
         };
@@ -2429,7 +2450,7 @@
           sha256 = "1apxgj14hgfpz6hjp3384yjf2zrkv4pcncf2zklijs668igvaskq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/boon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/boon";
           sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
           name = "boon";
         };
@@ -2450,7 +2471,7 @@
           sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/boxquote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
           name = "boxquote";
         };
@@ -2471,7 +2492,7 @@
           sha256 = "0y9m6cv70pzcm0v2v8nwmyh1xx40831chx72m85h5ic5db03gy7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/browse-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/browse-kill-ring";
           sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
           name = "browse-kill-ring";
         };
@@ -2492,7 +2513,7 @@
           sha256 = "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/browse-url-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/browse-url-dwim";
           sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
           name = "browse-url-dwim";
         };
@@ -2513,7 +2534,7 @@
           sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/buffer-flip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/buffer-flip";
           sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
           name = "buffer-flip";
         };
@@ -2534,7 +2555,7 @@
           sha256 = "0xdks4jfqyhkh34y48iq3gz8swp0f526kwnaai5mhgvazvs4za8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/buffer-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/buffer-move";
           sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
           name = "buffer-move";
         };
@@ -2555,7 +2576,7 @@
           sha256 = "0rp9hiysy13c4in7b420r7yjza2knlmvphj7l01xbxphbilplqk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/buffer-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/buffer-utils";
           sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
           name = "buffer-utils";
         };
@@ -2576,7 +2597,7 @@
           sha256 = "0x9q4amsmawi8jqj9xxg81khvb3gyyf9hjvb0w6vhrgjwpxiq8sy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bufshow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bufshow";
           sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
           name = "bufshow";
         };
@@ -2597,7 +2618,7 @@
           sha256 = "07jzg58a3jxs4mmsgb35f5f8awazlvzak9wrhif6xb60jq1wrp0v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bug-reference-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bug-reference-github";
           sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
           name = "bug-reference-github";
         };
@@ -2618,7 +2639,7 @@
           sha256 = "18d74nwcpk1i8adxzfwz1lgqqcxsc4wkrb490v64pph79dxsi80h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bundler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bundler";
           sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
           name = "bundler";
         };
@@ -2639,7 +2660,7 @@
           sha256 = "03hab3iw2jjckal20zwsw7cm38nf7pan0m96d8ab4i75phy6liyw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/bury-successful-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/bury-successful-compilation";
           sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
           name = "bury-successful-compilation";
         };
@@ -2660,7 +2681,7 @@
           sha256 = "1pii9dw4skq7nr4na6qxqasl36av8cwjp71bf1fgppqpcd9z8skj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/butler";
           sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
           name = "butler";
         };
@@ -2681,7 +2702,7 @@
           sha256 = "0wkivh8x75gfsks6hy1ps9mlk101hrwsk8hqxx7qhs7f5iv0a082";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/buttercup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/buttercup";
           sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
           name = "buttercup";
         };
@@ -2702,7 +2723,7 @@
           sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/button-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/button-lock";
           sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
           name = "button-lock";
         };
@@ -2723,7 +2744,7 @@
           sha256 = "1k2hmc87ifww95k3m8ksiswkk2z0y8grssba7381g8dnlp6jgprx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cacoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cacoo";
           sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
           name = "cacoo";
         };
@@ -2744,7 +2765,7 @@
           sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cake";
           sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr";
           name = "cake";
         };
@@ -2765,7 +2786,7 @@
           sha256 = "1w7yq35gzzwyf480d8gc5r6jbnawg09l6663q068ir6zr9pp4far";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cake-inflector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cake-inflector";
           sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
           name = "cake-inflector";
         };
@@ -2786,7 +2807,7 @@
           sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cake2";
           sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x";
           name = "cake2";
         };
@@ -2807,7 +2828,7 @@
           sha256 = "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/calfw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/calfw";
           sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
           name = "calfw";
         };
@@ -2828,7 +2849,7 @@
           sha256 = "0v927m3l5cf0j0rs0nfk5whwqmmxs941d8qalxi19j1ihspjz8d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/camcorder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/camcorder";
           sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
           name = "camcorder";
         };
@@ -2849,7 +2870,7 @@
           sha256 = "0xgnq21fb37y05535ipy0z584pnaglxy5bfqzdppyzsy7lpbb4k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cargo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cargo";
           sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
           name = "cargo";
         };
@@ -2870,7 +2891,7 @@
           sha256 = "0mg49rpz362ipn5qzqhyfs3d6fpb51rfa73kna3gxdw0wxq2sa7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/caseformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/caseformat";
           sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
           name = "caseformat";
         };
@@ -2891,7 +2912,7 @@
           sha256 = "1hvm6r6a8rgjwnn2mcamwqrmhz424vlr4mbvbri3wmn0ikbk510l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cask";
           sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
           name = "cask";
         };
@@ -2912,7 +2933,7 @@
           sha256 = "09y4cr32i2cw06lnq698lajxmqyzq2ah426f4dm176xfbrim89d5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cask-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cask-mode";
           sha256 = "0fs9zyihipr3klnh3w22h43qz0wnxplm62x4kx7pm1chq9bc9kz6";
           name = "cask-mode";
         };
@@ -2933,7 +2954,7 @@
           sha256 = "0padb1zfjkmx9kbqnqh744qvpd3ln0khwxifxld9cpcpdp5k04vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cask-package-toolset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cask-package-toolset";
           sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
           name = "cask-package-toolset";
         };
@@ -2954,7 +2975,7 @@
           sha256 = "1j1lw5zifp7q1ykm6si0nzxfp7n3z2lzla2njkkxmc2s6m7w4x1a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/caskxy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/caskxy";
           sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
           name = "caskxy";
         };
@@ -2975,7 +2996,7 @@
           sha256 = "125d5i7ycdn2hgffc1l3jqcfzvk70m1ciywj4h53qakkl15r9m38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cbm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cbm";
           sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn";
           name = "cbm";
         };
@@ -2996,7 +3017,7 @@
           sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cdlatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cdlatex";
           sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
           name = "cdlatex";
         };
@@ -3017,7 +3038,7 @@
           sha256 = "07h5g905i1jglsryl0dnqxz8yya5kkyjjggzbk4nl3rcj41lyas7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/celery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/celery";
           sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
           name = "celery";
         };
@@ -3038,7 +3059,7 @@
           sha256 = "08hqgsjvs62l1cfzshbpj80xd8365qmx2b5r5jq20d5cj68s36wl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cerbere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cerbere";
           sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
           name = "cerbere";
         };
@@ -3059,7 +3080,7 @@
           sha256 = "1pkbg1zlcfbzsxl0yhz1g9cn77lgw5p9g8xfvdm4ilsia9zy7d29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cfengine-code-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cfengine-code-style";
           sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
           name = "cfengine-code-style";
         };
@@ -3080,7 +3101,7 @@
           sha256 = "0n93qz5hzsnrs6c3y5yighfpdpkkmabxyi5i755hfcs5007v199v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chapel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chapel-mode";
           sha256 = "0hmnsv8xf85fc4jqkaqz5j3sf56hgib4jp530vvyc2dl2sps6vzz";
           name = "chapel-mode";
         };
@@ -3101,7 +3122,7 @@
           sha256 = "0vb03k10i8vwy5wv65xl15kcsh9zz4y2xhpgndih87ssckdnhhlw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/char-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/char-menu";
           sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l";
           name = "char-menu";
         };
@@ -3122,7 +3143,7 @@
           sha256 = "0crnd64cnsnaj5mcy55q0sc1rnamxa1xbpwpmirhyhxz780klww6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/charmap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/charmap";
           sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
           name = "charmap";
         };
@@ -3143,7 +3164,7 @@
           sha256 = "09ypxhfad3v1pz0xhw4xgxvfj7ad2kb3ff9zy1mnw7fzsa7gw6nj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/checkbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/checkbox";
           sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
           name = "checkbox";
         };
@@ -3164,7 +3185,7 @@
           sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/chinese-word-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/chinese-word-at-point";
           sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
           name = "chinese-word-at-point";
         };
@@ -3185,7 +3206,7 @@
           sha256 = "0pbgfm9hkryanb4fly74w417h6bw9mnad5k5raj9ypiwgcz2r0n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cider";
           sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
           name = "cider";
         };
@@ -3206,7 +3227,7 @@
           sha256 = "1rkd76561h93si4lpisz3qnaj48dx8x01nd59a3lgpqsbbibnccf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cider-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cider-eval-sexp-fu";
           sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
           name = "cider-eval-sexp-fu";
         };
@@ -3227,7 +3248,7 @@
           sha256 = "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cil-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cil-mode";
           sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
           name = "cil-mode";
         };
@@ -3248,7 +3269,7 @@
           sha256 = "008fz7829mvjlid93hvs5xwwvigh5lnq2fxf2w9ghnw9lygkv5bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/circe";
           sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
           name = "circe";
         };
@@ -3269,7 +3290,7 @@
           sha256 = "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cl-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cl-format";
           sha256 = "1259ykj6z6m6gaqhkmj5f3q9vyk7idpvlvlma5likpknxj5f444v";
           name = "cl-format";
         };
@@ -3290,7 +3311,7 @@
           sha256 = "12vgi5dicx3lxzngjcg9g3nflrhfy9wdw6ldm72zarp1h96jy5cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cl-lib-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cl-lib-highlight";
           sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
           name = "cl-lib-highlight";
         };
@@ -3311,7 +3332,7 @@
           sha256 = "0w34ixzk8vs2nv5xr7l1b3k0crl1lqvbq6gs5r4b8rhsx9b6c1mb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/click-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/click-mode";
           sha256 = "1p5dz4a74w5zxdlw17h5z9dglapia4p29880liw3bif2c7dzkg0r";
           name = "click-mode";
         };
@@ -3332,7 +3353,7 @@
           sha256 = "0h856l6rslawf3vg37xhsaw5w56r9qlwzbqapg751qg0v7wf0860";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cliphist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cliphist";
           sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
           name = "cliphist";
         };
@@ -3353,7 +3374,7 @@
           sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clips-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clips-mode";
           sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
           name = "clips-mode";
         };
@@ -3374,7 +3395,7 @@
           sha256 = "0qjj40h8ryrs02rj73hkyhcjxdz926qxgvnjidav3sw2ggn8vdl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clj-refactor";
           sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
           name = "clj-refactor";
         };
@@ -3406,7 +3427,7 @@
           sha256 = "18gv8vmmpiyq16cq4nr9nk2bmc5y2rsv21wjl4ji29rc7566shha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cljr-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
           name = "cljr-helm";
         };
@@ -3427,7 +3448,7 @@
           sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clocker";
           sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
           name = "clocker";
         };
@@ -3448,7 +3469,7 @@
           sha256 = "1x1kfycf3023z0r3v7xqci59k8jv5wn2vqc9y0nx7k5qgifmswrx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clojure-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clojure-cheatsheet";
           sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
           name = "clojure-cheatsheet";
         };
@@ -3469,7 +3490,7 @@
           sha256 = "1hz0dna07yw04swzr42fbv1384mq88j5npcgxj9db0ghdbnibq7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clojure-mode";
           sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
           name = "clojure-mode";
         };
@@ -3490,7 +3511,7 @@
           sha256 = "1hz0dna07yw04swzr42fbv1384mq88j5npcgxj9db0ghdbnibq7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clojure-mode-extra-font-locking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clojure-mode-extra-font-locking";
           sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
           name = "clojure-mode-extra-font-locking";
         };
@@ -3511,7 +3532,7 @@
           sha256 = "0sw34yjp8934xd2n76lbwyvxkbyz5pxszj6gkflas8lfjvms9z7d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clojure-quick-repls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clojure-quick-repls";
           sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
           name = "clojure-quick-repls";
         };
@@ -3532,7 +3553,7 @@
           sha256 = "1p0w83m9j4a6va4g68a4gcfbdkp8nic0q8cm28l8nr7czd5s0yl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/clojure-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/clojure-snippets";
           sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
           name = "clojure-snippets";
         };
@@ -3553,7 +3574,7 @@
           sha256 = "1p251vyh8fc6xzaf0v7yvf4wkrvcfjdb3qr88ll4xcb61gj3vi3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/closql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/closql";
           sha256 = "0a8fqw8n03x9mygvzb95m8mmfqp3j8hynwafvryjsl0np0695b6l";
           name = "closql";
         };
@@ -3574,7 +3595,7 @@
           sha256 = "1rwln3ms71fys3rdv3sx8w706aqn874im3kqcfrkxz86wiazm2d5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cm-mode";
           sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
           name = "cm-mode";
         };
@@ -3595,7 +3616,7 @@
           sha256 = "14z5izpgby7lak6hzjwsph31awg5126hcjzld21ihknhlg09sw7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cmake-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cmake-ide";
           sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
           name = "cmake-ide";
         };
@@ -3616,7 +3637,7 @@
           sha256 = "17s0ggv8cv7yslpdvfq3rvrj4r7zphv9ldqab9gak0c5c8n73ilp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cmake-mode";
           sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
           name = "cmake-mode";
         };
@@ -3637,7 +3658,7 @@
           sha256 = "10xlny2agxjknvnjdnw41cyb3d361yy0wvpc8l1d0xwnmmfh3bxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cmake-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cmake-project";
           sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
           name = "cmake-project";
         };
@@ -3658,7 +3679,7 @@
           sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/codic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/codic";
           sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
           name = "codic";
         };
@@ -3679,7 +3700,7 @@
           sha256 = "0yhmg5j051mviqp5laz7y1zjs1w9ykbbxqm7vrgf2py0hpd1kcrg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/coffee-mode";
           sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
           name = "coffee-mode";
         };
@@ -3700,7 +3721,7 @@
           sha256 = "1zwgyp65jivds9zvbp5k5q3gazffh3w0mvs739ddq93lkf165rwh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/color-identifiers-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/color-identifiers-mode";
           sha256 = "1hxp8lzn7kfckn5ngxic6qiz3nbynilqlxhlq9k1n1llfg216gfq";
           name = "color-identifiers-mode";
         };
@@ -3721,7 +3742,7 @@
           sha256 = "0apvqrva3f7valjrxpslln8460kpr82z4zazj3lg3j82k102zla9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/color-theme-modern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/color-theme-modern";
           sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
           name = "color-theme-modern";
         };
@@ -3742,7 +3763,7 @@
           sha256 = "13jmg05skv409z8pg5m9rzkajj9knyln0ff8a3i1pbpyrnpngmmc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/color-theme-sanityinc-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/color-theme-sanityinc-solarized";
           sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
           name = "color-theme-sanityinc-solarized";
         };
@@ -3763,7 +3784,7 @@
           sha256 = "0w99ypq048xldl1mrgc7qr4n2770dm48aknhp7q0176l43nvxnqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/color-theme-sanityinc-tomorrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/color-theme-sanityinc-tomorrow";
           sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
           name = "color-theme-sanityinc-tomorrow";
         };
@@ -3784,7 +3805,7 @@
           sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/colorsarenice-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/colorsarenice-theme";
           sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
           name = "colorsarenice-theme";
         };
@@ -3805,7 +3826,7 @@
           sha256 = "1j6hhyzww7wfwk6bllbb5mk4hw4qs8hsgfbfdifsam9c6i4spm45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/commander";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/commander";
           sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
           name = "commander";
         };
@@ -3826,7 +3847,7 @@
           sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/comment-dwim-2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/comment-dwim-2";
           sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
           name = "comment-dwim-2";
         };
@@ -3847,7 +3868,7 @@
           sha256 = "1jwd3whag39qhzhbsfivzdlcr6vj37dv5ychkhmilw8v6dfdnpdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/commenter";
           sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3";
           name = "commenter";
         };
@@ -3868,7 +3889,7 @@
           sha256 = "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/common-lisp-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/common-lisp-snippets";
           sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
           name = "common-lisp-snippets";
         };
@@ -3889,7 +3910,7 @@
           sha256 = "08rrjfp2amgya1hswjz3vd5ja6lg2nfmm7454p0h1naz00hlmmw0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company";
           sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
           name = "company";
         };
@@ -3910,7 +3931,7 @@
           sha256 = "1i6788qfinh47c5crgr57ykgbp6bvk1afcl00c8gywxsf8srvnvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-anaconda";
           sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
           name = "company-anaconda";
         };
@@ -3931,7 +3952,7 @@
           sha256 = "1dds3fynbd6yb0874aw6g4qk5zmq3pgl3jmcp38md027qalgqmym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-ansible";
           sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
           name = "company-ansible";
         };
@@ -3952,7 +3973,7 @@
           sha256 = "1pja44g15d11kl47abzykrp28j782nkbmb0db0ilpc96xf1fjlsw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-cabal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-cabal";
           sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
           name = "company-cabal";
         };
@@ -3973,7 +3994,7 @@
           sha256 = "0s6gzdmxlsl1l0vh52xspxys1wmsq063p6nva6qisg1r622gjzjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-coq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-coq";
           sha256 = "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa";
           name = "company-coq";
         };
@@ -3994,7 +4015,7 @@
           sha256 = "16ai8ljp0i75kby1knj7ldysd8s6kd6drmlh9ygyddxbi2i35x61";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-dict";
           sha256 = "1377b40f1j4rmw7lnhy1zsm6r234ds5zsn02v1ajm3bzrpkkmin0";
           name = "company-dict";
         };
@@ -4015,7 +4036,7 @@
           sha256 = "1f8sjjms9kxni153pia6b45p2ih2mhm2r07d0j3fmxmz3q2jdldd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-emoji";
           sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
           name = "company-emoji";
         };
@@ -4036,7 +4057,7 @@
           sha256 = "0y9i0q37xjbnlnlxq7xjvnpn6ykzbd55g6nbw10z1wg0m2v7f96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-ghc";
           sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
           name = "company-ghc";
         };
@@ -4057,7 +4078,7 @@
           sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-go";
           sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
           name = "company-go";
         };
@@ -4078,7 +4099,7 @@
           sha256 = "17zi0xx8p2diwy1wgrhl6j8p57alwz24rjpz4apyyrqjk09ippq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-irony";
           sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
           name = "company-irony";
         };
@@ -4099,7 +4120,7 @@
           sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-jedi";
           sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
           name = "company-jedi";
         };
@@ -4120,7 +4141,7 @@
           sha256 = "0k6bx4i3d2x6kmkzififc8r7vid74bxsvgxp19z7bv1fh6m1f3aa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-math";
           sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
           name = "company-math";
         };
@@ -4141,7 +4162,7 @@
           sha256 = "172aah6vnwsij6h8c668l0jrncmd9wszbf55bv3snnw80wnqikmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-ngram";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-ngram";
           sha256 = "1y9k9s8c248m91xld4f5l75j4swml333rpwq590bsx7mrsq131xx";
           name = "company-ngram";
         };
@@ -4162,7 +4183,7 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-nixos-options";
           sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
           name = "company-nixos-options";
         };
@@ -4183,7 +4204,7 @@
           sha256 = "1b2v84ss5k43nnbsnvabgvb19ardsacbs1prn2h9i1k2d5mb8icw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-quickhelp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-quickhelp";
           sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
           name = "company-quickhelp";
         };
@@ -4204,7 +4225,7 @@
           sha256 = "0i1fh5lvqwlgn3g3fzh0xacxyljx6gkryipn133vfkv4jbns51n4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-restclient";
           sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
           name = "company-restclient";
         };
@@ -4231,7 +4252,7 @@
           sha256 = "1ynyxrpl9qd2l60dpn9kb04zxgq748fffb0yj8pxvm9q3abblf3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-sourcekit";
           sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
           name = "company-sourcekit";
         };
@@ -4252,7 +4273,7 @@
           sha256 = "11cinjsyf24d4a682ikniprxd1vkwn6mynsp5dzab6yzq09np78i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-tern";
           sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
           name = "company-tern";
         };
@@ -4273,7 +4294,7 @@
           sha256 = "0b0k75rg43h48dbcqiid947nspqiqxkiqcmvph9aqpxlfr67bz5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-web";
           sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
           name = "company-web";
         };
@@ -4294,7 +4315,7 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/company-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/company-ycmd";
           sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
           name = "company-ycmd";
         };
@@ -4315,7 +4336,7 @@
           sha256 = "1mii790r6gaz0nidlaib50wj4vryfvw7ls6b4mg1nw5km7hplpgq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/composable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/composable";
           sha256 = "1fs4pczjn9sv12sladf6zbkz0cmzxr0jaqkiwryydal1l5nqqxcy";
           name = "composable";
         };
@@ -4336,7 +4357,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/concurrent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/concurrent";
           sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
           name = "concurrent";
         };
@@ -4357,7 +4378,7 @@
           sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/conkeror-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/conkeror-minor-mode";
           sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
           name = "conkeror-minor-mode";
         };
@@ -4378,7 +4399,7 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/connection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/connection";
           sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
           name = "connection";
         };
@@ -4399,7 +4420,7 @@
           sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/contextual";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/contextual";
           sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
           name = "contextual";
         };
@@ -4409,6 +4430,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "copyit";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "emacs-copyit";
+          rev = "4f869e13b3e2b1498bd13fe037480f1ccd8e2600";
+          sha256 = "16i8py34wapphknj5xl8a07gq4gk77w1ayjz4swlvn3b2wwxlqy6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/copyit";
+          sha256 = "1m28irqixzl44c683dxvc5x6l3qcqlpy6jzk6629paqkdi5mx1c0";
+          name = "copyit";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/copyit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    copyit-pandoc = callPackage ({ copyit, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pandoc }:
+    melpaBuild {
+        pname = "copyit-pandoc";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "emacs-copyit";
+          rev = "4f869e13b3e2b1498bd13fe037480f1ccd8e2600";
+          sha256 = "16i8py34wapphknj5xl8a07gq4gk77w1ayjz4swlvn3b2wwxlqy6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/copyit-pandoc";
+          sha256 = "03v448gh6glq126r95w4y6s2p08jgjhkc6zgsplx0v9d5f2mwaqk";
+          name = "copyit-pandoc";
+        };
+        packageRequires = [ copyit emacs pandoc ];
+        meta = {
+          homepage = "https://melpa.org/#/copyit-pandoc";
+          license = lib.licenses.free;
+        };
+      }) {};
     corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "corral";
@@ -4420,7 +4483,7 @@
           sha256 = "00055gzv032xxzqm1hffipljy8fzgsm58cbv8dzajh035jvdgpv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/corral";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/corral";
           sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
           name = "corral";
         };
@@ -4441,7 +4504,7 @@
           sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/counsel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/counsel";
           sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
           name = "counsel";
         };
@@ -4462,7 +4525,7 @@
           sha256 = "1ma67lc4y9y3byrz8v6635w8q2scp6f2cqagq09k723k5nnwisfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/counsel-dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/counsel-dash";
           sha256 = "0pzh8ww1p2jb859gdjr5ypya3rwhiyg3c79xhx8filxrqxgjv5fk";
           name = "counsel-dash";
         };
@@ -4483,7 +4546,7 @@
           sha256 = "01545iy2gaxyd4i8gawgxqi9gbkrjk20djhvc59finnjrblzccn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/coverage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/coverage";
           sha256 = "0ja7wsx2sj0h01sk1l3c0aidbs1ld4gj3kiwq6brs7r018sz45pm";
           name = "coverage";
         };
@@ -4504,7 +4567,7 @@
           sha256 = "0ji8n4sv0zqmfn4g7ay927d8ya6wrvqdzvd5sc6vicma9gn27lvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/coverlay";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/coverlay";
           sha256 = "0p5k9254r3i247h6ll6kjsgw3naiff5lgfkmb2wkc870lzggq0m4";
           name = "coverlay";
         };
@@ -4525,7 +4588,7 @@
           sha256 = "1rk0bwdvfrp24z69flh7jg3c8vgvwk6vciixmmmldnrlwhpnbh6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cpputils-cmake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cpputils-cmake";
           sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
           name = "cpputils-cmake";
         };
@@ -4546,7 +4609,7 @@
           sha256 = "169ai0xkh3988racnhaapxw0v1pbxvcaq470x1qacdzdpka4a7bs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/creds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/creds";
           sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
           name = "creds";
         };
@@ -4567,7 +4630,7 @@
           sha256 = "12qs9z1cnwhmks7x7fhymg21hbpjwgbdfz20pz2jgrl48hm6mmk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cricbuzz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cricbuzz";
           sha256 = "1ad2afyn3xny3rgb8yy6w87f33idlrmis1vx0b6s8ppafv9z74j0";
           name = "cricbuzz";
         };
@@ -4588,7 +4651,7 @@
           sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/crm-custom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/crm-custom";
           sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
           name = "crm-custom";
         };
@@ -4609,7 +4672,7 @@
           sha256 = "0809pb8626i6z1dics3i1cs30p4qd8bzqcgr20lx9k3yq2abq2k7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/crux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/crux";
           sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
           name = "crux";
         };
@@ -4630,7 +4693,7 @@
           sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cryptol-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cryptol-mode";
           sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
           name = "cryptol-mode";
         };
@@ -4651,7 +4714,7 @@
           sha256 = "0dqih7cy57sciqn5vz5fiwynpld96qldyl7jcgn9qpwnzb401ayx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/csharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/csharp-mode";
           sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
           name = "csharp-mode";
         };
@@ -4672,7 +4735,7 @@
           sha256 = "13zq8kym1y6bzrpxbcdz32323a6azy5px4ridff6xh8bfprwlay3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ctable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ctable";
           sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
           name = "ctable";
         };
@@ -4691,7 +4754,7 @@
           sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ctags";
           sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
           name = "ctags";
         };
@@ -4712,7 +4775,7 @@
           sha256 = "05vhryqcydvcfm18fwby344931kzzh47x4l5ixy95xkcjkzrj8c7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ctags-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ctags-update";
           sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
           name = "ctags-update";
         };
@@ -4733,7 +4796,7 @@
           sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ctxmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ctxmenu";
           sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
           name = "ctxmenu";
         };
@@ -4754,7 +4817,7 @@
           sha256 = "1y685qfdkjyl7dwyvivlgc2lwp102vy6hvcb9zynw84c49f726sn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cuda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cuda-mode";
           sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
           name = "cuda-mode";
         };
@@ -4775,7 +4838,7 @@
           sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cyberpunk-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cyberpunk-theme";
           sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
           name = "cyberpunk-theme";
         };
@@ -4796,7 +4859,7 @@
           sha256 = "04add8i0g4x5kzi1yd49i5viq9i2f5r5gzq33k05q6rimsp2ga02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cyphejor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cyphejor";
           sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
           name = "cyphejor";
         };
@@ -4817,7 +4880,7 @@
           sha256 = "11ddx5c535a76pnxqdfahchi839v59iwvpiyswigskyfhzxn5ic1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/cython-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/cython-mode";
           sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
           name = "cython-mode";
         };
@@ -4838,7 +4901,7 @@
           sha256 = "0kbncsaxj93jd79sd6dkap29fz8z100wi1nk0njd568glm8q4k5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/d-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/d-mode";
           sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
           name = "d-mode";
         };
@@ -4859,7 +4922,7 @@
           sha256 = "1gdh4izwhyly6dyrmh7lfpd12gnb8hpnafj8br51ksijsssrf21f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/darcula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/darcula-theme";
           sha256 = "1n9mpkdyf5jpxc5azfs38ccp9p0b5ii87sz4c7z4khs94y0gxqh3";
           name = "darcula-theme";
         };
@@ -4880,7 +4943,7 @@
           sha256 = "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/darktooth-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
           name = "darktooth-theme";
         };
@@ -4901,7 +4964,7 @@
           sha256 = "1vkn95dyc0pppnflyqlrlx32g9zc7wdcgc9fgf1hgvqp313ydfcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dart-mode";
           sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
           name = "dart-mode";
         };
@@ -4922,7 +4985,7 @@
           sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dash";
           sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
           name = "dash";
         };
@@ -4943,7 +5006,7 @@
           sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dash-functional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dash-functional";
           sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
           name = "dash-functional";
         };
@@ -4964,7 +5027,7 @@
           sha256 = "06aprbhhxb6bbzmf0r5yq2ry6x7708vp4d94ja3ir6zcwc96wn0k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/date-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/date-at-point";
           sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
           name = "date-at-point";
         };
@@ -4985,7 +5048,7 @@
           sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/date-field";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/date-field";
           sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
           name = "date-field";
         };
@@ -5006,7 +5069,7 @@
           sha256 = "1w8qzj8qrgkygprb3ibyx28j951lv7k1frbpdwz69cg23whi3s30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/datetime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/datetime";
           sha256 = "0mnkckibymc5dswmzd1glggna2fspk06ld71m7aaz6j78nfrm850";
           name = "datetime";
         };
@@ -5027,7 +5090,7 @@
           sha256 = "0wm24ndiyhrayg1gz456s0s1ddlpcvg4vp555g4zzl3zcpsy94bg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/decide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/decide";
           sha256 = "1gjkays48lhrifi9jwja5n2dpxjbl7f9rmka1nsqg9vf7s59vhhc";
           name = "decide";
         };
@@ -5048,7 +5111,7 @@
           sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dedicated";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dedicated";
           sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
           name = "dedicated";
         };
@@ -5069,7 +5132,7 @@
           sha256 = "031f8ls1q80j717cg6b4pjd37wk7vrl5hcycsn8ca7yssmqa8q81";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/default-text-scale";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/default-text-scale";
           sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
           name = "default-text-scale";
         };
@@ -5090,7 +5153,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/deferred";
           sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
           name = "deferred";
         };
@@ -5111,7 +5174,7 @@
           sha256 = "1lyqd9cgj7cb2lasf6ycw5j8wnsx2nrfm8ra4sg3dgcspm01a89g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/define-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/define-word";
           sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
           name = "define-word";
         };
@@ -5127,10 +5190,10 @@
         src = fetchgit {
           url = "git://jblevins.org/git/deft.git";
           rev = "4001a55cf5f79cdbfa00f1405e8a4645af4acd40";
-          sha256 = "1s71xk5c1hck7lh780lpa1q1c8qdpf2wdahl2406mgf06y1ifp7b";
+          sha256 = "157c6ck6gb59i7dikbdnaq7cwlh3nnk0vqgil4v1294s2xbpp46n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/deft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/deft";
           sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
           name = "deft";
         };
@@ -5151,7 +5214,7 @@
           sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/demangle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/demangle-mode";
           sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
           name = "demangle-mode";
         };
@@ -5172,7 +5235,7 @@
           sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/describe-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/describe-number";
           sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
           name = "describe-number";
         };
@@ -5193,7 +5256,7 @@
           sha256 = "184zi5fv7ranghfx1hpx7j2wnk6kim8ysliyw2c5c1294sxxq3f3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/desktop+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/desktop+";
           sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
           name = "desktop-plus";
         };
@@ -5214,7 +5277,7 @@
           sha256 = "11qvhbz7149vqh61fgqqn4inw0ic6ib9lz2xgr9m54pdw9a901mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/desktop-registry";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/desktop-registry";
           sha256 = "1sfj0w6hlrx37js63fn1v5xc9ngmahv07g42z68717md6w3c8g0v";
           name = "desktop-registry";
         };
@@ -5235,7 +5298,7 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dictionary";
           sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
           name = "dictionary";
         };
@@ -5256,7 +5319,7 @@
           sha256 = "0sjwpvzd4x9c1b9iv66b33llvp96ryyzyp8pn1rnhvxfvjv43cnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/diff-hl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/diff-hl";
           sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
           name = "diff-hl";
         };
@@ -5277,7 +5340,7 @@
           sha256 = "1ci2gmyl0i736b2sxh77fyg4hs2pkn6rn9z7v2hzv6xlgqd6j3z6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/diffview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/diffview";
           sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
           name = "diffview";
         };
@@ -5298,7 +5361,7 @@
           sha256 = "0jzwaivsqh66py9hd3dg1ys5rc3p6pn8ndpwpvgyivk4pg6zhhj6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/digistar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/digistar-mode";
           sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
           name = "digistar-mode";
         };
@@ -5319,7 +5382,7 @@
           sha256 = "1vrd74vmm60gb69a4in412mjncnhkjbfpakpaa6w9rj7w4kyfiz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dim";
           sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
           name = "dim";
         };
@@ -5340,7 +5403,7 @@
           sha256 = "0jn3hwnqg455fz85m79mbwsiv93ps4sfr1fcfjfwj3qhhbhq7d82";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dim-autoload";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dim-autoload";
           sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
           name = "dim-autoload";
         };
@@ -5361,7 +5424,7 @@
           sha256 = "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/diminish";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/diminish";
           sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
           name = "diminish";
         };
@@ -5382,7 +5445,7 @@
           sha256 = "1xg9cschjd2m0zal296q54ifk5i4s1s3azwfdkbgshxxgvxaky0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dionysos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dionysos";
           sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
           name = "dionysos";
         };
@@ -5403,7 +5466,7 @@
           sha256 = "1d813b4wiamif48v0za5invnss52mn7yw3hzrlxd4918gy5y2r74";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-atool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-atool";
           sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w";
           name = "dired-atool";
         };
@@ -5424,7 +5487,7 @@
           sha256 = "1m0nx8wd6q56qbp5mbp9n466kyglrz34nflwvgd1qnmi08jwswgv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-efap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-efap";
           sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
           name = "dired-efap";
         };
@@ -5445,7 +5508,7 @@
           sha256 = "0lrc4082ghg77x5jl26hj8c7cp48yjvqhv4g3j0pznpzb4qyfnq0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-fdclone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-fdclone";
           sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
           name = "dired-fdclone";
         };
@@ -5466,7 +5529,7 @@
           sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-imenu";
           sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
           name = "dired-imenu";
         };
@@ -5487,7 +5550,7 @@
           sha256 = "0rpln6m3j4xbhrmmz18hby6xpzpzbf1c5hr7bxvna265cb0i5rn7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-k";
           sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
           name = "dired-k";
         };
@@ -5508,7 +5571,7 @@
           sha256 = "1a9r1kz5irpvb2byabbf27sy7rjzaygfpqimpag41sj955wlgy9a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-quick-sort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-quick-sort";
           sha256 = "01vrk3wqq2zmcblyp9abi2lvrzr2a5ca8r8gjjnr5223037ppl3l";
           name = "dired-quick-sort";
         };
@@ -5529,7 +5592,7 @@
           sha256 = "0mfvyjbx7l7a1sfq47m6rb507xxw92nykkkpzmi2mpwv30f1c22j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dired-single";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dired-single";
           sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
           name = "dired-single";
         };
@@ -5550,7 +5613,7 @@
           sha256 = "1d8n8wj5k82a1sfg93kn3ajci804mpp9j206x5f185zd48wb25z8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/diredful";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/diredful";
           sha256 = "0y8x6q1yfsk0srxsh4g5nbsms1g9pk9d103jx7cfdac79mcigw7x";
           name = "diredful";
         };
@@ -5571,7 +5634,7 @@
           sha256 = "0p8c2hjgr81idm1psv3i3v5hr5rv0875ig8app2yqjwzvl0nn73f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/direx";
           sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
           name = "direx";
         };
@@ -5592,7 +5655,7 @@
           sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/direx-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/direx-grep";
           sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
           name = "direx-grep";
         };
@@ -5613,7 +5676,7 @@
           sha256 = "0qxw30zrlcxhxb0alrgyiclrk44dysal8xsbz2mvgrb6jli8wg18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/discover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/discover";
           sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
           name = "discover";
         };
@@ -5634,7 +5697,7 @@
           sha256 = "1wlqyl03hhnflbyay3qlvdzqzvv5rbybcjpfddggda7ias9h0pr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/discover-my-major";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/discover-my-major";
           sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
           name = "discover-my-major";
         };
@@ -5655,7 +5718,7 @@
           sha256 = "1b1a1bwc6nv6wkd8jg1cqmjb9m9pxi5i2wbrz97fgii23dwfmlnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dispass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dispass";
           sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
           name = "dispass";
         };
@@ -5676,7 +5739,7 @@
           sha256 = "0q35p9p26ywfaw6k8q05zmr8vmkiakykwns4ffgyl57dafkpjfj0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dix";
           sha256 = "0c5fmknpy6kwlz7nx0csbbia1maz0szj7yha1p7wq28s3a5426xq";
           name = "dix";
         };
@@ -5697,7 +5760,7 @@
           sha256 = "0q35p9p26ywfaw6k8q05zmr8vmkiakykwns4ffgyl57dafkpjfj0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dix-evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dix-evil";
           sha256 = "1jscaksnl5qmpqgkjkv6sx56llz0w4p5h7j73c4a1hld94gwklh3";
           name = "dix-evil";
         };
@@ -5718,7 +5781,7 @@
           sha256 = "1wkgb6wq3crnpnd747ilwl2kbz5fjk5q5z1xza8j4bf1ic2aybb8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/docker";
           sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
           name = "docker";
         };
@@ -5739,7 +5802,7 @@
           sha256 = "1cmh8pwwa6dhl4w66wy8s5yqxs326mnaalg1ig2yhl4bjk8gi4m2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dockerfile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dockerfile-mode";
           sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
           name = "dockerfile-mode";
         };
@@ -5760,7 +5823,7 @@
           sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/doom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/doom";
           sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl";
           name = "doom";
         };
@@ -5781,7 +5844,7 @@
           sha256 = "13czcxmmvy4g9ysfjr6lb91c0fqv1xv8ppd27wbfsrgxm3aaqimb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/downplay-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/downplay-mode";
           sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
           name = "downplay-mode";
         };
@@ -5796,14 +5859,14 @@
         pname = "dracula-theme";
         version = "1.2.5";
         src = fetchFromGitHub {
-          owner = "zenorocha";
-          repo = "dracula-theme";
-          rev = "ad3191b11603898d275450e5f7fca711617c82c8";
-          sha256 = "10a8z7bqn6dmj9pgkrx5pq7kbh4i1n2vvv6600a8wp8n8wqbc2i5";
+          owner = "dracula";
+          repo = "emacs";
+          rev = "509293bebeaf26ee662ff35a28a7af019190f286";
+          sha256 = "0ddznxn75qk22g0ah4490ysghvb9r6nin1a005y0zmschz46bar8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/50e8d089f4e163eb459fc602cb90440b110b489f/recipes/dracula-theme";
-          sha256 = "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dracula-theme";
+          sha256 = "1px162v7h7136rasafq875yzw0h8n6wvzbyh73c3w093kd30bmh8";
           name = "dracula-theme";
         };
         packageRequires = [ emacs ];
@@ -5823,7 +5886,7 @@
           sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/draft-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/draft-mode";
           sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
           name = "draft-mode";
         };
@@ -5844,7 +5907,7 @@
           sha256 = "131ww26pb97q2gyjhfrsf7nw2pi5b1kba0cgl97qc017sfhg92v6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/drag-stuff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/drag-stuff";
           sha256 = "1q67q20gfhixzkmddhzp6fd8z2qfpsmyyvymmaffjcscnjaz21w4";
           name = "drag-stuff";
         };
@@ -5865,7 +5928,7 @@
           sha256 = "1hbm3zdmd28fjl8fky0kq4gs2bxsrn2zxk9rd1wa2wky43ycnd35";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/drupal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/drupal-mode";
           sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
           name = "drupal-mode";
         };
@@ -5886,7 +5949,7 @@
           sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/drupal-spell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/drupal-spell";
           sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
           name = "drupal-spell";
         };
@@ -5907,7 +5970,7 @@
           sha256 = "17yldk76mxakhb90bma7r4z9jgx02wankgk17r2di196mc04bj7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ducpel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ducpel";
           sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
           name = "ducpel";
         };
@@ -5917,22 +5980,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    dumb-jump = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
+    dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "0.3.9";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "5313ef651b58dd9b8b9fcb388856b8dcbf1b791b";
-          sha256 = "1czw5z6w8pcc7ra5d82v06padyiy7c3ds00chw5xgyvq6s73gzn4";
+          rev = "910e4b2fd870e5e4a701fdd39af04e819cca4ddb";
+          sha256 = "0m9m1vfbxhnpayhs34k4q3isyz630gv6vswqv3cj3rjprnzn8ccs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dumb-jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dumb-jump";
           sha256 = "1pgbs2k1g8w7gr65w50fazrmcky6w37c9rvyxqfmh06yx90nj4kc";
           name = "dumb-jump";
         };
-        packageRequires = [ dash f popup s ];
+        packageRequires = [ dash emacs f popup s ];
         meta = {
           homepage = "https://melpa.org/#/dumb-jump";
           license = lib.licenses.free;
@@ -5949,7 +6012,7 @@
           sha256 = "033yqc19xxirbva65lz8hnwxj7pn7fx7dlnf70kq71iqclqa4v25";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dummy-h-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dummy-h-mode";
           sha256 = "10lzfzq7md6s28w2zzlhswn3d6765g4vqzyjn2q5ms8pd2i4b4in";
           name = "dummy-h-mode";
         };
@@ -5969,7 +6032,7 @@
           sha256 = "19aid1rqpqj0fvln98db5imfk1griqld55xsr9plm6kwrr174syq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dyalog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
           name = "dyalog-mode";
         };
@@ -5990,7 +6053,7 @@
           sha256 = "1ppwlill1z4vqd566h9zi6zx5jb7hggmnmqrga84j5n7fwqvgz7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dynamic-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dynamic-fonts";
           sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
           name = "dynamic-fonts";
         };
@@ -6011,7 +6074,7 @@
           sha256 = "09skp2d5likqjlrsfis3biqw59sjkgid5249fld9ahqm5f1wq296";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/dynamic-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/dynamic-ruler";
           sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
           name = "dynamic-ruler";
         };
@@ -6032,7 +6095,7 @@
           sha256 = "0g0cz5a0vf31w27ljq5sn52mq15ynadl6cfbb97ja5zj1zxsxgjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm";
           sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
           name = "e2wm";
         };
@@ -6053,7 +6116,7 @@
           sha256 = "1yf081rac0chvkjha9z9xi1p983gmhjph0hai6ppsz5hzf2vikpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm-R";
           sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
           name = "e2wm-R";
         };
@@ -6074,7 +6137,7 @@
           sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm-direx";
           sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
           name = "e2wm-direx";
         };
@@ -6095,7 +6158,7 @@
           sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm-pkgex4pl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm-pkgex4pl";
           sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
           name = "e2wm-pkgex4pl";
         };
@@ -6116,7 +6179,7 @@
           sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm-sww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm-sww";
           sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
           name = "e2wm-sww";
         };
@@ -6137,7 +6200,7 @@
           sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/e2wm-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/e2wm-term";
           sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
           name = "e2wm-term";
         };
@@ -6158,7 +6221,7 @@
           sha256 = "0r56nqrj6iaz57ys6hqdq5qkyliv7dj6dv274l228r7x0axrwd9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/easy-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/easy-kill";
           sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
           name = "easy-kill";
         };
@@ -6179,7 +6242,7 @@
           sha256 = "18fdlxz9k961k8wafdw0gq0y514bvrfvx6qc1lmm4pk3gdcfbbi0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/easy-kill-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/easy-kill-extras";
           sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
           name = "easy-kill-extras";
         };
@@ -6200,7 +6263,7 @@
           sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/easy-repeat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/easy-repeat";
           sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
           name = "easy-repeat";
         };
@@ -6221,7 +6284,7 @@
           sha256 = "0ysym38xaqyx1wc7xd3fvjm62dmiq4727dnjvyxv7hs4czff1gcb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ebal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
           name = "ebal";
         };
@@ -6242,7 +6305,7 @@
           sha256 = "16hiwz8a1hyyiflzn53v97704v783pg18yxapn7pqk90fbcf7czw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ebf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ebf";
           sha256 = "072w1hczzb4z0dadvqy8px9zfnfd2z0w8nwa7q2qm5njg30rrqpb";
           name = "ebf";
         };
@@ -6263,7 +6326,7 @@
           sha256 = "1kcmbr4a2jxd62s4nc8xshrksb36xwb17j6c0hjzvb75r544xy6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ebib";
           sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
           name = "ebib";
         };
@@ -6284,7 +6347,7 @@
           sha256 = "1s9r1qj7cjsjvvphdpyjff6y598xpbrm9qjv5ncq15w6ac7yxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ecb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ecb";
           sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
           name = "ecb";
         };
@@ -6305,7 +6368,7 @@
           sha256 = "1r5hlcspznvfm111l1z0r4isd582qj64sa8cqk6hyi3y1hyp1xxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ecukes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ecukes";
           sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
           name = "ecukes";
         };
@@ -6326,7 +6389,7 @@
           sha256 = "0xy3q68i47a3s81jwr0rdvc1722bp78ng56xm53pri05g1z0db9s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edbi";
           sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
           name = "edbi";
         };
@@ -6347,7 +6410,7 @@
           sha256 = "145knahvvxbm8qmcdb69ilrg14w7130vav2pqjd7anr1l8n2i6gz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edit-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edit-indirect";
           sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
           name = "edit-indirect";
         };
@@ -6368,7 +6431,7 @@
           sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edit-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edit-list";
           sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
           name = "edit-list";
         };
@@ -6389,7 +6452,7 @@
           sha256 = "12dp1xj09jrp0kxp9xb6cak9dn6zkyis1wfn4fnhzmxxnrd8c5rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edit-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edit-server";
           sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
           name = "edit-server";
         };
@@ -6410,7 +6473,7 @@
           sha256 = "1zb8f6gfflwzh1zkhcd1nhan9wxmdm0gpp96fm5gjn639zs88539";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/editorconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/editorconfig";
           sha256 = "0zv96m07ml8i3k7zm7sdci4hn611n3ypna7zppfkwbdyr7d5k2gc";
           name = "editorconfig";
         };
@@ -6431,7 +6494,7 @@
           sha256 = "06v34l9dkykrrdfpnm3zi5wjm0fdvy76pbkfnk92wqkjp8fqimhd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edn";
           sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
           name = "edn";
         };
@@ -6452,7 +6515,7 @@
           sha256 = "1a1apa48n24yisd2zw5k4lfkngx3016x6y11qi80hg75vrnmg7f1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/edts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/edts";
           sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
           name = "edts";
         };
@@ -6473,7 +6536,7 @@
           sha256 = "1ryb7smvf66hk307yazkjn9bqzbwzbyyb5db200fq6j2zdjwsmaj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/egg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/egg";
           sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
           name = "egg";
         };
@@ -6494,7 +6557,7 @@
           sha256 = "07vdvjy4x21gyw2r4rxrj929hj1jp4a8igwgb2m5a5x50capwzhy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/egison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/egison-mode";
           sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
           name = "egison-mode";
         };
@@ -6513,7 +6576,7 @@
           sha256 = "0w9j5q5pzw55nwsw5wic7dl7psvg75vk1cxhrz2isgra6gissh9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eide";
           sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
           name = "eide";
         };
@@ -6534,7 +6597,7 @@
           sha256 = "0w2j0bbqnba1wr12f0zk87zwnxf6xhchx224fwgwqd3kg0x5z0r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ein";
           sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
           name = "ein";
         };
@@ -6555,7 +6618,7 @@
           sha256 = "0m7qsk378c30fva2n2ag99rsdklx5nsqc395msg1ab11sbpxvis0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eink-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eink-theme";
           sha256 = "0z437cpf1b8bqyi7bv0w0dnc52q4f5g17530lwdcxjkr38s9b1zn";
           name = "eink-theme";
         };
@@ -6576,7 +6639,7 @@
           sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-autoyas";
           sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
           name = "el-autoyas";
         };
@@ -6597,7 +6660,7 @@
           sha256 = "1awyh9ffd6a4cia239s89asb88ddqlnrv757d76vcb701pq412bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-get";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-get";
           sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
           name = "el-get";
         };
@@ -6618,7 +6681,7 @@
           sha256 = "1mzla7ijmq1mgzr6bf16mjdycbf8ylsf4zdk4j6fh5kw5n4k6c5n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-init";
           sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
           name = "el-init";
         };
@@ -6639,7 +6702,7 @@
           sha256 = "1488wv0f9ihzzf9fl8cki044k61b0kva604hdwpb2qk9gnjr4g1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-init-viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-init-viewer";
           sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
           name = "el-init-viewer";
         };
@@ -6660,7 +6723,7 @@
           sha256 = "13mv1rhgkwiww2wh5w926jz7idppp492wir1vdl245c5x50dh4f7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-mock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-mock";
           sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
           name = "el-mock";
         };
@@ -6681,7 +6744,7 @@
           sha256 = "0390pfgfgj7hwfmkwikwhip0hmwkgx784l529cqvalc31jchi94i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-spice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-spice";
           sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
           name = "el-spice";
         };
@@ -6702,7 +6765,7 @@
           sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/el-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/el-x";
           sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
           name = "el-x";
         };
@@ -6723,7 +6786,7 @@
           sha256 = "0hlj6jn9gmi00sqghxswkxpgk65c4gy2k7010vpkr2257rd4f3gq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elang";
           sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
           name = "elang";
         };
@@ -6744,7 +6807,7 @@
           sha256 = "1fh9dx669czkwy4msylcg64azz3az27akx55ipnazb5ghmsi7ivk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eldoc-eval";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eldoc-eval";
           sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
           name = "eldoc-eval";
         };
@@ -6765,7 +6828,7 @@
           sha256 = "1ji6rdbqwk8j0nl6yk3rdqrpgxir99lj9pf6i9rx55l63qyrdfc4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/electric-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/electric-operator";
           sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
           name = "electric-operator";
         };
@@ -6786,7 +6849,7 @@
           sha256 = "0zqrh8ycrk7768mj0d5b9dkz72559a36yhddb6idhik1v4q836sw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elfeed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elfeed";
           sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
           name = "elfeed";
         };
@@ -6807,7 +6870,7 @@
           sha256 = "0zqrh8ycrk7768mj0d5b9dkz72559a36yhddb6idhik1v4q836sw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elfeed-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elfeed-web";
           sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
           name = "elfeed-web";
         };
@@ -6849,7 +6912,7 @@
           sha256 = "1k7kprdknqm18dc0nwl7gachm0rivcpa8ng7p7ximalja3nsg2j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elisp-slime-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elisp-slime-nav";
           sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
           name = "elisp-slime-nav";
         };
@@ -6870,7 +6933,7 @@
           sha256 = "06bi68x49v6f7flpz279mm4jpg31ll3s274givm3pvr8slcxs6xg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elixir-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elixir-mode";
           sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
           name = "elixir-mode";
         };
@@ -6891,7 +6954,7 @@
           sha256 = "0dx5h3sfccc2bp1jxnqqki95x5hp1skw8n5n4lnh703yjga5gkrz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elixir-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elixir-yasnippets";
           sha256 = "0vmkcd88wfafv31lyw0983p4qjj387qf258q7py1ij47fcmfp579";
           name = "elixir-yasnippets";
         };
@@ -6904,15 +6967,15 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "0.16.0";
+        version = "0.17.0";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "5e2e70436d4e5be6725a43b1f09eb68db7400f02";
-          sha256 = "0wzxk4p9rxgv2k3z5k5zyi46mfvax658j7p29q2ii5hyj9imcjka";
+          rev = "3112ff7964b596022de94c12b4676c6ca7a69c80";
+          sha256 = "1n6gp3c4b3ryprw7hxd7447gkgjafxnlbfg75mjm96vfgxkb7abx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elm-mode";
           sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
           name = "elm-mode";
         };
@@ -6933,7 +6996,7 @@
           sha256 = "0l2iincskpks9yvj3y9zh1b48xli1q39wybr5n96rys5gv0drc9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elmacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elmacro";
           sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
           name = "elmacro";
         };
@@ -6954,7 +7017,7 @@
           sha256 = "080nnw6ddsczbm7gk50x4dkahi77fsybfiki5iyp39fjpa7lfzq3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elmine";
           sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
           name = "elmine";
         };
@@ -6975,7 +7038,7 @@
           sha256 = "1q4krfrc2dy0vr7q148msfpkcwj55mlsrn4n5xjnya4xj0134ib7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elpa-audit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elpa-audit";
           sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
           name = "elpa-audit";
         };
@@ -6996,7 +7059,7 @@
           sha256 = "0h2xhys3cc9z61ax0ymg5fbsjg6192hwdvfhgmyq7vwibi402r1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elpa-mirror";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elpa-mirror";
           sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
           name = "elpa-mirror";
         };
@@ -7017,7 +7080,7 @@
           sha256 = "1x4asq5zqv8wbp034gzcrza9y2nbbwx1nrwi4jnwak0x0yn3c2dj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elpy";
           sha256 = "0n802bh7jj9zgz84xjrxvy33jl6s3hj5dqxafyfr87fank97hb6d";
           name = "elpy";
         };
@@ -7044,7 +7107,7 @@
           sha256 = "14hwl5jzmm43qa4jbpsyswbz4hk1l2iwqh3ank6502bz58877k6c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elscreen-mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elscreen-mew";
           sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
           name = "elscreen-mew";
         };
@@ -7065,7 +7128,7 @@
           sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elscreen-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elscreen-persist";
           sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
           name = "elscreen-persist";
         };
@@ -7086,7 +7149,7 @@
           sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elwm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elwm";
           sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
           name = "elwm";
         };
@@ -7107,7 +7170,7 @@
           sha256 = "07k8kq444ki7pxbz3vnrwqgycm9hfcdxgsnvf7qihqvzs2y1qm3d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/elx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/elx";
           sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
           name = "elx";
         };
@@ -7128,7 +7191,7 @@
           sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacs-eclim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacs-eclim";
           sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv";
           name = "emacs-eclim";
         };
@@ -7149,7 +7212,7 @@
           sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacs-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacs-setup";
           sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
           name = "emacs-setup";
         };
@@ -7170,7 +7233,7 @@
           sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsagist";
           sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
           name = "emacsagist";
         };
@@ -7191,7 +7254,7 @@
           sha256 = "1r6cpb7fck5znb7q7zrxcsjn7d3xiqhq8dp1ar1rsd6k4h05by4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsc";
           sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
           name = "emacsc";
         };
@@ -7212,7 +7275,7 @@
           sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsql";
           sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
           name = "emacsql";
         };
@@ -7233,7 +7296,7 @@
           sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsql-mysql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsql-mysql";
           sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
           name = "emacsql-mysql";
         };
@@ -7254,7 +7317,7 @@
           sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsql-psql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsql-psql";
           sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
           name = "emacsql-psql";
         };
@@ -7275,7 +7338,7 @@
           sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsql-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsql-sqlite";
           sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
           name = "emacsql-sqlite";
         };
@@ -7296,7 +7359,7 @@
           sha256 = "00q344vgihl2s0snibfwsjvxqkbvy2jlqnnid7qw5gcni673b2hl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emacsshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emacsshot";
           sha256 = "08xqx017yfizdj8wz7nbh9i7qpar6398sri78abzf78inv828s9j";
           name = "emacsshot";
         };
@@ -7317,7 +7380,7 @@
           sha256 = "1a9925n0jcgxcgiz2kmh9zbb1rg9039rlrbr9fr80by9znfwmy67";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emamux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emamux";
           sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
           name = "emamux";
         };
@@ -7338,7 +7401,7 @@
           sha256 = "1sagmgcarg7d7b7hv3bqgkxg39fzgxaaq7wz9cf7fpwz0pv8vfy6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/embrace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/embrace";
           sha256 = "1w9zp9n91703d6jd4adl2xk574wsr7fm2a9v32b1i9bi3hr0hdjc";
           name = "embrace";
         };
@@ -7359,7 +7422,7 @@
           sha256 = "1dsa85bk33j90h1ypaz1ylqh9yp2xvlga237h3kwa5y3sb0d5ydi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emmet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emmet-mode";
           sha256 = "0wjv4hqddjvbdrmsxzav5rpwnm2n6lr86jzkrnav8f2kyzypdsnr";
           name = "emmet-mode";
         };
@@ -7375,10 +7438,10 @@
         src = fetchgit {
           url = "git://git.sv.gnu.org/emms.git";
           rev = "c1e1a843c3389fc585908de367ff00fdd6470965";
-          sha256 = "04gdji7gjpwg8mfpah0z7hvghs2p4k0qi90ln6cq48z927dpa4ip";
+          sha256 = "0q8grh20mzz8yashvzwx8s8hr761xmi6s81mjw8cjqzajm4ky8q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms";
           sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m";
           name = "emms";
         };
@@ -7399,7 +7462,7 @@
           sha256 = "0q80f0plch6k4lhs8c9qm3mfycfbp3kn5sjrk9zxgxwnn901y9mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms-mode-line-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms-mode-line-cycle";
           sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
           name = "emms-mode-line-cycle";
         };
@@ -7420,7 +7483,7 @@
           sha256 = "104iw4bl6y33diqs5ayrvdljkhb6f9g2m5p5kh8klgy7z1yjhp4p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms-player-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms-player-mpv";
           sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
           name = "emms-player-mpv";
         };
@@ -7441,7 +7504,7 @@
           sha256 = "15bb8fp2lwr5brfrsjwa47yvja5g2wyaac5a4sh5rn734s64x2sq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms-player-simple-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms-player-simple-mpv";
           sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
           name = "emms-player-simple-mpv";
         };
@@ -7462,7 +7525,7 @@
           sha256 = "1kipxa9ax8zi9qqk19mknpg7nnlzgr734kh9bnklydipwnsy00pi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emms-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emms-state";
           sha256 = "080y02hxxqfn0a0dhq5vm0r020v2q3h1612a2zkq5fxi8ssvhp9i";
           name = "emms-state";
         };
@@ -7483,7 +7546,7 @@
           sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emoji-cheat-sheet-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emoji-cheat-sheet-plus";
           sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
           name = "emoji-cheat-sheet-plus";
         };
@@ -7504,7 +7567,7 @@
           sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emoji-fontset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emoji-fontset";
           sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
           name = "emoji-fontset";
         };
@@ -7525,7 +7588,7 @@
           sha256 = "0nrf6p4h66i17nz850kpdrnk5h5ra4l3icjjrq34sxvmsssp6zhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emojify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emojify";
           sha256 = "1sgd32qm43hwby75a9q2pz1yfzj988i35d8p9f18zvbxypy7b2yp";
           name = "emojify";
         };
@@ -7546,7 +7609,7 @@
           sha256 = "0pl7i2a0mf2s33qpsc14dcvqbl6jm5xrvcnrhfr7visvnih29cy4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/emr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/emr";
           sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
           name = "emr";
         };
@@ -7577,7 +7640,7 @@
           sha256 = "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/engine-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/engine-mode";
           sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
           name = "engine-mode";
         };
@@ -7598,7 +7661,7 @@
           sha256 = "08j6b79vy8ry4ad1abk3hvxjbb4ylrhkvrbrnq1gcikl4h1p2v63";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/enlive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/enlive";
           sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
           name = "enlive";
         };
@@ -7619,7 +7682,7 @@
           sha256 = "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/enotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/enotify";
           sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
           name = "enotify";
         };
@@ -7640,7 +7703,7 @@
           sha256 = "1yn9jn6jl6rmknj50g18z5yvpa1d8mzzx3j1pfdwfn36ak4nc9ba";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eopengrok";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eopengrok";
           sha256 = "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av";
           name = "eopengrok";
         };
@@ -7661,7 +7724,7 @@
           sha256 = "05r2m7zghbdrgscg0x78jnhk1g6fq8iylar4cx699zm6pzvlq98z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/epc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/epc";
           sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
           name = "epc";
         };
@@ -7682,7 +7745,7 @@
           sha256 = "18am0nc2kjxbnkls7dl9j47cynwiiafx8w6rqa4d9dyx7khl2rmp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/epkg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/epkg";
           sha256 = "0vc1g29rfmgd2ks4lbz4599rbgcax7rgdva53ahhvp6say8fy22q";
           name = "epkg";
         };
@@ -7703,7 +7766,7 @@
           sha256 = "0sjxd5y5hxhrbgfkpwx6m724r3841b53hgc61a0g5zwispw5pmrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/epl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/epl";
           sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
           name = "epl";
         };
@@ -7716,15 +7779,15 @@
     epm = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epm";
-        version = "0.1beta1";
+        version = "0.1beta2";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "epm";
-          rev = "2ee9a69d725a77ac4e57cc652ce4b4cfd1fef63a";
-          sha256 = "1kjkb2cvpkbbcvlq64imnv5ispkf3yrj4f5acagd32jx7gcgxfj8";
+          rev = "ee004d00c8c8fbe32c4e5baf6279c5e68dc5f201";
+          sha256 = "0llkgjqr9hl66nya1ppvrlcvmy3rh4pwc25ywq4zi0fbl25qsf5d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/epm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/epm";
           sha256 = "0k94qhzxjzw5d0c53jnyx1xfciwr9qib845awyjaybzzs34s8r08";
           name = "epm";
         };
@@ -7745,7 +7808,7 @@
           sha256 = "1xw56sir6gkr0p9g4s6p4qc0rajnl6ifbzrky07j28y9vsa59nsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
           name = "erc-crypt";
         };
@@ -7765,7 +7828,7 @@
           sha256 = "11a64rvhd88val6vg9l1d5j3zdjd0bbbwcqilj0wp6rbn57xy0w8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-hipchatify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-hipchatify";
           sha256 = "1a4gl05i757vvap0rzrfwms7mhw80sa84gvbwafrvj3x11rja24x";
           name = "erc-hipchatify";
         };
@@ -7786,7 +7849,7 @@
           sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-hl-nicks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-hl-nicks";
           sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
           name = "erc-hl-nicks";
         };
@@ -7807,7 +7870,7 @@
           sha256 = "1xsxykmhz34gmyj4jb26qfai7j95kzlc7vfydrajc6is7xlrwhfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-twitch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-twitch";
           sha256 = "08vlwcxrzc2ndm52112z1r0qnz6jlmjhiwq2j3j59fbw82ys61ia";
           name = "erc-twitch";
         };
@@ -7828,7 +7891,7 @@
           sha256 = "0kh4amx3l3a14qaiyvjyak1jbybs6n49mdvzjrd1i2vd1y74zj5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erc-youtube";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erc-youtube";
           sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
           name = "erc-youtube";
         };
@@ -7849,7 +7912,7 @@
           sha256 = "19jninbf0dhdw3kn4d38bxmklg0v7sh3m9dwj6z69w99r5pcw480";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ercn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ercn";
           sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
           name = "ercn";
         };
@@ -7870,7 +7933,7 @@
           sha256 = "17i567nfm0rykimh6bpcc5f2l7wsf8zcdy2jzd7sgrl54dvb0g9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erefactor";
           sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
           name = "erefactor";
         };
@@ -7891,7 +7954,7 @@
           sha256 = "19m6chwc2awbsk5z03q1yhq84m481pff2609a8bxymcvm6yaamvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ergoemacs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
           name = "ergoemacs-mode";
         };
@@ -7912,7 +7975,7 @@
           sha256 = "1iix7lnz8crza36yk7kmfh4qw84jjqmdbiflcm52rrq9jmpw176y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/erlang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/erlang";
           sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
           name = "erlang";
         };
@@ -7933,7 +7996,7 @@
           sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ert-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ert-async";
           sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
           name = "ert-async";
         };
@@ -7950,10 +8013,10 @@
         src = fetchgit {
           url = "https://bitbucket.org/olanilsson/ert-junit";
           rev = "341c755e7b60f8d2081303951377968b1d1a6c23";
-          sha256 = "1hsp0jp9gyfr6rhfsjgi55x4lqjlh1w13y90rrlnbxb0499zpa33";
+          sha256 = "0y06i97bbim6lmvk8l3adifwzhkjyrgyxv02ksshk4npr0b627gx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ert-junit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ert-junit";
           sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
           name = "ert-junit";
         };
@@ -7974,7 +8037,7 @@
           sha256 = "0rdgdslspzb4s0n4a68hnwfm8vm8baasa8nzrdinf0nryn7rrhbf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ert-runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ert-runner";
           sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
           name = "ert-runner";
         };
@@ -7995,7 +8058,7 @@
           sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/es-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/es-lib";
           sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
           name = "es-lib";
         };
@@ -8016,7 +8079,7 @@
           sha256 = "04lll5sscbpqcq3sv5gsfky5qcj6asqql7fw1bp6g12qqf9r02nd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/es-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/es-mode";
           sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
           name = "es-mode";
         };
@@ -8037,7 +8100,7 @@
           sha256 = "0cjchwrhk7bw87bg10zgcwkga50rvs0jn5v2jf6bbsxbcqx2nfc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/es-windows";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/es-windows";
           sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
           name = "es-windows";
         };
@@ -8058,7 +8121,7 @@
           sha256 = "0cairmqsaghl2ddb2v8zhcwy5ik756m7gkair8xrbigz4jklpcv9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/esa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/esa";
           sha256 = "1kbsv4xsp7p9v0g22had0dr7w5zsr24bgi2xzryy76699pxq4h6c";
           name = "esa";
         };
@@ -8079,7 +8142,7 @@
           sha256 = "0nkmwwx224r50y2xnrz3v26l3ngqshvy5hs861gy4zagwllqfmvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eshell-autojump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eshell-autojump";
           sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
           name = "eshell-autojump";
         };
@@ -8100,7 +8163,7 @@
           sha256 = "179xqh0rs8w3d03gygg9sy4qp5xqgfgl4c0ycrknip9zrnbmph4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eshell-z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eshell-z";
           sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
           name = "eshell-z";
         };
@@ -8121,7 +8184,7 @@
           sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/espuds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/espuds";
           sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
           name = "espuds";
         };
@@ -8142,7 +8205,7 @@
           sha256 = "0lvr14xlxsdad4ihywkpbwwj9lyal0w4p616ska5rk7gg5i8v74p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ess";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ess";
           sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
           name = "ess";
         };
@@ -8163,7 +8226,7 @@
           sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ess-R-data-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ess-R-data-view";
           sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
           name = "ess-R-data-view";
         };
@@ -8184,7 +8247,7 @@
           sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ess-R-object-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ess-R-object-popup";
           sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
           name = "ess-R-object-popup";
         };
@@ -8205,7 +8268,7 @@
           sha256 = "1avb6dng4xgw3bp7bw0j60wl6s4y26alfys9vwwj29rlzvjrlh74";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ess-smart-underscore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ess-smart-underscore";
           sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
           name = "ess-smart-underscore";
         };
@@ -8226,7 +8289,7 @@
           sha256 = "1pzbd2ka6h5ipiivfwfgq1hq80ww59xvyldmx406mdd5vn7yqk5z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/esup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/esup";
           sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
           name = "esup";
         };
@@ -8247,7 +8310,7 @@
           sha256 = "0k4vqlbk3h2snfiriraxhnjpdxgs49vcaazl191p9s2f799msd8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/esxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/esxml";
           sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
           name = "esxml";
         };
@@ -8268,7 +8331,7 @@
           sha256 = "1xqc4lqzirpmr21w766g8vmcvvsq8b3hv9i7r27i5x1g0j4jabja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ethan-wspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ethan-wspace";
           sha256 = "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws";
           name = "ethan-wspace";
         };
@@ -8289,7 +8352,7 @@
           sha256 = "077rj7yj6laxyhcsmrmlpg438962jv0fm2yiqx6i365fbgyx0hck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eval-in-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eval-in-repl";
           sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
           name = "eval-in-repl";
         };
@@ -8310,7 +8373,7 @@
           sha256 = "0lwpl9akdxml9f51pgsv0g7k7mr8dvqm94l01i7vq8jl6vd6v6i5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eval-sexp-fu";
           sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
           name = "eval-sexp-fu";
         };
@@ -8331,7 +8394,7 @@
           sha256 = "1a3y69s7lb24zdivxcpsjh9l6adxyjqxbpgradnj0q1n6kdyq679";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evalator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evalator";
           sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk";
           name = "evalator";
         };
@@ -8347,11 +8410,11 @@
         version = "1.2.12";
         src = fetchhg {
           url = "https://bitbucket.com/lyro/evil";
-          rev = "136e0e5a8fc4";
-          sha256 = "1f5kdaj0gh3kcqlsxly8kiq2a9k75j6nwnvjwwxl6c8n6rljly3a";
+          rev = "f5e708761c6d";
+          sha256 = "0bgbfcx4amdy6r9rj24928dy0f0axdfn3j482zkxirbpkyxil4l7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil";
           sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc";
           name = "evil";
         };
@@ -8372,7 +8435,7 @@
           sha256 = "0lw7fg4gqwj30r0l6k2ni36sxqkf65zf0d0z3rxnpwbxlf8dlkrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-anzu";
           sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
           name = "evil-anzu";
         };
@@ -8393,7 +8456,7 @@
           sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-args";
           sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
           name = "evil-args";
         };
@@ -8414,7 +8477,7 @@
           sha256 = "183fdg7rmnnbps0knnj2kmhf1hxk0q91wbqx1flhciq6wq4rilni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-commentary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-commentary";
           sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
           name = "evil-commentary";
         };
@@ -8435,7 +8498,7 @@
           sha256 = "0cj17gk7cxia2p9xzqnlnmqqbw2afd3x61gfw9fpf65j9wik5hbz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-escape";
           sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
           name = "evil-escape";
         };
@@ -8456,7 +8519,7 @@
           sha256 = "0r9gif2sgf84z8qniz6chr32av9g2i38rlyms81m8ssghf0j86ss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-iedit-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-iedit-state";
           sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
           name = "evil-iedit-state";
         };
@@ -8477,7 +8540,7 @@
           sha256 = "1k2zinchs0jjllp8zkpggckyy63dkyi5yig3p46vh4w45jdzysk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-leader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-leader";
           sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
           name = "evil-leader";
         };
@@ -8498,7 +8561,7 @@
           sha256 = "1n6r8xs670r5qp4b5f72nr9g8nlqcrx1v7yqqlbkgv8gns8n5xgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-lisp-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-lisp-state";
           sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
           name = "evil-lisp-state";
         };
@@ -8519,7 +8582,7 @@
           sha256 = "040iam8ayb4q5f2w2cn40y9rgljv2gsa5yf0vky1ayjf1zl57g3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-magit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-magit";
           sha256 = "10mhq6mzpklk5sj28lvd478dv9k84s81ax5jkwwxj26mqdw1ybg6";
           name = "evil-magit";
         };
@@ -8540,7 +8603,7 @@
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-mark-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-mark-replace";
           sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
           name = "evil-mark-replace";
         };
@@ -8561,7 +8624,7 @@
           sha256 = "0x6rc98g7hvvmlgq31n7qanylrld6dzvg6n8qgzp4s544l0dwfw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-matchit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-matchit";
           sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
           name = "evil-matchit";
         };
@@ -8582,7 +8645,7 @@
           sha256 = "118a9bkj2i95xi4axa39mwm3nh519jzznzahbvlncf2279v8mrzr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-multiedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-multiedit";
           sha256 = "0p02q9skqw2zhx7sfadqgs7vn518s72856962dam0xw4sqasplfp";
           name = "evil-multiedit";
         };
@@ -8603,7 +8666,7 @@
           sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-nerd-commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-nerd-commenter";
           sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
           name = "evil-nerd-commenter";
         };
@@ -8624,7 +8687,7 @@
           sha256 = "13jg2xbh4p02x1nj77b6csb93hh56c1nv8kslcq2hjj3caipk4m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-numbers";
           sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
           name = "evil-numbers";
         };
@@ -8645,7 +8708,7 @@
           sha256 = "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-org";
           sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
           name = "evil-org";
         };
@@ -8666,7 +8729,7 @@
           sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-quickscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-quickscope";
           sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
           name = "evil-quickscope";
         };
@@ -8687,7 +8750,7 @@
           sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-rsi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-rsi";
           sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
           name = "evil-rsi";
         };
@@ -8708,7 +8771,7 @@
           sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-search-highlight-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-search-highlight-persist";
           sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
           name = "evil-search-highlight-persist";
         };
@@ -8729,7 +8792,7 @@
           sha256 = "0j2m3rsszivyjhv8bjid5fdqaf1vwp8rf55b27y4vc2489wrw415";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-smartparens";
           sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
           name = "evil-smartparens";
         };
@@ -8750,7 +8813,7 @@
           sha256 = "1ip2ibgsir6rhj7ci2f128z18n1yrwd6pg0i42j1flc3m4shs6ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-snipe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
           name = "evil-snipe";
         };
@@ -8771,7 +8834,7 @@
           sha256 = "1rchanv0vq9rx6x69608dlpdybvkn8a9ymx8wzm7gqpz9qh6xqrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-space";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-space";
           sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
           name = "evil-space";
         };
@@ -8792,7 +8855,7 @@
           sha256 = "0vsf7yzlb2j7c5c7cnk81y1979psy6a9v7klg6c2j9lkcn3cqpvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-textobj-anyblock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-textobj-anyblock";
           sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
           name = "evil-textobj-anyblock";
         };
@@ -8813,7 +8876,7 @@
           sha256 = "1rskvkmz30xyy8xfjf2i35f3dxh663gb3plfy3f0j6z17i086jl2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-tutor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-tutor";
           sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
           name = "evil-tutor";
         };
@@ -8834,7 +8897,7 @@
           sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-visual-mark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-visual-mark-mode";
           sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
           name = "evil-visual-mark-mode";
         };
@@ -8855,7 +8918,7 @@
           sha256 = "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evil-visualstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evil-visualstar";
           sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
           name = "evil-visualstar";
         };
@@ -8876,7 +8939,7 @@
           sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/evm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/evm";
           sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
           name = "evm";
         };
@@ -8897,7 +8960,7 @@
           sha256 = "0gs6bi3s2sszc6v2b26929azmn5513kvyin99n4d0ark1jdbjmv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eww-lnum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eww-lnum";
           sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
           name = "eww-lnum";
         };
@@ -8910,15 +8973,15 @@
     exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exec-path-from-shell";
-        version = "1.10";
+        version = "1.11";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "30c793b388312e5044afb7549b50996bf2b71941";
-          sha256 = "0nhc3m88i6rl2y426ksmjbbaqwfrjnwbzqq1bvd6r0bkcwgfwfml";
+          rev = "4d6a6aa18031a4bbdd5b3bfad8686dc5ff942ab2";
+          sha256 = "0n86zj350jw1lxnaa450qmggza0za3a1zg9k9clwb9cjz4wwghsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/exec-path-from-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/exec-path-from-shell";
           sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
           name = "exec-path-from-shell";
         };
@@ -8939,7 +9002,7 @@
           sha256 = "0rvkhjfkhamr3ys9iarblfwvwq7n4wishdjgnwj1lx7m80h1hzbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/expand-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/expand-region";
           sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
           name = "expand-region";
         };
@@ -8960,7 +9023,7 @@
           sha256 = "106yh793scbyharsk1dvrirkj3c6666w8jqilpkaz78vwyw3zs5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/express";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/express";
           sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
           name = "express";
         };
@@ -8981,7 +9044,7 @@
           sha256 = "1k2j8szavyq2wy5c0skvs03a88cr9njy7y63b7knh2m92nw4830d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/extend-dnd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/extend-dnd";
           sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
           name = "extend-dnd";
         };
@@ -9002,7 +9065,7 @@
           sha256 = "0jc5wv2hkc89yh5ypa324xlfqdna20msr63g30njxq4g2vd0iqa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/eyebrowse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/eyebrowse";
           sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
           name = "eyebrowse";
         };
@@ -9023,7 +9086,7 @@
           sha256 = "095ka87144jms5gi9spjcmkq346a56kzzy3in6naaha0djd4d607";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/f";
           sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
           name = "f";
         };
@@ -9044,7 +9107,7 @@
           sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fabric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fabric";
           sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
           name = "fabric";
         };
@@ -9065,7 +9128,7 @@
           sha256 = "01l8dlfpyy97b17djbza46rq11xlbkhd5kn2r26r2xac8klj4pka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/factlog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/factlog";
           sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
           name = "factlog";
         };
@@ -9086,7 +9149,7 @@
           sha256 = "05lwcwf412m717yhwpjrswqkm8c3i7391rmiwv2k8xc1vk6dpp4g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fancy-battery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fancy-battery";
           sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
           name = "fancy-battery";
         };
@@ -9107,7 +9170,7 @@
           sha256 = "10ds6nlzm1s5xsp53a52qlzrnph7in6gib67qhgnwpj33wp8gs91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fancy-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fancy-narrow";
           sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
           name = "fancy-narrow";
         };
@@ -9120,15 +9183,15 @@
     fastdef = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, w3m }:
     melpaBuild {
         pname = "fastdef";
-        version = "0.1.0";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "fastdef";
-          rev = "602808385974db7a8e57b2980b3adc1bc61e4aec";
-          sha256 = "0kidb2kwjyrz93yy9gnwwsb60xx3k6npni2gj8q38w50lql5ja2l";
+          rev = "b9e7427d65ca5a14db0d318cb799f6cc34c5c58a";
+          sha256 = "196agfqcd943wmd3kq6g0dwrqwrx93zn1r7yqj1wri60vv6b9p8q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fastdef";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fastdef";
           sha256 = "1cf4slxhcp2z7h9k3l31h06nnqsyb4smwnj55ivil2lm0fa0vlzj";
           name = "fastdef";
         };
@@ -9149,7 +9212,7 @@
           sha256 = "0h32w63vv451797zi6206j529fd4j8l3fp7rqip3s8xn8d4728x1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fastnav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fastnav";
           sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
           name = "fastnav";
         };
@@ -9162,15 +9225,15 @@
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
-        version = "0.2.1";
+        version = "0.2.2";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "fcitx.el";
-          rev = "5e216df6df652599d921e00afb6e52a050f8cb50";
-          sha256 = "03w68zbgprly45i6ps7iviwvjf3acbc7f7acvjpzj2plf0g5i19z";
+          rev = "77f1e187b9cecb6975bedcfe91c8c81f1b133686";
+          sha256 = "0n0v9jwswcc16cigyffvy3m9y7qqrs8qzjs11sq3d420zrv16b39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fcitx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fcitx";
           sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
           name = "fcitx";
         };
@@ -9191,7 +9254,7 @@
           sha256 = "1cxjygg05v8s96c8z6plk3hl34jaiwg7s7dl7dsk20rj5f54kgw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/feature-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/feature-mode";
           sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
           name = "feature-mode";
         };
@@ -9212,7 +9275,7 @@
           sha256 = "0fghhy5xqsdwal4fwlr6hxr5kpnfw71q79mxpp9db59ldnj9f5y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fill-column-indicator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fill-column-indicator";
           sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
           name = "fill-column-indicator";
         };
@@ -9233,7 +9296,7 @@
           sha256 = "1r9y9zschavi28c5ysrlh56vxszjfyhh5r36fhn74i0b5iiy15rx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/finalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
@@ -9254,7 +9317,7 @@
           sha256 = "1xjb66pydm3yf0jxnm2mri98pxq3b26xvwjkaj1488qgj27i05jr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/find-by-pinyin-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
           name = "find-by-pinyin-dired";
         };
@@ -9264,22 +9327,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
+    find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "4.9.1";
+        version = "5.0.1";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "32e291c4d741a520234c77c227954b2d6430ef19";
-          sha256 = "13myami3vm5py9pp957kbfl9dd11z1a4vy0bbzqqnkgliim7pbsb";
+          rev = "006a66404c25255b32d1442f1c3655cc7540d29b";
+          sha256 = "1kxlyhid7yskshy97lag44xjddckaw80bsml0wi1mrcc989amrng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/find-file-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/find-file-in-project";
           sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
           name = "find-file-in-project";
         };
-        packageRequires = [ emacs swiper ];
+        packageRequires = [ emacs ivy ];
         meta = {
           homepage = "https://melpa.org/#/find-file-in-project";
           license = lib.licenses.free;
@@ -9296,7 +9359,7 @@
           sha256 = "0wbmmrd7brf4498pdyilz17rzv7221cj8sd4h11gac2r72f1q2md";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/find-file-in-repository";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/find-file-in-repository";
           sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
           name = "find-file-in-repository";
         };
@@ -9317,7 +9380,7 @@
           sha256 = "0lwgbd9zwdv7qs39c3fp4hrc17d9wrwwjgba7a14zwrhb27m7j07";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fiplr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fiplr";
           sha256 = "1a4w0yqdkz477lfyin4lb9k9qkfpx4350kfxmrqx6dj3aadkikca";
           name = "fiplr";
         };
@@ -9338,7 +9401,7 @@
           sha256 = "0icgl88pwizwzkdqsxbwhnc6pdyqsfd7wgjnkvg3206i7hcqwpsp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/firefox-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/firefox-controller";
           sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6";
           name = "firefox-controller";
         };
@@ -9359,7 +9422,7 @@
           sha256 = "174x0qyrwswppc9p1q1nn4424r3zg7g49zk329k5aq18vyjz52d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fireplace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fireplace";
           sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
           name = "fireplace";
         };
@@ -9380,7 +9443,7 @@
           sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/firestarter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/firestarter";
           sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
           name = "firestarter";
         };
@@ -9401,7 +9464,7 @@
           sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fish-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fish-mode";
           sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
           name = "fish-mode";
         };
@@ -9422,7 +9485,7 @@
           sha256 = "16rd23ygh76fs4i7rni94k8gwa9n360h40qmhm65snp31kqnpr1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fix-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fix-input";
           sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p";
           name = "fix-input";
         };
@@ -9443,7 +9506,7 @@
           sha256 = "1hj5jp4vbkcmnc8l2hqsvjc76f7c9zcsq8znwcwv2nv9xj9hlbkr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fix-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fix-word";
           sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
           name = "fix-word";
         };
@@ -9464,7 +9527,7 @@
           sha256 = "1hnxdmzqmnp3dr7mpr58pjmigykb3cxwphxzia013kfi37ipf5a0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fixmee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fixmee";
           sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
           name = "fixmee";
         };
@@ -9492,7 +9555,7 @@
           sha256 = "0acgyxl4kpfld6h6j54415ac8crk7byfs5lcysil9s5l3qrxjl3h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/floobits";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/floobits";
           sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
           name = "floobits";
         };
@@ -9513,7 +9576,7 @@
           sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flx";
           sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
           name = "flx";
         };
@@ -9534,7 +9597,7 @@
           sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flx-ido";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flx-ido";
           sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
           name = "flx-ido";
         };
@@ -9547,15 +9610,15 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "27";
+        version = "28";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "0040538d275ba388ef8114bda486e5150e67a9bd";
-          sha256 = "1igsnps6yc4lh05ka17nwfl03yn26varglm5xhgka8p6vk1z906b";
+          rev = "0b6d258cc8907d9bf6c3dc111a39ff14c892ad36";
+          sha256 = "1bwx7ka79kggk180rjf6fcdndfhlfayvibyjyha9cxpvg78dafkl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck";
           sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
           name = "flycheck";
         };
@@ -9576,7 +9639,7 @@
           sha256 = "14idjjz6fhmq806mmncmqnr9bvcjks6spin8z6jb0gqcg1dbhm06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-apertium";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-apertium";
           sha256 = "1cc15sljqs6gvb3wiw7n1wkd714qkvfpw6l1kg4lfx9r4jalcvw7";
           name = "flycheck-apertium";
         };
@@ -9597,7 +9660,7 @@
           sha256 = "1c3igqfd42dm42kfjm2q2xgr673vws10n9jn2jjlsk4g33brc7h4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-cask";
           sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
           name = "flycheck-cask";
         };
@@ -9618,7 +9681,7 @@
           sha256 = "1s2zq97d7ryif6rlbvriz36dh23wmwi67v4q6krl77dfzcs705b3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-checkbashisms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-checkbashisms";
           sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
           name = "flycheck-checkbashisms";
         };
@@ -9639,7 +9702,7 @@
           sha256 = "1i824iyjsg4d786kx5chsb64wlqd8vn2vsrhq6rmdx2x3gzdfcsx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-clojure";
           sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
           name = "flycheck-clojure";
         };
@@ -9660,7 +9723,7 @@
           sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-color-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-color-mode-line";
           sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
           name = "flycheck-color-mode-line";
         };
@@ -9681,7 +9744,7 @@
           sha256 = "1ap5hgvaccmf2xkfvyp7rqcfjwmiy6mhr6ccgahxm2z0vm51kpyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-dmd-dub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-dmd-dub";
           sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
           name = "flycheck-dmd-dub";
         };
@@ -9702,7 +9765,7 @@
           sha256 = "0frgyj57mrggq5ib6xi71696m97ch0bw6cc208d2qbnb55sf4fgb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-gometalinter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-gometalinter";
           sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
           name = "flycheck-gometalinter";
         };
@@ -9723,7 +9786,7 @@
           sha256 = "0yryd346cp5zir3icldkhjzwjb0bkq8rlidbr62dry1cw9bic6z0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-haskell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-haskell";
           sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
           name = "flycheck-haskell";
         };
@@ -9744,7 +9807,7 @@
           sha256 = "136mdg21a8sqxhijsjsvpli7r7sb40nmf80p6gmgb1ghwmhlm8k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-hdevtools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-hdevtools";
           sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
           name = "flycheck-hdevtools";
         };
@@ -9765,7 +9828,7 @@
           sha256 = "0qa5a8wzvzxwqql92ibc9s43k8sj3vwn7skz9hfr8av0skkhx996";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-irony";
           sha256 = "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z";
           name = "flycheck-irony";
         };
@@ -9786,7 +9849,7 @@
           sha256 = "1pdssw5k88ym5fczllfjv26sp4brlyrywnlzq5baha5pq91h9cb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-ledger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-ledger";
           sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
           name = "flycheck-ledger";
         };
@@ -9796,6 +9859,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-mix = callPackage ({ elixir-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-mix";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "tomekowal";
+          repo = "flycheck-mix";
+          rev = "c565ebb12a48fcd49cc65656d79295c3288fcb84";
+          sha256 = "1yncail979sfljmib7b1m9aw376xd4b76apz4d50hj83lrfy169c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-mix";
+          sha256 = "1wp8lp45lc519w3xsws2c91jlbfmc0pc8764kxsifk74akwcizfl";
+          name = "flycheck-mix";
+        };
+        packageRequires = [ elixir-mode flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-mix";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }:
     melpaBuild {
         pname = "flycheck-ocaml";
@@ -9807,7 +9891,7 @@
           sha256 = "1phfarws2aajkgcl96hqa4ydmb1yncg10q2ldzf8ff6yd6mvk51l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-ocaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-ocaml";
           sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
           name = "flycheck-ocaml";
         };
@@ -9828,7 +9912,7 @@
           sha256 = "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-package";
           sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
           name = "flycheck-package";
         };
@@ -9849,7 +9933,7 @@
           sha256 = "1da10q378k5kbcj0rrpzhm7r3ym4rfwc7v1ialcndbmflsn09m5s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-pony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-pony";
           sha256 = "18w1d7y3jsmsc4wg0909p72cnvbxzsmnirmrahhwgsb963fij5qk";
           name = "flycheck-pony";
         };
@@ -9870,7 +9954,7 @@
           sha256 = "0v23yc8znzjp44lrpfzqb4hc3psad14hsnvqcp8f1yyhgvdx35n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-pos-tip";
           sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
           name = "flycheck-pos-tip";
         };
@@ -9891,7 +9975,7 @@
           sha256 = "1xxvri9ax5cjrkxhjqhs7zqbch9cx8kvrn7sg611frl68qawkjsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-status-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-status-emoji";
           sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
           name = "flycheck-status-emoji";
         };
@@ -9912,7 +9996,7 @@
           sha256 = "0azjr5mfb3hnb66m1b2319i035mn5i9qz24y7fj5crhnc9vp8w3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-tip";
           sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
           name = "flycheck-tip";
         };
@@ -9933,7 +10017,7 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flycheck-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flycheck-ycmd";
           sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
           name = "flycheck-ycmd";
         };
@@ -9954,7 +10038,7 @@
           sha256 = "1svj5n7mmzhq03azlv4n33rz0nyqb00qr8ihdbc8hh2xnp63j5rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-coffee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-coffee";
           sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
           name = "flymake-coffee";
         };
@@ -9975,7 +10059,7 @@
           sha256 = "054ws88fcfz3hf3cha7dvndm52v5n4jc4vzif1lif44xq0iggwqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-css";
           sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
           name = "flymake-css";
         };
@@ -9996,7 +10080,7 @@
           sha256 = "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-easy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-easy";
           sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
           name = "flymake-easy";
         };
@@ -10017,7 +10101,7 @@
           sha256 = "002s01cymgx4z4l3j2pqirg7899pljdx2hmbz8k6cksdxlymzmkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-gjshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-gjshint";
           sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
           name = "flymake-gjshint";
         };
@@ -10038,7 +10122,7 @@
           sha256 = "1b3lf5jwan03k7rb97g4bb982dacdwsfdddnwc0inx9gs3qq1zni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-haml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-haml";
           sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
           name = "flymake-haml";
         };
@@ -10059,7 +10143,7 @@
           sha256 = "0k1qc0r0gr7f9l5if2a67cv4k73z5yxd6vxd6l1bqw500y0aajxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-haskell-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-haskell-multi";
           sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
           name = "flymake-haskell-multi";
         };
@@ -10080,7 +10164,7 @@
           sha256 = "1ygg51r4ym4x7h4svizwllsvr72x9np6jvjqpk8ayv3w2fpb9l31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-hlint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-hlint";
           sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
           name = "flymake-hlint";
         };
@@ -10101,7 +10185,7 @@
           sha256 = "00zkm3wqlss386qd6jiq0siga7c48n5ykh0vf9q5v83rmpd79yri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-jslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-jslint";
           sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
           name = "flymake-jslint";
         };
@@ -10122,7 +10206,7 @@
           sha256 = "0rzlw80mi39147yqnpzcvw9wvr5svksd3kn6s3w8191f2kc6xzzv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-json";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-json";
           sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
           name = "flymake-json";
         };
@@ -10143,7 +10227,7 @@
           sha256 = "0ggvmsjj6p6a7cwr2bzhlcf8ab4v6a2bz5djsscd2ryy570p367z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-less";
           sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
           name = "flymake-less";
         };
@@ -10164,7 +10248,7 @@
           sha256 = "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-perlcritic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-perlcritic";
           sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
           name = "flymake-perlcritic";
         };
@@ -10185,7 +10269,7 @@
           sha256 = "0dzyid0av9icp77wv0zcsygpw46z24qibq1ra0iwnkzl3kqvkyzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-php";
           sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
           name = "flymake-php";
         };
@@ -10206,7 +10290,7 @@
           sha256 = "0l8qpcbzfi32h3vy7iwydx3hg2w60x9l3v3rabzjx412m5d00gsh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-python-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-python-pyflakes";
           sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
           name = "flymake-python-pyflakes";
         };
@@ -10227,7 +10311,7 @@
           sha256 = "0d2vmpgr5c2cbpxcqm5x1ckfysbpwcbaa9frcnp2yfp8scvkvqj0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-ruby";
           sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
           name = "flymake-ruby";
         };
@@ -10248,7 +10332,7 @@
           sha256 = "0c74qdgy9c4hv3nyjnbqdzypbg9399vq3p5ngp5lasc7iz6vi0h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-sass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-sass";
           sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
           name = "flymake-sass";
         };
@@ -10269,7 +10353,7 @@
           sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flymake-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flymake-shell";
           sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
           name = "flymake-shell";
         };
@@ -10279,6 +10363,90 @@
           license = lib.licenses.free;
         };
       }) {};
+    flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flyspell-correct";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "d12frosted";
+          repo = "flyspell-correct";
+          rev = "4993404b971fb0e58082d93d505fa9df29c8507a";
+          sha256 = "04f0vfsf4wazq8gzgrb42bkbcwfjbzyzzid8jwsyzf2pqhls0xj4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flyspell-correct";
+          sha256 = "0j7fp2r1463517716d070wmgwxyj8p59b4ybqh106lmpc5w1i9nj";
+          name = "flyspell-correct";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/flyspell-correct";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flyspell-correct-helm";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "d12frosted";
+          repo = "flyspell-correct";
+          rev = "4993404b971fb0e58082d93d505fa9df29c8507a";
+          sha256 = "04f0vfsf4wazq8gzgrb42bkbcwfjbzyzzid8jwsyzf2pqhls0xj4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flyspell-correct-helm";
+          sha256 = "18s2bzszy6x31avqg7j2lsll2cf4asb8njwhmx4mm215agack976";
+          name = "flyspell-correct-helm";
+        };
+        packageRequires = [ flyspell-correct helm ];
+        meta = {
+          homepage = "https://melpa.org/#/flyspell-correct-helm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flyspell-correct-ivy";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "d12frosted";
+          repo = "flyspell-correct";
+          rev = "4993404b971fb0e58082d93d505fa9df29c8507a";
+          sha256 = "04f0vfsf4wazq8gzgrb42bkbcwfjbzyzzid8jwsyzf2pqhls0xj4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flyspell-correct-ivy";
+          sha256 = "1n5iyab6bj761w6vxncyqvqzwh9k60pzq5f2n00ifrz74pqs537i";
+          name = "flyspell-correct-ivy";
+        };
+        packageRequires = [ flyspell-correct ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/flyspell-correct-ivy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "flyspell-correct-popup";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "d12frosted";
+          repo = "flyspell-correct";
+          rev = "4993404b971fb0e58082d93d505fa9df29c8507a";
+          sha256 = "04f0vfsf4wazq8gzgrb42bkbcwfjbzyzzid8jwsyzf2pqhls0xj4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flyspell-correct-popup";
+          sha256 = "1fr8ajwldcl58i8xm31dz1mjwbi9f4q8s58x5jrqhqha0x4p4h9l";
+          name = "flyspell-correct-popup";
+        };
+        packageRequires = [ flyspell-correct popup ];
+        meta = {
+          homepage = "https://melpa.org/#/flyspell-correct-popup";
+          license = lib.licenses.free;
+        };
+      }) {};
     flyspell-lazy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flyspell-lazy";
@@ -10290,7 +10458,7 @@
           sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flyspell-lazy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flyspell-lazy";
           sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
           name = "flyspell-lazy";
         };
@@ -10311,7 +10479,7 @@
           sha256 = "1rk7fsill0salrhb4anbf698nd21nxj8pni35brbmv64nj9fhfic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/flyspell-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/flyspell-popup";
           sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
           name = "flyspell-popup";
         };
@@ -10332,7 +10500,7 @@
           sha256 = "0r2j238iyxnww60xpbxggjmz6y2waayw4m51f0l39hszbhags2cv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fm";
           sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f";
           name = "fm";
         };
@@ -10353,7 +10521,7 @@
           sha256 = "0aj5qxzlfxxp7z27fiw9bvir5yi2zj0xzj5kbh17ix4wnhi03bhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/focus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/focus";
           sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
           name = "focus";
         };
@@ -10374,7 +10542,7 @@
           sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fold-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fold-dwim";
           sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
           name = "fold-dwim";
         };
@@ -10395,7 +10563,7 @@
           sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fold-dwim-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fold-dwim-org";
           sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
           name = "fold-dwim-org";
         };
@@ -10416,7 +10584,7 @@
           sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fold-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fold-this";
           sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
           name = "fold-this";
         };
@@ -10437,7 +10605,7 @@
           sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/font-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/font-utils";
           sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
           name = "font-utils";
         };
@@ -10458,7 +10626,7 @@
           sha256 = "0qq13jhn9i2ls6n3fbay4i2r0hfs426pkmmif43b87gjxb510irc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fontawesome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
           name = "fontawesome";
         };
@@ -10479,7 +10647,7 @@
           sha256 = "1x4l24cbgc4apv9cfzf6phmj5pm32hfdgv37wpbh7ml8v3p8xm0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/forecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/forecast";
           sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
           name = "forecast";
         };
@@ -10500,7 +10668,7 @@
           sha256 = "199kybf2bvywqfnwr5w893km82829k1j7sp079y6s2601hq8ylw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/foreman-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/foreman-mode";
           sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
           name = "foreman-mode";
         };
@@ -10521,7 +10689,7 @@
           sha256 = "171jna631b2iqcimfsik9c66gii8nc0zdb58m077w00rn7rcxbh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/form-feed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/form-feed";
           sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
           name = "form-feed";
         };
@@ -10542,7 +10710,7 @@
           sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/format-sql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/format-sql";
           sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
           name = "format-sql";
         };
@@ -10563,7 +10731,7 @@
           sha256 = "1zy45s1m1injwr4d1qvpnvfvv4nkkv9mricshxjannsjfbz09ra7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fountain-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fountain-mode";
           sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
           name = "fountain-mode";
         };
@@ -10584,7 +10752,7 @@
           sha256 = "1vznkbly0lyh5kri9lcgy309ws96q3d5m1lghck9l8ain8hphhqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/frame-restore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/frame-restore";
           sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm";
           name = "frame-restore";
         };
@@ -10605,7 +10773,7 @@
           sha256 = "1c3yx9j3q8fkfiay4nzcabsq9i4ydqf6vxk8vv80h78gg9afrzrj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fringe-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fringe-helper";
           sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
           name = "fringe-helper";
         };
@@ -10626,7 +10794,7 @@
           sha256 = "00api7q86mrfv8z2g7skh34mhlkxwymf4gfpxa6zcvirhlpglyxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fsharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fsharp-mode";
           sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
           name = "fsharp-mode";
         };
@@ -10642,10 +10810,10 @@
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
           rev = "905ec06d864537fb6be9c46ad98f1b6d101dfbf0";
-          sha256 = "146iqy3rjr5yv19wbaq5dqm3kjxyjly7i27qjvk0yj1yja2y4j5k";
+          sha256 = "0ip7azxi5nvp8vvi15ds46mgs0fmi7gq97f2iz1c7m67ml5wi2g7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fuel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fuel";
           sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
           name = "fuel";
         };
@@ -10666,7 +10834,7 @@
           sha256 = "0c3w3xs2jbdqgsqw0qmdbwii6p395qfznird4gg0hfr7lby2kmjq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/full-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/full-ack";
           sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
           name = "full-ack";
         };
@@ -10687,7 +10855,7 @@
           sha256 = "1narmlcd8ycwkmsrgk64l7q0ljsbq2fsikl8hjbrsc20nma032m4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fullframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fullframe";
           sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
           name = "fullframe";
         };
@@ -10708,7 +10876,7 @@
           sha256 = "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/function-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
           name = "function-args";
         };
@@ -10729,7 +10897,7 @@
           sha256 = "1g7my9ha5cnwg3pjwa86wncg5gphv18xpnpmj3xc3vg7z5m45rss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fuzzy";
           sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
           name = "fuzzy";
         };
@@ -10750,7 +10918,7 @@
           sha256 = "0c3g0yfclczdh6nxmg9lljjf288zibqy51bhh1b1cgdmxcbpg8bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fvwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fvwm-mode";
           sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
           name = "fvwm-mode";
         };
@@ -10771,7 +10939,7 @@
           sha256 = "1c7h043lz10mw1hdsx9viksy6q79jipz2mm18y1inlbqhmg33n2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fwb-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fwb-cmds";
           sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
           name = "fwb-cmds";
         };
@@ -10792,7 +10960,7 @@
           sha256 = "0vfh4azibv71mj86bgl4rfbm96pw9l95r87mwhzx42j36rxffl73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fxrd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fxrd-mode";
           sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
           name = "fxrd-mode";
         };
@@ -10813,7 +10981,7 @@
           sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/fzf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/fzf";
           sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
           name = "fzf";
         };
@@ -10834,7 +11002,7 @@
           sha256 = "16x3fz2ljrmqhjy7w96fhp3j9ja2gib042c363yfrzwa7q5rxzd2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gams-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gams-mode";
           sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci";
           name = "gams-mode";
         };
@@ -10855,7 +11023,7 @@
           sha256 = "1q9bz294bc6bplwfrfzsczh444v9152wv7zm2l1pcpwv8n8581p6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gather";
           sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
           name = "gather";
         };
@@ -10865,6 +11033,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    geben-helm-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, geben, helm-projectile, lib, melpaBuild }:
+    melpaBuild {
+        pname = "geben-helm-projectile";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "ahungry";
+          repo = "geben-helm-projectile";
+          rev = "14db489efcb20c5aa9102288c94cec3c5a87c35d";
+          sha256 = "1nd1jhy393vkn2g65zhygxkpgna0l8gkndxr8jb6qjkkapk58k8l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/geben-helm-projectile";
+          sha256 = "11zhapys6wx2cadflvjimsmilwvjpfd4ihwzzmap8shxpyllsq9r";
+          name = "geben-helm-projectile";
+        };
+        packageRequires = [ emacs geben helm-projectile ];
+        meta = {
+          homepage = "https://melpa.org/#/geben-helm-projectile";
+          license = lib.licenses.free;
+        };
+      }) {};
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
@@ -10876,7 +11065,7 @@
           sha256 = "1667zln7bav0bdhrc4b5z36n8rn36xvwh4y9ffgns67zfgwi64kk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/geiser";
           sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
           name = "geiser";
         };
@@ -10897,7 +11086,7 @@
           sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/genrnc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/genrnc";
           sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
           name = "genrnc";
         };
@@ -10918,7 +11107,7 @@
           sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/german-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/german-holidays";
           sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
           name = "german-holidays";
         };
@@ -10939,7 +11128,7 @@
           sha256 = "1m9ra9qp7bgf6anfqyn56n3xa9a25ran10k9wd355qknd5skq1zz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ggo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ggo-mode";
           sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
           name = "ggo-mode";
         };
@@ -10960,7 +11149,7 @@
           sha256 = "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ggtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ggtags";
           sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
           name = "ggtags";
         };
@@ -10981,7 +11170,7 @@
           sha256 = "0a5v91k9gm9vv15d3m8czicv8n39f0hvqhcr6lfw0w82n26xwsms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gh";
           sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
           name = "gh";
         };
@@ -11002,7 +11191,7 @@
           sha256 = "1m5q2s9nxm0m18njaxzryjly8rl3m598r94nn53xpazd4i5ln8cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ghc";
           sha256 = "02nc7a9khqpd4ca2snam8dq72m53q8x7v5awx56bjq31z6vcmav5";
           name = "ghc";
         };
@@ -11023,7 +11212,7 @@
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ghc-imported-from";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ghc-imported-from";
           sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
           name = "ghc-imported-from";
         };
@@ -11044,7 +11233,7 @@
           sha256 = "0q3ps5f6mr9hyf6nq1wshcm1z6a5yhskqd7dbbwq5dm78552z6z8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gist";
           sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
           name = "gist";
         };
@@ -11065,7 +11254,7 @@
           sha256 = "06ws3x5qa92drmn6rcp502jk2yil6q9gkzdmb2gww9gb2g695wl5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git";
           sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
           name = "git";
         };
@@ -11086,7 +11275,7 @@
           sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-auto-commit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-auto-commit-mode";
           sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
           name = "git-auto-commit-mode";
         };
@@ -11107,7 +11296,7 @@
           sha256 = "0a3ws852ypi34ash39srkwzkfish4n3c5lma10d9xzddjrwapgj9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-command";
           sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
           name = "git-command";
         };
@@ -11128,7 +11317,7 @@
           sha256 = "1dv5qr9z5lxj2zjhwjhx451mbkb8d3y00q7ar6n34x7d5c4gmiya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-commit";
           sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
           name = "git-commit";
         };
@@ -11141,15 +11330,15 @@
     git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-gutter";
-        version = "0.88";
+        version = "0.89";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-gutter";
-          rev = "c40683e9c5931dd67f89ad9ef8625de28752f00c";
-          sha256 = "1gr57n6chhbzazqxb0vwsddais14zpg9c5qpfn6igw0qzhkxn8x0";
+          rev = "02f67e207f0653077c06ddc8502c6a0cd28de260";
+          sha256 = "04qkznd85f9msrgpwsfswbfi5nzvpy4mk5mcmv2cvbq68grs4c40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-gutter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-gutter";
           sha256 = "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg";
           name = "git-gutter";
         };
@@ -11170,7 +11359,7 @@
           sha256 = "18jpa5i99x0gqizs2qbqr8c1jlza8x9vpb6wg9zqd4np1p6q4lan";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-gutter-fringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-gutter-fringe";
           sha256 = "10k07dzmkxsxzwc70vpv05rxjyps9494y6k7yhlv8d46x7xjyp0z";
           name = "git-gutter-fringe";
         };
@@ -11191,7 +11380,7 @@
           sha256 = "1c7ijbpa7xw831k55cdm2gl8r597rxnp22jcmqnfpwqkqmk48ln9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-gutter-fringe+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-gutter-fringe+";
           sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
           name = "git-gutter-fringe-plus";
         };
@@ -11212,7 +11401,7 @@
           sha256 = "101hracd77mici778x3ixwrcicd6fqkcr9z76kapkr0dq5z42yjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-gutter+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-gutter+";
           sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
           name = "git-gutter-plus";
         };
@@ -11233,7 +11422,7 @@
           sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-lens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-lens";
           sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
           name = "git-lens";
         };
@@ -11254,7 +11443,7 @@
           sha256 = "0a1kxdz05ly9wbzyxcb79xlmy11q38xplf5s8w8klmyajdn43g1j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
           name = "git-link";
         };
@@ -11275,7 +11464,7 @@
           sha256 = "139yivbxdpmv8j6qz406769b040nbmj3j8r28n9gqy54zlwblgv8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-messenger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
           name = "git-messenger";
         };
@@ -11296,7 +11485,7 @@
           sha256 = "1hyq3il03cm6apfawps60r4km8r6pw0vphzba30smsqfk50z3ya3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-ps1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-ps1-mode";
           sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
           name = "git-ps1-mode";
         };
@@ -11317,7 +11506,7 @@
           sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-timemachine";
           sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
           name = "git-timemachine";
         };
@@ -11338,7 +11527,7 @@
           sha256 = "0igawn43i81icshimj5agv33ab120hd6182knlrn3i46p7lcs3lx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/git-wip-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/git-wip-timemachine";
           sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
           name = "git-wip-timemachine";
         };
@@ -11359,7 +11548,7 @@
           sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gitattributes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gitattributes-mode";
           sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
           name = "gitattributes-mode";
         };
@@ -11380,7 +11569,7 @@
           sha256 = "0j0w6ywhiapmx7dk20yw3zgf8803kmccnjsr664am3g85kbb644v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gitconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gitconfig";
           sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
           name = "gitconfig";
         };
@@ -11401,7 +11590,7 @@
           sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gitconfig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gitconfig-mode";
           sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
           name = "gitconfig-mode";
         };
@@ -11422,7 +11611,7 @@
           sha256 = "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/github-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/github-browse-file";
           sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
           name = "github-browse-file";
         };
@@ -11443,7 +11632,7 @@
           sha256 = "18c169nxvdl7iv18pyqx690ldg6pkc8njaxdg1cww6ykqzqnfxh7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/github-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/github-clone";
           sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
           name = "github-clone";
         };
@@ -11464,7 +11653,7 @@
           sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gitignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gitignore-mode";
           sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
           name = "gitignore-mode";
         };
@@ -11485,7 +11674,7 @@
           sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gitlab";
           sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
           name = "gitlab";
         };
@@ -11506,7 +11695,7 @@
           sha256 = "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gmail-message-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gmail-message-mode";
           sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
           name = "gmail-message-mode";
         };
@@ -11527,7 +11716,7 @@
           sha256 = "0p6n52m3y56nx7chwvmnslrnwc0xmh4fmmlkbkfz9n58hlmw8x1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gmail2bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gmail2bbdb";
           sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
           name = "gmail2bbdb";
         };
@@ -11548,7 +11737,7 @@
           sha256 = "0x0a94bfkk72kqyr5m6arx450qsg1axmp5r0c4r9m84z8j08r4v1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gmpl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gmpl-mode";
           sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
           name = "gmpl-mode";
         };
@@ -11569,7 +11758,7 @@
           sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnome-calendar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnome-calendar";
           sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
           name = "gnome-calendar";
         };
@@ -11590,7 +11779,7 @@
           sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gntp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gntp";
           sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
           name = "gntp";
         };
@@ -11611,7 +11800,7 @@
           sha256 = "0bwri3cvm2vr27kyqkrddm28fs08axnd4nm9amfgp54xp20bn4yn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnuplot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnuplot";
           sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
           name = "gnuplot";
         };
@@ -11632,7 +11821,7 @@
           sha256 = "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnus-desktop-notify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnus-desktop-notify";
           sha256 = "08k32vhdp6i8c03rp1k6b5jmvj5ijplj26mdblrgasklcqbdnlfs";
           name = "gnus-desktop-notify";
         };
@@ -11653,7 +11842,7 @@
           sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gnus-x-gm-raw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gnus-x-gm-raw";
           sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
           name = "gnus-x-gm-raw";
         };
@@ -11674,7 +11863,7 @@
           sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-autocomplete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-autocomplete";
           sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
           name = "go-autocomplete";
         };
@@ -11695,7 +11884,7 @@
           sha256 = "05yc0nylg3457an5j7yp3x23157j0hbi21qhcpgsa01144mwnwln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-direx";
           sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
           name = "go-direx";
         };
@@ -11716,7 +11905,7 @@
           sha256 = "1n5fnlfq9cy9rbn2hizqqsy0iryw5g2blaa7nd75ya03gxm10p8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
           name = "go-eldoc";
         };
@@ -11737,7 +11926,7 @@
           sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-errcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-errcheck";
           sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
           name = "go-errcheck";
         };
@@ -11758,7 +11947,7 @@
           sha256 = "01j67naqvajhg5ccb5yk4dz7hg6rrc6k9q6ppbm77c0aacjxcr39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-impl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-impl";
           sha256 = "09frwpwc080rfpwkb63yv47dyj741lrpyrp65sq2bn4sf03xw0cx";
           name = "go-impl";
         };
@@ -11779,7 +11968,7 @@
           sha256 = "0g0vjm125wmw5nd38r3d7gc2h4pg3a9yskcbk1mzg9vf6gbhr0hx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-mode";
           sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
           name = "go-mode";
         };
@@ -11800,7 +11989,7 @@
           sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/go-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/go-scratch";
           sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
           name = "go-scratch";
         };
@@ -11821,7 +12010,7 @@
           sha256 = "00igv83hiyx7x3pf2grmjpd379brn33fm85f05k104mkkrhg99nm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/golden-ratio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/golden-ratio";
           sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
           name = "golden-ratio";
         };
@@ -11842,7 +12031,7 @@
           sha256 = "14dz9wjp8ym86a03pw5y1sd51zw83d6485hpq8mh8zm0j1fba0y0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/google-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/google-this";
           sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
           name = "google-this";
         };
@@ -11863,7 +12052,7 @@
           sha256 = "0dzr1nb1s1sh8rv5wr9xfjd5xna54vp03y3h4q59vmnynsn64m9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/google-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/google-translate";
           sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
           name = "google-translate";
         };
@@ -11884,7 +12073,7 @@
           sha256 = "1d1x5ffpn9gq9byd0qavxr081sl3qf0lihdxfdqvhwd815kravxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/goose-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/goose-theme";
           sha256 = "18kfz61mhf8pvp3z5cdvjklla9p840p1dazylrgjb1g5hdwqw0n9";
           name = "goose-theme";
         };
@@ -11905,7 +12094,7 @@
           sha256 = "1idhnsl8vkq3v3nbvhkmxmvgqp97aycxvmkj7894mj9hvhib68l9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gotest";
           sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
           name = "gotest";
         };
@@ -11926,7 +12115,7 @@
           sha256 = "1lgljlfxs3gwxr072bvpl55r0b4z78wiww2g093sy7dgxgzgzmq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gotham-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gotham-theme";
           sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
           name = "gotham-theme";
         };
@@ -11947,7 +12136,7 @@
           sha256 = "188q7jr1y872as3w32m8lf6vwl2by1ibgdk6zk7dhpcjwd0ik7x7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/goto-gem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/goto-gem";
           sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
           name = "goto-gem";
         };
@@ -11968,7 +12157,7 @@
           sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/goto-last-change";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/goto-last-change";
           sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
           name = "goto-last-change";
         };
@@ -11989,7 +12178,7 @@
           sha256 = "0mqhk6jaayjv5jnkkr0sd3nqk9f7asnk5ib6y488l9gs5nfvazrp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/govc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/govc";
           sha256 = "1ivgaziv25wlzg6y4zh8x7mv97pnyhi7p8jpvgh5fg5lnqpzhl4v";
           name = "govc";
         };
@@ -12010,7 +12199,7 @@
           sha256 = "0k86lrb55d701nj6pvlw3kjp1dcd3lzfya0hv6q56c529y69d782";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gradle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gradle-mode";
           sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
           name = "gradle-mode";
         };
@@ -12031,7 +12220,7 @@
           sha256 = "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grails";
           sha256 = "177y6xv35d2dhc3pdx5qhpywlmlqgfnjpzfm9yxc8l6q2rgs8irw";
           name = "grails";
         };
@@ -12052,7 +12241,7 @@
           sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grails-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grails-mode";
           sha256 = "1zdlmdkwyaj2zns3xwmqpil83j7857aj2070kvx8xza66dxcnlm4";
           name = "grails-mode";
         };
@@ -12073,7 +12262,7 @@
           sha256 = "0xnj0wp0na53l0y8fiaah50ij4r80j8a29hbjbcicska21p5w1s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grails-projectile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grails-projectile-mode";
           sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
           name = "grails-projectile-mode";
         };
@@ -12094,7 +12283,7 @@
           sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grandshell-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grandshell-theme";
           sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
           name = "grandshell-theme";
         };
@@ -12115,7 +12304,7 @@
           sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/graphene";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/graphene";
           sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
           name = "graphene";
         };
@@ -12148,7 +12337,7 @@
           sha256 = "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/graphene-meta-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/graphene-meta-theme";
           sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
           name = "graphene-meta-theme";
         };
@@ -12169,7 +12358,7 @@
           sha256 = "1zk664ilyz14p11csmqgzs73gx08hy32h3pnyymzqkavmgb6h3s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/graphviz-dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/graphviz-dot-mode";
           sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
           name = "graphviz-dot-mode";
         };
@@ -12190,7 +12379,7 @@
           sha256 = "0xcj1kqzgxifhrhpl9j2nfpnkd6213ix5z7f97269v3inpzaiyf5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grapnel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grapnel";
           sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
           name = "grapnel";
         };
@@ -12210,7 +12399,7 @@
           sha256 = "0mnwmsn078hz317xfz6c05r7narx3k8956v1ajz5myxx8xrcr24z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grass-mode";
           sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
           name = "grass-mode";
         };
@@ -12229,7 +12418,7 @@
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grin";
           sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
           name = "grin";
         };
@@ -12250,7 +12439,7 @@
           sha256 = "1bq73kcx744xnlm2yvccrzlbyx91c492sg7blx2a9z643v3gg1zs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grizzl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grizzl";
           sha256 = "0354xskqzxc38l14zxqs31hadwh27v9lyx67y3hnd94d8abr0qcb";
           name = "grizzl";
         };
@@ -12271,7 +12460,7 @@
           sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/groovy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/groovy-mode";
           sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
           name = "groovy-mode";
         };
@@ -12292,7 +12481,7 @@
           sha256 = "14h0rcd3nkw3pmx8jwip20p6rzl9qdkip5g52gfjjbqfvaffsrkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gruber-darker-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gruber-darker-theme";
           sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
           name = "gruber-darker-theme";
         };
@@ -12313,7 +12502,7 @@
           sha256 = "0zpmhjwj64s72iv3dgsy07pfh20f25ngsy3pszmlrfkxk0926d8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/grunt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/grunt";
           sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
           name = "grunt";
         };
@@ -12334,7 +12523,7 @@
           sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/gscholar-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/gscholar-bibtex";
           sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
           name = "gscholar-bibtex";
         };
@@ -12355,7 +12544,7 @@
           sha256 = "1bmcvn8a7g9ahpv2fww673hx9pa7nnrj9kpljq65azf61vq2an2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/guide-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/guide-key";
           sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
           name = "guide-key";
         };
@@ -12376,7 +12565,7 @@
           sha256 = "040mcfhj2gggp8w1pgip7rxb1bnb23rxlm02wl6x1qv5i0q7g5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/guide-key-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/guide-key-tip";
           sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
           name = "guide-key-tip";
         };
@@ -12397,7 +12586,7 @@
           sha256 = "1y46qd9cgkfb0wp2cvksjncyp77hd2jnr4bm4zafqirc3qhbysx0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/guru-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/guru-mode";
           sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
           name = "guru-mode";
         };
@@ -12418,7 +12607,7 @@
           sha256 = "1c49lfm5saafxks591qyy2nilymxz3aqlxpsmnad5d0kfhvjr47z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hackernews";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hackernews";
           sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
           name = "hackernews";
         };
@@ -12439,7 +12628,7 @@
           sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ham-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ham-mode";
           sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
           name = "ham-mode";
         };
@@ -12460,7 +12649,7 @@
           sha256 = "0fmr7ji8x5ki9fzybpbg3xbhzws6n7ffk7d0zf9jl1x3jd8d6988";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haml-mode";
           sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
           name = "haml-mode";
         };
@@ -12481,7 +12670,7 @@
           sha256 = "08l6p9n2ggg4filad1k663qc2gjgfbia4knnnif4sw7h92yb31jl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hardcore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hardcore-mode";
           sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
           name = "hardcore-mode";
         };
@@ -12502,7 +12691,7 @@
           sha256 = "0j9z46j777y3ljpai5czdlwl07f0irp4fsk4677n11ndyqm1amb5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hardhat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hardhat";
           sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
           name = "hardhat";
         };
@@ -12523,7 +12712,7 @@
           sha256 = "0rqxi668wra1mfzq4fqscjghis5gqnwpazgidgix13brybaxydx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/harvest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/harvest";
           sha256 = "1qfhfzjwlnqpbq4kfxvs97fa3xks8zi02fnwv0ik8wb1ppbb77qd";
           name = "harvest";
         };
@@ -12544,7 +12733,7 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haskell-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haskell-emacs";
           sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
           name = "haskell-emacs";
         };
@@ -12565,7 +12754,7 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haskell-emacs-base";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haskell-emacs-base";
           sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
           name = "haskell-emacs-base";
         };
@@ -12586,7 +12775,7 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haskell-emacs-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haskell-emacs-text";
           sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
           name = "haskell-emacs-text";
         };
@@ -12607,7 +12796,7 @@
           sha256 = "1hxjqr448z7sfk3wb48s1y4q51870gb2zv5bfam30lvwxbl3znkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haskell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haskell-mode";
           sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
           name = "haskell-mode";
         };
@@ -12628,7 +12817,7 @@
           sha256 = "0b3d7rvqvvcsp51aqfhl0zg9zg8j0p6vlfvga6jp9xc7626vh6f6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haskell-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haskell-snippets";
           sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
           name = "haskell-snippets";
         };
@@ -12648,7 +12837,7 @@
           sha256 = "00bjmww8pc9jr4ssqcv7k0migbxl1c8qs2l1khf25fxvgd1nyy02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haskell-tab-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haskell-tab-indent";
           sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
           name = "haskell-tab-indent";
         };
@@ -12661,15 +12850,15 @@
     haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haxor-mode";
-        version = "0.3.0";
+        version = "0.6.0";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
           repo = "haxor-mode";
-          rev = "9bc95e03db30633ea8ac487e69af093b519fc604";
-          sha256 = "0ylsb3ry3fh3pir347v4m3dqf8ig0gcv0k8m3yp2j847mniwkdr3";
+          rev = "02dc0635885635561bfa01a69fa0b0df7e32eb36";
+          sha256 = "06k95pfkxxfwcnm6b6c3yr1d26j8jl1vgcibxjbrq1s5vr0yw5qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/haxor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/haxor-mode";
           sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
           name = "haxor-mode";
         };
@@ -12690,7 +12879,7 @@
           sha256 = "0hiw226gv73jh7s3jg4p1c15p4km4rs7i9ab4wgpkl5lg4vrz5i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
           name = "hcl-mode";
         };
@@ -12703,15 +12892,15 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "1.9.6";
+        version = "1.9.7";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "84115895421601a82de65d7da6fa0e70a6deb79b";
-          sha256 = "11bnibhnci1cpxrdlcxzdi6m6zsyn6c51gi6h2a9xp60fcm57h5f";
+          rev = "07b5c098144e75005987050b6c3f3a52c0c09440";
+          sha256 = "0wk642ksiba9az2ph6avkfbvw90bxfdp4p2lh4bdymla2r9z9mwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm";
           sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9";
           name = "helm";
         };
@@ -12732,7 +12921,7 @@
           sha256 = "0ps86zpyywibjwcm9drmamla979ad61fyqr8d6bv71fr56k9ak21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ack";
           sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
           name = "helm-ack";
         };
@@ -12753,7 +12942,7 @@
           sha256 = "0ybxjvhzpsg8k9j1315ls6xa3pqysm5xabn94xla99hc0n98mpw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ag";
           sha256 = "050qh5xqh8lwkgmz3jxm8gql5nd7bq8sp9q6mzm2z7367qy4qqyf";
           name = "helm-ag";
         };
@@ -12774,7 +12963,7 @@
           sha256 = "015p5sszd54x81qm96gx6xwjkvbi4f3j9i2nhcvlkk75s95w1ijv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-aws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-aws";
           sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
           name = "helm-aws";
         };
@@ -12795,7 +12984,7 @@
           sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-backup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-backup";
           sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
           name = "helm-backup";
         };
@@ -12816,7 +13005,7 @@
           sha256 = "011k37p4vnzm1x8vyairllanvjfknskl20bdfv0glf64xgbdpfil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-bm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-bm";
           sha256 = "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh";
           name = "helm-bm";
         };
@@ -12837,7 +13026,7 @@
           sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-bundle-show";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
           name = "helm-bundle-show";
         };
@@ -12858,7 +13047,7 @@
           sha256 = "108584bmadgidqkdfvf333zkyb5v9f84pasz5h01fkh57ks8by9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-c-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-c-yasnippet";
           sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
           name = "helm-c-yasnippet";
         };
@@ -12879,7 +13068,7 @@
           sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-circe";
           sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
           name = "helm-circe";
         };
@@ -12900,7 +13089,7 @@
           sha256 = "1l61csd1gqz7kg5zjx60cfy824g42p682z7pk0rqzlrz8498wvkh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-commandlinefu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-commandlinefu";
           sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
           name = "helm-commandlinefu";
         };
@@ -12913,15 +13102,15 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "1.9.6";
+        version = "1.9.7";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "84115895421601a82de65d7da6fa0e70a6deb79b";
-          sha256 = "11bnibhnci1cpxrdlcxzdi6m6zsyn6c51gi6h2a9xp60fcm57h5f";
+          rev = "07b5c098144e75005987050b6c3f3a52c0c09440";
+          sha256 = "0wk642ksiba9az2ph6avkfbvw90bxfdp4p2lh4bdymla2r9z9mwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-core";
           sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
           name = "helm-core";
         };
@@ -12942,7 +13131,7 @@
           sha256 = "0xnqkc4z22m41v5lgf87dd8xc4gmf932zbnbdhf9xic1gal1779c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-cscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-cscope";
           sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
           name = "helm-cscope";
         };
@@ -12963,7 +13152,7 @@
           sha256 = "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-dash";
           sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
           name = "helm-dash";
         };
@@ -12984,7 +13173,7 @@
           sha256 = "1cm2vaw0j1x2w2m45k6iqbzm7nydfdx1x89673vsvb90whdgvjbp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-descbinds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-descbinds";
           sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
           name = "helm-descbinds";
         };
@@ -13005,7 +13194,7 @@
           sha256 = "1v4kmw4hflvmy5v8mlp2mm284809alxybqszvv4j6dhjxyg4xz6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-firefox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-firefox";
           sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
           name = "helm-firefox";
         };
@@ -13026,7 +13215,7 @@
           sha256 = "1fg786m4m6x7brbbchpdf4pwvwma7sn4597p5lzmhvh187z6g525";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-flycheck";
           sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b";
           name = "helm-flycheck";
         };
@@ -13047,7 +13236,7 @@
           sha256 = "00ls9v3jdpz3wka90crd193z3ipwnf1b0slmldn4vb9ivrndh6wn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ghc";
           sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
           name = "helm-ghc";
         };
@@ -13068,7 +13257,7 @@
           sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
           name = "helm-ghq";
         };
@@ -13089,7 +13278,7 @@
           sha256 = "1hx9m18dfpl97xaskadhqdrd8syk271shxjasn3jnqa8a07m2983";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-git-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-git-grep";
           sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
           name = "helm-git-grep";
         };
@@ -13110,7 +13299,7 @@
           sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-github-stars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-github-stars";
           sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
           name = "helm-github-stars";
         };
@@ -13131,7 +13320,7 @@
           sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-gitlab";
           sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
           name = "helm-gitlab";
         };
@@ -13152,7 +13341,7 @@
           sha256 = "0h3iql8dxq80vpr1cv7fdaw0aniykp2rfzh07j5941jkiy4q63h0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-go-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-go-package";
           sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6";
           name = "helm-go-package";
         };
@@ -13173,7 +13362,7 @@
           sha256 = "0zyspn9rqfs3hkq8qx0q1w5qiv30ignbmycyv0vn3a6q7a5fsnhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-gtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-gtags";
           sha256 = "1kbpfqhhbxmp3f70h91x2fws9mhx87zx4nzjjl29lpl93vf8xckl";
           name = "helm-gtags";
         };
@@ -13194,7 +13383,7 @@
           sha256 = "0hmvyyhddpf831cad35c9z9fv5mpdq6qg4nzbdghlqs9pf7ik6h2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-hatena-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
           name = "helm-hatena-bookmark";
         };
@@ -13215,7 +13404,7 @@
           sha256 = "1imfzz6cfdq7fgrcgrafy2nln929mgh31vybk9frm7a9jpamqdxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-hayoo";
           sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
           name = "helm-hayoo";
         };
@@ -13236,7 +13425,7 @@
           sha256 = "0bz2ngw816jvpw1a10j31y5hf1knz0mzz60l073h33qci11jbwid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ispell";
           sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
           name = "helm-ispell";
         };
@@ -13257,7 +13446,7 @@
           sha256 = "1nd562lffc41r3y5x7y46f37ra97avllk2m95w23f9g42h47f1ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-lobsters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-lobsters";
           sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
           name = "helm-lobsters";
         };
@@ -13278,7 +13467,7 @@
           sha256 = "0azs971d7pqd4ddxzy7bfs52cmrjbafwrcnf57afw39d772rzpdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ls-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ls-git";
           sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
           name = "helm-ls-git";
         };
@@ -13299,7 +13488,7 @@
           sha256 = "1hma79i69l8ilkr3l4b8zqk3ny62vqr1ym2blymia4ibwk4zqbda";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-ls-hg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-ls-hg";
           sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
           name = "helm-ls-hg";
         };
@@ -13320,7 +13509,7 @@
           sha256 = "17ls0bplnja2qvg3129x2irgsgs7l4bjj0qi7b9z16i6knjkwfya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-make";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-make";
           sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
           name = "helm-make";
         };
@@ -13341,7 +13530,7 @@
           sha256 = "03588hanfa20pjp9w1bqy8wsf5x6az0vfq0bmcnr4xvlf6fhkyxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-migemo";
           sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
           name = "helm-migemo";
         };
@@ -13362,7 +13551,7 @@
           sha256 = "1srx5f0s9x7zan7ayqd6scxfhcvr3nkd4yzs96hphd87rb18apzk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-mode-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-mode-manager";
           sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
           name = "helm-mode-manager";
         };
@@ -13383,7 +13572,7 @@
           sha256 = "0gknncyhr2392xkvghgy5mh6gdv6qzvswidx2wy04ypb4s0vxgq2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-mt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-mt";
           sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
           name = "helm-mt";
         };
@@ -13404,7 +13593,7 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-nixos-options";
           sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
           name = "helm-nixos-options";
         };
@@ -13425,7 +13614,7 @@
           sha256 = "1hq1nnmgkx0a8sv6g8k4v9f0102qg7jga0hcjnr8lcji51nqrcya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-open-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-open-github";
           sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx";
           name = "helm-open-github";
         };
@@ -13446,7 +13635,7 @@
           sha256 = "02yjnag9wr9dk93z41f0i5mqij9bz57fxkv4nddabyc18k7zfrhj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-org-rifle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-org-rifle";
           sha256 = "0hx764vql2qgw9i8qrr3kkn23lw6jx3x604dm1y33ig6a15gy3a3";
           name = "helm-org-rifle";
         };
@@ -13467,7 +13656,7 @@
           sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-orgcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-orgcard";
           sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
           name = "helm-orgcard";
         };
@@ -13488,7 +13677,7 @@
           sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-package";
           sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
           name = "helm-package";
         };
@@ -13509,7 +13698,7 @@
           sha256 = "1r2ndmrw5ivawb940j8jnmqzxv46qrzd3cqh9fvxx5yicf020fjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-pages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-pages";
           sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
           name = "helm-pages";
         };
@@ -13530,7 +13719,7 @@
           sha256 = "01cj2897hqz02mfz32nxlyyp59iwm0gz1zj11s8ll7pwy9q3r90g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-perldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-perldoc";
           sha256 = "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb";
           name = "helm-perldoc";
         };
@@ -13551,7 +13740,7 @@
           sha256 = "0bgpd50ningqyzwhfinfrn6gqacard5ynwllhg9clq0f683sbck2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-proc";
           sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
           name = "helm-proc";
         };
@@ -13572,7 +13761,7 @@
           sha256 = "1q7hfj8ldwivhjp9ns5pvsn0ds6pyvl2zhl366c22s6q8jmbr8ik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-project-persist";
           sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
           name = "helm-project-persist";
         };
@@ -13593,7 +13782,7 @@
           sha256 = "0jm6nnnjyd4kmm1knh0mq3xhnw2hvs3linwlynj8yaliqvlv6brv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-pt";
           sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
           name = "helm-pt";
         };
@@ -13614,7 +13803,7 @@
           sha256 = "1jy9l4an2aqynj86pw2qxpzw446xm376n2ykiz17qlimqbxhwkgz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-purpose";
           sha256 = "0am8fy7ihk4hv07a6bnk9mwy986h6i6qxwpdmfhajzga71ixchg6";
           name = "helm-purpose";
         };
@@ -13635,7 +13824,7 @@
           sha256 = "1ik0vllakh73kc2zbgii4sm33n9pj388gaz69j4drz2mik307zvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-pydoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-pydoc";
           sha256 = "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7";
           name = "helm-pydoc";
         };
@@ -13656,7 +13845,7 @@
           sha256 = "05394vf125qlgfrhkaqvly3340qp3zy7kldsnisms9gv0l1c60bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-qiita";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-qiita";
           sha256 = "1iz2w1901zz3zk9zazikmnkzng5klnvqn4ph1id7liksrcdpdmpm";
           name = "helm-qiita";
         };
@@ -13677,7 +13866,7 @@
           sha256 = "1hfn7zk3pgz3w8mn44hh6dcv377j5272azx4r12p95kkp770xls2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-recoll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-recoll";
           sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
           name = "helm-recoll";
         };
@@ -13698,7 +13887,7 @@
           sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-robe";
           sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
           name = "helm-robe";
         };
@@ -13719,7 +13908,7 @@
           sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-rubygems-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-rubygems-org";
           sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
           name = "helm-rubygems-org";
         };
@@ -13740,7 +13929,7 @@
           sha256 = "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-sage";
           sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
           name = "helm-sage";
         };
@@ -13761,7 +13950,7 @@
           sha256 = "13j3rgg5zfpxds6vsyq0aqws1f3p5y5dsq8558nqsymqvycpn047";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-spaces";
           sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
           name = "helm-spaces";
         };
@@ -13782,7 +13971,7 @@
           sha256 = "1lkjrz9ma2bxr8vskdm3sgrmsyiic798q3271dw38d453bhv4bl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-swoop";
           sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
           name = "helm-swoop";
         };
@@ -13803,7 +13992,7 @@
           sha256 = "0rzbdrs5d5a0icpxrqik2iaz8i5bacw6nm2caf75s9w9j0j6s9li";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-themes";
           sha256 = "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j";
           name = "helm-themes";
         };
@@ -13824,7 +14013,7 @@
           sha256 = "14lbdvs9xdnipsn3lywbvgsqwqnbm8fxm6d1ilq0cj5z6zkxkya0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-unicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-unicode";
           sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4";
           name = "helm-unicode";
         };
@@ -13845,7 +14034,7 @@
           sha256 = "0s8zp3kx2kxlfyd26yr3lphwcybhbm8qa9vzmxr3kaylwy6jpz5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-w32-launcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-w32-launcher";
           sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
           name = "helm-w32-launcher";
         };
@@ -13866,7 +14055,7 @@
           sha256 = "1j6ssbjbm5ym3pg0icpfp735y4dfhlky9qhl9hwp2n3wmba5g9h1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/helm-zhihu-daily";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/helm-zhihu-daily";
           sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
           name = "helm-zhihu-daily";
         };
@@ -13887,7 +14076,7 @@
           sha256 = "1zr59kcnkd9bm5676shmz63n0wpnfr7yl9g4l01ng0xcili1n13i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hfst-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hfst-mode";
           sha256 = "1w342n5k9ak1m5znysvrplpr9dhmi7hxbkr4d1dx51dn0azbpjh7";
           name = "hfst-mode";
         };
@@ -13908,7 +14097,7 @@
           sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hi2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hi2";
           sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
           name = "hi2";
         };
@@ -13929,7 +14118,7 @@
           sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-blocks";
           sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
           name = "highlight-blocks";
         };
@@ -13950,7 +14139,7 @@
           sha256 = "08czwa165rnd5z0dwwdddn7zi5w63sdk31l47bj0598kbly01n7r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-defined";
           sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
           name = "highlight-defined";
         };
@@ -13971,7 +14160,7 @@
           sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-indentation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-indentation";
           sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
           name = "highlight-indentation";
         };
@@ -13992,7 +14181,7 @@
           sha256 = "083jmw9jaxj5d5f0b0gxxb0gjdi4dv1sm66559105slbkl2nsa3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-numbers";
           sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
           name = "highlight-numbers";
         };
@@ -14013,7 +14202,7 @@
           sha256 = "08ld4wjrkd77cghmrf1n2hn2yzid7bdqwz6b1rzzqaiwxl138iy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-parentheses";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-parentheses";
           sha256 = "1d38wxk5bwblddr74crzwjwpgyr8zgcl5h5ilywg35jpv7n66lp5";
           name = "highlight-parentheses";
         };
@@ -14034,7 +14223,7 @@
           sha256 = "1ahg9qzss67jpw0wp2izys6lyss4nqjy9320fpa4vdx39msdmjjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-quoted";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-quoted";
           sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
           name = "highlight-quoted";
         };
@@ -14055,7 +14244,7 @@
           sha256 = "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/highlight-symbol";
           sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
           name = "highlight-symbol";
         };
@@ -14076,7 +14265,7 @@
           sha256 = "0hb74j5137yj3rm2si16xzwmcvkiwx8ywh1qrlnrzv5gl4viyjzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hindent";
           sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
           name = "hindent";
         };
@@ -14097,7 +14286,7 @@
           sha256 = "0mzk4agkcaaw7gryi0wrxv0blqndqsjf1ivdvr2nrnqi798sdhbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hippie-expand-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hippie-expand-slime";
           sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
           name = "hippie-expand-slime";
         };
@@ -14118,7 +14307,7 @@
           sha256 = "0nfr8ad0klqwi97fjchvwx9mfc672lhv3ll166sr8vn6jlh7rkv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hippie-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hippie-namespace";
           sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
           name = "hippie-namespace";
         };
@@ -14139,7 +14328,7 @@
           sha256 = "0dy98sg92xvnr4algm2v2bnjcdwzv0b0vqk0312b0ziinkzisas1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/history";
           sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
           name = "history";
         };
@@ -14160,7 +14349,7 @@
           sha256 = "1mxicha6m61qxz1mv9z76x4g9fpqk4ch9i6jf7nnpxd6x4xz3f7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/historyf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/historyf";
           sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
           name = "historyf";
         };
@@ -14181,7 +14370,7 @@
           sha256 = "0889dzrwizpkyh3wms13k8zx27ipsrsxfa4j4yzk4cwk3aicckcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hl-anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hl-anything";
           sha256 = "0czpc82j5hbzprc66aall72lqnk38dxgpzx4rs8sbx95cag12dxa";
           name = "hl-anything";
         };
@@ -14202,7 +14391,7 @@
           sha256 = "1hgigbgppdhmr7rc901r95kyydjk05dck8mwbryh7kpglns365fa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hl-sentence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hl-sentence";
           sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
           name = "hl-sentence";
         };
@@ -14223,7 +14412,7 @@
           sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hl-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hl-sexp";
           sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
           name = "hl-sexp";
         };
@@ -14236,15 +14425,15 @@
     hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hl-todo";
-        version = "1.6.0";
+        version = "1.7.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "hl-todo";
-          rev = "954ab8390b627499248986a608aacfaa6ddae4e0";
-          sha256 = "0rvkkzbcf36jbnk8adn39gmv0c8m0a189q9s235nasmbry8pjqmg";
+          rev = "dff381a5b2c9235bbdbe32123751ecdf17df7432";
+          sha256 = "0r2xyljcvhh547mkx7h9diajc21l6lpwjwpklc3h7491zazv3s6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hl-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
           name = "hl-todo";
         };
@@ -14265,7 +14454,7 @@
           sha256 = "1wg6vc9swwspi6s6jpig3my83i2pq8vkq2cy1q3an87rczacmfzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hoa-pp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hoa-pp-mode";
           sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
           name = "hoa-pp-mode";
         };
@@ -14286,7 +14475,7 @@
           sha256 = "0yh9v5zng1j2kfjjadfkdds67jws79q52kvl2mx9s8mq28263idm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/homebrew-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/homebrew-mode";
           sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
           name = "homebrew-mode";
         };
@@ -14307,7 +14496,7 @@
           sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hookify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hookify";
           sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
           name = "hookify";
         };
@@ -14328,7 +14517,7 @@
           sha256 = "0k09n66jar0prq9aal2h3izp1y67jibdx0gjr0g4jx1p1yxig1dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ht";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ht";
           sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
           name = "ht";
         };
@@ -14349,7 +14538,7 @@
           sha256 = "0c648dl5zwjrqx9n6zr6nyzx2zcnv05d5i4hvhjpl9q3y011ncns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/html-to-markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/html-to-markdown";
           sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
           name = "html-to-markdown";
         };
@@ -14370,7 +14559,7 @@
           sha256 = "1h9n388fi17nbyfciqywgrq3n165kpiildbimx59qyk2ac3v7rqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/httpcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/httpcode";
           sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
           name = "httpcode";
         };
@@ -14391,7 +14580,7 @@
           sha256 = "0dd257988bdar9hl2711ch5qshx9jc11fqxcvbrd7rc1va5cshs9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/httprepl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/httprepl";
           sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
           name = "httprepl";
         };
@@ -14412,7 +14601,7 @@
           sha256 = "1b8992vzq5bh01pjlj181nzqjrqs4fbjpwvv8h7gjq42sf8w59sm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hyai";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hyai";
           sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
           name = "hyai";
         };
@@ -14433,7 +14622,7 @@
           sha256 = "0nwsmc4c3v0wbfy917ik9k7yz8yclfac695p7p9sh9y354k3maw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hyde";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hyde";
           sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
           name = "hyde";
         };
@@ -14454,7 +14643,7 @@
           sha256 = "08iw95lyizcyf6cjl37fm8wvay0vsk9758pk9gq9f2xiafcchl7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/hydra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/hydra";
           sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
           name = "hydra";
         };
@@ -14475,7 +14664,7 @@
           sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ibuffer-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ibuffer-projectile";
           sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
           name = "ibuffer-projectile";
         };
@@ -14496,7 +14685,7 @@
           sha256 = "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ibuffer-vc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ibuffer-vc";
           sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
           name = "ibuffer-vc";
         };
@@ -14517,7 +14706,7 @@
           sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/identica-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/identica-mode";
           sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
           name = "identica-mode";
         };
@@ -14538,7 +14727,7 @@
           sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/idle-highlight-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/idle-highlight-mode";
           sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
           name = "idle-highlight-mode";
         };
@@ -14559,7 +14748,7 @@
           sha256 = "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-at-point";
           sha256 = "0jpgq2iiwgqifwdhwhqv0cd3lp846pdqar6rxqgw9fvvb8bijqm0";
           name = "ido-at-point";
         };
@@ -14580,7 +14769,7 @@
           sha256 = "1ffmsmi31jc0gqnbdxrd8ipsy790bn6hgq3rmayylavmdpg3qfd5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-complete-space-or-hyphen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-complete-space-or-hyphen";
           sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
           name = "ido-complete-space-or-hyphen";
         };
@@ -14601,7 +14790,7 @@
           sha256 = "1ddy590xgv982zsgs1civqy0ch0a88z98qhq0bqqjivf9gq3v0pf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-completing-read+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-completing-read+";
           sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
           name = "ido-completing-read-plus";
         };
@@ -14622,7 +14811,7 @@
           sha256 = "0055dda1la7yah33xsi19j4hcdmqp17ily2dvkipm4y6d3ww8yqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-describe-bindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-describe-bindings";
           sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
           name = "ido-describe-bindings";
         };
@@ -14643,7 +14832,7 @@
           sha256 = "0f1p6cnl0arcc2y1h99nqcflp7byvyf6hj6fmv5xqggs66qc72lb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-grid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-grid-mode";
           sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
           name = "ido-grid-mode";
         };
@@ -14664,7 +14853,7 @@
           sha256 = "1z7az7h90v72llxvdclcywvf1qd0nhkfa45bp99xi7cy7sqsqssf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-load-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-load-library";
           sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
           name = "ido-load-library";
         };
@@ -14685,7 +14874,7 @@
           sha256 = "050r5cr0a4kyscp8pp2a1mzawji080pnw0q4hxrsc97s2bxrj9x5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-occur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-occur";
           sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
           name = "ido-occur";
         };
@@ -14706,7 +14895,7 @@
           sha256 = "1ddy590xgv982zsgs1civqy0ch0a88z98qhq0bqqjivf9gq3v0pf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-ubiquitous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-ubiquitous";
           sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
           name = "ido-ubiquitous";
         };
@@ -14727,7 +14916,7 @@
           sha256 = "1lv82q639xjnmvby56nwqn23ijh6f163bk675s33dkingm8csj8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-vertical-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-vertical-mode";
           sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
           name = "ido-vertical-mode";
         };
@@ -14748,7 +14937,7 @@
           sha256 = "046ns1nqisz830f6xwlly1qgmi4v2ikw6vmj0f93jprv4vkjylpq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ido-yes-or-no";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ido-yes-or-no";
           sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
           name = "ido-yes-or-no";
         };
@@ -14769,7 +14958,7 @@
           sha256 = "0bq0kx0889rdy8aasxbpmb0a4awpk2b24zv6x1dmhacmc5rj11i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/idomenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/idomenu";
           sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
           name = "idomenu";
         };
@@ -14790,7 +14979,7 @@
           sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/idris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/idris-mode";
           sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
           name = "idris-mode";
         };
@@ -14811,7 +15000,7 @@
           sha256 = "06qv95bgcb6n3zcjs2i1q80v9040z7m9pb9xbhxmqzcx68vpbpdm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/iedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/iedit";
           sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
           name = "iedit";
         };
@@ -14832,7 +15021,7 @@
           sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/iflipb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/iflipb";
           sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
           name = "iflipb";
         };
@@ -14853,7 +15042,7 @@
           sha256 = "1ca2n6vv2z7c3550w0jzwmp6xp0rmrrbljr1ik2ijign62r35a3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ignoramus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ignoramus";
           sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
           name = "ignoramus";
         };
@@ -14874,7 +15063,7 @@
           sha256 = "0imvxzcja91cd19zm2frqfpxm8j0bc89w9s7q0pkpvyjz44kjbq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/image-archive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/image-archive";
           sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
           name = "image-archive";
         };
@@ -14895,7 +15084,7 @@
           sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/image-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/image-dired+";
           sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
           name = "image-dired-plus";
         };
@@ -14916,7 +15105,7 @@
           sha256 = "0k69xbih0273xvmj035vcmm67l6hgjb99pb1jbva5x0pnszb1vdv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/image+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/image+";
           sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
           name = "image-plus";
         };
@@ -14937,7 +15126,7 @@
           sha256 = "15lflvpapm5749qq7jzdwbd0isb89i6df3np4wn9y9gjl7y92wk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/imapfilter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/imapfilter";
           sha256 = "0i893kqj6yzadhza800r6ri7fihl01r57z8yrzzh3d09qaias5vz";
           name = "imapfilter";
         };
@@ -14958,7 +15147,7 @@
           sha256 = "0qc96p5f7paxaxzv73w072cba8jb6ibdbhml7n7cm85b0rz1wf16";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/imenu-anywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/imenu-anywhere";
           sha256 = "1ylqzdnd3nzcpyyd6rh6i5q9mvf8c99rvpk51fzfm3yq2kyw4dbq";
           name = "imenu-anywhere";
         };
@@ -14979,7 +15168,7 @@
           sha256 = "1j0p0zkk89lg5xk5qzdnj9nxxiaxhff2y9iv9lw456kvb3lsyvjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/imenu-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/imenu-list";
           sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
           name = "imenu-list";
         };
@@ -15000,7 +15189,7 @@
           sha256 = "1y57xp0w0c6hg3gn4f1l3612a18li4gwhfa4dy18fy94gr54ycpx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/imenus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/imenus";
           sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
           name = "imenus";
         };
@@ -15021,7 +15210,7 @@
           sha256 = "19jqcbiwqknlpij9q63m1p69k4zb3v1qdx0858drprc2rl1p55cd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/imgix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/imgix";
           sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
           name = "imgix";
         };
@@ -15042,7 +15231,7 @@
           sha256 = "1pf7pqh8yzyvh4gzvp5npfq8kcfjcbzra0kkw7zmz769xxc8v84x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/immutant-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/immutant-server";
           sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
           name = "immutant-server";
         };
@@ -15063,7 +15252,7 @@
           sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/impatient-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/impatient-mode";
           sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg";
           name = "impatient-mode";
         };
@@ -15105,7 +15294,7 @@
           sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/import-popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/import-popwin";
           sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
           name = "import-popwin";
         };
@@ -15126,7 +15315,7 @@
           sha256 = "1dmr1arqy2vs9jdjha513mvw3yfwgkn4zs728q83asjy91sfcz7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inf-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inf-clojure";
           sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
           name = "inf-clojure";
         };
@@ -15147,7 +15336,7 @@
           sha256 = "11zsprv5ycnfqi358dd4cx70dbn6a8hccd4prf28lln7vhldbmjz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inf-ruby";
           sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
           name = "inf-ruby";
         };
@@ -15168,7 +15357,7 @@
           sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inflections";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
           name = "inflections";
         };
@@ -15189,7 +15378,7 @@
           sha256 = "031vb7ndz68x0119v4pyizz0ykd341ywcp5s7i4z35zx1vcqj8az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/init-loader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/init-loader";
           sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
           name = "init-loader";
         };
@@ -15210,7 +15399,7 @@
           sha256 = "06w1vnfhjy8g62z6xajin5akgh30pa0kk56am61kv6mi5ia8fc96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/init-open-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/init-open-recentf";
           sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
           name = "init-open-recentf";
         };
@@ -15231,7 +15420,7 @@
           sha256 = "1rfw38a63bvzglqx7mb8wlnzjvlmkhkn35hn66snqqgvnmnvi54g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/initsplit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/initsplit";
           sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
           name = "initsplit";
         };
@@ -15252,7 +15441,7 @@
           sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inline-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inline-crypt";
           sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
           name = "inline-crypt";
         };
@@ -15273,7 +15462,7 @@
           sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/inlineR";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/inlineR";
           sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
           name = "inlineR";
         };
@@ -15294,7 +15483,7 @@
           sha256 = "1mqnz40zirnyn3wa71wzzjph3a0sbgvzcywcr7xnzqpl6sp7g93f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/insert-shebang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/insert-shebang";
           sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
           name = "insert-shebang";
         };
@@ -15314,7 +15503,7 @@
           sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/instapaper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/instapaper";
           sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
           name = "instapaper";
         };
@@ -15335,7 +15524,7 @@
           sha256 = "1qs6j9cz152wfy54c5d1a558l0df6wxv3djlvfl2mx58wf0sk73h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/interleave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/interleave";
           sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
           name = "interleave";
         };
@@ -15345,22 +15534,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    intero = callPackage ({ company, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "0.1.13";
+        version = "0.1.14";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "314154585104c33d187b4b14a89c077356de7b2c";
-          sha256 = "089ijl39fmyd7zspqb0496myv0sy6gz6r46hpwz3v3k9mr3q4873";
+          rev = "9a69013019caf204da16e67bf6f77474858e92a4";
+          sha256 = "0whsshrsczpw5s6msiwv7qi75bq9f0b6sajqwhvdkz4z356za85m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/intero";
           sha256 = "15n7ipsq8ylmq4blsycpszkx034j9sb92vqvaz30j5v307fmvs99";
           name = "intero";
         };
-        packageRequires = [ company flycheck ];
+        packageRequires = [ company emacs flycheck haskell-mode ];
         meta = {
           homepage = "https://melpa.org/#/intero";
           license = lib.licenses.free;
@@ -15377,7 +15566,7 @@
           sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/iplayer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/iplayer";
           sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
           name = "iplayer";
         };
@@ -15398,7 +15587,7 @@
           sha256 = "036q933yw7pimnnq43ydaqqfccgf4iwvjhjmsavp7l6y1w16rvmy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ir-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ir-black-theme";
           sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
           name = "ir-black-theme";
         };
@@ -15419,7 +15608,7 @@
           sha256 = "1y72xhs978ah53fmp10pa8riscx94y9bjvr26wk2f3zc94c6cq3d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/irony";
           sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
           name = "irony";
         };
@@ -15440,7 +15629,7 @@
           sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/isgd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/isgd";
           sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
           name = "isgd";
         };
@@ -15461,7 +15650,7 @@
           sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ivy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ivy";
           sha256 = "0xf5p91r2ljl93wbr5wbgnb4hzhs00wkaf4fmdlf31la8xwwp5ci";
           name = "ivy";
         };
@@ -15482,7 +15671,7 @@
           sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ivy-gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ivy-gitlab";
           sha256 = "0gbwsmb6my0327f9j96s20mybnjaw9yaiwhs3sy3vav0qww91z1y";
           name = "ivy-gitlab";
         };
@@ -15503,7 +15692,7 @@
           sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ivy-hydra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ivy-hydra";
           sha256 = "1xv8nfi6dzhx868h44ydq4f5jmsa7rbqfa7jk8g0z0ifv477hrvx";
           name = "ivy-hydra";
         };
@@ -15524,7 +15713,7 @@
           sha256 = "0rpxh1jv98dl9b5ldjkljk70z4hkl61kcmvy1lhpj3lxn8ysv87a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ix";
           sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
           name = "ix";
         };
@@ -15545,7 +15734,7 @@
           sha256 = "1mb0k4lmbkbpn6qzzg8n14pybhd5zla77ppqac6a9kw89fj2qj4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/iy-go-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/iy-go-to-char";
           sha256 = "10szn9y7gl8947p3f9w6p6vzjf1a9cjif9mbj3qdqx4vbsl9mqpz";
           name = "iy-go-to-char";
         };
@@ -15566,7 +15755,7 @@
           sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/j-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/j-mode";
           sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
           name = "j-mode";
         };
@@ -15582,10 +15771,10 @@
         src = fetchgit {
           url = "git://git.code.sf.net/p/emacs-jabber/git";
           rev = "2999f58619dd9c20cc6cac8060c4c850a504cbbd";
-          sha256 = "0d6dwj45rrvh3dlrhdmqkxjmd439a1x3h88czdg7np2m5q2xg2dg";
+          sha256 = "03x93wkd8syj2ybf5ymwcm6khx0h5nhrl8pyync1520294pq6i1i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jabber";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jabber";
           sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
           name = "jabber";
         };
@@ -15606,7 +15795,7 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jade-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jade-mode";
           sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
           name = "jade-mode";
         };
@@ -15627,7 +15816,7 @@
           sha256 = "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jammer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jammer";
           sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
           name = "jammer";
         };
@@ -15648,7 +15837,7 @@
           sha256 = "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/japanlaw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/japanlaw";
           sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
           name = "japanlaw";
         };
@@ -15669,7 +15858,7 @@
           sha256 = "1bngn6v6w60qb3zz7s3px7v3wk99a3hfvzrg9l06dz1q7xgyvsi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/java-imports";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/java-imports";
           sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98";
           name = "java-imports";
         };
@@ -15690,7 +15879,7 @@
           sha256 = "16gywcma1s8kslwznlxwlx0xj0gs5g31637kb74vfdplk48f04zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/javadoc-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/javadoc-lookup";
           sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
           name = "javadoc-lookup";
         };
@@ -15711,7 +15900,7 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jedi";
           sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
           name = "jedi";
         };
@@ -15732,7 +15921,7 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jedi-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jedi-core";
           sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
           name = "jedi-core";
         };
@@ -15753,7 +15942,7 @@
           sha256 = "0ws0297v6sairvsk665wrfzymfi599g5ljshfnpmi81qnnnbwjgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jq-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jq-mode";
           sha256 = "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin";
           name = "jq-mode";
         };
@@ -15774,7 +15963,7 @@
           sha256 = "1f1zad423q5adycbbh62094m622gl8ncwbr8vxad1a6zcga70cgi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/js-comint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
           name = "js-comint";
         };
@@ -15787,15 +15976,15 @@
     js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-closure";
-        version = "1.4";
+        version = "2.0";
         src = fetchFromGitHub {
           owner = "jart";
           repo = "js2-closure";
-          rev = "e1b3e7db13285e63c3c428d87c018289352bd043";
-          sha256 = "0d2hqlgm09rw0azha5dxmq63b56sa8b9qj7gd7invibl6nnyjh4a";
+          rev = "37409e4ad1925e48b633c1d424caa2fe94eb9d49";
+          sha256 = "1yjgi0glh4fb4k7z5n216sbfzmxrxnnspmq2r5j6ag7b59qamyym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/js2-closure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/js2-closure";
           sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
           name = "js2-closure";
         };
@@ -15816,7 +16005,7 @@
           sha256 = "0r2szaxr3q0gvxqd9asn03q8jf3nclxv4mqdsjn96s98n45x388l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/js2-highlight-vars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/js2-highlight-vars";
           sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
           name = "js2-highlight-vars";
         };
@@ -15837,7 +16026,7 @@
           sha256 = "0xj87grvg7pbhh4d239gaqai5gl72klhpp9yksaqn77qnm98q4fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/js2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/js2-mode";
           sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
           name = "js2-mode";
         };
@@ -15858,7 +16047,7 @@
           sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/js2-refactor";
           sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
           name = "js2-refactor";
         };
@@ -15879,7 +16068,7 @@
           sha256 = "17d0nf1kz7mgv5qz57q6khy4w5vrmsliqirggahk9s6nnsx1j56n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/js3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/js3-mode";
           sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
           name = "js3-mode";
         };
@@ -15900,7 +16089,7 @@
           sha256 = "0pjmslxwmlb9cb3j5qfsyxq1lg1ywzw1p9dvj330c2m7nla1j70x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jsfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jsfmt";
           sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
           name = "jsfmt";
         };
@@ -15921,7 +16110,7 @@
           sha256 = "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/json-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/json-mode";
           sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
           name = "json-mode";
         };
@@ -15942,7 +16131,7 @@
           sha256 = "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/json-reformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/json-reformat";
           sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
           name = "json-reformat";
         };
@@ -15963,7 +16152,7 @@
           sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/json-snatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/json-snatcher";
           sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
           name = "json-snatcher";
         };
@@ -15984,7 +16173,7 @@
           sha256 = "1wx28rr5dk238yz07xn95v88qmv10c1gz9pcxard2kszpnmrn6dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jsx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jsx-mode";
           sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
           name = "jsx-mode";
         };
@@ -16005,7 +16194,7 @@
           sha256 = "11wybxrl2lny6vbf7qrxyf9wxw88ppvbrlfcd65paalrna2hn46h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/judge-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/judge-indent";
           sha256 = "1gakdhnlxfq8knnykqdw4bizb5y67m8xhi07zannd7bsfwi4k6rh";
           name = "judge-indent";
         };
@@ -16026,7 +16215,7 @@
           sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jump";
           sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
           name = "jump";
         };
@@ -16047,7 +16236,7 @@
           sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jump-to-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jump-to-line";
           sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
           name = "jump-to-line";
         };
@@ -16068,7 +16257,7 @@
           sha256 = "1785nsv61m51lpykai2wxrv6zmwbm5654v937fgw177p37054s83";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/jvm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/jvm-mode";
           sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
           name = "jvm-mode";
         };
@@ -16089,7 +16278,7 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kaesar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kaesar";
           sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
           name = "kaesar";
         };
@@ -16110,7 +16299,7 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kaesar-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kaesar-file";
           sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
           name = "kaesar-file";
         };
@@ -16131,7 +16320,7 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kaesar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kaesar-mode";
           sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
           name = "kaesar-mode";
         };
@@ -16152,7 +16341,7 @@
           sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kakapo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kakapo-mode";
           sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
           name = "kakapo-mode";
         };
@@ -16173,7 +16362,7 @@
           sha256 = "0avcg307r4navvgj3hjkggk4gr7mzs4mljhxh223r8g69l9bm6m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/karma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/karma";
           sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
           name = "karma";
         };
@@ -16194,7 +16383,7 @@
           sha256 = "14ijniyvcfmj4y77yhiplsclincng2r3jbdnmmdnwzliv65f7l6q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/key-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/key-combo";
           sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
           name = "key-combo";
         };
@@ -16215,7 +16404,7 @@
           sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/key-seq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/key-seq";
           sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
           name = "key-seq";
         };
@@ -16236,7 +16425,7 @@
           sha256 = "0xgm80dbg45bs3k8psd3pv49z1xbvzm156xs55gmxdzbgxbzpazr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/keychain-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/keychain-environment";
           sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
           name = "keychain-environment";
         };
@@ -16257,7 +16446,7 @@
           sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/keydef";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/keydef";
           sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
           name = "keydef";
         };
@@ -16278,7 +16467,7 @@
           sha256 = "1x87mbnzkggx5llh0i0s3sj1nfw7liwnlqc9csya517w4x5mhl8i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/keyfreq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/keyfreq";
           sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
           name = "keyfreq";
         };
@@ -16299,7 +16488,7 @@
           sha256 = "17bfxn1bl2by3vnp24hnk6qjxx6av1fayrsw9hlldwhgp4ayhy48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/keymap-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/keymap-utils";
           sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
           name = "keymap-utils";
         };
@@ -16320,7 +16509,7 @@
           sha256 = "0z6sgz8nywsd00zaayafwy5hfi7kzxfifjkfr5cn1l7wlypyksfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/keyset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/keyset";
           sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
           name = "keyset";
         };
@@ -16341,7 +16530,7 @@
           sha256 = "0ky167xh1hrmqsldybzjhyqjizgjzs1grn5mf8sm2j9qwcvjw2zv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kibit-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kibit-helper";
           sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
           name = "kibit-helper";
         };
@@ -16362,7 +16551,7 @@
           sha256 = "1c5al7cyfnb0p5ya2aa5afadzbrrc079jx3r6zpkr64psskrhdv5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kill-or-bury-alive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kill-or-bury-alive";
           sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
           name = "kill-or-bury-alive";
         };
@@ -16383,7 +16572,7 @@
           sha256 = "0axvhikhg4fikiz4ifg0p4a5ygphbpjs0wd0gcbx29n0y54d1i93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kill-ring-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kill-ring-search";
           sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
           name = "kill-ring-search";
         };
@@ -16404,7 +16593,7 @@
           sha256 = "0imylcaiwpzvvb3g8kpsna1vk7v7bwdjfcsa98i41m1rv9yla86l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/killer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/killer";
           sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
           name = "killer";
         };
@@ -16425,7 +16614,7 @@
           sha256 = "0rzzjzkzgpiadm9awkj7wrh2hg97lhgwxg74gvdis3fc1xg2hyri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kivy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kivy-mode";
           sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
           name = "kivy-mode";
         };
@@ -16446,7 +16635,7 @@
           sha256 = "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/know-your-http-well";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/know-your-http-well";
           sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
           name = "know-your-http-well";
         };
@@ -16467,7 +16656,7 @@
           sha256 = "1kbmlhfxbp704mky8v69lzqd20bbnqijfnv110yigsy3kxi7hdrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ksp-cfg-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ksp-cfg-mode";
           sha256 = "0azcn4qvziacbw1qy33fwdaldw7xpzr672vzjsqhr0b2vg9m2ipi";
           name = "ksp-cfg-mode";
         };
@@ -16488,7 +16677,7 @@
           sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/kurecolor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/kurecolor";
           sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
           name = "kurecolor";
         };
@@ -16509,7 +16698,7 @@
           sha256 = "1i8wbhc6i88plpq48ccka0avdj2x5rcxm81j93dmwp70ld0zws8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/langtool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/langtool";
           sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
           name = "langtool";
         };
@@ -16530,7 +16719,7 @@
           sha256 = "07aavdr1dlw8hca27l8a0i8cs5ga1wqqdf1v1iyvjz61vygld77a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/latex-extra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/latex-extra";
           sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
           name = "latex-extra";
         };
@@ -16551,7 +16740,7 @@
           sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/latex-math-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/latex-math-preview";
           sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
           name = "latex-math-preview";
         };
@@ -16572,7 +16761,7 @@
           sha256 = "10i4r81pm95990d4yrabzdm49gp47mqpv15h4r4sih10p1kbn83h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/latex-unicode-math-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/latex-unicode-math-mode";
           sha256 = "1p9gpp28vylibv1s95bzfgscznw146ybgk6f3qdbbnafrcrmifcr";
           name = "latex-unicode-math-mode";
         };
@@ -16593,7 +16782,7 @@
           sha256 = "1hp65aai2bp5l7b3dhr6bz042xcikkk8vssirzibdw5qq6zqzgxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ledger-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ledger-mode";
           sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s";
           name = "ledger-mode";
         };
@@ -16614,7 +16803,7 @@
           sha256 = "04h6vk7w25yp4kzkwqnsmc59bm0182qqkyk5nxm3a1lv1v1590lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lentic";
           sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
           name = "lentic";
         };
@@ -16635,7 +16824,7 @@
           sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/less-css-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/less-css-mode";
           sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
           name = "less-css-mode";
         };
@@ -16656,7 +16845,7 @@
           sha256 = "1l9qjmyb4a3f6i2iimpmjczbx890cd1p24n941s13sg67xfbm7hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/letcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/letcheck";
           sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
           name = "letcheck";
         };
@@ -16677,7 +16866,7 @@
           sha256 = "1n84vqxv4jqy5mnb1hbrqrhavq0y8c4mjsp0smg48bzi18350irl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lfe-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lfe-mode";
           sha256 = "0smncyby53ipm8yqslz88sqjafk0x6r8d0qwk4wzk0pbgfyklhgs";
           name = "lfe-mode";
         };
@@ -16698,7 +16887,7 @@
           sha256 = "0hi8s20vw4a5i5n5jlm5dzgsl1qpfyqbpskqszjls1xrrf3dd4zl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lice";
           sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
           name = "lice";
         };
@@ -16719,7 +16908,7 @@
           sha256 = "11sw43z5b0vypmhi0yysf2bxjy8fqpzl61y503jb7nhcfywmfkys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lingr";
           sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
           name = "lingr";
         };
@@ -16740,7 +16929,7 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/link";
           sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
           name = "link";
         };
@@ -16761,7 +16950,7 @@
           sha256 = "1v4fadxv7ym6lc09nd2xpz2k5vrikjv7annw99ii5cqrwhqa5838";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/link-hint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/link-hint";
           sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
           name = "link-hint";
         };
@@ -16782,7 +16971,7 @@
           sha256 = "1m4g4b96cxs05pfln7kdi6gvrdbv76f8dk806py5lq0gq7da2csc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/linum-relative";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/linum-relative";
           sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
           name = "linum-relative";
         };
@@ -16803,7 +16992,7 @@
           sha256 = "05iqhnhj61f30yk4ih63rimmyp134gyq18frc8qgrnwym64dsm6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lispy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lispy";
           sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
           name = "lispy";
         };
@@ -16831,7 +17020,7 @@
           sha256 = "0qyj04p63fdh3iasp5cna1z5fhibmfyl9lvwyh22ajzsfbr3nhnk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lispyscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lispyscript-mode";
           sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
           name = "lispyscript-mode";
         };
@@ -16852,7 +17041,7 @@
           sha256 = "197cqkiwxgamhfwbc8h492cmjll3fypkwzcphj26dfnr22v63kwq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/list-packages-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/list-packages-ext";
           sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
           name = "list-packages-ext";
         };
@@ -16873,7 +17062,7 @@
           sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/list-unicode-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/list-unicode-display";
           sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
           name = "list-unicode-display";
         };
@@ -16894,7 +17083,7 @@
           sha256 = "0ql159v7sxs33yh2l080kchrj52vk34knz50cvqi3ykpb7djg3sz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/list-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/list-utils";
           sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
           name = "list-utils";
         };
@@ -16915,7 +17104,7 @@
           sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lit-mode";
           sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
           name = "lit-mode";
         };
@@ -16936,7 +17125,7 @@
           sha256 = "1fh9wrw5irn0g3dy8gkk63csdcxgi3w2038mxx3sk6ki3r2bmhw8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/literate-coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/literate-coffee-mode";
           sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
           name = "literate-coffee-mode";
         };
@@ -16957,7 +17146,7 @@
           sha256 = "1cwydbhhbs5v9y2s872zxc5lflqmfrdvnc8xz0qars52d7lg4br5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/live-code-talks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/live-code-talks";
           sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
           name = "live-code-talks";
         };
@@ -16978,7 +17167,7 @@
           sha256 = "0vmkqlgiahcc6aa0ky4jjdc5nxnn2i7qwfl6wkgy5rmq051nk4k0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/live-py-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/live-py-mode";
           sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
           name = "live-py-mode";
         };
@@ -16999,7 +17188,7 @@
           sha256 = "1fq4bnngbh9a18hq8mvnqkzs74k3g4c0lmwsncbhy6n21njv3kdy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/load-relative";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/load-relative";
           sha256 = "0j8ybbjzhzgjx47pqqdbsqi8n6pzqcf6zqc38x7cf1kkklgc87ay";
           name = "load-relative";
         };
@@ -17020,7 +17209,7 @@
           sha256 = "1089sbx20r30sis39vwy29fxhb2n3hh35rdv09lpzdxdq01s8wwp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/loc-changes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/loc-changes";
           sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
           name = "loc-changes";
         };
@@ -17041,7 +17230,7 @@
           sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/log4e";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/log4e";
           sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
           name = "log4e";
         };
@@ -17062,7 +17251,7 @@
           sha256 = "0g5vq9xy9lwczs77lr91c1srhhfmasnnnmjvgc55hbl6iwmbizbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/logalimacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/logalimacs";
           sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
           name = "logalimacs";
         };
@@ -17083,7 +17272,7 @@
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/logito";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/logito";
           sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
           name = "logito";
         };
@@ -17104,7 +17293,7 @@
           sha256 = "1yacic778ranlqblrcdhyf5igbrcin8aj30vjdm4klpmqb73hf1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/logview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
           name = "logview";
         };
@@ -17125,7 +17314,7 @@
           sha256 = "1rpvw0dvym559vb4nrfy74jq06nbsz2b0n60lcykagcir8mpcidk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/loop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/loop";
           sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
           name = "loop";
         };
@@ -17146,7 +17335,7 @@
           sha256 = "11y5jyq4xg9zlm1qi2y97nh05vhva9pai9yyr4x2pr41xz3s8fpk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/love-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/love-minor-mode";
           sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
           name = "love-minor-mode";
         };
@@ -17167,7 +17356,7 @@
           sha256 = "1qawjd0nbj1c142van7r01pmq74vkzcvnn27jgn79wwhplp9gm99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/lua-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/lua-mode";
           sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
           name = "lua-mode";
         };
@@ -17188,7 +17377,7 @@
           sha256 = "01847f8xmjfxvvi7hf73l7ypkdazwg8ciinm117zp4jkgnv0apz0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/m-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/m-buffer";
           sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc";
           name = "m-buffer";
         };
@@ -17209,7 +17398,7 @@
           sha256 = "0dgsl1x6r8m9vvff1ia0kmz21h0dji2jl5cqlpx1m947zh45dahj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/macro-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/macro-math";
           sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
           name = "macro-math";
         };
@@ -17230,7 +17419,7 @@
           sha256 = "0g9bnq4p3ffvva30hpll80dn3i41m51mcvw3qf787zg1nmc5a0j6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/macrostep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/macrostep";
           sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
           name = "macrostep";
         };
@@ -17251,7 +17440,7 @@
           sha256 = "1rw5lvcj2v4b21akmsinkz24fbmp19s3jdqsd8jgmk3qqv0z81fc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magic-filetype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magic-filetype";
           sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
           name = "magic-filetype";
         };
@@ -17272,7 +17461,7 @@
           sha256 = "1dv5qr9z5lxj2zjhwjhx451mbkb8d3y00q7ar6n34x7d5c4gmiya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit";
           sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q";
           name = "magit";
         };
@@ -17300,7 +17489,7 @@
           sha256 = "19w8143c4spa856xyzx8fylndbj4s9nwn27f6v1ckqxvm5l0pph0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-annex";
           sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
           name = "magit-annex";
         };
@@ -17321,7 +17510,7 @@
           sha256 = "1vn6x53kpwv3zf2b5xjswyz6v853r8b9dg88qhwd2h480hrx6kal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-filenotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-filenotify";
           sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7";
           name = "magit-filenotify";
         };
@@ -17342,7 +17531,7 @@
           sha256 = "1jlww053s580d7rlvmr1dl79wxasa0hhh2jnwb1ra353d6h3a73w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-find-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-find-file";
           sha256 = "1y66nsq1hbv1sb4n71gdxv7p1rz37vd9lkf7zl7avy0dchs499ik";
           name = "magit-find-file";
         };
@@ -17363,7 +17552,7 @@
           sha256 = "0ym24gjd6c04zry08abcb09zvjbgj8nc1j12q0r51fhzzadxcxbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-gerrit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-gerrit";
           sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
           name = "magit-gerrit";
         };
@@ -17384,7 +17573,7 @@
           sha256 = "19iqa2kzarpa75xy34hqvpy1y7dzx84pj540wwkj04dnpb4fwj2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-gh-pulls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-gh-pulls";
           sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
           name = "magit-gh-pulls";
         };
@@ -17405,7 +17594,7 @@
           sha256 = "0g9wqd4dbd0spal7ss9k679nak02hr1z0mgq6k4g5nkgngwn6l2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-gitflow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-gitflow";
           sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
           name = "magit-gitflow";
         };
@@ -17426,7 +17615,7 @@
           sha256 = "1dv5qr9z5lxj2zjhwjhx451mbkb8d3y00q7ar6n34x7d5c4gmiya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-popup";
           sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
           name = "magit-popup";
         };
@@ -17447,7 +17636,7 @@
           sha256 = "075gxm4shbh5zfr17zpfn35w8ndgz9aqz6y3wws23wa4ff2n8kdc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-rockstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-rockstar";
           sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
           name = "magit-rockstar";
         };
@@ -17468,7 +17657,7 @@
           sha256 = "1mk8g8rr9vf8jm0mmsj33p8gc71nhlv3847hvqywy6z40nhcjnyb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-stgit";
           sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
           name = "magit-stgit";
         };
@@ -17489,7 +17678,7 @@
           sha256 = "1g8zq0s38di96wlhljp370kyj4a0ir1z3vb94k66v2m5nj83ap68";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-svn";
           sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
           name = "magit-svn";
         };
@@ -17510,7 +17699,7 @@
           sha256 = "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/magit-topgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/magit-topgit";
           sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
           name = "magit-topgit";
         };
@@ -17531,7 +17720,7 @@
           sha256 = "0fp5gbin1sgsdz39spk74vadkzig3ydwhpzx9vg7f231kk5f6wzx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/make-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/make-color";
           sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
           name = "make-color";
         };
@@ -17552,7 +17741,7 @@
           sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/makey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/makey";
           sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
           name = "makey";
         };
@@ -17573,7 +17762,7 @@
           sha256 = "0z0ml7l1a45ych61qfc5fvkybl9hh37pgl6lzkaz6mcif1sl8gn1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/malabar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/malabar-mode";
           sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
           name = "malabar-mode";
         };
@@ -17594,7 +17783,7 @@
           sha256 = "0hwxwwjzjxv2mmkxmalr2hp3x8apwcyvn2bz4d4yd4wrzcscay97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/malinka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/malinka";
           sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
           name = "malinka";
         };
@@ -17615,7 +17804,7 @@
           sha256 = "1272fsjzsza9dxm8s64b7x2jzr3ks8wjpwvgcxha2dnsjzklcdcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mallard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mallard-mode";
           sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
           name = "mallard-mode";
         };
@@ -17636,7 +17825,7 @@
           sha256 = "1fkijm0gikbwmxa9hf7s1rcwb0ipzjygd1mlicsm78rxvdd8k877";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/map-progress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/map-progress";
           sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
           name = "map-progress";
         };
@@ -17657,7 +17846,7 @@
           sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/map-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/map-regexp";
           sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
           name = "map-regexp";
         };
@@ -17678,7 +17867,7 @@
           sha256 = "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/marcopolo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/marcopolo";
           sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
           name = "marcopolo";
         };
@@ -17699,7 +17888,7 @@
           sha256 = "0fcyspz7n97n84d9203mxgn8ar4rn52qa49s3vayfrbkn038j5qw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mark-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mark-tools";
           sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
           name = "mark-tools";
         };
@@ -17720,7 +17909,7 @@
           sha256 = "098lf4n4rpx00sm07sy8dwp683a4sb7x0p15mrfp268apir3kkxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/markdown-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markdown-mode";
           sha256 = "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14";
           name = "markdown-mode";
         };
@@ -17741,7 +17930,7 @@
           sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/markdown-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markdown-mode+";
           sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
           name = "markdown-mode-plus";
         };
@@ -17754,15 +17943,15 @@
     markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }:
     melpaBuild {
         pname = "markdown-preview-mode";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "markdown-preview-mode";
-          rev = "ff75e31a57f62156441d66d5c4033ad204d49a87";
-          sha256 = "1yi5hsgf8hr7v1wyn3bw650g3ysbglwn5qfrmb6yl3s08lvi1vlf";
+          rev = "625c041efda1fa5e621c510770586baea1fd6a72";
+          sha256 = "1r0aqy78671k4cgf6y6rilch0vrhcj22ff7bvpwpba7imb8mf1cj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/markdown-preview-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markdown-preview-mode";
           sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
           name = "markdown-preview-mode";
         };
@@ -17783,7 +17972,7 @@
           sha256 = "0l687bna8rrc49y1fyn1ldjcwh290qgvi3p86c63yj4xy24fmdm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/markdown-toc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markdown-toc";
           sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
           name = "markdown-toc";
         };
@@ -17804,7 +17993,7 @@
           sha256 = "0nk2rm14ccwrh1aaxzm80rllsz8g38h9w52m0pf3nnwh6sa757nk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/markup-faces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/markup-faces";
           sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
           name = "markup-faces";
         };
@@ -17825,7 +18014,7 @@
           sha256 = "0pbli67wia8pximvgd68x6i9acdgsk51g9hjpqfm49rqg5nqalh9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/marmalade";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/marmalade";
           sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
           name = "marmalade";
         };
@@ -17846,7 +18035,7 @@
           sha256 = "0sriyjjhgis7fgq276j5mw6n84jdwxf8lq0iqqiaqwmc66l985mv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/marshal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/marshal";
           sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
           name = "marshal";
         };
@@ -17867,7 +18056,7 @@
           sha256 = "127q9xp015j28gjcna988dnrkadznn0xw8sdfvi943nhhqy4yvri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/math-symbol-lists";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/math-symbol-lists";
           sha256 = "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27";
           name = "math-symbol-lists";
         };
@@ -17887,7 +18076,7 @@
           sha256 = "1nmwny1y6n3w283v4kw57y6rlrlc9l8vy8nqhshl6v7vkzw5dvfp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/matrix-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/matrix-client";
           sha256 = "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6";
           name = "matrix-client";
         };
@@ -17908,7 +18097,7 @@
           sha256 = "0x92b1qrhyrdh0z0xriyjc12h0wpk16x4yawj5i828ca6mz0qh5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/maven-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/maven-test-mode";
           sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
           name = "maven-test-mode";
         };
@@ -17929,7 +18118,7 @@
           sha256 = "08gbkd8wln89j9yxp0zzd539hbwy1db31gca3vxxrpszixx8280y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/maxframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/maxframe";
           sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
           name = "maxframe";
         };
@@ -17950,7 +18139,7 @@
           sha256 = "1pi5yi76781pckvqgqabmkvq081npzkzl3r97f1wbcndvpfvv8jx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mb-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mb-url";
           sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
           name = "mb-url";
         };
@@ -17971,7 +18160,7 @@
           sha256 = "00gwd2jf5ncgyay5w2jc2mhv18jf4ydnzpfkxaxw9zjbdxg4ym2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mbe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mbe";
           sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
           name = "mbe";
         };
@@ -17992,7 +18181,7 @@
           sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mc-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mc-extras";
           sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
           name = "mc-extras";
         };
@@ -18013,7 +18202,7 @@
           sha256 = "1vsla0a5x4kfyj3ca4r1v8cspp12dadi0frpailclaxfmpmpl5d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mediawiki";
           sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
           name = "mediawiki";
         };
@@ -18034,7 +18223,7 @@
           sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/melpa-upstream-visit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/melpa-upstream-visit";
           sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
           name = "melpa-upstream-visit";
         };
@@ -18055,7 +18244,7 @@
           sha256 = "1y4ra5z3ayw3w7dszzlkk3qz3nv2jg1vvx8cf0y5j1pqpx8vy3jf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mentor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
           name = "mentor";
         };
@@ -18076,7 +18265,7 @@
           sha256 = "0vk1b9gjhjq47jhjhwh6h2x2cl2w7pz4018s6c444paw46gmgkln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/merlin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/merlin";
           sha256 = "177cy9xcrjckxv8gvi1zhg2ndfr8cmsr37inyvpi5dxqy6d6alhp";
           name = "merlin";
         };
@@ -18097,7 +18286,7 @@
           sha256 = "0n4nv1s25z70xfy3bl1wy467abz3agj4qmpx4rwdwzbarnqp9ps3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/metafmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/metafmt";
           sha256 = "1ca102al7r3k2g92b4jkqv53crnmxy3z7cz31w1rprf41s69mn75";
           name = "metafmt";
         };
@@ -18118,7 +18307,7 @@
           sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/metaweblog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/metaweblog";
           sha256 = "10kwqnfafby4ap0572mfkkdssr13y9p2gl9z3nmxqjjy04fkfi8b";
           name = "metaweblog";
         };
@@ -18139,7 +18328,7 @@
           sha256 = "1dhws4a298zrm88cdn66sikdk06n0p60d32cxsgybakkhg5c5wgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mew";
           sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
           name = "mew";
         };
@@ -18160,7 +18349,7 @@
           sha256 = "1bp4xqklf422n0zwwyj0ag3a4nndg8klazrga6rlvpy01hgg3drl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mhc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mhc";
           sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
           name = "mhc";
         };
@@ -18181,7 +18370,7 @@
           sha256 = "1cdjpqrsv2vhpdmv67krsds7wz19z9ajkabawr3yhxqii4myl4ik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mic-paren";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mic-paren";
           sha256 = "042dzp0nal18nxq94qlwwksh0nnypsyc0yykmc6l3kayp9pv4hw7";
           name = "mic-paren";
         };
@@ -18202,7 +18391,7 @@
           sha256 = "1ckb5hymwj4wmsxakalsky4mkzn9vxhxr6416b2cr6r5jxj4xgsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/migemo";
           sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
           name = "migemo";
         };
@@ -18223,7 +18412,7 @@
           sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/milkode";
           sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
           name = "milkode";
         };
@@ -18244,7 +18433,7 @@
           sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/minibuffer-complete-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/minibuffer-complete-cycle";
           sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
           name = "minibuffer-complete-cycle";
         };
@@ -18265,7 +18454,7 @@
           sha256 = "07nbn2pwlp33kr136xsm6lzddhjs538xkz0fbays89psblmy4kwj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/minibuffer-cua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/minibuffer-cua";
           sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
           name = "minibuffer-cua";
         };
@@ -18286,7 +18475,7 @@
           sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/miniedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/miniedit";
           sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
           name = "miniedit";
         };
@@ -18307,7 +18496,7 @@
           sha256 = "0kjhn48sf2ps3k5pv06gqmqc4hlk6di9ld3ssw6vwfh8313x1fc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/minimal-session-saver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/minimal-session-saver";
           sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
           name = "minimal-session-saver";
         };
@@ -18328,7 +18517,7 @@
           sha256 = "0nd0jl5r5drnh98wdpqj2i7pgs7zvcizsh4qbvh8n0iw0c3f0pwh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/minitest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/minitest";
           sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
           name = "minitest";
         };
@@ -18348,7 +18537,7 @@
           sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mmm-mako";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mmm-mako";
           sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
           name = "mmm-mako";
         };
@@ -18369,7 +18558,7 @@
           sha256 = "097s4xnwfy8d1wzmz65g2f8bnjjjlj67w1yzwn4d3yasb171nbv8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mmm-mode";
           sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
           name = "mmm-mode";
         };
@@ -18390,7 +18579,7 @@
           sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mmt";
           sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
           name = "mmt";
         };
@@ -18411,7 +18600,7 @@
           sha256 = "0yj9kc59c227727kh1zjxwrhijzd7rdhix7qqm4na1z6s4ycpxbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mocha";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mocha";
           sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx";
           name = "mocha";
         };
@@ -18432,7 +18621,7 @@
           sha256 = "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mocker";
           sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
           name = "mocker";
         };
@@ -18453,7 +18642,7 @@
           sha256 = "0yf5lwd95j55dkrkplsgnynq37ww0g97vw517j9q7spn7dqnq5f6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/modalka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/modalka";
           sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
           name = "modalka";
         };
@@ -18474,7 +18663,7 @@
           sha256 = "1ykj68d4h92i4qv90zgwrf9jhy1n22l2h9k5f1zsn8hvz9mhj1av";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mode-icons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mode-icons";
           sha256 = "1dqcry27rz7afyvjg7345wysp6wmh8fpj32ysk5iw5i7v5scf6kf";
           name = "mode-icons";
         };
@@ -18495,7 +18684,7 @@
           sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mode-line-debug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mode-line-debug";
           sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
           name = "mode-line-debug";
         };
@@ -18516,7 +18705,7 @@
           sha256 = "1gpsdyzcjb9j7yy39pbbjln2c7zkcbbm1brn9y1djwpv5571sd1v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/modern-cpp-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/modern-cpp-font-lock";
           sha256 = "0h43icb5rqbkc5699kdy2mrjs5448phl18jch45ylp2wy2r8c2qj";
           name = "modern-cpp-font-lock";
         };
@@ -18537,7 +18726,7 @@
           sha256 = "0pfzzyfknfaj8yil5f55xfa8x5jypc5i95c4lrkb0vykgccczj78";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/monokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/monokai-theme";
           sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
           name = "monokai-theme";
         };
@@ -18558,7 +18747,7 @@
           sha256 = "1a0pv8fkv1cjdb0k5bmjd67a273bzcmxjwzgy4jpb3ng1qbb2xnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/monroe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/monroe";
           sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
           name = "monroe";
         };
@@ -18579,7 +18768,7 @@
           sha256 = "0kjqdm6kzhgjmfdj4n95ivffw1wqf4r3gk62fvhfi4w29g7wd16j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/morlock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/morlock";
           sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
           name = "morlock";
         };
@@ -18600,7 +18789,7 @@
           sha256 = "01mdy7sps0xryz5gfpl083rv7ixkxs2rkz5yaqjlam2rypdcsyy2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/move-dup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/move-dup";
           sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
           name = "move-dup";
         };
@@ -18613,15 +18802,15 @@
     mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mowedline";
-        version = "0.2.8";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "retroj";
           repo = "mowedline";
-          rev = "c299991ace6f55e9edbf26c1d53b054873899101";
-          sha256 = "1mg7arw4wbbm84frq3sws5937fh901qn0xnjk9jcp3pvc4d0sxwd";
+          rev = "41b9fab11d38d8c0898a3646ec7f0ed8b525f33f";
+          sha256 = "01rh5fniislcxrvn8ar37f59vnbkzjm45vdkbvk8nbkl5adk6smi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mowedline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mowedline";
           sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
           name = "mowedline";
         };
@@ -18642,7 +18831,7 @@
           sha256 = "13bf5jn1kgqg59j5czlzvajq2fw1rz4h5jqfc7x8w1a067nymf2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/moz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/moz";
           sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
           name = "moz";
         };
@@ -18663,7 +18852,7 @@
           sha256 = "1w1i1clkjg9mj1g4i2y3xw3hyj8s7h9gr04qgyb9c1q8vh11z8d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/moz-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/moz-controller";
           sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
           name = "moz-controller";
         };
@@ -18684,7 +18873,7 @@
           sha256 = "1gdi2pz8450h11aknz3hbgjlx09w6c4l8d8sz0zv3pb1z8cqkgqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mozc-temp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mozc-temp";
           sha256 = "0x1bsa1py0kn73hzbsb4ijl0bqng8nib191vgn6xq8f5cx55044d";
           name = "mozc-temp";
         };
@@ -18705,7 +18894,7 @@
           sha256 = "1pjhch8vah0kf73fl2fk6khhrx1kflggd3zlxrf7w4fxr0qn8la3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mpv";
           sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
           name = "mpv";
         };
@@ -18726,7 +18915,7 @@
           sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/msvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/msvc";
           sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
           name = "msvc";
         };
@@ -18747,7 +18936,7 @@
           sha256 = "0wrg6f7czn61f9wmrk27dzcdskznm5i1pwwjck5h768j0y9dfv6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mu4e-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mu4e-alert";
           sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
           name = "mu4e-alert";
         };
@@ -18768,7 +18957,7 @@
           sha256 = "1lyd8pcawn106zwlbq6gdq05i2zhry1qh9cdyjiw61nvgbbfi0yx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mu4e-maildirs-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mu4e-maildirs-extension";
           sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
           name = "mu4e-maildirs-extension";
         };
@@ -18789,7 +18978,7 @@
           sha256 = "11zabs7qpdhri6n90ck7pgwcbz46d813nyl73h5m1i8jvz1wzx7v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/multi";
           sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
           name = "multi";
         };
@@ -18810,7 +18999,7 @@
           sha256 = "1d9y3dw27pgzgv6wk575d5ign55xdqgbl3ycyq1z7sji1477lz6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/multi-web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/multi-web-mode";
           sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
           name = "multi-web-mode";
         };
@@ -18831,7 +19020,7 @@
           sha256 = "1ijgvzv5r44xqvz751fd5drbvrspapw6xwv47582w255j363r6ss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/multiple-cursors";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/multiple-cursors";
           sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
           name = "multiple-cursors";
         };
@@ -18852,7 +19041,7 @@
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mustache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mustache-mode";
           sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
           name = "mustache-mode";
         };
@@ -18873,7 +19062,7 @@
           sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mwim";
           sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
           name = "mwim";
         };
@@ -18894,7 +19083,7 @@
           sha256 = "0550k0rfm0zai306642v689mcpsw9pbd5vs0il82cihwvrxjifc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/mykie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/mykie";
           sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
           name = "mykie";
         };
@@ -18915,7 +19104,7 @@
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/name-this-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/name-this-color";
           sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
           name = "name-this-color";
         };
@@ -18936,7 +19125,7 @@
           sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/names";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/names";
           sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
           name = "names";
         };
@@ -18957,7 +19146,7 @@
           sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/narrow-reindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/narrow-reindent";
           sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
           name = "narrow-reindent";
         };
@@ -18978,7 +19167,7 @@
           sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/narrowed-page-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/narrowed-page-navigation";
           sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
           name = "narrowed-page-navigation";
         };
@@ -18999,7 +19188,7 @@
           sha256 = "0d8bfz41ry5bvkz2894dqkk3244n7xcjk3pf58fcsagvmmkkln7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nasm-mode";
           sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
           name = "nasm-mode";
         };
@@ -19020,7 +19209,7 @@
           sha256 = "119hy8rs83f17d6zizdaxn2ck3sylxbyz7adszbznjc8zrbaw0ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nav-flash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nav-flash";
           sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
           name = "nav-flash";
         };
@@ -19041,7 +19230,7 @@
           sha256 = "15jh1lsgqfnpbmrikm8kdh5bj60yb96f2as2anppjjsgl6w96glh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/navi-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/navi-mode";
           sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
           name = "navi-mode";
         };
@@ -19062,7 +19251,7 @@
           sha256 = "09cb07f98aclgq8jf5419305zydkk1hz4nvzrwqz7syrlpvx8xi5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/navorski";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/navorski";
           sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
           name = "navorski";
         };
@@ -19083,7 +19272,7 @@
           sha256 = "16i1k1zr6ng1dlxb1b73mxjf25f4kvf3x5vfffsi3qnfm960bg3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ncl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ncl-mode";
           sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9";
           name = "ncl-mode";
         };
@@ -19104,7 +19293,7 @@
           sha256 = "19xxg4ya6vndk2ljdnl284zs8qf9dkq4ghr7pmsclp9n7zh46v48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nemerle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nemerle";
           sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6";
           name = "nemerle";
         };
@@ -19125,7 +19314,7 @@
           sha256 = "1gmi0xxwkh33w5gxc8488m1vv6ycizqhlw1kpn81zhqdzzq3s06n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/neotree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
           name = "neotree";
         };
@@ -19146,7 +19335,7 @@
           sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nginx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nginx-mode";
           sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
           name = "nginx-mode";
         };
@@ -19167,7 +19356,7 @@
           sha256 = "0dzcaa88l7yjc7fhyhkvbzs7bmhi6bb6rx41wsnnidlnpzbgdrk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/niceify-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/niceify-info";
           sha256 = "1s9c8yxbab9zl5jx38alwa2hpp4zj5cb9a5gfm3x09jf3iw768bl";
           name = "niceify-info";
         };
@@ -19188,7 +19377,7 @@
           sha256 = "14jh2cg1isip8b8lls3hdj99vpqjyjqlv27r2kpq6095b78p64d9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ninja-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ninja-mode";
           sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
           name = "ninja-mode";
         };
@@ -19209,7 +19398,7 @@
           sha256 = "1rvi30xyj2vj3gmzagy51smrhb1xwlsfgnyg30hblj88yn0wh5sz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nix-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nix-mode";
           sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
           name = "nix-mode";
         };
@@ -19230,7 +19419,7 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nixos-options";
           sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
           name = "nixos-options";
         };
@@ -19240,6 +19429,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "no-littering";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "no-littering";
+          rev = "6e4c239f58645d6cee3ed4aa180ae484f677a7ab";
+          sha256 = "1j5agcq56mphpbpxdaklvl1y2689sfny4l6wknvrwxnqyl48yzkb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/no-littering";
+          sha256 = "129nyml8jx3nwdskcr2favbi3x6f74dblc6yw8vijw32w8z14k2l";
+          name = "no-littering";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/no-littering";
+          license = lib.licenses.free;
+        };
+      }) {};
     noccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "noccur";
@@ -19251,7 +19461,7 @@
           sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/noccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/noccur";
           sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
           name = "noccur";
         };
@@ -19272,7 +19482,7 @@
           sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nodejs-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nodejs-repl";
           sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
           name = "nodejs-repl";
         };
@@ -19291,7 +19501,7 @@
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nose";
           sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
           name = "nose";
         };
@@ -19307,10 +19517,10 @@
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
           rev = "ea5caecec5c50833a6f5a422e217a71eee6324af";
-          sha256 = "0n471pjj433jivmwbifzw8x6ya09v52yvgdjfkxcp2a6mn23k6xm";
+          sha256 = "0883vwwcir5w3b4831y46bcm80z7chqri4wsx7qxc2ynw0a4qfx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/notmuch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/notmuch";
           sha256 = "173d1gf5rd4nbjwg91486ibg54n3qlpwgyvkcy4d30jm4vqwqrqv";
           name = "notmuch";
         };
@@ -19331,7 +19541,7 @@
           sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/notmuch-labeler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/notmuch-labeler";
           sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
           name = "notmuch-labeler";
         };
@@ -19352,7 +19562,7 @@
           sha256 = "1l07nrlfd5qj8jnqacjba7mb6prapg8d8h3881l3kb66sn02ahgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nrepl-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nrepl-sync";
           sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
           name = "nrepl-sync";
         };
@@ -19373,7 +19583,7 @@
           sha256 = "0c4qfbb345yna5c30czq8nhcx283z1fnpp6h16p7vjqs6y37czsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nsis-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nsis-mode";
           sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
           name = "nsis-mode";
         };
@@ -19394,7 +19604,7 @@
           sha256 = "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nvm";
           sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
           name = "nvm";
         };
@@ -19415,7 +19625,7 @@
           sha256 = "199ii1658k4sp5krha77n9l5jblyvnvvvr28g2nbc74lfybckjwq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nyan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nyan-mode";
           sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
           name = "nyan-mode";
         };
@@ -19436,7 +19646,7 @@
           sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/nyan-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/nyan-prompt";
           sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
           name = "nyan-prompt";
         };
@@ -19457,7 +19667,7 @@
           sha256 = "0r12023yy8j96bp8z2ml6ffyr2c9rcd5abkh6vqnkwsdxkzx6wrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/o-blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/o-blog";
           sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
           name = "o-blog";
         };
@@ -19478,7 +19688,7 @@
           sha256 = "0bqr6yl1hpykpykjpfb247xnpnz510zrg9yv7nkxlrig4pjgdcx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-http";
           sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
           name = "ob-http";
         };
@@ -19499,7 +19709,7 @@
           sha256 = "08p64ss3ia1gq6dsna5v3ajjwm5g9ma7yvd5y0jx91xssjqq5dja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-sagemath";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-sagemath";
           sha256 = "02ispac1y4g7p7iyscf5p8lvp92ncrn6281jm9igyiny1w6hivy7";
           name = "ob-sagemath";
         };
@@ -19520,7 +19730,7 @@
           sha256 = "1xx6hyq3gk4bavcx6i9bhipbn4mn5rv2ga9lryq09qgq2l9znclk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-sml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-sml";
           sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
           name = "ob-sml";
         };
@@ -19541,7 +19751,7 @@
           sha256 = "10hm20dzhkxk61ass3bd5gdn1bs2l60y3zjnpkxinzn7m6aaniia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ob-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ob-translate";
           sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
           name = "ob-translate";
         };
@@ -19562,7 +19772,7 @@
           sha256 = "05ay599nc6jdw2fjss4izz1ynv2wc4svff932n8j9hvrhygipb2w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ocodo-svg-modelines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ocodo-svg-modelines";
           sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
           name = "ocodo-svg-modelines";
         };
@@ -19583,7 +19793,7 @@
           sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ocp-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ocp-indent";
           sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
           name = "ocp-indent";
         };
@@ -19604,7 +19814,7 @@
           sha256 = "19fg6r7aiirfsbp2h1a824476sn1ln4nz8kvpdzkzvyf1hzx68gw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/octicons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/octicons";
           sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
           name = "octicons";
         };
@@ -19625,7 +19835,7 @@
           sha256 = "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/offlineimap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/offlineimap";
           sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
           name = "offlineimap";
         };
@@ -19646,7 +19856,7 @@
           sha256 = "1hx1yv0fd64832y15c2chz9d50hqs4ap5vry4x6745vify6mchlj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/olivetti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/olivetti";
           sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
           name = "olivetti";
         };
@@ -19667,7 +19877,7 @@
           sha256 = "07grj81alrr6qgs3jmqkjzphkvi26w6jm5hf1f5wyx7h6q293ady";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/omni-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/omni-kill";
           sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
           name = "omni-kill";
         };
@@ -19688,7 +19898,7 @@
           sha256 = "030f983n19n64f8irif102nncvam04xpx020vfgja9886wlj40pk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/omni-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/omni-log";
           sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
           name = "omni-log";
         };
@@ -19709,7 +19919,7 @@
           sha256 = "1rfs6z56pnacy6m7yvm2hrb0ykfvaiyichivcmb9ssdgqp92cbxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/omni-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/omni-scratch";
           sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
           name = "omni-scratch";
         };
@@ -19730,7 +19940,7 @@
           sha256 = "0c34rci5793hd674x2srhqvnj46llrbkrw1xpzf73s4ib5zhh7xi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/omni-tags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/omni-tags";
           sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
           name = "omni-tags";
         };
@@ -19751,7 +19961,7 @@
           sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/omnisharp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/omnisharp";
           sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
           name = "omnisharp";
         };
@@ -19781,7 +19991,7 @@
           sha256 = "119pk7gg4fw5bdvir8077ra603b5nbqvd7ph9cqrwxa056jzvry8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/opam";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/opam";
           sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
           name = "opam";
         };
@@ -19802,7 +20012,7 @@
           sha256 = "0n64l1jrrk60g192nn0240qcv2p9r138mi9gb38qq5k65wffbc21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/opencl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/opencl-mode";
           sha256 = "1g351wiaycwmg1bnf4s2mdnc3lb2ml5l54g19184xqssfqlx7y79";
           name = "opencl-mode";
         };
@@ -19823,7 +20033,7 @@
           sha256 = "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/operate-on-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/operate-on-number";
           sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
           name = "operate-on-number";
         };
@@ -19844,7 +20054,7 @@
           sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-ac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-ac";
           sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
           name = "org-ac";
         };
@@ -19865,7 +20075,7 @@
           sha256 = "0gkxxzdk8bd1yi5x9217pkq9d01ccq8znxc7h8qcw0p1336rigfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-agenda-property";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-agenda-property";
           sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
           name = "org-agenda-property";
         };
@@ -19886,7 +20096,7 @@
           sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-autolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-autolist";
           sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
           name = "org-autolist";
         };
@@ -19907,7 +20117,7 @@
           sha256 = "0j765rb2yfwnc0ri53jb8d6lxj6knpmy495bk3sd63492kdrxf93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-bookmark-heading";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-bookmark-heading";
           sha256 = "1q92rg9d945ypcpb7kig2r0cr7nb7avsylaa7nxjib25advx80n9";
           name = "org-bookmark-heading";
         };
@@ -19928,7 +20138,7 @@
           sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-bullets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-bullets";
           sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75";
           name = "org-bullets";
         };
@@ -19949,7 +20159,7 @@
           sha256 = "0cxccxz17pj67wgmyxr74n381mknqgqkyav3jkxs4ghg59g5nygl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-dp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-dp";
           sha256 = "0fnrzpgw8l0g862j20yy4mw1wfcm2i04r6dxi4yd7yay8bw2i4yq";
           name = "org-dp";
         };
@@ -19970,7 +20180,7 @@
           sha256 = "18x8c6jcqkfam79z4hskr8h1lvzvd5rlfgymmj1ps6p6hd3j4ihl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-elisp-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-elisp-help";
           sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
           name = "org-elisp-help";
         };
@@ -19991,7 +20201,7 @@
           sha256 = "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-gcal";
           sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
           name = "org-gcal";
         };
@@ -20012,7 +20222,7 @@
           sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-gnome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-gnome";
           sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
           name = "org-gnome";
         };
@@ -20033,7 +20243,7 @@
           sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-if";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-if";
           sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
           name = "org-if";
         };
@@ -20054,7 +20264,7 @@
           sha256 = "1rv1d49gc544cmzknd272x4v74kqbvccg0mf16b1jkn5h8f4jhkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-journal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-journal";
           sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b";
           name = "org-journal";
         };
@@ -20075,7 +20285,7 @@
           sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-link-travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-link-travis";
           sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
           name = "org-link-travis";
         };
@@ -20096,7 +20306,7 @@
           sha256 = "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-linkany";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-linkany";
           sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
           name = "org-linkany";
         };
@@ -20113,10 +20323,10 @@
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
           rev = "592dc2ee7e4c80b9b61efb77117c8dc22d6cefd1";
-          sha256 = "055ahg27z4y0r4nhgqdik10x91dpmfmrv1mbr7hc7xzk9cy4rf2w";
+          sha256 = "0rvsn085r1sgvv0gwvjlfgn7371bjd254hdzamc97m122pqr7cxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-mac-iCal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-mac-iCal";
           sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
           name = "org-mac-iCal";
         };
@@ -20137,7 +20347,7 @@
           sha256 = "0yxfhzygiki8sha1dddac4g72r51yi4jnga2scmk51f9jgwqbihp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-multiple-keymap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-multiple-keymap";
           sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
           name = "org-multiple-keymap";
         };
@@ -20158,7 +20368,7 @@
           sha256 = "15fy6xpz6mk4j3nkrhiqal2dp77rhxmk8a7xiw037xr1jgq9sd9a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-outlook";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-outlook";
           sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
           name = "org-outlook";
         };
@@ -20179,7 +20389,7 @@
           sha256 = "0zc20m63a1iz9aziid5jsvcbl86k9dg9js4k3almchh55az4a0i3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-page";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-page";
           sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
           name = "org-page";
         };
@@ -20200,7 +20410,7 @@
           sha256 = "14lshgyrlzjcrqdfsn17llm70ijbs86cv9mccy87vlr01rbsz6lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-pdfview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-pdfview";
           sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
           name = "org-pdfview";
         };
@@ -20221,7 +20431,7 @@
           sha256 = "1fjdza723615bhdm5x6gbd03vi7ywzpbjn8p59saimczqngfdpmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-pomodoro";
           sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
           name = "org-pomodoro";
         };
@@ -20242,7 +20452,7 @@
           sha256 = "16aq5p65q5a0an14q9xzsnkaa5bzkrwhm9cv5ljajjfcjsjcvmb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-projectile";
           sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
           name = "org-projectile";
         };
@@ -20263,7 +20473,7 @@
           sha256 = "1cxjzj955rvp0ijbp7ifpmkxdhimz8hqjw5c9gv6zwjqb5iih9ry";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-protocol-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-protocol-jekyll";
           sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
           name = "org-protocol-jekyll";
         };
@@ -20284,7 +20494,7 @@
           sha256 = "1bi09hd5m994rkqcx0a045h20419b6n4vvwiiggzsi0723dd9fb9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-random-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-random-todo";
           sha256 = "0yflppdbkfn2phd21zkjdlidzasfm846mzniay83v3akz0qx31lr";
           name = "org-random-todo";
         };
@@ -20305,7 +20515,7 @@
           sha256 = "0hhgfw0sqvl9jmmslwxn6v3dii99v09yz2h0ia5np9lzyxsc207a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-readme";
           sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
           name = "org-readme";
         };
@@ -20326,7 +20536,7 @@
           sha256 = "1iwvff3bi80xyds6xy202kfx42hv162cpcl78r88sl8j25q3jxhk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-ref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-ref";
           sha256 = "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08";
           name = "org-ref";
         };
@@ -20347,7 +20557,7 @@
           sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-repo-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-repo-todo";
           sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
           name = "org-repo-todo";
         };
@@ -20368,7 +20578,7 @@
           sha256 = "0zx9gpvm5gy9k45lbhaks9s935id727lszsh40gmpdp5zxf3rjk1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-sync";
           sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
           name = "org-sync";
         };
@@ -20389,7 +20599,7 @@
           sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-table-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-table-comment";
           sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
           name = "org-table-comment";
         };
@@ -20410,7 +20620,7 @@
           sha256 = "1qz1qhd7v6ynmvz7j1xscz85z6zwy9dcarwhbz020l4bk4g9zf94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-tfl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-tfl";
           sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf";
           name = "org-tfl";
         };
@@ -20431,7 +20641,7 @@
           sha256 = "12fksqi9flf84h1lbmbcjnqxa7dairp50wvlwfhbp1hbb8l9z63a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-themis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-themis";
           sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln";
           name = "org-themis";
         };
@@ -20452,7 +20662,7 @@
           sha256 = "09iw2jffb2qrx5r07zd1j8sk5wafamjkc2khqyfwc5kx6xyp1f46";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-time-budgets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-time-budgets";
           sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
           name = "org-time-budgets";
         };
@@ -20473,7 +20683,7 @@
           sha256 = "0qqa62fsmra6v4061kpki8wbhfcwkgnb2gzxwvnaqlcmhivksg6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-toodledo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-toodledo";
           sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
           name = "org-toodledo";
         };
@@ -20494,7 +20704,7 @@
           sha256 = "1yh4p3i0ajfnsvh057h8dpf4rqvvblmfgzj6vyn9dmcl5is1ir2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-tracktable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-tracktable";
           sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
           name = "org-tracktable";
         };
@@ -20515,7 +20725,7 @@
           sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-transform-tree-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-transform-tree-table";
           sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
           name = "org-transform-tree-table";
         };
@@ -20536,7 +20746,7 @@
           sha256 = "0aacxxwhwjzby0f9r4q0lra5lqcrw5snnm1yc63jrs6c0ifakk45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-tree-slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-tree-slide";
           sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
           name = "org-tree-slide";
         };
@@ -20549,15 +20759,15 @@
     org-trello = callPackage ({ dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
     melpaBuild {
         pname = "org-trello";
-        version = "0.7.8";
+        version = "0.7.9";
         src = fetchFromGitHub {
           owner = "org-trello";
           repo = "org-trello";
-          rev = "321a74585bceafdd82f96433e014f13b4f3fa674";
-          sha256 = "061nf6gwrzi36q3m3b1hn4bj33a6q4yic3fxdxxwvwrzi42bl74a";
+          rev = "dfb98150207b13c7771d0c0b8209e0503cd99cd6";
+          sha256 = "1d2bi29m8kxhp46slg904frgmlc6ajqagxjrhxlbdmlxrp18s44g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-trello";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-trello";
           sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i";
           name = "org-trello";
         };
@@ -20585,7 +20795,7 @@
           sha256 = "1qf4pqsg12y1qx7di0y5dp0f4slyp69h2q6y21hldzknhwxx4yy4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org-vcard";
           sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
           name = "org-vcard";
         };
@@ -20606,7 +20816,7 @@
           sha256 = "0av1477jn3s4s5kymd7sbb0av437vb5mnfc6rpfgzwji7b8mfr7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org2blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org2blog";
           sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
           name = "org2blog";
         };
@@ -20627,7 +20837,7 @@
           sha256 = "089nqbda5mg1ippqnsl5wcx9n1gpnaqhl6kz54n47kivb400bidh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/org2jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/org2jekyll";
           sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
           name = "org2jekyll";
         };
@@ -20648,7 +20858,7 @@
           sha256 = "02mxp17p7bj4xamg0m6zk832hmpqcgzc7bjbjcnvbvrawhc255hy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/orgbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/orgbox";
           sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
           name = "orgbox";
         };
@@ -20669,7 +20879,7 @@
           sha256 = "1wxxdx3c5qacsii4kysk438cjr1hnmpir78kp6xgk9xw5g9snlnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/orgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/orgit";
           sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
           name = "orgit";
         };
@@ -20682,15 +20892,15 @@
     orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "orglink";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "orglink";
-          rev = "3a0f6b12a69cc9e09285d317277b0dc6e1623f8a";
-          sha256 = "07ggg2mvvmv40h3gqlcxwrxsyrpvn2pffdjrzbh7yprm5mxynbjc";
+          rev = "4e3e6d920a74fd32a57d5722f81293428e9d8a46";
+          sha256 = "0yjnnrrcvbsq41dpw8cz8gv6q3jd626y1k4fgzsimyciz9l23w11";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/orglink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/orglink";
           sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
           name = "orglink";
         };
@@ -20711,7 +20921,7 @@
           sha256 = "0zfiq9d5jqzpmscngb1s2jgfiqmbi4dyw0fqa59v2g84gxjg793x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/orgtbl-show-header";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/orgtbl-show-header";
           sha256 = "1xgqjg3lmcczdblxaka47cc1ad8p8jhyb2nqwq0qnbqw46fqjp3k";
           name = "orgtbl-show-header";
         };
@@ -20732,7 +20942,7 @@
           sha256 = "0g1xhh88a65vcq6rlh7ii16pra4pv519ajcws0h93ldbbjiy7p0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-browse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-browse";
           sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
           name = "osx-browse";
         };
@@ -20753,7 +20963,7 @@
           sha256 = "1ykn48src7qhx9cmpjkaqsz7h36p75kkq1h9wlcpv5fhaky2d4n4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-clipboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-clipboard";
           sha256 = "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f";
           name = "osx-clipboard";
         };
@@ -20774,7 +20984,7 @@
           sha256 = "1vywqzw8hydi944q4ghgxbbvvmwfpa9wj5nmrnixfcw8h4mfcxvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-dictionary";
           sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
           name = "osx-dictionary";
         };
@@ -20795,7 +21005,7 @@
           sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-location";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-location";
           sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
           name = "osx-location";
         };
@@ -20816,7 +21026,7 @@
           sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-plist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-plist";
           sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8";
           name = "osx-plist";
         };
@@ -20837,7 +21047,7 @@
           sha256 = "1n44wdffkw14si9kb7bpkp6d9cjwjrvksfh22y9549dhs1vav6qq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/osx-trash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/osx-trash";
           sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
           name = "osx-trash";
         };
@@ -20858,7 +21068,7 @@
           sha256 = "1v9kx5xr7xcr6i664h2g6j8824yjsjdn5pvgmawvxrrplbjmiqnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/outorg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/outorg";
           sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
           name = "outorg";
         };
@@ -20879,7 +21089,7 @@
           sha256 = "1v04iyx57w8scw3iqrivii7q0sh8sa7xacswdhd18mw9kvjrbj98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/outshine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/outshine";
           sha256 = "1ajddzcrnvfgx3xa5wm0bcll9dax52syg1p521mv0ffkld63jyfl";
           name = "outshine";
         };
@@ -20900,7 +21110,7 @@
           sha256 = "0qxk2rf84j86syxi8xknsq252irwg7sz396v3bb4wqz4prpj0kzc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ov";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ov";
           sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
           name = "ov";
         };
@@ -20921,7 +21131,7 @@
           sha256 = "0jz8p6bwpfncxwi6ssmi6ngx8sjjica565i6ln0gsr5i11zfb7nx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/overseer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/overseer";
           sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
           name = "overseer";
         };
@@ -20942,7 +21152,7 @@
           sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/owdriver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/owdriver";
           sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
           name = "owdriver";
         };
@@ -20963,7 +21173,7 @@
           sha256 = "047fcvpvwzaqisw4q3p6hxgjyqsi2n9nms1qx9w4znvxrnjq8jz3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-ioslide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-ioslide";
           sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
           name = "ox-ioslide";
         };
@@ -20984,7 +21194,7 @@
           sha256 = "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
           name = "ox-pandoc";
         };
@@ -21005,7 +21215,7 @@
           sha256 = "08dw3h1417cr6ddd8gl8zcd11pxqpmkd67bknzhjpj7bbqznfqwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ox-twbs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ox-twbs";
           sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
           name = "ox-twbs";
         };
@@ -21026,7 +21236,7 @@
           sha256 = "073qpa223ja673p63mhvy4l6yyv3k7z05ifwvn7bmq4b5fq42hw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pabbrev";
           sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
           name = "pabbrev";
         };
@@ -21047,7 +21257,7 @@
           sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/package+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/package+";
           sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
           name = "package-plus";
         };
@@ -21068,7 +21278,7 @@
           sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/package-safe-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/package-safe-delete";
           sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
           name = "package-safe-delete";
         };
@@ -21089,7 +21299,7 @@
           sha256 = "0fs0a274c7sxldjj0m8wfx9vx7fkq41wngsvk8drzc38qa965vs0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/package-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
           name = "package-utils";
         };
@@ -21110,7 +21320,7 @@
           sha256 = "1kjcb6z08bj5ysxrykgz3x6bz2122yycpjhbv875ppc5ihls88xl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/packed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/packed";
           sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
           name = "packed";
         };
@@ -21131,7 +21341,7 @@
           sha256 = "1acz3w2zdcds0h6p2k9h3lmjsk519asqrxjw7f3pyrcq7x2qbhc4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/page-break-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/page-break-lines";
           sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
           name = "page-break-lines";
         };
@@ -21152,7 +21362,7 @@
           sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pallet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pallet";
           sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
           name = "pallet";
         };
@@ -21162,6 +21372,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pandoc";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "pandoc.el";
+          rev = "0f59533bbd8494fea3172551efb6ec49f61ba285";
+          sha256 = "0xqd64k8liaywsf65apj5xmf7ip6sikjmpc4740nld8iywhq8gf4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pandoc";
+          sha256 = "0x81anxam7agr2v2zqgc331zs5s5zxcw54kzpanndda23n51h5cc";
+          name = "pandoc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/pandoc";
+          license = lib.licenses.free;
+        };
+      }) {};
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
@@ -21173,7 +21404,7 @@
           sha256 = "17ibs2szjvy4ar4gidlyg6w20926fr1z59m851akghiwf4aqly7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pandoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pandoc-mode";
           sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
           name = "pandoc-mode";
         };
@@ -21194,7 +21425,7 @@
           sha256 = "0gmdzagyg0p7q1gyj2a3aqp2g4asljpib3n67nikr0v99c2mki5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pangu-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pangu-spacing";
           sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
           name = "pangu-spacing";
         };
@@ -21215,7 +21446,7 @@
           sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paper-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paper-theme";
           sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
           name = "paper-theme";
         };
@@ -21236,7 +21467,7 @@
           sha256 = "1vq3xjllgvzwp18mv2y1qydbbl6j1nk58vw7sm99zsf3wdpls465";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paradox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paradox";
           sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
           name = "paradox";
         };
@@ -21255,7 +21486,7 @@
           sha256 = "13wzz5fahbz5svc4ql3ajzzpd1fv0ynwpa5widklbcp5yqncv1vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paredit";
           sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
           name = "paredit";
         };
@@ -21276,7 +21507,7 @@
           sha256 = "0jbjwjl92pf0kih3p2x20ms2kpyzzam8fir661nimpmk802ahgkj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paredit-everywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paredit-everywhere";
           sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
           name = "paredit-everywhere";
         };
@@ -21297,7 +21528,7 @@
           sha256 = "0f128gqn170s6hl62n44i9asais75ns1mpvb4l8vzy1sc0v16c0k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paren-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paren-face";
           sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
           name = "paren-face";
         };
@@ -21318,7 +21549,7 @@
           sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/parent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/parent-mode";
           sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
           name = "parent-mode";
         };
@@ -21339,7 +21570,7 @@
           sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/parsebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/parsebib";
           sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
           name = "parsebib";
         };
@@ -21360,7 +21591,7 @@
           sha256 = "18m0973l670cjbzpa1vfv06gymhsa2f1pjcp329s0npb735x5whj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pass";
           sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
           name = "pass";
         };
@@ -21381,7 +21612,7 @@
           sha256 = "1g0mvg9i8f2qccb4b0m4d74zkjx9gjfv47x57by6cdaf9yywqryi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/passthword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/passthword";
           sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
           name = "passthword";
         };
@@ -21398,10 +21629,10 @@
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
           rev = "1aac79d9617431bbaf218f9a9d270929762d2816";
-          sha256 = "0c5yjjvvlrcny13sg5kaadbqnc2wdcc2qrxn11gc70q9awv0n7gp";
+          sha256 = "0zlhiqhx19dpmxvcczhif5c8acj911p61plsp0gdmamkpbxmkbjv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/password-store";
           sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
           name = "password-store";
         };
@@ -21422,7 +21653,7 @@
           sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pastehub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pastehub";
           sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
           name = "pastehub";
         };
@@ -21443,7 +21674,7 @@
           sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pastelmac-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pastelmac-theme";
           sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
           name = "pastelmac-theme";
         };
@@ -21464,7 +21695,7 @@
           sha256 = "1brdyrp2sz1pszdfr6f4w94qxk5lrd6kphc1xa5pywfns14c9386";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pathify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pathify";
           sha256 = "1z970xnzbhmfikj1rkfx24jvwc7f1xxw6hk7kmahxvphjxrvgc2f";
           name = "pathify";
         };
@@ -21485,7 +21716,7 @@
           sha256 = "0kkgqaxyrv65rfg2ng1vmmmrc9bm98yqpsv2pcb760287dn0l27m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/paxedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/paxedit";
           sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
           name = "paxedit";
         };
@@ -21506,7 +21737,7 @@
           sha256 = "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pcache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pcache";
           sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
           name = "pcache";
         };
@@ -21527,7 +21758,7 @@
           sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pcomplete-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pcomplete-extension";
           sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
           name = "pcomplete-extension";
         };
@@ -21548,7 +21779,7 @@
           sha256 = "1dpfhrxbaqpgjzac3m9hclbzlnrxq9b8bx6za53aqvml72yzxc6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pcre2el";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pcre2el";
           sha256 = "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3";
           name = "pcre2el";
         };
@@ -21569,7 +21800,7 @@
           sha256 = "03k3xhrim4s3yvbnl8g8ci5g7chlffycdw7d6a1pz3077mxf1f1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pcsv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pcsv";
           sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
           name = "pcsv";
         };
@@ -21590,7 +21821,7 @@
           sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pdf-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pdf-tools";
           sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
           name = "pdf-tools";
         };
@@ -21611,7 +21842,7 @@
           sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/peg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/peg";
           sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
           name = "peg";
         };
@@ -21631,7 +21862,7 @@
           sha256 = "0w02l91x624cgzdg33a9spgcwy12m607dsfnr1xbc1fi08np4sd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/per-buffer-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/per-buffer-theme";
           sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
           name = "per-buffer-theme";
         };
@@ -21652,7 +21883,7 @@
           sha256 = "0j72rqd96dz9pp9zwc88q3358m4b891dg0szmbyvs4myp3yandz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/persistent-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/persistent-scratch";
           sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
           name = "persistent-scratch";
         };
@@ -21673,7 +21904,7 @@
           sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/persistent-soft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/persistent-soft";
           sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
           name = "persistent-soft";
         };
@@ -21694,7 +21925,7 @@
           sha256 = "090b73969namf3h7pbf8xc969dygj3frzlkf0h2x29wl1fmag5kr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/persp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/persp-mode";
           sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
           name = "persp-mode";
         };
@@ -21715,7 +21946,7 @@
           sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/perspective";
           sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
           name = "perspective";
         };
@@ -21736,7 +21967,7 @@
           sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ph";
           sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
           name = "ph";
         };
@@ -21757,7 +21988,7 @@
           sha256 = "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phi-search-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phi-search-mc";
           sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
           name = "phi-search-mc";
         };
@@ -21778,7 +22009,7 @@
           sha256 = "0zs11811kx6x1zgc1icd8gw420saa7z6zshpzmrddnbznya4qql6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/php-auto-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/php-auto-yasnippets";
           sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
           name = "php-auto-yasnippets";
         };
@@ -21799,7 +22030,7 @@
           sha256 = "0pwhw59ki19f9rkgvvnjzhby67s0y9hpsrg6cwqxakjlm66w96q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/php-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/php-mode";
           sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
           name = "php-mode";
         };
@@ -21820,7 +22051,7 @@
           sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phpcbf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phpcbf";
           sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
           name = "phpcbf";
         };
@@ -21841,7 +22072,7 @@
           sha256 = "1pmds2g7y1pcs3ivsd68zg30ih34janib0ydz4wr0mci3q52cjpy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/phpunit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/phpunit";
           sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
           name = "phpunit";
         };
@@ -21862,7 +22093,7 @@
           sha256 = "19i8hgzr7kdj4skf0cnv6vlsklq9qcyxcv3p33k9vgq7y4f9mah8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pillar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pillar";
           sha256 = "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js";
           name = "pillar";
         };
@@ -21883,7 +22114,7 @@
           sha256 = "12jhdkgfck2a6d5jj65l9d98dm34gsyi0ya4h21dbbvz35zivz70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pinyin-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pinyin-search";
           sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
           name = "pinyin-search";
         };
@@ -21904,7 +22135,7 @@
           sha256 = "13q95z0j1mpk2yrrq0amc2jjhajaz4884bfliy2h8adh109j4q1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pinyinlib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pinyinlib";
           sha256 = "0kv67qa3825fw64qimkph2b65pilrsx5730y4c7f7c1f8giz5vxr";
           name = "pinyinlib";
         };
@@ -21925,7 +22156,7 @@
           sha256 = "1dsg49156mfhkd8ip4ny03sc06zchxr1qpbcx48f5sn4m9j5d3vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pip-requirements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pip-requirements";
           sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
           name = "pip-requirements";
         };
@@ -21946,7 +22177,7 @@
           sha256 = "1wg8pcwd70ixn2bxh01934zl12ry4pgx3l9dccpbjdi40gira00d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pixiv-novel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pixiv-novel-mode";
           sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
           name = "pixiv-novel-mode";
         };
@@ -21967,7 +22198,7 @@
           sha256 = "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pkg-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pkg-info";
           sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
           name = "pkg-info";
         };
@@ -21988,7 +22219,7 @@
           sha256 = "0a8qb1ldk6bjs7fpxgxrf90md7q46fhl71gmay8yafdkh6hn0kqr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pkgbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pkgbuild-mode";
           sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
           name = "pkgbuild-mode";
         };
@@ -22009,7 +22240,7 @@
           sha256 = "1nznbkl06cdq4pyqmvkp9jynsjibn0fd6ai4mggz6ggcwzcixbf0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/platformio-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/platformio-mode";
           sha256 = "1v1pp3365wj19a5wmsxyyy5n548z3lmcbm2pwl914wip3ca7546f";
           name = "platformio-mode";
         };
@@ -22030,7 +22261,7 @@
           sha256 = "0slfaclbhjm5paw8l7rr3y9xxjyhkizp9lwyvlgpkd38n4pgj2bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/play-routes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/play-routes-mode";
           sha256 = "17phqil2zf5rfvhs5v743dh4lix4v2azbf33z9n97ahs7j66y2gz";
           name = "play-routes-mode";
         };
@@ -22051,7 +22282,7 @@
           sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/plenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/plenv";
           sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
           name = "plenv";
         };
@@ -22072,7 +22303,7 @@
           sha256 = "0f00dv5jwbhs99j4jc6lvr5n0mv1y80yg7zpp6yrmhww6829l5rg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/plsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/plsense";
           sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
           name = "plsense";
         };
@@ -22093,7 +22324,7 @@
           sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/plsense-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/plsense-direx";
           sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
           name = "plsense-direx";
         };
@@ -22114,7 +22345,7 @@
           sha256 = "0qlxj19hj96l4lw81xh5r14ppf6kp63clikk060s9yw00q7gnl6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/plur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/plur";
           sha256 = "0nf1dc7xf2zp316rssnz8sv374akcr54hp0rb219qvgyck9bdqiv";
           name = "plur";
         };
@@ -22135,7 +22366,7 @@
           sha256 = "0xjvxfkrl6wl31s7rvbv9zczn6d6i9vf20waqlr3c2ff3zy55ygy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pony-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pony-snippets";
           sha256 = "12ygvpfkzldq6s4mwbrxs4x9927i7pa7ywn7lf1r3gg4h29ar9gn";
           name = "pony-snippets";
         };
@@ -22156,7 +22387,7 @@
           sha256 = "0by7klp7imy7zgc37wsiil86y6i2h1wfwfyifc2cf0jn5dsvfikw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ponylang-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ponylang-mode";
           sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1";
           name = "ponylang-mode";
         };
@@ -22177,7 +22408,7 @@
           sha256 = "18i0kivn6prh5pwdr7b4pxfxqsc8l4mks1h6cfs7iwnfn15g5k19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pophint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pophint";
           sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
           name = "pophint";
         };
@@ -22198,7 +22429,7 @@
           sha256 = "1y538siabcf1n00wr4iz5gbxfndw661kx2mn9w1g4lg7yi4n0h0h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/popup";
           sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
           name = "popup";
         };
@@ -22219,7 +22450,7 @@
           sha256 = "084hb3zn1aiabbyxgaalszb2qjf9z64z960ks5fvz8nh7n6y7ny4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/popup-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/popup-complete";
           sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
           name = "popup-complete";
         };
@@ -22240,7 +22471,7 @@
           sha256 = "19mqzfpki2zlnibp2vzymhdld1m20jinxwgdhmbl6zdfx74zbz7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/popup-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/popup-imenu";
           sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
           name = "popup-imenu";
         };
@@ -22261,7 +22492,7 @@
           sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/popwin";
           sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
           name = "popwin";
         };
@@ -22282,7 +22513,7 @@
           sha256 = "0w8bnspnk871qndp18hs0wk4x9x31xr9rwbvf5dc8mcbnj29ch33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pos-tip";
           sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
           name = "pos-tip";
         };
@@ -22303,7 +22534,7 @@
           sha256 = "1nx3b24i26kgm52xw21x4m15qjkxw3sg5r6qyvck0fyhj0gw69gr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/powerline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/powerline";
           sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
           name = "powerline";
         };
@@ -22324,7 +22555,7 @@
           sha256 = "010b151wblgxlfpy590yanbl2r8qhpbqgi02v0pyir340frm9ngn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/powershell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/powershell";
           sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
           name = "powershell";
         };
@@ -22345,7 +22576,7 @@
           sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ppd-sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ppd-sr-speedbar";
           sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
           name = "ppd-sr-speedbar";
         };
@@ -22366,7 +22597,7 @@
           sha256 = "013fig9i4fyx16krp2vfv953p3rwdzr38zs6i50af4pqz4vrcfvh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pretty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pretty-mode";
           sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
           name = "pretty-mode";
         };
@@ -22387,7 +22618,7 @@
           sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/processing-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/processing-mode";
           sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
           name = "processing-mode";
         };
@@ -22408,7 +22639,7 @@
           sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/processing-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/processing-snippets";
           sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
           name = "processing-snippets";
         };
@@ -22429,7 +22660,7 @@
           sha256 = "0r32rjfsbna0g2376gdv0c0im1lzw1cwbp9690rgqjj95ls4saa3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/prodigy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/prodigy";
           sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
           name = "prodigy";
         };
@@ -22450,7 +22681,7 @@
           sha256 = "1hv8ifrpwn434sm41vkgbwni21ma5kfybkwasi6zp0f2b5i9ziw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/project-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/project-explorer";
           sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
           name = "project-explorer";
         };
@@ -22471,7 +22702,7 @@
           sha256 = "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/project-persist";
           sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
           name = "project-persist";
         };
@@ -22492,7 +22723,7 @@
           sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/project-persist-drawer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/project-persist-drawer";
           sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
           name = "project-persist-drawer";
         };
@@ -22512,7 +22743,7 @@
           sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/project-root";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/project-root";
           sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
           name = "project-root";
         };
@@ -22533,7 +22764,7 @@
           sha256 = "1rl6n6v9f4m7m969frx8b51a4lzfix2bxx6rfcfbh6kzhc00qnxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
           name = "projectile";
         };
@@ -22554,7 +22785,7 @@
           sha256 = "0g4slcaj5waka5sz0plnn0clnl9750wzj3bi7zfcycb2g7xhncwg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projectile-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projectile-rails";
           sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
           name = "projectile-rails";
         };
@@ -22575,7 +22806,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projectile-sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projectile-sift";
           sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
           name = "projectile-sift";
         };
@@ -22596,7 +22827,7 @@
           sha256 = "1rw55w2fpb3rw7j136kclkhppz21f7d7di4cvlv7zj5zpdl5zz88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/projekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/projekt";
           sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
           name = "projekt";
         };
@@ -22617,7 +22848,7 @@
           sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/prompt-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/prompt-text";
           sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
           name = "prompt-text";
         };
@@ -22638,7 +22869,7 @@
           sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/prop-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/prop-menu";
           sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
           name = "prop-menu";
         };
@@ -22659,7 +22890,7 @@
           sha256 = "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/protobuf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/protobuf-mode";
           sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
           name = "protobuf-mode";
         };
@@ -22680,7 +22911,7 @@
           sha256 = "0wgxrwl7dpy084sc76wiwpixycb171g7xwc66m5gnlrv79qyac73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/psci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/psci";
           sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
           name = "psci";
         };
@@ -22701,7 +22932,7 @@
           sha256 = "0msa8c29djhy5h3zpdvx25f4y1c50rgsk8iz6r127psrxdlfrvg8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/psession";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/psession";
           sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
           name = "psession";
         };
@@ -22722,7 +22953,7 @@
           sha256 = "0mnxvh5yd8v8a5mfi53isknc88kv2kdjjv0qffblz0sgshkpl30x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/psysh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/psysh";
           sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5";
           name = "psysh";
         };
@@ -22743,7 +22974,7 @@
           sha256 = "1p0k770h96iw8bxm8ssi0a91m050s615q036870lrlsz35mzc5kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pt";
           sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
           name = "pt";
         };
@@ -22764,7 +22995,7 @@
           sha256 = "1wiiarxh0lcxvy56f1rxdbk1iwhdynl2xn6v8nr35bw1l82b1j9g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pug-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pug-mode";
           sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85";
           name = "pug-mode";
         };
@@ -22785,7 +23016,7 @@
           sha256 = "19bcf3wbmp186yxvrdsm2ax4npvi2x0id94zi13pdnw4cz7zch3v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/puml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/puml-mode";
           sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
           name = "puml-mode";
         };
@@ -22806,7 +23037,7 @@
           sha256 = "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/punctuality-logger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/punctuality-logger";
           sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
           name = "punctuality-logger";
         };
@@ -22827,7 +23058,7 @@
           sha256 = "012lv7hrwlhvins81vw3yjkhdwbpi6g1dx55i101qyrpzv5ifngm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pungi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pungi";
           sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
           name = "pungi";
         };
@@ -22848,7 +23079,7 @@
           sha256 = "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/puppet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/puppet-mode";
           sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
           name = "puppet-mode";
         };
@@ -22869,7 +23100,7 @@
           sha256 = "1wk319akv0scvyyjsd48pisi2i1gkahhsan9hfszrs6xx3anvfd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/purescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/purescript-mode";
           sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
           name = "purescript-mode";
         };
@@ -22890,7 +23121,7 @@
           sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pushbullet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pushbullet";
           sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
           name = "pushbullet";
         };
@@ -22911,7 +23142,7 @@
           sha256 = "06xdq2slwhkcqlbv7x86zmv55drzif9cwjlj543cwhncphl2x9rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/py-autopep8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/py-autopep8";
           sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
           name = "py-autopep8";
         };
@@ -22932,7 +23163,7 @@
           sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/py-isort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/py-isort";
           sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
           name = "py-isort";
         };
@@ -22953,7 +23184,7 @@
           sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/py-yapf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/py-yapf";
           sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
           name = "py-yapf";
         };
@@ -22974,7 +23205,7 @@
           sha256 = "0qg1kjzsv2mcvlsivqy8ys3djbs5yala37r9h2zcxdicl88q0l11";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pycarddavel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pycarddavel";
           sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
           name = "pycarddavel";
         };
@@ -22995,7 +23226,7 @@
           sha256 = "1y3q1k195wp2kgp00a1y34i20zm80wdv2kxigh6gbn2r6qzkqrar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pyenv-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pyenv-mode";
           sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
           name = "pyenv-mode";
         };
@@ -23016,7 +23247,7 @@
           sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/python-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/python-environment";
           sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
           name = "python-environment";
         };
@@ -23037,7 +23268,7 @@
           sha256 = "00i7cc4r7275l22k3708xi4hqw2j44yivdb1madzrpf314v3kabr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/python-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/python-x";
           sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
           name = "python-x";
         };
@@ -23058,7 +23289,7 @@
           sha256 = "1af9cd8l5ac58mj92xc7a3diy995cv29abnbb3fl6x4208l4xs3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pythonic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pythonic";
           sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
           name = "pythonic";
         };
@@ -23079,7 +23310,7 @@
           sha256 = "0jidmc608amd0chs4598zkj0nvyll0al093121hkczsbpgbllq9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/pyvenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/pyvenv";
           sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
           name = "pyvenv";
         };
@@ -23100,7 +23331,7 @@
           sha256 = "110z27n3h7p2yalicfhnv832ikfcf7p0hrf5qkryz1sdmz79wb3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/qiita";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/qiita";
           sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
           name = "qiita";
         };
@@ -23121,7 +23352,7 @@
           sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/qml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/qml-mode";
           sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
           name = "qml-mode";
         };
@@ -23142,7 +23373,7 @@
           sha256 = "0lfmdlb626b3gbmlvacwn84vpqam6gk9lp29wk0hcraw69vaw1v8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/quasi-monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/quasi-monochrome-theme";
           sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
           name = "quasi-monochrome-theme";
         };
@@ -23163,7 +23394,7 @@
           sha256 = "1iypwvdgdh30c9br7jnibgwbdca2mqjy95x2ppsc51sik2mz2db1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/quickrun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/quickrun";
           sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy";
           name = "quickrun";
         };
@@ -23184,7 +23415,7 @@
           sha256 = "02bddznlqys37fnhdpp2g9xa9m7kfgrj1vl0hc5kr42hggk9wwmg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/r-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/r-autoyas";
           sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
           name = "r-autoyas";
         };
@@ -23205,7 +23436,7 @@
           sha256 = "1r1gq6b33iv5a3kf96s73xp5y7yw2lq36cczmwbb9ix5bh5jhcyk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/racer";
           sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
           name = "racer";
         };
@@ -23226,7 +23457,7 @@
           sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rainbow-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rainbow-blocks";
           sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
           name = "rainbow-blocks";
         };
@@ -23247,7 +23478,7 @@
           sha256 = "0vs9pf8lqq5p5qz1770pxgw47ym4xj8axxmwamn66br59mykdhv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rainbow-delimiters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rainbow-delimiters";
           sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
           name = "rainbow-delimiters";
         };
@@ -23268,7 +23499,7 @@
           sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rainbow-identifiers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rainbow-identifiers";
           sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
           name = "rainbow-identifiers";
         };
@@ -23289,7 +23520,7 @@
           sha256 = "1q65jj6bghvzhlqmpg61a7vn8izc01wp2fjiqx013zxpg9awvzmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rake";
           sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
           name = "rake";
         };
@@ -23310,7 +23541,7 @@
           sha256 = "1r2k9s46njys2acacwk57mkr9szbpxz93xd4rnjf5gx551khlhjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ranger";
           sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
           name = "ranger";
         };
@@ -23331,7 +23562,7 @@
           sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rase";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rase";
           sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
           name = "rase";
         };
@@ -23352,7 +23583,7 @@
           sha256 = "0rwgwz1x9w447y8mxy9hrx1rzi3ac9dwk2y5yg1p08z5b7dy6vcz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rats";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rats";
           sha256 = "0jhwiq9yzwpyqhk3c32vqx8nryingzh58psxbzjl3812b7xdqphr";
           name = "rats";
         };
@@ -23373,7 +23604,7 @@
           sha256 = "09c6v4lnv6vm2cckbdpx2fdi9xkz9l68qvhx35vaawxhrkgvypzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rbenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rbenv";
           sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
           name = "rbenv";
         };
@@ -23394,7 +23625,7 @@
           sha256 = "1kwn33rxaqik5jls66c2indvswhwmxdmd60n7a1h9siqm5qhy9d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rcirc-styles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rcirc-styles";
           sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
           name = "rcirc-styles";
         };
@@ -23415,7 +23646,7 @@
           sha256 = "1hn5x6kw7xh5wnpwr862584h4vrmvd36vjbshcgwng1qj486m3as";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rdf-prefix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rdf-prefix";
           sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
           name = "rdf-prefix";
         };
@@ -23436,7 +23667,7 @@
           sha256 = "1ka5q2q18hgh7wl5yn04489121bq4nx369rz8nb7dr5l14cas0xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/real-auto-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/real-auto-save";
           sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
           name = "real-auto-save";
         };
@@ -23457,7 +23688,7 @@
           sha256 = "07j1grdbqv3iv5ghmgsjw678bxjajcxi27clz4krcz3ys5b1h70v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/realgud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/realgud";
           sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15";
           name = "realgud";
         };
@@ -23478,7 +23709,7 @@
           sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/recover-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/recover-buffers";
           sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
           name = "recover-buffers";
         };
@@ -23499,7 +23730,7 @@
           sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rect+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rect+";
           sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
           name = "rect-plus";
         };
@@ -23520,7 +23751,7 @@
           sha256 = "048pjrd04w6w4v6r56yblbqgkjh01xib7k1i6rjc6288jh5vr1vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rectangle-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rectangle-utils";
           sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
           name = "rectangle-utils";
         };
@@ -23541,7 +23772,7 @@
           sha256 = "1j9zvkfxccwzr8adxikw450xv0kc2a4j8rskbfqlmsylrpniszqm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/redpen-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/redpen-paragraph";
           sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
           name = "redpen-paragraph";
         };
@@ -23562,7 +23793,7 @@
           sha256 = "0q4a4iznk6xk680xnvly69j8w1dac79qxlycwrfki6msnkagyn9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/redtick";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/redtick";
           sha256 = "1a9rviz0hg6vlh2jc04g6vslyf9n89xglcz9cb79vf10hhr6igrb";
           name = "redtick";
         };
@@ -23583,7 +23814,7 @@
           sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/relative-line-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/relative-line-numbers";
           sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
           name = "relative-line-numbers";
         };
@@ -23604,7 +23835,7 @@
           sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/relax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/relax";
           sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
           name = "relax";
         };
@@ -23625,7 +23856,7 @@
           sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/repeatable-motion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/repeatable-motion";
           sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
           name = "repeatable-motion";
         };
@@ -23646,7 +23877,7 @@
           sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/repl-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/repl-toggle";
           sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
           name = "repl-toggle";
         };
@@ -23667,7 +23898,7 @@
           sha256 = "178y1cmpdb2r72igx8j4l7pyhs1idw56j6hg5h8r9a2p99lkgjjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/replace-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/replace-symbol";
           sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
           name = "replace-symbol";
         };
@@ -23688,7 +23919,7 @@
           sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/repo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/repo";
           sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
           name = "repo";
         };
@@ -23709,7 +23940,7 @@
           sha256 = "1xzp2hnkr9lsjx50cxlpki9mvyhjsv0vyc77480jrlnpspakj7qs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/req-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/req-package";
           sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
           name = "req-package";
         };
@@ -23730,7 +23961,7 @@
           sha256 = "0rpw9is8sx2gmbc7l6mv5qdd0jrh497lyj5f0zx0lqwjl8imw401";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/request";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/request";
           sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji";
           name = "request";
         };
@@ -23751,7 +23982,7 @@
           sha256 = "0rpw9is8sx2gmbc7l6mv5qdd0jrh497lyj5f0zx0lqwjl8imw401";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/request-deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/request-deferred";
           sha256 = "1dcxqnzmvddk61dzmfx8vjbzd8m44lscr3pjdp3r7211zhwfk40n";
           name = "request-deferred";
         };
@@ -23772,7 +24003,7 @@
           sha256 = "1b832r7779rmr6rhzj7klc0l5xzwc4rids87g2hczpb5dhqnchca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/requirejs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/requirejs";
           sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
           name = "requirejs";
         };
@@ -23793,7 +24024,7 @@
           sha256 = "1ps9l6q6hgzzaywkig0gjjdlsir9avxghynzx9a3q6h0fpdkpgrj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/resize-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
           name = "resize-window";
         };
@@ -23814,7 +24045,7 @@
           sha256 = "0y4ga1lj2x2f0r535ivs09m2l0q76iz72w42wknhsw9lmdsyl5nz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/restart-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/restart-emacs";
           sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
           name = "restart-emacs";
         };
@@ -23835,7 +24066,7 @@
           sha256 = "1z4ackggrw428f9f7bd02by4fw34bwndv2i4v7cj80c533mfwy9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/restclient-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/restclient-test";
           sha256 = "0g26z5p9fq7fm6bgrwaszya5xmhsgzcn1p7zqr83w74fbw6bcl39";
           name = "restclient-test";
         };
@@ -23856,7 +24087,7 @@
           sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/reveal-in-osx-finder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/reveal-in-osx-finder";
           sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
           name = "reveal-in-osx-finder";
         };
@@ -23877,7 +24108,7 @@
           sha256 = "15xnz4fi22wsximimwmirlz11v4ksfj8nilyjfw6acd92yrhzg6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/reverse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/reverse-theme";
           sha256 = "163kk5qnz9bk3l2fam79n264s764jfxbwqbiwgid8kw9cmk0v776";
           name = "reverse-theme";
         };
@@ -23898,7 +24129,7 @@
           sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rich-minority";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rich-minority";
           sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
           name = "rich-minority";
         };
@@ -23919,7 +24150,7 @@
           sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rigid-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rigid-tabs";
           sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
           name = "rigid-tabs";
         };
@@ -23940,7 +24171,7 @@
           sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rinari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rinari";
           sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
           name = "rinari";
         };
@@ -23961,7 +24192,7 @@
           sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rnc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rnc-mode";
           sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q";
           name = "rnc-mode";
         };
@@ -23982,7 +24213,7 @@
           sha256 = "01xd3nc7bmf4r4d37x08rw2dlsg6gns8mraahi4rwkg6a9lwl44n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/robe";
           sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
           name = "robe";
         };
@@ -24003,7 +24234,7 @@
           sha256 = "0dimmdz4aqcif4lp23nqxfg7kngzym2yivn6h3p7bn1821vgzq9s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/robots-txt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/robots-txt-mode";
           sha256 = "1q3fqaf9nysy9bhx4h9idgshxr65hfwnx05vlwazx7jd6bq6kxfh";
           name = "robots-txt-mode";
         };
@@ -24024,7 +24255,7 @@
           sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/roguel-ike";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/roguel-ike";
           sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
           name = "roguel-ike";
         };
@@ -24045,7 +24276,7 @@
           sha256 = "0x3mmf4gq4d0cqfqbkrrpwhayvmplacck0zc9nlzcn35y17jzpcz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rope-read-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rope-read-mode";
           sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
           name = "rope-read-mode";
         };
@@ -24066,7 +24297,7 @@
           sha256 = "0mfkq8n28lal4lqwp6v0ilz8wrwgg61sbm0jggznwisjqqy3lzrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rsense";
           sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
           name = "rsense";
         };
@@ -24087,7 +24318,7 @@
           sha256 = "0hrn5n7aaymwimk511kjij44vqaxbmhly1gwmlmsrnbvvma7f2mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rspec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rspec-mode";
           sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
           name = "rspec-mode";
         };
@@ -24108,7 +24339,7 @@
           sha256 = "0pir76xhi58nqfmjcijn5s7dz3pjjz43g97hh7sd1m32s8saddm1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rtags";
           sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
           name = "rtags";
         };
@@ -24129,7 +24360,7 @@
           sha256 = "10djjp1520xc05qkciaiaiiciscaln6c74h7ymba40mvzlf67y9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rubocop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rubocop";
           sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
           name = "rubocop";
         };
@@ -24150,7 +24381,7 @@
           sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-compilation";
           sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
           name = "ruby-compilation";
         };
@@ -24171,7 +24402,7 @@
           sha256 = "1cpz9vkp57nk682c5xm20g7bfj5g2aq5ahpk4nhgx7pvd3xvr1ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-end";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-end";
           sha256 = "1cnmdlkhm8xsifbjs6ymvi92gdnxiaghb04h10qg41phj6v7m9mg";
           name = "ruby-end";
         };
@@ -24192,7 +24423,7 @@
           sha256 = "01n9j7sag49m4bdl6065jklnxnc5kck51izg884s1is459qgy86k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-hash-syntax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-hash-syntax";
           sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
           name = "ruby-hash-syntax";
         };
@@ -24213,7 +24444,7 @@
           sha256 = "008zj9rg2cmh0xd7g6kgx6snm5sspxs4jmfa8hd43wx5y9pmlb8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-test-mode";
           sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
           name = "ruby-test-mode";
         };
@@ -24234,7 +24465,7 @@
           sha256 = "1zvhq9l717rjgkm7bxz5gqkmh5i49cshwzlimb3h78kpjw3hxl2k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ruby-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ruby-tools";
           sha256 = "0zpk55rkrqyangyyljxzf0n1icgqnpdzycwack5rji556h5grvjy";
           name = "ruby-tools";
         };
@@ -24255,7 +24486,7 @@
           sha256 = "1v2qr58n0rfb21dzcw6vlxwpvpmwnmgwrk32mzw32k08yappqjn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/runner";
           sha256 = "09apmk22swj05z77ziij31jj6b3g221qv3mw3mymffzxn5ap2rbx";
           name = "runner";
         };
@@ -24276,7 +24507,7 @@
           sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/rvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/rvm";
           sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
           name = "rvm";
         };
@@ -24297,7 +24528,7 @@
           sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/s";
           sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
           name = "s";
         };
@@ -24318,7 +24549,7 @@
           sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sackspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sackspace";
           sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
           name = "sackspace";
         };
@@ -24339,7 +24570,7 @@
           sha256 = "1124akipvrcmkd66slklgap2jdvb8iksldd8sjvg9n25kp0wd0vr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sage-shell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sage-shell-mode";
           sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx";
           name = "sage-shell-mode";
         };
@@ -24360,7 +24591,7 @@
           sha256 = "0lxrq3mzabkwj5bv0mgd7fnx3dsx8vxd5kjgb79rjfra0m7pfgln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sass-mode";
           sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
           name = "sass-mode";
         };
@@ -24381,7 +24612,7 @@
           sha256 = "1mcag7qad1npjn096byakb8pmmi2g64nlf2vcc12irzmwia85fml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sauron";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sauron";
           sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
           name = "sauron";
         };
@@ -24402,7 +24633,7 @@
           sha256 = "1gkzgcnh5ib4j5206mx8gbwj5ykay19vqlfg9070m2r09d1a55qf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/say-what-im-doing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/say-what-im-doing";
           sha256 = "1hgh842f7gs2sxy7s6zq57nsqy4jjlnjcga6hwzcx0kw3albgz7x";
           name = "say-what-im-doing";
         };
@@ -24423,7 +24654,7 @@
           sha256 = "1lvf7y1n63p8jvnp6ppwmxq2s6h9sk45319576f3s28ixsfa6cp2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sbt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sbt-mode";
           sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
           name = "sbt-mode";
         };
@@ -24444,7 +24675,7 @@
           sha256 = "1ayqdmnp38wvhi3a8r8wivn4z8v6irbz0kwqvgsnpq6m2s3jsbz9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scala-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scala-mode";
           sha256 = "12x377iw085fbkjb034dmcsbi7hma17zkkmbgrhkvfkz8pbgaic8";
           name = "scala-mode";
         };
@@ -24465,7 +24696,7 @@
           sha256 = "13s8hp16wxd9fb8gf05dn0xr692kkgiqg7v49fgr00gas4xgpfpm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scpaste";
           sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
           name = "scpaste";
         };
@@ -24486,7 +24717,7 @@
           sha256 = "0zpjf9cp8g4rgnwgmhlpwnanf9lzqm3rm1mkihf0gk5qzxvwsdh9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/scss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/scss-mode";
           sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
           name = "scss-mode";
         };
@@ -24507,7 +24738,7 @@
           sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/search-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/search-web";
           sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
           name = "search-web";
         };
@@ -24528,7 +24759,7 @@
           sha256 = "0nsm7z056rh32sq7abgdwyaz4dbz8v9pgbha5jvpk7y0zmnabrgs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sekka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sekka";
           sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
           name = "sekka";
         };
@@ -24549,7 +24780,7 @@
           sha256 = "1c9yv1kjcd0jrzgw99q9p4kzj980f261mjcsggbcw806wb0iw1xn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/select-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/select-themes";
           sha256 = "18ydv7240vcqppg1i7n8sy18hy0lhpxz17947kxs7mvj4rl4wd84";
           name = "select-themes";
         };
@@ -24570,7 +24801,7 @@
           sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/selectric-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/selectric-mode";
           sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
           name = "selectric-mode";
         };
@@ -24591,7 +24822,7 @@
           sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/servant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/servant";
           sha256 = "0h8xsg37cvc5r8vkclf7d3gbf6gh4k5pmbiyhwpkbrxwjyl1sl21";
           name = "servant";
         };
@@ -24612,7 +24843,7 @@
           sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/serverspec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/serverspec";
           sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
           name = "serverspec";
         };
@@ -24633,7 +24864,7 @@
           sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/session";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/session";
           sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
           name = "session";
         };
@@ -24654,7 +24885,7 @@
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sexp-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sexp-move";
           sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
           name = "sexp-move";
         };
@@ -24675,7 +24906,7 @@
           sha256 = "0yy162sz7vwj0i9w687a5x1c2fq31vc3i6gqhbywspviczdp4q1y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shackle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shackle";
           sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
           name = "shackle";
         };
@@ -24696,7 +24927,7 @@
           sha256 = "0vkxl3w4y4yacs1s4v0gwggvzrss8g74d3dgk8h3gphl4dlgx496";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shakespeare-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shakespeare-mode";
           sha256 = "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd";
           name = "shakespeare-mode";
         };
@@ -24717,7 +24948,7 @@
           sha256 = "11g9lsgakq8nf689k49p9l536ffi62g3bh11mh9ix1l058xamqw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shampoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shampoo";
           sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
           name = "shampoo";
         };
@@ -24738,7 +24969,7 @@
           sha256 = "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shell-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
           name = "shell-pop";
         };
@@ -24759,7 +24990,7 @@
           sha256 = "0mcxp74sk9bn36gbhhimgns07iqa4dgbq2pvpqy41igqwb84w306";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shell-split-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shell-split-string";
           sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
           name = "shell-split-string";
         };
@@ -24780,7 +25011,7 @@
           sha256 = "0ia7sdip4hl27avckv3qpqgm3k4ynvp3xxq1cy53bqfzzx0gcria";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shell-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shell-switcher";
           sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
           name = "shell-switcher";
         };
@@ -24801,7 +25032,7 @@
           sha256 = "0wvaa5nrbblayjvzjyj6cd942ywg7xz5d8fqaffxcvwlcdihvm7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shell-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shell-toggle";
           sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
           name = "shell-toggle";
         };
@@ -24822,7 +25053,7 @@
           sha256 = "1nli26llyfkj1cz2dwn18c5pz1pnpz3866hapfibvdmwrg4z6cax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shelldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shelldoc";
           sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
           name = "shelldoc";
         };
@@ -24843,7 +25074,7 @@
           sha256 = "0mn7bwvj1yv75a2531jp929j6ypckdfqdg6b5ig0kkbcrrwb7kxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shelltest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shelltest-mode";
           sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
           name = "shelltest-mode";
         };
@@ -24864,7 +25095,7 @@
           sha256 = "0zlwmzsxkv4mkggylxfx2fkrwgz7dz3zbg2gkn2rxcpy2k2gla64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shift-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shift-number";
           sha256 = "1sbzkmd336d0dcdpk29pzk2b5bhlahrn083x62l6m150n2xzxn4p";
           name = "shift-number";
         };
@@ -24885,7 +25116,7 @@
           sha256 = "1vf766ja8f4xp1f5pmwgz6a85km0nxvc5dn571lwidfrrdbr9rkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shm";
           sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
           name = "shm";
         };
@@ -24906,7 +25137,7 @@
           sha256 = "09454mcjd8n1090pjc5mk1dc6bn3bgh60ddpnv9hkajkzpcjxx4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shpec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shpec-mode";
           sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
           name = "shpec-mode";
         };
@@ -24927,7 +25158,7 @@
           sha256 = "050gmxdk88zlfjwi07jsj2mvsfcv5imhzcpa6ip3cqkzpmw3pl32";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shrink-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shrink-whitespace";
           sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
           name = "shrink-whitespace";
         };
@@ -24948,7 +25179,7 @@
           sha256 = "103yvfgkj78i4bnv1fwk76izsa8h4wyj3vwj1vq7xggj607hkxzq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/shut-up";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/shut-up";
           sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
           name = "shut-up";
         };
@@ -24969,7 +25200,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sift";
           sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
           name = "sift";
         };
@@ -24990,7 +25221,7 @@
           sha256 = "1qmkc0w28l53zzf5yd2grrk1sq222g5qnsm35ph25s1cfvc1qb2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simple-httpd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simple-httpd";
           sha256 = "1g9m8dx62pql6dqz490pifcli96i5pv6sar18w4lwrfgpfisfz8c";
           name = "simple-httpd";
         };
@@ -25011,7 +25242,7 @@
           sha256 = "0v0vmkix9f0hb2183irr6xra8mwi47g6rn843sas7jy2ycaqd91v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simpleclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simpleclip";
           sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
           name = "simpleclip";
         };
@@ -25032,7 +25263,7 @@
           sha256 = "04giklbd1fsw2zysr7aqg17h6cpyn4i9jbknm4d4v6581f2pcl93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simplenote2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simplenote2";
           sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
           name = "simplenote2";
         };
@@ -25053,7 +25284,7 @@
           sha256 = "1p1771qm3jndnf4rdhb1bri5cjiksvxizagi7vfb7mjmsmx18w61";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/simplezen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/simplezen";
           sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
           name = "simplezen";
         };
@@ -25074,7 +25305,7 @@
           sha256 = "101xn4glqi7b5vhdqqahj2ib4pm30pzq8sad7zagxw9csihcri3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/skeletor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/skeletor";
           sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
           name = "skeletor";
         };
@@ -25095,7 +25326,7 @@
           sha256 = "0g5sapd76pjnfhxlw149zj0fpn6l3pz3l8qlcn2c237vm8vn6qv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/skewer-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/skewer-less";
           sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
           name = "skewer-less";
         };
@@ -25116,7 +25347,7 @@
           sha256 = "05jndz0c26q60s416vqgvr66axdmxb7qsr2g70fvl5iqavnayhpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/skewer-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/skewer-mode";
           sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
           name = "skewer-mode";
         };
@@ -25137,7 +25368,7 @@
           sha256 = "09ccdgg2wgw3xmlkpjsaqmnmf7f8rhjy4g6ypsn1sk5rgbgk8aj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slamhound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slamhound";
           sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
           name = "slamhound";
         };
@@ -25158,7 +25389,7 @@
           sha256 = "0rk12am1dq52khwkwrmg70zarhni2avj4sy44jqckb4x7sv7djfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slideview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slideview";
           sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
           name = "slideview";
         };
@@ -25179,7 +25410,7 @@
           sha256 = "1cl8amk1kc7a953l1khjms04j40mfkpnbsjz3qa123msgachrsg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slim-mode";
           sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
           name = "slim-mode";
         };
@@ -25200,7 +25431,7 @@
           sha256 = "0d1fcjv11my4sa11zim99ylzfsc5q989x4izrrxs3y9ii0nq8kax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slime";
           sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
           name = "slime";
         };
@@ -25221,7 +25452,7 @@
           sha256 = "0rdhd6kymbzhkc96dxy3nr21ajrkc7iy6zvq1va22r90f96jj9x4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slime-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slime-company";
           sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
           name = "slime-company";
         };
@@ -25242,7 +25473,7 @@
           sha256 = "0swd9rbsag8k18njp741ljg6lmlz949i4bbz5w7bl0spcpc26fs9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slime-docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slime-docker";
           sha256 = "13zkkrpww51ndsblpyz2msiwrjnaz6yrk61jbzrwp0r7a2v0djsa";
           name = "slime-docker";
         };
@@ -25263,7 +25494,7 @@
           sha256 = "0lp584k35asqlvbhglv124jazdgp3h7pzl0akfwbdmby9zayqk96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slime-ritz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slime-ritz";
           sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
           name = "slime-ritz";
         };
@@ -25284,7 +25515,7 @@
           sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/slime-volleyball";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/slime-volleyball";
           sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
           name = "slime-volleyball";
         };
@@ -25305,7 +25536,7 @@
           sha256 = "1aihr5pbdqjb5j6xsghi7qbrmp46kddv76xmyx5z98m93n70wzqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sly";
           sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
           name = "sly";
         };
@@ -25326,7 +25557,7 @@
           sha256 = "11p89pz6zmnjng5177w31ilcmifvnhv9mfjy79ic7amg01h09hsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sly-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sly-company";
           sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
           name = "sly-company";
         };
@@ -25347,7 +25578,7 @@
           sha256 = "1176fxrzzk4fyp4wjyp0xyqrga74j5csr5x37mlgplh9790248dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-mode-line";
           sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
           name = "smart-mode-line";
         };
@@ -25368,7 +25599,7 @@
           sha256 = "1176fxrzzk4fyp4wjyp0xyqrga74j5csr5x37mlgplh9790248dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-mode-line-powerline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-mode-line-powerline-theme";
           sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
           name = "smart-mode-line-powerline-theme";
         };
@@ -25389,7 +25620,7 @@
           sha256 = "1kfihh4s8578cwqyzn5kp3iib7f9vvg6rfc3klqzgads187ryd4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smart-tabs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smart-tabs-mode";
           sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
           name = "smart-tabs-mode";
         };
@@ -25410,7 +25641,7 @@
           sha256 = "0pvgnfg8a8w7c1nmrwyhfc0j7clzb290kwkid0c8kz275mb9nm3k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smartparens";
           sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
           name = "smartparens";
         };
@@ -25431,7 +25662,7 @@
           sha256 = "0j5lg9gryl8vbzw8d3r2fl0c9wxa0c193mcvdfidd25b98wccc3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smartrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smartrep";
           sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
           name = "smartrep";
         };
@@ -25452,7 +25683,7 @@
           sha256 = "1sd7dh9114mvr4xnp43xx4b7qmwkaj1a1fv7pwc28fhiy89d2md4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smartscan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smartscan";
           sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
           name = "smartscan";
         };
@@ -25462,6 +25693,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    smbc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smbc";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "sakshamsharma";
+          repo = "emacs-smbc";
+          rev = "45c39f82bc11ee157cac242d45f1563ce6160ab5";
+          sha256 = "1qhs6k0bk5spcz81a99nznl0xi4nw7ml048h2gnymdcb3zd4xrfr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smbc";
+          sha256 = "0aviqa8mk8dxxnddfskq9jgz3knqhf0frj7gq7nk6ckxkrxrgqn4";
+          name = "smbc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/smbc";
+          license = lib.licenses.free;
+        };
+      }) {};
     smeargle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smeargle";
@@ -25473,7 +25725,7 @@
           sha256 = "1pcpg3lalbrc24z3vwcaysps8dbdzmncdgqdd5ig6yk2a9wyj9ng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smeargle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
           name = "smeargle";
         };
@@ -25494,7 +25746,7 @@
           sha256 = "1hcjh577xz3inx28r8wb4g2b1424ccw8pffvgdmpf80xp1llldj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smex";
           sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
           name = "smex";
         };
@@ -25515,7 +25767,7 @@
           sha256 = "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smooth-scroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smooth-scroll";
           sha256 = "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf";
           name = "smooth-scroll";
         };
@@ -25536,7 +25788,7 @@
           sha256 = "1dkqix0iyjyiqf34h3p8faqcpffc0pwkxqqn80ys9jvj4f27kkrg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/smooth-scrolling";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/smooth-scrolling";
           sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
           name = "smooth-scrolling";
         };
@@ -25557,7 +25809,7 @@
           sha256 = "12s3ykb2flnbl6kvjn0yy11y0g5nq2k5arpgf7pqwj4wgx0fl8nb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/snakemake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/snakemake-mode";
           sha256 = "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4";
           name = "snakemake-mode";
         };
@@ -25578,7 +25830,7 @@
           sha256 = "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/solarized-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/solarized-theme";
           sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
           name = "solarized-theme";
         };
@@ -25599,7 +25851,7 @@
           sha256 = "0b5w3vdr8llg3hqd22gnc6b6y089lq6vfk0ajkws6gfldz2gg2v1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sos";
           sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
           name = "sos";
         };
@@ -25620,7 +25872,7 @@
           sha256 = "13yn2yadkpmykaly3l3xsq1bhm4sxyk8k1px555y11qi0mfdcjhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sotclojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sotclojure";
           sha256 = "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090";
           name = "sotclojure";
         };
@@ -25641,7 +25893,7 @@
           sha256 = "0xykm4yayb8gw83arv5p205cx18j14q9407rqw3sbcj9cj5nbk34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sotlisp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sotlisp";
           sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
           name = "sotlisp";
         };
@@ -25662,7 +25914,7 @@
           sha256 = "0q2ragq4hw89d3w48ykwljb19n2nhz8z6bsmb10shimaf203652g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sound-wav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sound-wav";
           sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
           name = "sound-wav";
         };
@@ -25683,7 +25935,7 @@
           sha256 = "1ynyxrpl9qd2l60dpn9kb04zxgq748fffb0yj8pxvm9q3abblf3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
           name = "sourcekit";
         };
@@ -25704,7 +25956,7 @@
           sha256 = "1k2gfw4dydzqxbfdmcghajbb2lyg1j4wgdhp8chlql3dax1f503d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sourcemap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
           name = "sourcemap";
         };
@@ -25725,7 +25977,7 @@
           sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sourcetalk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sourcetalk";
           sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
           name = "sourcetalk";
         };
@@ -25746,7 +25998,7 @@
           sha256 = "1q8r95zfrh0vxna5ml2pq9b9f66clfqcl4d2qy2aizkvzyxg6skl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/spaceline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/spaceline";
           sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
           name = "spaceline";
         };
@@ -25767,7 +26019,7 @@
           sha256 = "1gmmmkzxxlpz2ml6qk24vndlrbyl55r5cba76jn342zrxvb357ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sparkline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sparkline";
           sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
           name = "sparkline";
         };
@@ -25788,7 +26040,7 @@
           sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sparql-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
           name = "sparql-mode";
         };
@@ -25809,7 +26061,7 @@
           sha256 = "1k6c7450v0ln6l9b8z1hib2s2b4rmjbskynvwwyilgdnvginfhi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/speech-tagger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/speech-tagger";
           sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
           name = "speech-tagger";
         };
@@ -25830,7 +26082,7 @@
           sha256 = "1q6v0xfdxm57lyj4zxyqv6n5ik5w9drk7yf9w8spb5r22jg0dg8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sphinx-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sphinx-doc";
           sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
           name = "sphinx-doc";
         };
@@ -25851,7 +26103,7 @@
           sha256 = "17qsmjsbk8aq3azjxid6h9fzz77bils74scp21sqn8vdnijx8991";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/splitjoin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/splitjoin";
           sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
           name = "splitjoin";
         };
@@ -25872,7 +26124,7 @@
           sha256 = "05y8xv6zapspwr5bii41lgirslas22wsbm0kgb4dm79qbk9j1kzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/spotify";
           sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
           name = "spotify";
         };
@@ -25893,7 +26145,7 @@
           sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sprintly-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sprintly-mode";
           sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
           name = "sprintly-mode";
         };
@@ -25914,7 +26166,7 @@
           sha256 = "03wjzk1ljclfjgqzkg6m7v8saaajgavyd0xskd8fg8rdkx13ki0l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sprunge";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sprunge";
           sha256 = "199vfl6i881aks8fi9d9w4w7mnc7n443h79p3s4srcpmbyfg6g3w";
           name = "sprunge";
         };
@@ -25935,7 +26187,7 @@
           sha256 = "12zyw8b8s3jga560wv141gc4yvlbldvfcmpibns8wrpx2w8aivfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sql-impala";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sql-impala";
           sha256 = "1jr9k48d0q00d1x5lqv0n971mla2ymnqmjfn8pw0s0vxkldq4ibi";
           name = "sql-impala";
         };
@@ -25948,15 +26200,15 @@
     sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sqlup-mode";
-        version = "0.5.8";
+        version = "0.5.9";
         src = fetchFromGitHub {
           owner = "Trevoke";
           repo = "sqlup-mode.el";
-          rev = "432a9dc927d284b622113b895416bfc56eee8f5e";
-          sha256 = "1bxb8yzl6x8y4cqglxwcv15crj7ffij5d43baq7izzvzcm5rnqj1";
+          rev = "68c355d4d5bb6f227ed060e2ba16930252b1bf9c";
+          sha256 = "1hvs9nc99jvhmmycnhriycya64rfnsr793ffk3y1ilvgf239wacg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sqlup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sqlup-mode";
           sha256 = "0ngs58iri3fwv5ny707kvb6xjq98x19pzak8c9nq4qnpw3nkr83b";
           name = "sqlup-mode";
         };
@@ -25977,7 +26229,7 @@
           sha256 = "0wx8l8gkh8rbf2g149f35gpnmkk45s9x4r844aqw5by4zkvix4rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/srefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/srefactor";
           sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
           name = "srefactor";
         };
@@ -25998,7 +26250,7 @@
           sha256 = "08nx1iwvxqs1anng32w3c2clhnjf45527j0gxz5fy6h9svmb921q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ssh-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ssh-config-mode";
           sha256 = "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb";
           name = "ssh-config-mode";
         };
@@ -26019,7 +26271,7 @@
           sha256 = "0igqifws73cayvjnhhrsqpy14sr27avymfhaqzrpj76m2fsh6fj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stash";
           sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
           name = "stash";
         };
@@ -26040,7 +26292,7 @@
           sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/status";
           sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
           name = "status";
         };
@@ -26061,7 +26313,7 @@
           sha256 = "0pik6mq8syhxk9l9ns8wgvg5312qkckm3cilb3irwdm1dvnl5hpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stekene-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stekene-theme";
           sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
           name = "stekene-theme";
         };
@@ -26077,10 +26329,10 @@
         src = fetchgit {
           url = "git://repo.or.cz/stgit.git";
           rev = "48e5cef14cea5c810833d119900cd484c2a6ca85";
-          sha256 = "05jy51g2krmj1c3rq8k7lihml1m4x6j73lkf8z1qwg35kmadzi8j";
+          sha256 = "0hgqxhqnc93pnh6j3hyi92hfx1cbdjylzqb2nl6ldsz1g2wdcw9r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stgit";
           sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
           name = "stgit";
         };
@@ -26101,7 +26353,7 @@
           sha256 = "15gdcpbba3h84s7xnpk69nav6bixdixnirdh5n1rly010q0m5s5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/string-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/string-edit";
           sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
           name = "string-edit";
         };
@@ -26122,7 +26374,7 @@
           sha256 = "03azfs6z0jg66ppalijcxl973vdbhj4c3g84sm5dm8xv6rnxrv2s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/string-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/string-utils";
           sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
           name = "string-utils";
         };
@@ -26143,7 +26395,7 @@
           sha256 = "035ym1c1vzg6hjsnd258z4dkrfc11lj4c0y4gpgybhk54dq3w9dk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stripe-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stripe-buffer";
           sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
           name = "stripe-buffer";
         };
@@ -26160,10 +26412,10 @@
         src = fetchgit {
           url = "git://git.savannah.nongnu.org/stumpwm.git";
           rev = "4d0603e52b5bab993b3be63e3654c74f641e677d";
-          sha256 = "0a0lwwlly4hlmb30bk6dmi6bsdsy37g4crvv1z24gixippyv1qzm";
+          sha256 = "0pn3xjz433b0djcys25a8fv775yqmj3qgg0hyghgxjpzsh6k2a4f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stumpwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stumpwm-mode";
           sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
           name = "stumpwm-mode";
         };
@@ -26184,7 +26436,7 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/stylus-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/stylus-mode";
           sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
           name = "stylus-mode";
         };
@@ -26205,7 +26457,7 @@
           sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/subatomic-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/subatomic-theme";
           sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc";
           name = "subatomic-theme";
         };
@@ -26226,7 +26478,7 @@
           sha256 = "189547d0g9ax0nr221bkdchlfcj60dsy8lgbbrvq3n3xrmlvl362";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/subemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/subemacs";
           sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
           name = "subemacs";
         };
@@ -26247,7 +26499,7 @@
           sha256 = "0mx892vn4a32df30iqmf2vsz1gdl3i557fw0194g6a66n9w2q7xf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/subshell-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/subshell-proc";
           sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
           name = "subshell-proc";
         };
@@ -26268,7 +26520,7 @@
           sha256 = "1kmyivsyxr6gb2k36ssyr779rpk8qsrb27q5rjsir9fgc95qhvjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sudden-death";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sudden-death";
           sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
           name = "sudden-death";
         };
@@ -26289,7 +26541,7 @@
           sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/suomalainen-kalenteri";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/suomalainen-kalenteri";
           sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
           name = "suomalainen-kalenteri";
         };
@@ -26310,7 +26562,7 @@
           sha256 = "0cw3yf2npy2ah00q2whpn52kaybbccw1qvfzsww0x4zshlrwvvvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/super-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/super-save";
           sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
           name = "super-save";
         };
@@ -26331,7 +26583,7 @@
           sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/svg-mode-line-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/svg-mode-line-themes";
           sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
           name = "svg-mode-line-themes";
         };
@@ -26341,6 +26593,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    swagger-to-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "swagger-to-org";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "ahungry";
+          repo = "swagger-to-org";
+          rev = "181357c71ea24bede263f5706d8781ad65e16877";
+          sha256 = "0x1mxxvlhhs34j869cy68gy5pgmvpfliyl9vlrlwm3z8apbip9gp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/swagger-to-org";
+          sha256 = "1m40f5njxcxmc2snaz2q43b4scwgp51y761kq6klixjvafi0pv86";
+          name = "swagger-to-org";
+        };
+        packageRequires = [ cl-lib emacs json ];
+        meta = {
+          homepage = "https://melpa.org/#/swagger-to-org";
+          license = lib.licenses.free;
+        };
+      }) {};
     sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }:
     melpaBuild {
         pname = "sweetgreen";
@@ -26352,7 +26625,7 @@
           sha256 = "1h56qkbx5abz1l94wrdpbzspiz24mfgkppzfalvbvx5qwl079cvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sweetgreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sweetgreen";
           sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
           name = "sweetgreen";
         };
@@ -26373,7 +26646,7 @@
           sha256 = "07xrcg33vsw19kz692hm7blzvnf7b6isllsz79fvs8q3l5c9mfjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/swift-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/swift-mode";
           sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
           name = "swift-mode";
         };
@@ -26394,7 +26667,7 @@
           sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/swiper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/swiper";
           sha256 = "0qaia5pgsjsmrfmcdj72jmj39zq82wg4i5l2mb2z6jlf1jpbk6y9";
           name = "swiper";
         };
@@ -26415,7 +26688,7 @@
           sha256 = "1y2dbd3ikdpjvi8xz10jkrx2773h7cgr6jxm5b2bldm81lvi8x64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/swiper-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/swiper-helm";
           sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
           name = "swiper-helm";
         };
@@ -26436,7 +26709,7 @@
           sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/switch-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/switch-window";
           sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
           name = "switch-window";
         };
@@ -26457,7 +26730,7 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sws-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sws-mode";
           sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
           name = "sws-mode";
         };
@@ -26478,7 +26751,7 @@
           sha256 = "02f63k8rzb3bcch6vj6w5c5ncccqg83siqnc8hyi0lhy1bfx240p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/sx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/sx";
           sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
           name = "sx";
         };
@@ -26499,7 +26772,7 @@
           sha256 = "01bymbsvbisnpb2wpqxhrvqx6cj57nh4xvpsbsr5rr1h4pm5jkzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/syndicate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/syndicate";
           sha256 = "06nmldcw5dy2shhpk6nyix7gs57gsr5s9ksj57xgg8y2j3j0da95";
           name = "syndicate";
         };
@@ -26520,7 +26793,7 @@
           sha256 = "0hi2jflrlpp7xkbj852vp9hcl8bfmf04jqw1hawxrw4bxdp95jh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/synosaurus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/synosaurus";
           sha256 = "06a48ajpickf4qr1bc14skfr8khnjjph7c35b7ajfy8jw2zwavpn";
           name = "synosaurus";
         };
@@ -26541,7 +26814,7 @@
           sha256 = "1pn69f4w48jdj3wd1myj6qq2mhvygmlzbq2dws2qkjlp3kbwa6da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/syntactic-sugar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/syntactic-sugar";
           sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
           name = "syntactic-sugar";
         };
@@ -26561,7 +26834,7 @@
           sha256 = "1wcgr6scvwwfmhhjbpq3riq0gmp4g08ffbl91fpgp72j8zrc1c6x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/syntax-subword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/syntax-subword";
           sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
           name = "syntax-subword";
         };
@@ -26582,7 +26855,7 @@
           sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/system-specific-settings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/system-specific-settings";
           sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
           name = "system-specific-settings";
         };
@@ -26603,7 +26876,7 @@
           sha256 = "0wqmpvqv5dbnniv7xpvmhw75h9xh3q5ndkrpzz3pk5b94drgm5s3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/systemd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/systemd";
           sha256 = "1ykvm8mfi3fjvrkfcy9qn0sr9mhwm9x1svrmrd0gyqk418clk5i3";
           name = "systemd";
         };
@@ -26624,7 +26897,7 @@
           sha256 = "09nndx83ws5v2i9x0dzk6l1a0lq29ffzh3y05n0n64nf5j0a7zvk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ta";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ta";
           sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
           name = "ta";
         };
@@ -26645,7 +26918,7 @@
           sha256 = "1xd67s92gyr49v73j7r7cbhsc40bkw8aqh21whgbypdgzpyc7azc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tabbar-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tabbar-ruler";
           sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
           name = "tabbar-ruler";
         };
@@ -26666,7 +26939,7 @@
           sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tablist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tablist";
           sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
           name = "tablist";
         };
@@ -26687,7 +26960,7 @@
           sha256 = "0kq40g46s8kgiafrhdq99h79rz9h5fvgz59k7ralmf86bl4sdmdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tagedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tagedit";
           sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
           name = "tagedit";
         };
@@ -26708,7 +26981,7 @@
           sha256 = "0amsz28n0syqqkxlmzsndm0ayvzc9kgzk8brs9ihskv0j5b3pdcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tawny-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tawny-mode";
           sha256 = "1xaw1six1n6rw1283fdyl15xcf6m7ngvq6gqlz0xzpf232c4b0kr";
           name = "tawny-mode";
         };
@@ -26729,7 +27002,7 @@
           sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/telepathy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/telepathy";
           sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
           name = "telepathy";
         };
@@ -26750,7 +27023,7 @@
           sha256 = "0smdlzrcbmip6c6c3rd0871wv5xyagavwsxhhgvki6ybyzdj9a19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/telephone-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
           name = "telephone-line";
         };
@@ -26771,7 +27044,7 @@
           sha256 = "17633jachcgnibmvx433ygcfmz3j6hzli5mqbqg83r27chiq5mjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ten-hundred-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ten-hundred-mode";
           sha256 = "17v38h33ka70ynq72mvma2chvlnm1k2amyvk62c65iv67rwilky3";
           name = "ten-hundred-mode";
         };
@@ -26792,7 +27065,7 @@
           sha256 = "195jghl1c8ncl15nix275r4x61zlii90pnwgx4m9q2bnbwsz3ycm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/term-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/term-alert";
           sha256 = "02qvfhklysfk1fd4ibdngf4crp9k5ab11zgg90hi1sp429a53f3m";
           name = "term-alert";
         };
@@ -26813,7 +27086,7 @@
           sha256 = "08qiipjsqc9dfbha6r2yijjbrg2s4i2mkn6zn5616086550v3kpj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/term-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/term-cmd";
           sha256 = "0pbz9fy9rjfpzspwq78ggf1wcvjslwvj8fvc05w4g56ydza0gqi4";
           name = "term-cmd";
         };
@@ -26834,7 +27107,7 @@
           sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/term-run";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/term-run";
           sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
           name = "term-run";
         };
@@ -26855,7 +27128,7 @@
           sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/termbright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/termbright-theme";
           sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
           name = "termbright-theme";
         };
@@ -26876,7 +27149,7 @@
           sha256 = "1kaymyihskmdav56xj85j04iq7a8948b1jgjfrv9s7pc965j9795";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tern";
           sha256 = "1am97ssslkyijpvgk4nldi67ws48g1kpj6gisqzajrrlw5q93wvd";
           name = "tern";
         };
@@ -26897,7 +27170,7 @@
           sha256 = "1kaymyihskmdav56xj85j04iq7a8948b1jgjfrv9s7pc965j9795";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tern-auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tern-auto-complete";
           sha256 = "1i99b4awph50ygcqsnppm1h48hbf8cpq1ppd4swakrwgmcy2mn26";
           name = "tern-auto-complete";
         };
@@ -26918,7 +27191,7 @@
           sha256 = "0l63lzm96gg3ihgc4l671i342qxigwdbn4xfkbxnarb0206gnb5p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tern-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tern-django";
           sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
           name = "tern-django";
         };
@@ -26939,7 +27212,7 @@
           sha256 = "1k0v56v7mwpb5p228c0g252szpxvpqswrmjfpk75kh32v56wp5xi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/terraform-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
           name = "terraform-mode";
         };
@@ -26960,7 +27233,7 @@
           sha256 = "108csr1d7w0105rb6brzgbksb9wmq1p573vxbq0miv5k894j447f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/test-case-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/test-case-mode";
           sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
           name = "test-case-mode";
         };
@@ -26981,7 +27254,7 @@
           sha256 = "004rd6jkaklsbgka9mf2zi5qzxsl2shwl1kw0vgb963xkmk9zaz8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/test-kitchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/test-kitchen";
           sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
           name = "test-kitchen";
         };
@@ -27002,7 +27275,7 @@
           sha256 = "08g7fan1y3wi4w7cdij14awadqss6prqg3k7qzf0wrnbm13dzhmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/test-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/test-simple";
           sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
           name = "test-simple";
         };
@@ -27023,7 +27296,7 @@
           sha256 = "1a0fzn66gv421by0x6wj3z6bvzv274a9p8c2aaax0dskncl5lgk1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/textmate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/textmate";
           sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
           name = "textmate";
         };
@@ -27044,7 +27317,7 @@
           sha256 = "0fjapb7naysf34g4ac5gsa90b2s2ss7qgpyd9mfv3mdqrsp2dyw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/textmate-to-yas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/textmate-to-yas";
           sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
           name = "textmate-to-yas";
         };
@@ -27065,7 +27338,7 @@
           sha256 = "09vf3qs949n4iqzd14iq2kgvypwdwdv8ii8l5jcqfppgspd8m8yd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/theme-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/theme-changer";
           sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
           name = "theme-changer";
         };
@@ -27086,7 +27359,7 @@
           sha256 = "1srylw9wwkyq92f9v6ds9zp9z8sl800wbxjbir80g1lwv4hghaii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/thrift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/thrift";
           sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
           name = "thrift";
         };
@@ -27107,7 +27380,7 @@
           sha256 = "1vq5yp6pyjam2csz22mcp353a4d5r7f9m6bsjizfmgr2ld7bwhx7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/timer-revert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/timer-revert";
           sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
           name = "timer-revert";
         };
@@ -27128,7 +27401,7 @@
           sha256 = "028d1sn29idznzsc95w2c1sdz3rpmf3vgk2365li0vvs99s51hi2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/timesheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/timesheet";
           sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
           name = "timesheet";
         };
@@ -27149,7 +27422,7 @@
           sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tox";
           sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
           name = "tox";
         };
@@ -27169,7 +27442,7 @@
           sha256 = "1pnsky541m8kzcv81w98jkv0hgajh04hxqlmgddc1y0wbvi849j0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/toxi-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/toxi-theme";
           sha256 = "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd";
           name = "toxi-theme";
         };
@@ -27190,7 +27463,7 @@
           sha256 = "008fz7829mvjlid93hvs5xwwvigh5lnq2fxf2w9ghnw9lygkv5bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tracking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tracking";
           sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
           name = "tracking";
         };
@@ -27211,7 +27484,7 @@
           sha256 = "0nsh2rz9w33m79rrr8nrz3g1wcgfrv7dc8q9g3s82ckj5g8gxfpr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/transmission";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/transmission";
           sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
           name = "transmission";
         };
@@ -27232,7 +27505,7 @@
           sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/travis";
           sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
           name = "travis";
         };
@@ -27253,7 +27526,7 @@
           sha256 = "0x1knf2jqkd1sdswv1w902jnlppih2yw6z028268nizl0c9q92yn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/trr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/trr";
           sha256 = "068vqsyx8riqzfrmjk8wr81f68r2y2b6ymc2vvl6vka9rprvsfwr";
           name = "trr";
         };
@@ -27274,7 +27547,7 @@
           sha256 = "18na22fhwqz80qinmnpsvp6ghc9irva1scixi6s4q6plmgr4m397";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/truthy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/truthy";
           sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
           name = "truthy";
         };
@@ -27295,7 +27568,7 @@
           sha256 = "1ma3k9bbw427cj1n2gjajbqii482jhs2lgjggz9clpc21bn5wqfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tss";
           sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
           name = "tss";
         };
@@ -27316,7 +27589,7 @@
           sha256 = "060jksd9aamqx1n4l0bb9v4icsf7cr8jkyw0mbhgyz32nmxh3v6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ttrss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ttrss";
           sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
           name = "ttrss";
         };
@@ -27326,22 +27599,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    tuareg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "2.0.9";
+        version = "2.0.10";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "f97b800db79d9856c70b4988bd39bd7aa623158e";
-          sha256 = "0jpcjy2a77mywba2vm61knj26pgylsmv5a21cdp80q40bac4i6bb";
+          rev = "93b9c6cdba3a8f333cc817c3822fc76b71ff4dcd";
+          sha256 = "14l0y7gahbz1l4ag5nvswj7cl4skchvzr6r7zc1a5k000skdmv69";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tuareg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tuareg";
           sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
           name = "tuareg";
         };
-        packageRequires = [ caml ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/tuareg";
           license = lib.licenses.free;
@@ -27358,7 +27631,7 @@
           sha256 = "0ihjjw5wxz5ybl3600k937pszw3442cijs4gbqqip9vhd5y9m8gy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tumble";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tumble";
           sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
           name = "tumble";
         };
@@ -27379,7 +27652,7 @@
           sha256 = "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/tup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/tup-mode";
           sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
           name = "tup-mode";
         };
@@ -27400,7 +27673,7 @@
           sha256 = "0glw5lns7hwp8jznnfm6dyjw454sv2n84gy07ma7s1q3yczhq5bc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/twilight-anti-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/twilight-anti-bright-theme";
           sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
           name = "twilight-anti-bright-theme";
         };
@@ -27421,7 +27694,7 @@
           sha256 = "193v98i84xybm3n0f30jin5q10i87vbcnbdhl4zqi7jij9p5v98z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/twittering-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/twittering-mode";
           sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
           name = "twittering-mode";
         };
@@ -27442,7 +27715,7 @@
           sha256 = "1risfbsaafh760vnl4ryys91g4k78g0fxj2zlcndpxxv34gwkhy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/typed-clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/typed-clojure-mode";
           sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
           name = "typed-clojure-mode";
         };
@@ -27463,7 +27736,7 @@
           sha256 = "1jv5qmp3xs37py7d9aln4jn85j65h9pp5vb2dcmd8rlszhplsrng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/typit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/typit";
           sha256 = "05m7ymcq6fgbhh93ninrf3qi7csdnf2ahhf01mkm8gxxyaqq6m4n";
           name = "typit";
         };
@@ -27484,7 +27757,7 @@
           sha256 = "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/typo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/typo";
           sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
           name = "typo";
         };
@@ -27505,7 +27778,7 @@
           sha256 = "0k41hwb6jgv3hngfrphlyhmfhvy4k05mvn0brm64xk7lj56y8q2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ubuntu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ubuntu-theme";
           sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
           name = "ubuntu-theme";
         };
@@ -27526,7 +27799,7 @@
           sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ucs-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ucs-utils";
           sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
           name = "ucs-utils";
         };
@@ -27547,7 +27820,7 @@
           sha256 = "06qcvbp5rd0kh3ibrxj5p6r578lwsrgd7yj5c6slwmkdmna2fj33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/undercover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/undercover";
           sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
           name = "undercover";
         };
@@ -27568,7 +27841,7 @@
           sha256 = "1g1ldyz42q3i2xlgvhd4s93cvkh0fm8m3l344zjcw8rvqaisyphj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/underwater-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/underwater-theme";
           sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
           name = "underwater-theme";
         };
@@ -27589,7 +27862,7 @@
           sha256 = "1qy0q1fp7cmvmxynqrb086dkb727lmk5h1k98y14j75b94ilpy0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unfill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unfill";
           sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
           name = "unfill";
         };
@@ -27610,7 +27883,7 @@
           sha256 = "0n06dvf6r7qblz8vz38qc37xrn29wa1c0jyzis1qw9zzf6hmmzj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unicode-enbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unicode-enbox";
           sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
           name = "unicode-enbox";
         };
@@ -27631,7 +27904,7 @@
           sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unicode-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unicode-fonts";
           sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
           name = "unicode-fonts";
         };
@@ -27658,7 +27931,7 @@
           sha256 = "0qy1hla7vf674ynqdzsaw2cnk92nhpcimww5q94rc0a95pzw64wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unicode-progress-reporter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unicode-progress-reporter";
           sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
           name = "unicode-progress-reporter";
         };
@@ -27679,7 +27952,7 @@
           sha256 = "0q7cbl89yg3fjxaxsqsksxhw7ibdslbb004z5y1m579n7zgcrljy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unicode-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unicode-whitespace";
           sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
           name = "unicode-whitespace";
         };
@@ -27700,7 +27973,7 @@
           sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unify-opening";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unify-opening";
           sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
           name = "unify-opening";
         };
@@ -27721,7 +27994,7 @@
           sha256 = "1w2w0gmyr0nbq8kv3ldj30h9xma76gi1khbdia1y30kss677rr8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/unkillable-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/unkillable-scratch";
           sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
           name = "unkillable-scratch";
         };
@@ -27742,7 +28015,7 @@
           sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/use-package";
           sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
           name = "use-package";
         };
@@ -27763,7 +28036,7 @@
           sha256 = "17p3cwjxdvp0v3n8fiib7hgl07z2iqi1qwlff0g3zwf4rr6kxgqy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/utop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/utop";
           sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
           name = "utop";
         };
@@ -27784,7 +28057,7 @@
           sha256 = "0z53n9qsglp87f6q1pa3sixrjni9k46j31zg15gcwrmflmfrw8ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/uzumaki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/uzumaki";
           sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
           name = "uzumaki";
         };
@@ -27805,7 +28078,7 @@
           sha256 = "1661fwfx2gpxjriy3ngi9raz8c2kkk3rgg51irdi591jr2zqmw6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vagrant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vagrant";
           sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
           name = "vagrant";
         };
@@ -27826,7 +28099,7 @@
           sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vbasense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vbasense";
           sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
           name = "vbasense";
         };
@@ -27847,7 +28120,7 @@
           sha256 = "07dx3dyvkwcin0gb6j4jx0ldfxs4rqhygl56a8i81yy05adkaq2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vcomp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vcomp";
           sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
           name = "vcomp";
         };
@@ -27868,7 +28141,7 @@
           sha256 = "034475m2d2vlrlc2l88gdx0ga3krsdh08wkjxwnbb2dfyz3p8r9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vdirel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vdirel";
           sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
           name = "vdirel";
         };
@@ -27889,7 +28162,7 @@
           sha256 = "0lzq31zqnk32vfp3kicnvgfr3nkv8amjzxmk9nrz1kwgmq7gvkjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vector-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vector-utils";
           sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
           name = "vector-utils";
         };
@@ -27910,7 +28183,7 @@
           sha256 = "1yk7qqg8i3970kpfk34wvi0gh16qf0b0sfnf18g3s21dd4gk5a6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vertigo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vertigo";
           sha256 = "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83";
           name = "vertigo";
         };
@@ -27931,7 +28204,7 @@
           sha256 = "0ggblkaz214vl1j4i5gv5qj2q6ahnr0k3c3l9sd0w5vdkbw8n5jb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vhdl-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vhdl-tools";
           sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
           name = "vhdl-tools";
         };
@@ -27952,7 +28225,7 @@
           sha256 = "1750gx65ymibam8ahx5blfv5jc26f3mzbklk1jrmfwpsalyghdd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vim-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vim-region";
           sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
           name = "vim-region";
         };
@@ -27973,7 +28246,7 @@
           sha256 = "1f94qx8rbnn21cl0grxqa9gzkbrz68vmqsihv8vvi8qf1c1dmd0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vimgolf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vimgolf";
           sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
           name = "vimgolf";
         };
@@ -27994,7 +28267,7 @@
           sha256 = "01wxjvbq3i1ji9fpff7fbk20pzmr52z6fycqfi7malgwq05is1bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vimish-fold";
           sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
           name = "vimish-fold";
         };
@@ -28015,7 +28288,7 @@
           sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/visible-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/visible-mark";
           sha256 = "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80";
           name = "visible-mark";
         };
@@ -28036,7 +28309,7 @@
           sha256 = "02msgb2dh3b5ki6v2bg39l2x93amvmaxg6v57kmyl80x27h00vx9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/visual-fill-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/visual-fill-column";
           sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
           name = "visual-fill-column";
         };
@@ -28057,7 +28330,7 @@
           sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/vlf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/vlf";
           sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
           name = "vlf";
         };
@@ -28078,7 +28351,7 @@
           sha256 = "0q1rwqjwqcnsr57s531pwlm464q8wx5vvdm5rj2xy9b3yi6phis1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/voca-builder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/voca-builder";
           sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
           name = "voca-builder";
         };
@@ -28099,7 +28372,7 @@
           sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/volatile-highlights";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/volatile-highlights";
           sha256 = "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d";
           name = "volatile-highlights";
         };
@@ -28120,7 +28393,7 @@
           sha256 = "0jl3n79wmbxnrbf83qjq0v5pzhvv67i9r5sp2zj8nc86hh7dvjsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wacspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wacspace";
           sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
           name = "wacspace";
         };
@@ -28141,7 +28414,7 @@
           sha256 = "1nx7cr7d4qmzwbvp59kc8139nzc965ibc9vf7afrz8z2h5qg4d4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wandbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wandbox";
           sha256 = "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz";
           name = "wandbox";
         };
@@ -28162,7 +28435,7 @@
           sha256 = "0mnfk2ys8axjh696cq5msr5cdr91icl1i3mi0dd2y00lvh6sbm7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wc-goal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wc-goal-mode";
           sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
           name = "wc-goal-mode";
         };
@@ -28183,7 +28456,7 @@
           sha256 = "0kzs256ymhdrqzva32j215q9fl66n9571prb7mi6syx1vpk7m3lw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wc-mode";
           sha256 = "191dmxfpqnj7d43cr0fhdmj5ldfs7w9zg5pb2lv9wvlfl7asdid6";
           name = "wc-mode";
         };
@@ -28204,7 +28477,7 @@
           sha256 = "113prlamr2j6y6n0w43asffawwa4qiq63mgwm85v04h6pr8bd90l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wcheck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wcheck-mode";
           sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
           name = "wcheck-mode";
         };
@@ -28225,7 +28498,7 @@
           sha256 = "0qx92jqzsimjk92pql2h8pzhq66mqijwqgjqwp7rmq5b6k0nvx1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/weather-metno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/weather-metno";
           sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
           name = "weather-metno";
         };
@@ -28246,7 +28519,7 @@
           sha256 = "0zpvs9yc2gxfmm0x0majhzxc0b0vmm6p6pxh92h8iq3pmr0di8yj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/web-beautify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/web-beautify";
           sha256 = "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f";
           name = "web-beautify";
         };
@@ -28267,7 +28540,7 @@
           sha256 = "19nzjgvd2i5745283ck3k2vylrr6lnk9h3ggzwrwdhyd3m9433vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/web-completion-data";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/web-completion-data";
           sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
           name = "web-completion-data";
         };
@@ -28288,7 +28561,7 @@
           sha256 = "1cs9ldj2qckyynwxzvbd5fmniis6mhprdz1wvvvpjs900bbc843s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
           name = "web-mode";
         };
@@ -28308,7 +28581,7 @@
           sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/weblogger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/weblogger";
           sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk";
           name = "weblogger";
         };
@@ -28329,7 +28602,7 @@
           sha256 = "0vg3w18xj6i320jsivsml3mi1fdxr8dgxmn7qy2780ajy5ndxnw1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/weechat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/weechat";
           sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
           name = "weechat";
         };
@@ -28350,7 +28623,7 @@
           sha256 = "14vmgfz45wmpjfhfx3pfjn3bak8qvj1zk1w4xc5w1cfl6vnij6hv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/weibo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/weibo";
           sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
           name = "weibo";
         };
@@ -28371,7 +28644,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wgrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wgrep";
           sha256 = "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4";
           name = "wgrep";
         };
@@ -28392,7 +28665,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wgrep-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wgrep-ack";
           sha256 = "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh";
           name = "wgrep-ack";
         };
@@ -28413,7 +28686,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wgrep-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wgrep-ag";
           sha256 = "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a";
           name = "wgrep-ag";
         };
@@ -28434,7 +28707,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wgrep-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wgrep-helm";
           sha256 = "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b";
           name = "wgrep-helm";
         };
@@ -28455,7 +28728,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wgrep-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wgrep-pt";
           sha256 = "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg";
           name = "wgrep-pt";
         };
@@ -28476,7 +28749,7 @@
           sha256 = "0i25y5j5qwmj3v3cd16v1c81y5bwhgar379bjy4052mfm870b90d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/which-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/which-key";
           sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
           name = "which-key";
         };
@@ -28497,7 +28770,7 @@
           sha256 = "01fwhrfi92pcrwc4yn03pflc9wj07mhzj0a0i5amar4f9bj6m5b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/whitaker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/whitaker";
           sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
           name = "whitaker";
         };
@@ -28518,7 +28791,7 @@
           sha256 = "0xmwhybb8x6wwfr55ym5xg4dhy1aqx1abxy9qskn7h3zf1z4pgg2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/whitespace-cleanup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/whitespace-cleanup-mode";
           sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
           name = "whitespace-cleanup-mode";
         };
@@ -28539,7 +28812,7 @@
           sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/whole-line-or-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/whole-line-or-region";
           sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
           name = "whole-line-or-region";
         };
@@ -28560,7 +28833,7 @@
           sha256 = "0fqv63m8z5m5ghh4j8ccdnmgcdkvi4jqpg9z7lp17g4p9pq3xfjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/widget-mvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/widget-mvc";
           sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
           name = "widget-mvc";
         };
@@ -28581,7 +28854,7 @@
           sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wiki-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wiki-nav";
           sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
           name = "wiki-nav";
         };
@@ -28602,7 +28875,7 @@
           sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/win-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/win-switch";
           sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
           name = "win-switch";
         };
@@ -28623,7 +28896,7 @@
           sha256 = "049bwa5g0z1b9nrsc1vc4511aqcq9fvl16xg493wj651g6q9qigb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/window-end-visible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/window-end-visible";
           sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
           name = "window-end-visible";
         };
@@ -28644,7 +28917,7 @@
           sha256 = "0jyymmbz03zj2ydca1rv6ra0b2brjl7pyl4897zd00j5kvqjdyif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/window-layout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/window-layout";
           sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
           name = "window-layout";
         };
@@ -28665,7 +28938,7 @@
           sha256 = "1rz2a1l3apavsknlfy0faaivqgpj4x9jz3hbysbg9pydpcwqgf64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/window-numbering";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/window-numbering";
           sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
           name = "window-numbering";
         };
@@ -28686,7 +28959,7 @@
           sha256 = "1xjs51wm5ydcqdwvg3c42c5z4j92q75lmk895qkka7ayy5spxxf7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/window-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/window-purpose";
           sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d";
           name = "window-purpose";
         };
@@ -28707,7 +28980,7 @@
           sha256 = "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/windsize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/windsize";
           sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
           name = "windsize";
         };
@@ -28723,11 +28996,11 @@
         version = "0.9.0";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "f23c198f7086";
-          sha256 = "1nfyi9grkl9vhf8rs6r53g5f1p2wsk5jggw0m4i3z60yfflmkqi7";
+          rev = "dcf6c1298df3";
+          sha256 = "1l4al5pjipq50njdfwndnhhjs0cvgxwj8gpk8yrmx7r89ixl34wg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wisp-mode";
           sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
           name = "wisp-mode";
         };
@@ -28748,7 +29021,7 @@
           sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wispjs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wispjs-mode";
           sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
           name = "wispjs-mode";
         };
@@ -28769,7 +29042,7 @@
           sha256 = "0rzq2fbz523fyy2p6ddx9iws89sfgw3pwillw8yz965f3hxx3dj3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/with-editor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/with-editor";
           sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
           name = "with-editor";
         };
@@ -28790,7 +29063,7 @@
           sha256 = "0nmzh6dynbm8vglp4pqz81s2z68jbnasvamvi1x1iawf8g9zfyix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wn-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wn-mode";
           sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
           name = "wn-mode";
         };
@@ -28811,7 +29084,7 @@
           sha256 = "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wonderland";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wonderland";
           sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
           name = "wonderland";
         };
@@ -28832,7 +29105,7 @@
           sha256 = "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wordsmith-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wordsmith-mode";
           sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
           name = "wordsmith-mode";
         };
@@ -28853,7 +29126,7 @@
           sha256 = "0l2n3vwk251ba06xdrs9z0bp4ligfdjd259a84ap2z3sqdfa98x4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/worf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/worf";
           sha256 = "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi";
           name = "worf";
         };
@@ -28874,7 +29147,7 @@
           sha256 = "03hjwm51sngkh7jjiwnqhflllqq6i99ib47rm2ja9ii0qyhj1qa0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wrap-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wrap-region";
           sha256 = "058518smxj3j3mr6ljzh7c9x5g23d24104p58sl9nhpw0cq9k28i";
           name = "wrap-region";
         };
@@ -28895,7 +29168,7 @@
           sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/writegood-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/writegood-mode";
           sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
           name = "writegood-mode";
         };
@@ -28916,7 +29189,7 @@
           sha256 = "11a3h5v7knj8y360cxin59c1ipd9y4qsqlanrw69yb5k4816ayyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/writeroom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/writeroom-mode";
           sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
           name = "writeroom-mode";
         };
@@ -28937,7 +29210,7 @@
           sha256 = "1lv0l27lrp6xyl0c5yhlnyjwx872izq02z8x34da9jv3walxpk8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ws-butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ws-butler";
           sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
           name = "ws-butler";
         };
@@ -28958,7 +29231,7 @@
           sha256 = "1ibvcc54y2w72d3yvcczvzywribiwmkhlb1b08g4pyb1arclw393";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wsd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wsd-mode";
           sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
           name = "wsd-mode";
         };
@@ -28979,7 +29252,7 @@
           sha256 = "0mbc3ndggv2rbmfcfhw8bsx3qw6jy684hxz5dqa88lfb6vs5knzc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/wttrin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/wttrin";
           sha256 = "0msp8lja9nz6khz3dkasv8hnhkaayqxd7m58kma03hpkcjxnaxil";
           name = "wttrin";
         };
@@ -29000,7 +29273,7 @@
           sha256 = "0fks0bnil7m4m56k267f0awqnyq3vr2ywd81rsmbk1154g3acndc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/x86-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/x86-lookup";
           sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
           name = "x86-lookup";
         };
@@ -29021,7 +29294,7 @@
           sha256 = "154xnfcmil9xjjmq4cyrfpir4ga4mgcmmbd7dja1m7rpk1734xk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xbm-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xbm-life";
           sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
           name = "xbm-life";
         };
@@ -29042,7 +29315,7 @@
           sha256 = "0xqw0yhm08alaaqma3ymnihzyp2wg0hxsjzmrb2vmak5q1qqnkrp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xcscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xcscope";
           sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
           name = "xcscope";
         };
@@ -29063,7 +29336,7 @@
           sha256 = "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xkcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xkcd";
           sha256 = "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w";
           name = "xkcd";
         };
@@ -29084,7 +29357,7 @@
           sha256 = "0g52bmamcd54acyk6i47ar5jawad6ycvm9g656inb994wprnjin9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xml-rpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xml-rpc";
           sha256 = "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js";
           name = "xml-rpc";
         };
@@ -29105,7 +29378,7 @@
           sha256 = "1yy759qc4njc8bqh8hmgc0mq5vk5spz5syxgflqhjijk8nrvyfgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xquery-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xquery-tool";
           sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
           name = "xquery-tool";
         };
@@ -29126,7 +29399,7 @@
           sha256 = "1kmlya0bwgm2krwc6j4gp80579sf5azz08l8d7pydw69rckv6ji0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xref-js2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xref-js2";
           sha256 = "1mfyszdi1wx2lqd9fyqm0ra227dcsjs8asc1dw2li0alwh7n4xs3";
           name = "xref-js2";
         };
@@ -29147,7 +29420,7 @@
           sha256 = "1zdj4664gvwc4kyx7fx5232l3c5anm0xyrrnrw596q604q6xxj2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xterm-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xterm-color";
           sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
           name = "xterm-color";
         };
@@ -29168,7 +29441,7 @@
           sha256 = "1wqx6hlqcmqiljydih5fx89dw06g8w728pyn4iqsap8jwgjngb09";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/xtest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/xtest";
           sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
           name = "xtest";
         };
@@ -29189,7 +29462,7 @@
           sha256 = "1rplafm6mldsirj7xg66vsx03n263yii3il3fkws69xmv7sx1a6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yafolding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yafolding";
           sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
           name = "yafolding";
         };
@@ -29210,7 +29483,7 @@
           sha256 = "0l9b888wv72j4hhkcfzsh09iqjxp2qjbjcjcfmvfhxf7il11pv8h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yagist";
           sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
           name = "yagist";
         };
@@ -29231,7 +29504,7 @@
           sha256 = "1mj1gwrflpdlmc7wl1axygn1jqlrjys1dh3cpdh27zrgsjvhd6c1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yaml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yaml-mode";
           sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
           name = "yaml-mode";
         };
@@ -29252,7 +29525,7 @@
           sha256 = "007837w6gd7k253h7g2in6l3ihcbwv733yiffs26pnymgk21xdqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yascroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yascroll";
           sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
           name = "yascroll";
         };
@@ -29262,22 +29535,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "0.9.1";
+        version = "0.10.0";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "yasnippet";
-          rev = "6aeccce2f17aca6a59a2790ec08680d52c03f6c0";
-          sha256 = "0yiglsb1s9ni4xig05ysw75l0ndjgdyhzip7c0sdxb265p3yrfby";
+          rev = "dc3e4ca3454e8ffcd9a9eae312dba5b3657f9b11";
+          sha256 = "16akdsqb74b4lriywidszmyyc8irq5dws8ya3mcja87kvih76148";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yasnippet";
           sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
           name = "yasnippet";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/yasnippet";
           license = lib.licenses.free;
@@ -29294,7 +29567,7 @@
           sha256 = "1yplaj7pry43qps8hvqxj9983ah4jvaiq94l171a7f8qi28386s8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yatemplate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yatemplate";
           sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
           name = "yatemplate";
         };
@@ -29313,7 +29586,7 @@
           sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yatex";
           sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
           name = "yatex";
         };
@@ -29334,7 +29607,7 @@
           sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yaxception";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yaxception";
           sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
           name = "yaxception";
         };
@@ -29355,7 +29628,7 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/ycmd";
           sha256 = "10jqr6xz2fnrd1ihips9jmbcd28zha432h4pxjpswz3ivwjqhxna";
           name = "ycmd";
         };
@@ -29376,7 +29649,7 @@
           sha256 = "0yvz7lmid4jcikb9jmc7h2lcry3fdyy809k25nyasj2bk41xqqsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yesql-ghosts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yesql-ghosts";
           sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
           name = "yesql-ghosts";
         };
@@ -29397,7 +29670,7 @@
           sha256 = "19a47780h0x1rdicr8i7356kvamkbkcwp31skdpp5cxgysvi3d9s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/yoshi-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/yoshi-theme";
           sha256 = "1kzdjs3rzg9rxrjgsk0wk75rwvbip6ixg1apcxv2c1a6biqqf2hv";
           name = "yoshi-theme";
         };
@@ -29418,7 +29691,7 @@
           sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/youdao-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/youdao-dictionary";
           sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
           name = "youdao-dictionary";
         };
@@ -29439,7 +29712,7 @@
           sha256 = "1n7ka608lk0xp7vg4zcw282zna0cwvcwvmhic6ym1ag7lq5cjrhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zenburn-theme";
           sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
           name = "zenburn-theme";
         };
@@ -29460,7 +29733,7 @@
           sha256 = "1kdsyki7i7x0ypq0iabdv1bnx0gd45acqcixvrxi3rf9j4chyvls";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zerodark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
           name = "zerodark-theme";
         };
@@ -29481,7 +29754,7 @@
           sha256 = "1ksjd3askc3k1l0b3nia5mzkxa74bidh2x0xlrj4qs4im5445vnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zombie-trellys-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zombie-trellys-mode";
           sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
           name = "zombie-trellys-mode";
         };
@@ -29502,7 +29775,7 @@
           sha256 = "1lrgirfvcvbir7csshkhhwj99jj1x5aprhw7xfiicv7nan9m6gjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zone-nyan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zone-nyan";
           sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
           name = "zone-nyan";
         };
@@ -29523,7 +29796,7 @@
           sha256 = "13393bd5lqpbv7m3p6ihg0ghx1w4w6mrnybx4m8hcfvcn17dr3hw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zoom-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zoom-window";
           sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
           name = "zoom-window";
         };
@@ -29544,7 +29817,7 @@
           sha256 = "0j6x3az8vpq2ggafjxdl8x3ln7lhh58c27z72mwywp4a2ca1g496";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zop-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zop-to-char";
           sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
           name = "zop-to-char";
         };
@@ -29565,7 +29838,7 @@
           sha256 = "0qwdbzfi8mddmchdd9ab9ms1ynlc8dx08i6g2mf3za1sbcivdqsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zotelo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zotelo";
           sha256 = "0y6s5ma7633h5pf9zj7vkazidlf211va7nk47ppb1q0iyfkyln36";
           name = "zotelo";
         };
@@ -29586,7 +29859,7 @@
           sha256 = "0qksa67aazs9vx7v14nlakr34z6l0h6mhfzi2c0vhrr0c210r6hp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zotxt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zotxt";
           sha256 = "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5";
           name = "zotxt";
         };
@@ -29607,7 +29880,7 @@
           sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zygospore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zygospore";
           sha256 = "0n9qs6fymdjly0i4rmx87y8gapfn5sqivsivcffi42vcb5f17kxj";
           name = "zygospore";
         };
@@ -29628,7 +29901,7 @@
           sha256 = "0y0hhar3krkvbpb5y9k197mb0wfpz8cl6fmxazq8msjml7hkk339";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/zzz-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/zzz-to-char";
           sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
           name = "zzz-to-char";
         };

From 22da52f28daae87e240c8c7e7c4884fccfbd27b0 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sun, 12 Jun 2016 16:23:12 +0100
Subject: [PATCH 243/436] {lib}mediainfo{-gui}: 0.7.84 -> 0.7.86

From the changelog:
```
Version 0.7.86, 2016-05-31

+ Linux/Mac: more output formats (PBCore, EBUCore, FIMS)
+ FFV1 parsing optimization, avoiding by default a too verbose trace
+ Matroska: more elements support and typo fixes in the trace
+ #I172, Trace feature: provide the name of the main parser in the media element
+ Matroska: consider all values below 0x10 EBML names as 1-byte junk
x Matroska: better support (including speed improvement) of huge lossless frames (e.g. 20 MB FFV1 4K)
x #I144, Python binding: Python 2 on Linux does not automatically provide the locale to the shared object
x HTML output: don't escape carriage returns from the input file
x FFV1: some streams were rejected despite the fact they are valid
x Python binding: some errors during call of Get() API with Python3 on Linux/Mac
```
---
 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 a136497de890..73dc8433b88d 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.84";
+  version = "0.7.86";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0w3hm34amfy5bq3n1jihbwqvwqn0f8kvvq3lfc8nfwf8v7mjn7q9";
+    sha256 = "15w6m75bk6rsxxdrdibi330ch1x0cw131gynbhmhbsppsg0v5vb5";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 6f4c014fb23a..c512f6a249e7 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.84";
+  version = "0.7.86";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0w3hm34amfy5bq3n1jihbwqvwqn0f8kvvq3lfc8nfwf8v7mjn7q9";
+    sha256 = "15w6m75bk6rsxxdrdibi330ch1x0cw131gynbhmhbsppsg0v5vb5";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 8b8bf61a99b7..26416dc1ee17 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.84";
+  version = "0.7.86";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "0k657ynfxcw6lvakc8plz0pzfixlqbsiih2idimk9k1dd4xzhq3d";
+    sha256 = "14m7cgd93mglc9a4x28pb4yc6nfxhqk7vfryca83vpn80la1lxy0";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 20f0c66fe4fb0251e53a6d71e82231596d8b8b8a Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sun, 12 Jun 2016 16:55:53 +0100
Subject: [PATCH 244/436] canto-{curses,daemon}: 0.9.{6,5} -> 0.9.{7,6}

Unfortunately there is no changelog available.
---
 .../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 37736d6edd78..3db20d3de4c1 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.6";
+  version = "0.9.7";
   name = "canto-curses-${version}";
 
   src = fetchFromGitHub {
     owner = "themoken";
     repo = "canto-curses";
     rev = "v${version}";
-    sha256 = "0hxzpx314cflxq68gswjf2vrqf1z1ci9mxhxgwrk7sa6di86ygy0";
+    sha256 = "0ap1b4m5gbzi0l7vj6pwvvg77i2aarbynbdc147z2b1lzvr985zq";
   };
 
   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 b6f0ff19dc33..18837299e93e 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.5";
+  version = "0.9.6";
   name = "canto-daemon-${version}";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ python34Packages.buildPythonApplication rec {
     owner = "themoken";
     repo = "canto-next";
     rev = "v${version}";
-    sha256 = "1ycwrg5n2il833mdxgzz07r0vb4rxz89rk5c6l9g5x33ifinykdq";
+    sha256 = "0ibakwmsbpk10bvxsr5vvka0pks89arric428y5cmfgcpr72sqzw";
   };
 
   propagatedBuildInputs = with python34Packages; [ feedparser ];

From 82f2e72941764436242a4c4409bbd9675e957cfc Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 11 Jun 2016 21:59:15 -0700
Subject: [PATCH 245/436] zathura: Update mupdf dependency

---
 .../misc/zathura/pdf-mupdf/config.patch         | 17 -----------------
 .../misc/zathura/pdf-mupdf/default.nix          | 12 +++++++-----
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/applications/misc/zathura/pdf-mupdf/config.patch

diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/config.patch b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch
deleted file mode 100644
index 6445fab22989..000000000000
--- a/pkgs/applications/misc/zathura/pdf-mupdf/config.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- zathura-pdf-mupdf-0.2.7/config.mk
-+++ zathura-pdf-mupdf-0.2.7/config.mk
-@@ -32,10 +32,11 @@
- OPENSSL_INC ?= $(shell pkg-config --cflags libcrypto)
- OPENSSL_LIB ?= $(shell pkg-config --libs libcrypto)
- 
--MUPDF_LIB ?= -lmupdf -lmujs
-+MUPDF_INC ?= $(shell pkg-config --cflags mupdf)
-+MUPDF_LIB ?= $(shell pkg-config --libs mupdf)
- 
--INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC}
--LIBS = ${GTK_LIB} ${GIRARA_LIB} ${MUPDF_LIB} ${OPENSSL_LIB} -ljbig2dec -lopenjp2 -ljpeg
-+INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC} ${MUPDF_INC}
-+LIBS = ${GTK_LIB} ${GIRARA_LIB} ${OPENSSL_LIB} ${MUPDF_LIB} -ljbig2dec -ljpeg
- 
- # flags
- CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index 2b74fc21b8c6..b8f75b7151f5 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl }:
+{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, libjpeg, jbig2dec, openjpeg, fetchpatch}:
 
 stdenv.mkDerivation rec {
   version = "0.3.0";
@@ -9,13 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "1j3j3wbp49walb19f0966qsnlqbd26wnsjpcxfbf021dav8vk327";
   };
 
-  buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf ];
+  buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ];
 
   makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
 
-  patches = [
-    ./config.patch
-  ];
+  patches = [(fetchpatch {
+    name = "mupdf-1.9.patch";
+    url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/mupdf-1.9.patch?h=packages/zathura-pdf-mupdf";
+    sha256 = "185wgg0z4b0z5aybcnnyvbs50h43imn5xz3nqmya4rk4v5bwy49y";
+  })];
 
   meta = with lib; {
     homepage = http://pwmt.org/projects/zathura/;

From b8a525a8b644d9fc9961ca3ab3c4083b93987b2c Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 11 Jun 2016 23:32:33 -0700
Subject: [PATCH 246/436] jfbview: update mupdf 1.8 -> 1.9

---
 pkgs/os-specific/linux/jfbview/default.nix    |  4 +++
 .../os-specific/linux/jfbview/mupdf-1.9.patch | 28 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/os-specific/linux/jfbview/mupdf-1.9.patch

diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index 31ba5e1152c5..bad64a20cac7 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
     imlib2
   ];
 
+  patches = [
+    ./mupdf-1.9.patch
+  ];
+
   configurePhase = ''
     # Hack. Probing (`ldconfig -p`) fails with ‘cannot execute binary file’.
     # Overriding `OPENJP2 =` later works, but makes build output misleading:
diff --git a/pkgs/os-specific/linux/jfbview/mupdf-1.9.patch b/pkgs/os-specific/linux/jfbview/mupdf-1.9.patch
new file mode 100644
index 000000000000..99d7377239bf
--- /dev/null
+++ b/pkgs/os-specific/linux/jfbview/mupdf-1.9.patch
@@ -0,0 +1,28 @@
+--- JFBView-0.5.2-src/Makefile	2016-06-11 23:27:54.969894750 -0700
++++ JFBView-0.5.2-src/Makefile	2016-06-11 23:24:45.181142832 -0700
+@@ -134,13 +134,22 @@
+ 
+ .PHONY: detect_libopenjp2
+ detect_libopenjp2:
+-	$(eval OPENJP2 = $(shell ldconfig -p | grep -q libopenjp2 && echo 'openjp2' || echo 'openjpeg'))
++	$(eval OPENJP2 = $(shell echo libopenjp2 | grep -q libopenjp2 && echo 'openjp2'  || echo 'openjpeg'))
+ 	@echo "OPENJP2 = $(OPENJP2)" >> $(CONFIG_MK)
+ 
+ # mupdf_version only depends on -lmupdf.
+ mupdf_version: mupdf_version.cpp
+-	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDLIBS) -lmupdf
+-
++	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDLIBS) -lmupdf \
++    -lpthread \
++    -lform \
++    -lncurses \
++    -lfreetype \
++    -lharfbuzz \
++    -lz \
++    -ljbig2dec \
++    -ljpeg \
++    -lmujs \
++    -lopenjp2
+ endif
+ 
+ 

From 857ba2d956c17e87c1a347e0a8454ca5dec4cc73 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 11 Jun 2016 23:39:59 -0700
Subject: [PATCH 247/436] llpp: 21-git-2016-05-07 -> 21-git-2015-07-30

Update llpp to sync with mupdf
---
 pkgs/applications/misc/llpp/default.nix | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 42bfe698a9b6..04ad52175ff1 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -1,33 +1,36 @@
 { stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl
-, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl }:
+, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }:
 
 let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
 in stdenv.mkDerivation rec {
   name = "llpp-${version}";
-  version = "21-git-2015-07-30";
+  version = "21-git-2016-05-07";
 
   src = fetchgit {
     url = "git://repo.or.cz/llpp.git";
-    rev = "e9fe06d684b145a104cc319673076e069e853cac";
-    sha256 = "0w6kdjmh6jp5j88m213r0dg66ma42nxl6j4hjy4xnhkf52mg0iwx";
+    rev = "1beb003ca0f4ed90fda2823cb07c2eb674fc3ca4";
+    sha256 = "1r59yfm81zmiij401d3wc3zb1zc873ss02gkplbwi4lad2l0chba";
     fetchSubmodules = false;
   };
 
   buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl
-                  gtk3 jbig2dec openjpeg mujs openssl ];
+                  gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ];
+
+  dontStrip = true;
 
   configurePhase = ''
-      sh configure.sh -O -F ${mupdf}
-      sed -i 's;-lopenjpeg;-lopenjp2;g' .config
-      sed -i 's;$builddir/link\.so;link.so;g' build.ninja
+    sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype}/include+' build.sh
+    sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh
+    sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh
   '';
 
-  buildPhase = "${ninja}/bin/ninja";
+  buildPhase = ''
+    sh ./build.sh build
+  '';
 
   installPhase = ''
     install -d $out/bin $out/lib
     install build/llpp $out/bin
-    install link.so $out/lib
     wrapProgram $out/bin/llpp \
         --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \
         --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \

From af76a52c06bf7a14693005650fe6999e1d50effb Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Fri, 10 Jun 2016 16:56:58 -0700
Subject: [PATCH 248/436] libsixel: init at 1.6.1

libsixel is a library for display of graphics in console.
---
 .../libraries/libsixel/default.nix            | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/libsixel/default.nix

diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix
new file mode 100644
index 000000000000..86f6a7f24798
--- /dev/null
+++ b/pkgs/development/libraries/libsixel/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchFromGitHub}:
+stdenv.mkDerivation rec {
+  version = "1.6.1";
+  name = "libsixel-${version}";
+
+  src = fetchFromGitHub {
+    repo = "libsixel";
+    rev = "ef4374f80385edc48e0844cf324d7ef757688e44";
+    owner = "saitoha";
+    sha256 = "08m5q2ppk235bzbwff1wg874vr1bh4080qdj26l39v8lw1xzlqcp";
+  };
+
+  meta = with stdenv.lib; {
+    description = "The SIXEL library for console graphics, and converter programs";
+    homepage = http://saitoha.github.com/libsixel;
+    maintainers = with maintainers; [ vrthra ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75fdb3c2ea35..0d73577a51a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7970,6 +7970,8 @@ in
 
   libsieve = callPackage ../development/libraries/libsieve { };
 
+  libsixel = callPackage ../development/libraries/libsixel { };
+
   libsolv = callPackage ../development/libraries/libsolv { };
 
   libspectre = callPackage ../development/libraries/libspectre { };

From 0edbfabe2480a59b31a4728ab8ca1955e60c71b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 14:13:24 -0300
Subject: [PATCH 249/436] mate-common: 1.14.1 -> 1.15.0

---
 pkgs/desktops/mate/mate-common/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index 2f95043097d0..ada4fb7a3946 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "mate-common-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = "1.14";
+  major-ver = "1.15";
   minor-ver = "0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1xkcwn3w6vrgnkcw7mcvihrsqclpkbqqxs1ivj4cq0dkqrm1kdq4";
+    sha256 = "1r3c0i03ylrlibn4pz4j9qzbnj7b540hyhf98kkzzh680jn59iiy";
   };
 
   meta = {

From bea663985ae9b887c7a5542c0f124b4c7b56f90e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 14:30:04 -0300
Subject: [PATCH 250/436] mate-icon-theme: 1.14.1 -> 1.15.0

---
 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 f68c8b403eec..9d4adb331ac9 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "mate-icon-theme-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = "1.14";
+  major-ver = "1.15";
   minor-ver = "0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1d8y4vlna8higz05mc01srrgspxmzw04vh3hyzcd9ms603njpfqm";
+    sha256 = "1jpz3ihmyhyiyqlqz798xgzl3qa31ghymw3yrw6abd7ww0nkwiq9";
   };
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];

From 14e4e62ea49c95a2895922b4b9d9efcff9fa077b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 14:36:58 -0300
Subject: [PATCH 251/436] mate-icon-theme-faenza: 1.14.1 -> 1.15.0

---
 pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index 941b730d7544..ea441f0cc092 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -3,17 +3,17 @@
 stdenv.mkDerivation rec {
   name = "mate-icon-theme-faenza-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = "1.14";
+  major-ver = "1.15";
   minor-ver = "0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "115rbw4rbk8jqbjpbh5bfqjzsbwj5723r6cw96b1xrq1dv4gy4nr";
+    sha256 = "0ypk61sjgqj0b1sina9947x1dg456baxhsyybmxrwpgy3pr06qlz";
   };
 
-  nativeBuildInputs = [ autoreconfHook mate.mate-common ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs = [ hicolor_icon_theme ];
+  buildInputs = [ mate.mate-icon-theme hicolor_icon_theme ];
   
   meta = {
     description = "Faenza icon theme from MATE";

From 473062c9a7f07c93dc6a5932e113208e8e1c5e1c Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sun, 12 Jun 2016 20:15:42 +0200
Subject: [PATCH 252/436] kmod-debian-aliases: 21-1 -> 22-1.1

---
 pkgs/os-specific/linux/kmod-debian-aliases/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
index 13fe500286d7..0fbf7821147a 100644
--- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
+++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, lib }:
-let
-  version = "21-1";
-in
-stdenv.mkDerivation {
+
+stdenv.mkDerivation rec {
   name = "kmod-debian-aliases-${version}.conf";
+  version = "22-1.1";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/k/kmod/kmod_${version}.debian.tar.xz";
-    sha256 = "1abpf8g3yx972by2xpmz6dwwyc1pgh6gjbvrivmrsws69vs0xjsy";
+    sha256 = "0daap2n4bvjqcnksaayy6csmdb1px4r02w3xp36bcp6w3lbnqamh";
   };
 
   installPhase = ''

From 077ac28f2c762853065a5c28fd66738d7aca4984 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sun, 12 Jun 2016 20:23:00 +0200
Subject: [PATCH 253/436] mercurial: update source url

The old download url isn't reachable since a few weeks. The new one uses
mercurials domain instead of selenics.
---
 pkgs/applications/version-management/mercurial/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index f0ffffde5fad..f2e471787753 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "http://mercurial.selenic.com/release/${name}.tar.gz";
+    url = "https://mercurial-scm.org/release/${name}.tar.gz";
     sha256 = "1zdz42znd6i7c3nf31j0k6frcs68qyniyvcad8k2a1hlarlv2y6b";
   };
 

From 9573ef7e0df4a761160b9c702ed0216f3730f823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 15:47:42 -0300
Subject: [PATCH 254/436] mate-themes: 3.18.1 -> 3.18.2, 3.20.8

---
 pkgs/desktops/mate/mate-themes/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index bc622ef3729f..1984e2dbdf9c 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -1,20 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk2, gtk_engines,
+{ stdenv, fetchurl, pkgconfig, intltool, mate, gnome3, gtk2, gtk_engines,
 gtk-engine-murrine, gdk_pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
   name = "mate-themes-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = "3.18";
-  minor-ver = "1";
+  major-ver = gnome3.version;
+  minor-ver = {
+    "3.18" = "2";
+    "3.20" = "8";
+  }."${major-ver}";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz";
-    sha256 = "0lkp6jqvnxp6jly35iw89paqs279nvhqg01ig92n1xcfp8yrqq9c";
+    sha256 = {
+      "3.18" = "1yy22nk450wsx0mlsvdalkyj41mijlvy8s6kifh98d4dnk8dvgfj";
+      "3.20" = "14jl3mbhzm7k2ilp8nmdwy9wrbmc7mbg2i0arf479xs2h7dz06f6";
+    }."${major-ver}";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  buildInputs = [ gtk2 gtk_engines gtk-engine-murrine gdk_pixbuf librsvg ];
+  buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gtk-engine-murrine
+  gdk_pixbuf librsvg ];
 
   meta = {
     description = "A set of themes from MATE";

From 0da4bb869e259f5e629ada1583af3dd927e7af8f Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 12 Jun 2016 21:28:40 +0200
Subject: [PATCH 255/436] bgnet: init at 3.0.21

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

diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix
new file mode 100644
index 000000000000..e205129db194
--- /dev/null
+++ b/pkgs/data/documentation/bgnet/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchurl, python, zip, fop }:
+
+stdenv.mkDerivation rec {
+  name = "bgnet-${version}";
+  version = "3.0.21";
+
+  src = fetchurl {
+    url = https://beej.us/guide/bgnet/bgnet.tgz;
+    sha256 = "00ggr5prc5i3w9gaaw2sadfq6haq7lmh0vdilaxx8xz9z5znxvyv";
+  };
+
+  buildInputs = [ python zip fop ];
+
+  preBuild = ''
+    sed -i "s/#disable=1/disable=1/" bin/bgvalidate
+    # build scripts need some love
+    patchShebangs .
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    mv * $out/
+  '';
+
+  meta = {
+    description = "Beej’s Guide to Network Programming";
+    homepage = https://beej.us/guide/bgnet/;
+    license = lib.licenses.unfree;
+
+    maintainers = with lib.maintainers; [ profpatsch ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be51cff6fe5b..10dcf6e86e64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10873,6 +10873,8 @@ let
 
   bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { };
 
+  bgnet = callPackage ../data/documentation/bgnet { };
+
   cacert = callPackage ../data/misc/cacert { };
 
   caladea = callPackage ../data/fonts/caladea {};

From 8b3278b7945acb9e9106eabb22bd8a221704e7da Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 10 Jun 2016 10:44:30 +0200
Subject: [PATCH 256/436] i2p: 0.9.25 -> 0.9.26

---
 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 dbb85f386354..fb2f43586946 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.25";
+  name = "i2p-0.9.26";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "1lj4khln0k0b4f55hjighwn5j3cyal8flmapjmadjyj6cd5py0v8";
+    sha256 = "0h672w69a5xzgcrls64bpss3ga9hgpnrq90dr5lb5912pwwq9pa1";
   };
   buildInputs = [ jdk ant gettext which ];
   patches = [ ./i2p.patch ];

From 7df03fbbb3515e74cb5a9c2637be242717ee8f03 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 2 Jun 2016 08:04:45 +0200
Subject: [PATCH 257/436] dropbox: 3.20.1 -> 4.4.29

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 1f10751cd5b2..301012316110 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -21,11 +21,11 @@
 
 let
   # NOTE: When updating, please also update in current stable, as older versions stop working
-  version = "3.20.1";
+  version = "4.4.29";
   sha256 =
     {
-      "x86_64-linux" = "170xnrxlsadl5iw96276f8l3w687l6n5j5m8z4djsfqqr3lqjxvg";
-      "i686-linux" = "0a7k56ib2qp5560wmbk7b30pqf7h9h7rjnq850993gn9lfwz81q2";
+      "x86_64-linux" = "1ff01vqi9jiwhkqm81rh321bsz4brl11xal2xzm9gll7s2m8lz06";
+      "i686-linux" = "0lwvvyxy5xyxh0b2g8a9bdy0y2hgpbak4n6q6b30167fvpj1ad1i";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From e1a487fa8f17f6ddd880899c0fe25ca97816926e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 12 Jun 2016 23:14:42 +0100
Subject: [PATCH 258/436] gx: init at 20160601

---
 pkgs/tools/package-management/gx/default.nix |  23 +++
 pkgs/tools/package-management/gx/deps.json   | 191 +++++++++++++++++++
 pkgs/top-level/all-packages.nix              |   2 +
 3 files changed, 216 insertions(+)
 create mode 100644 pkgs/tools/package-management/gx/default.nix
 create mode 100644 pkgs/tools/package-management/gx/deps.json

diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix
new file mode 100644
index 000000000000..7f9df88abdea
--- /dev/null
+++ b/pkgs/tools/package-management/gx/default.nix
@@ -0,0 +1,23 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "gx-${version}";
+  version = "20160601-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "f84ddf792ceb329e20c857731154798e1ce87314";
+
+  goPackagePath = "github.com/whyrusleeping/gx";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/whyrusleeping/gx";
+    sha256 = "10a6p9ba526jr6m66x3vsa3xsjlnzv7yma8vyp8d0bf0hs44bpih";
+  };
+
+  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.json;
+}
diff --git a/pkgs/tools/package-management/gx/deps.json b/pkgs/tools/package-management/gx/deps.json
new file mode 100644
index 000000000000..781557b6a4f6
--- /dev/null
+++ b/pkgs/tools/package-management/gx/deps.json
@@ -0,0 +1,191 @@
+[
+  {
+    "goPackagePath": "github.com/anacrolix/missinggo",
+    "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"
+    }
+  },
+  {
+    "goPackagePath": "github.com/blang/semver",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/blang/semver",
+      "rev": "aea32c919a18e5ef4537bbd283ff29594b1b0165",
+      "sha256": "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd"
+    }
+  },
+  {
+    "goPackagePath": "github.com/bradfitz/iter",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/bradfitz/iter",
+      "rev": "454541ec3da2a73fc34fd049b19ee5777bf19345",
+      "sha256": "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i"
+    }
+  },
+  {
+    "goPackagePath": "github.com/codegangsta/cli",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/codegangsta/cli",
+      "rev": "e5bef42c62aa7d25aba4880dc02b7624f01e9e19",
+      "sha256": "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq"
+    }
+  },
+  {
+    "goPackagePath": "github.com/ipfs/go-ipfs-api",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/ipfs/go-ipfs-api",
+      "rev": "7c354892da3abdaafb6ac576c100b259b1a73dac",
+      "sha256": "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jbenet/go-base58",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jbenet/go-base58",
+      "rev": "6237cf65f3a6f7111cd8a42be3590df99a66bc7d",
+      "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": {
+      "type": "git",
+      "url": "https://github.com/jbenet/go-os-rename",
+      "rev": "3ac97f61ef67a6b87b95c1282f6c317ed0e693c2",
+      "sha256": "0fmsmmh9h3l7swf5d56spy9jyrnrvw0vnxgh11mpvxmw5hv3lclr"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jbenet/go-random",
+    "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"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mitchellh/go-homedir",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mitchellh/go-homedir",
+      "rev": "1111e456ffea841564ac0fa5f69c26ef44dafec9",
+      "sha256": "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23"
+    }
+  },
+  {
+    "goPackagePath": "github.com/sabhiram/go-git-ignore",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/sabhiram/go-git-ignore",
+      "rev": "228fcfa2a06e870a3ef238d54c45ea847f492a37",
+      "sha256": "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj"
+    }
+  },
+  {
+    "goPackagePath": "github.com/whyrusleeping/go-multipart-files",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/whyrusleeping/go-multipart-files",
+      "rev": "3be93d9f6b618f2b8564bfb1d22f1e744eabbae2",
+      "sha256": "0lf58q5nrxp10v7mj4b0lz01jz8is1xysxwdwkhhs88qxha8vm2f"
+    }
+  },
+  {
+    "goPackagePath": "github.com/whyrusleeping/json-filter",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/whyrusleeping/json-filter",
+      "rev": "e9937f5649231265a56d0a419f062530425401a1",
+      "sha256": "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s"
+    }
+  },
+  {
+    "goPackagePath": "github.com/whyrusleeping/stump",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/whyrusleeping/stump",
+      "rev": "206f8f13aae1697a6fc1f4a55799faf955971fc5",
+      "sha256": "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n"
+    }
+  },
+  {
+    "goPackagePath": "github.com/whyrusleeping/tar-utils",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/whyrusleeping/tar-utils",
+      "rev": "beab27159606f5a7c978268dd1c3b12a0f1de8a7",
+      "sha256": "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/crypto",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/crypto",
+      "rev": "f3241ce8505855877cc8a9717bd61a0f7c4ea83c",
+      "sha256": "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq"
+    }
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3331f6d6b03c..c240e48be71d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1829,6 +1829,8 @@ in
     stdenv = stdenv_32bit;
   };
 
+  gx = callPackage ../tools/package-management/gx { };
+
   sbsigntool = callPackage ../tools/security/sbsigntool { };
 
   gsmartcontrol = callPackage ../tools/misc/gsmartcontrol {

From 292a8892a091905500105be931d8ddb4bc3cd68c Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 5 Jun 2016 00:19:06 +0200
Subject: [PATCH 259/436] haskell.lib.buildStackProject: allow passing in a
 custom GHC version.

Previously, the user could only compile using the default version of
GHC in Nixpkgs. Now this can be changed by setting the `ghc` attribute
appropriately.
---
 pkgs/development/haskell-modules/generic-stack-builder.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 94999ed8c45a..caada71632d5 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -5,6 +5,7 @@ with stdenv.lib;
 { buildInputs ? []
 , extraArgs ? []
 , LD_LIBRARY_PATH ? ""
+, ghc ? ghc
 , ...
 }@args:
 

From e6aa4e0ccb6b169eaa4ff5ff28f332e078c018b4 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 5 Jun 2016 00:30:37 +0200
Subject: [PATCH 260/436] doc: Document how to set custom GHC version in
 haskell.lib.buildStackProject.

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

diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index e066ad110bec..cdabcbe0379d 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -378,6 +378,23 @@ special options turned on:
 	  buildInputs = [ R zeromq zlib ];
     }
 
+You can select a particular GHC version to compile with by setting the
+`ghc` attribute as an argument to `buildStackProject`. Better yet, let
+Stack choose what GHC version it wants based on the snapshot specified
+in `stack.yaml` (only works with Stack >= 1.1.3):
+
+    {nixpkgs ? import <nixpkgs> { }, ghc ? nixpkgs.ghc}
+
+    with nixpkgs;
+
+    let R = pkgs.R.override { enableStrictBarrier = true; };
+    in
+	haskell.lib.buildStackProject {
+      name = "HaskellR";
+	  buildInputs = [ R zeromq zlib ];
+	  inherit ghc;
+    }
+
 [stack-nix-doc]: http://docs.haskellstack.org/en/stable/nix_integration.html
 
 ### How to create ad hoc environments for `nix-shell`

From 70bc97b731c74beb95b3cb95939ed6b9ea02b9b8 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Mon, 13 Jun 2016 00:53:20 +0200
Subject: [PATCH 261/436] haskell.lib.buildStackProject: fix treatment of
 LD_LIBRARY_PATH.

Don't make LD_LIBRARY_PATH pick up cwd when original string is empty,
due to colon terminated search path.
---
 pkgs/development/haskell-modules/generic-stack-builder.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index caada71632d5..07421b1d14f8 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -4,7 +4,7 @@ with stdenv.lib;
 
 { buildInputs ? []
 , extraArgs ? []
-, LD_LIBRARY_PATH ? ""
+, LD_LIBRARY_PATH ? []
 , ghc ? ghc
 , ...
 }@args:
@@ -23,7 +23,7 @@ stdenv.mkDerivation (args // {
     extraArgs;
 
   # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042.
-  LD_LIBRARY_PATH = "${makeLibraryPath buildInputs}:${LD_LIBRARY_PATH}";
+  LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs);
 
   preferLocalBuild = true;
 

From f16171dd24451ed01b588760f0555fbcdc7fa912 Mon Sep 17 00:00:00 2001
From: Tom Dimiduk <tom@dimiduk.net>
Date: Fri, 10 Jun 2016 11:21:44 -0400
Subject: [PATCH 262/436] emcee: init at 2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb12e63bfafc..7d0b3c05cae5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -183,7 +183,19 @@ in modules // {
     };
   };
 
-
+  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";
+    };
+  };
 
   dbus = callPackage ../development/python-modules/dbus {
     dbus = pkgs.dbus;

From 96066935f27330fef376202482d495f55e57f0f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 13 Jun 2016 01:20:49 +0200
Subject: [PATCH 263/436] fix build of pngcheck

---
 pkgs/tools/graphics/pngcheck/default.nix | 2 +-
 pkgs/top-level/all-packages.nix          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix
index d288e7018e60..38efa0236b2e 100644
--- a/pkgs/tools/graphics/pngcheck/default.nix
+++ b/pkgs/tools/graphics/pngcheck/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   # '';
 
   makefile = "Makefile.unx";
-  makeFlags = "ZPATH=${zlib.out}/lib";
+  makeFlags = "ZPATH=${zlib.static}/lib";
 
   buildInputs = [ zlib ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6367d3fec834..94f1ac9d3c29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2953,7 +2953,9 @@ in
 
   plowshare = callPackage ../tools/misc/plowshare { };
 
-  pngcheck = callPackage ../tools/graphics/pngcheck { };
+  pngcheck = callPackage ../tools/graphics/pngcheck {
+    zlib = zlibStatic;
+  };
 
   pngcrush = callPackage ../tools/graphics/pngcrush { };
 

From 4227aa2c4feccbdb79058836c82c409af292c07f Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 11 Jun 2016 15:15:13 -0700
Subject: [PATCH 264/436] ffmpeg-sixel: init at nightly-2.3.x

---
 .../libraries/ffmpeg-sixel/default.nix        | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/ffmpeg-sixel/default.nix

diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix
new file mode 100644
index 000000000000..dced5582cf63
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, pkgconfig, perl, libsixel, yasm
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "ffmpeg-sixel-${version}";
+  version = "nightly-2.3.x";
+
+  src = fetchFromGitHub {
+    owner = "saitoha";
+    repo = "FFmpeg-SIXEL";
+    rev = "8566fdb8b7516b54aed58f329dc216e06fc10052";
+    sha256 = "00s2lggfdj2ibpngpyqqg7360p7yb69ys1ppg59yvv0m0mxk5x3k";
+  };
+
+  buildInputs = [
+    pkgconfig
+    libsixel
+    yasm
+  ];
+
+  configurePhase = ''
+    ./configure --enable-libsixel --prefix=$out
+  '';
+
+  postInstall = ''
+    mv $out/bin/ffmpeg $out/bin/ffmpeg-sixel
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A complete, cross-platform solution to record, convert and stream audio and video, extended to support console graphics";
+    homepage = http://www.ffmpeg.org/;
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ vrthra ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94f1ac9d3c29..530ccb5d1598 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6961,6 +6961,8 @@ in
 
   ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };
 
+  ffmpeg-sixel = callPackage ../development/libraries/ffmpeg-sixel { };
+
   ffms = callPackage ../development/libraries/ffms { };
 
   fftw = callPackage ../development/libraries/fftw { };

From 9b01ad3ce8da52f093b0724f01571d2e4a2b59a1 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <gopinath@eecs.oregonstate.edu>
Date: Thu, 9 Jun 2016 14:45:11 -0700
Subject: [PATCH 265/436] rebol: init at 3-alpha

Rebol is a cross-platform data exchange language and a multi-paradigm dynamic
programming language for network communications and distributed computing.
---
 .../interpreters/rebol/default.nix            | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/interpreters/rebol/default.nix

diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix
new file mode 100644
index 000000000000..8a13c4efce61
--- /dev/null
+++ b/pkgs/development/interpreters/rebol/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, fetchurl, patchelf, glibc, libX11, libXt, perl }:
+
+stdenv.mkDerivation rec {
+  name = "rebol-nightly-${version}";
+  version = "3-alpha";
+  src = fetchFromGitHub {
+    rev = "bd45d0de512ff5953e098301c3d610f6024515d6";
+    owner = "earl";
+    repo = "r3";
+    sha256 = "0pirn6936rxi894xxdvj7xdwlwmmxq2wz36jyjnj26667v2n543c";
+  };
+
+  r3 = fetchurl {
+    url = "http://rebolsource.net/downloads/experimental/r3-linux-x64-gbf237fc";
+    sha256 = "0cm86kn4lcbvyy6pqg67x53y0wz353y0vg7pfqv65agxj1ynxnrx";
+    name = "r3";
+  };
+
+  buildInputs = [ glibc libX11 libXt perl ];
+
+  configurePhase = ''
+    cp ${r3} make/r3-make
+    chmod 777 make/r3-make
+    patchelf  --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./make/r3-make
+    cd make
+    perl -pi -e 's#-m32##g' makefile
+    perl -pi -e 's#sudo .*#echo#g' makefile
+    make prep
+  '';
+  buildPhase = ''
+    make
+    mkdir -p $out/bin
+    cp r3 $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''Relative expression based object language, a language where code is data'';
+    maintainers = with maintainers; [ vrthra ];
+    platforms = [ "x86_64-linux" ];
+    license = licenses.asl20;
+    homepage = http://www.rebol.com/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94f1ac9d3c29..04729d3e50c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9746,6 +9746,8 @@ in
 
   rbtools = pythonPackages.rbtools;
 
+  rebol =  callPackage ../development/interpreters/rebol { };
+
   setuptools = pythonPackages.setuptools;
 
   slowaes = pythonPackages.slowaes;

From b3edfdbe217d401873f9e90d9099fc34ab34fec4 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sun, 12 Jun 2016 18:36:27 -0700
Subject: [PATCH 266/436] mlterm: Disable darwin compilaton

Mlterm does not compile on darwin due to utmp.h not found.
---
 pkgs/applications/misc/mlterm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index cfcff9554e7d..80d0c136628e 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     homepage = https://sourceforge.net/projects/mlterm/;
     license = licenses.bsd2;
     maintainers = [ maintainers.vrthra ];
-    platforms = with platforms; linux ++ darwin;
+    platforms = with platforms; linux;
   };
 }

From b331af6de6eab62be38b4abbce12cbbad414ba25 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 11 Jun 2016 21:02:33 -0500
Subject: [PATCH 267/436] lua-mpack: fix building with clang
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

clang has some things considered “warnings” that gcc doesn’t so it is
necessary to set “-Wno-error” to build under clang.
---
 pkgs/top-level/lua-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index c90a8452c25b..7a315eaa4d23 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -398,6 +398,7 @@ let
     preInstall = ''
       mkdir -p $out/lib/lua/${lua.luaversion}
     '';
+    NIX_CFLAGS_COMPILE = "-Wno-error -fpic";
     installFlags = [
       "USE_SYSTEM_LUA=yes"
       "LUA_VERSION_MAJ_MIN="

From e0884e85cfc2634aeb2d7456f9e0cf6b7dc3b945 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 11 Jun 2016 21:11:31 -0500
Subject: [PATCH 268/436] neovim: fix build on darwin, cleanup lua paths
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes #16152

The cmake script had trouble finding the lua paths, this sets them
using “luaPackages.getLuaPath” and “luaPackages.getLuaCPath”.
---
 pkgs/applications/editors/neovim/default.nix | 26 +++++++++-----------
 pkgs/top-level/lua-packages.nix              |  5 ++++
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index d00d9a79ac77..15bd695aafc8 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack, libtermkey
-, libtool, libuv, lua, luajit, luaPackages, man, ncurses, perl, pkgconfig
+, libtool, libuv, luajit, luaPackages, man, ncurses, perl, pkgconfig
 , unibilium, makeWrapper, vimUtils, xsel
 
 , withPython ? true, pythonPackages, extraPythonPackages ? []
@@ -75,20 +75,14 @@ let
       glib
       libtermkey
       libuv
-      # For some reason, `luajit` has to be listed after `lua`. See
-      # https://github.com/NixOS/nixpkgs/issues/14442
-      lua
-      luajit
       libmsgpack
       ncurses
       neovimLibvterm
       unibilium
-
-      luaPackages.lpeg
-      luaPackages.mpack
-      luaPackages.luabitop
-
-    ] ++ optional withJemalloc jemalloc;
+      luajit
+      luaPackages.lua
+    ] ++ optional withJemalloc jemalloc
+      ++ lualibs;
 
     nativeBuildInputs = [
       cmake
@@ -97,11 +91,13 @@ let
       pkgconfig
     ];
 
-    LUA_CPATH = "${luaPackages.lpeg}/lib/lua/${lua.luaversion}/?.so;${luaPackages.mpack}/lib/lua/${lua.luaversion}/?.so;${luaPackages.luabitop}/lib/lua/${lua.luaversion}/?.so";
+    LUA_PATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaPath lualibs);
+    LUA_CPATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaCPath lualibs);
 
-    configureFlags = [
-      "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-      "-DENABLE_JEMALLOC=ON"
+    lualibs = [ luaPackages.mpack luaPackages.lpeg luaPackages.luabitop ];
+
+    cmakeFlags = [
+      "-DLUA_PRG=${luaPackages.lua}/bin/lua"
     ];
 
     preConfigure = ''
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 7a315eaa4d23..5f38fdf42aa7 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -19,6 +19,11 @@ let
   inherit lua;
   inherit (stdenv.lib) maintainers;
 
+  # helper functions for dealing with LUA_PATH and LUA_CPATH
+  getPath       = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}";
+  getLuaPath    = lib : getPath lib "lua";
+  getLuaCPath   = lib : getPath lib "so";
+
   #define build lua package function
   buildLuaPackage = callPackage ../development/lua-modules/generic lua;
 

From e37bb985a33e684bdff3c494b4effbfc7c86fda7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 26 May 2016 19:24:26 -0500
Subject: [PATCH 269/436] retroarch: 2015-11-20 -> 1.3.4

also: remove nvidia-cg-toolkit as input for retroarch.
see #15707

darwin is also building but you have to trick it into
thinking it's a desktop app for the GUI to load

platforms is set to "platforms.all".
---
 pkgs/misc/emulators/retroarch/default.nix | 39 ++++++++++++++---------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index 0ab4698c196e..ac8e1e46112f 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -1,6 +1,12 @@
-{ stdenv, fetchgit, makeDesktopItem, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit
-, freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib
-, libX11, libXext, libXxf86vm, libXdmcp, SDL, libpulseaudio ? null }:
+{ stdenv, fetchFromGitHub, makeDesktopItem, coreutils, which, pkgconfig
+, ffmpeg, mesa, freetype, libxml2, python34
+, enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null
+, alsaLib ? null, libv4l ? null
+, udev ? null, libX11 ? null, libXext ? null, libXxf86vm ? null
+, libXdmcp ? null, SDL ? null, libpulseaudio ? null
+}:
+
+with stdenv.lib;
 
 let
   desktopItem = makeDesktopItem {
@@ -9,25 +15,28 @@ let
     icon = "retroarch";
     comment = "Multi-Engine Platform";
     desktopName = "RetroArch";
-    genericName = "Libretro Frontend";    
+    genericName = "Libretro Frontend";
     categories = "Game;Emulator;";
     #keywords = "multi;engine;emulator;xmb;";
   };
-  
 in
 
 stdenv.mkDerivation rec {
   name = "retroarch-bare-${version}";
-  version = "2015-11-20";
+  version = "1.3.4";
 
-  src = fetchgit {
-    url = https://github.com/libretro/RetroArch.git;
-    rev = "09dda14549fc13231311fd522a07a75e923889aa";
-    sha256 = "0yrisl61iaa70ahswzgb505bvm5cxq8ndnv2bw7gqrlm5qrh54qy";
+  src = fetchFromGitHub {
+    owner = "libretro";
+    repo = "RetroArch";
+    sha256 = "0ccp17580w0884baxj5kcynlm03jgd7i62dprz1ajxbi2s7b3mi3";
+    rev = "v${version}";
   };
 
-  buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils
-                  python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL libpulseaudio ];
+  buildInputs = [ pkgconfig ffmpeg mesa freetype libxml2 coreutils python34 which SDL ]
+                ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
+                ++ optionals stdenv.isLinux [ udev alsaLib libX11 libXext libXxf86vm libXdmcp libv4l libpulseaudio ];
+
+  configureScript = "sh configure";
 
   patchPhase = ''
     export GLOBAL_CONFIG_DIR=$out/etc
@@ -44,11 +53,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://libretro.org/;
     description = "Multi-platform emulator frontend for libretro cores";
     license = licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with maintainers; [ MP2E edwtjo ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ MP2E edwtjo matthewbauer ];
   };
 }

From ea8fb0aee53e121bb844201f6032c8d33b70dc16 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sun, 12 Jun 2016 18:29:56 -0700
Subject: [PATCH 270/436] SDL_sixel: init at 1.2-nightly

SDL_sixel is a fork of SDL1.2 that supports sixel as a video driver (for
console graphics)
---
 .../libraries/SDL_sixel/default.nix           | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/SDL_sixel/default.nix

diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix
new file mode 100644
index 000000000000..5b8e887c2eee
--- /dev/null
+++ b/pkgs/development/libraries/SDL_sixel/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, pkgconfig, libsixel }:
+
+stdenv.mkDerivation rec {
+  name    = "SDL_sixel-${version}";
+  version = "1.2-nightly";
+
+  src = fetchFromGitHub {
+    owner = "saitoha";
+    repo = "SDL1.2-SIXEL";
+    rev = "ab3fccac6e34260a617be511bd8c2b2beae41952";
+    sha256 = "0gm2vngdac17lzw9azkhzazmfq3byjddms14gqjk18vnynfqp5wp";
+  };
+
+  configureFlags = [ "--enable-video-sixel" ];
+
+  buildInputs = [ pkgconfig libsixel ];
+
+  meta = with stdenv.lib; {
+    description = "A cross-platform multimedia library, that supports sixel graphics on consoles";
+    homepage    = https://github.com/saitoha/SDL1.2-SIXEL;
+    maintainers = with maintainers; [ vrthra ];
+    platforms   = platforms.linux;
+    license     = licenses.lgpl21;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94f1ac9d3c29..3c294b498aac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8990,6 +8990,8 @@ in
     inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa;
   };
 
+  SDL_sixel = callPackage ../development/libraries/SDL_sixel { };
+
   SDL_gfx = callPackage ../development/libraries/SDL_gfx { };
 
   SDL_image = callPackage ../development/libraries/SDL_image { };

From e19c5ce2e72c1930df663c7c7320691de8c35b6b Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sun, 12 Jun 2016 18:27:02 -0700
Subject: [PATCH 271/436] green-pdf-viewer: init at nightly-2014-04-22

Green pdf viewer uses SDL and libpoppler to render pdf.
---
 .../misc/green-pdfviewer/default.nix          | 37 +++++++++++++
 .../misc/green-pdfviewer/gdk-libs.patch       | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 96 insertions(+)
 create mode 100644 pkgs/applications/misc/green-pdfviewer/default.nix
 create mode 100644 pkgs/applications/misc/green-pdfviewer/gdk-libs.patch

diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix
new file mode 100644
index 000000000000..03d333e59e67
--- /dev/null
+++ b/pkgs/applications/misc/green-pdfviewer/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "green-pdfviewer-${version}";
+  version = "nightly-2014-04-22";
+
+  src = fetchFromGitHub {
+    owner = "schandinat";
+    repo = "green";
+    rev = "0b516aec17915d9742d8e505d2ed383a3bdcea61";
+    sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj";
+  };
+
+  buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk ];
+
+  patches = [
+    ./gdk-libs.patch
+  ];
+
+  buildPhase = ''
+    make PREFIX=$out
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man1
+    make install PREFIX=$out MANDIR=$out/share
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/schandinat/green/;
+    description = "Viewer for PDF files, uses SDL and libpoppler";
+
+    platforms = platforms.unix;
+    license  = licenses.gpl3;
+    maintainers = [ maintainers.vrthra ];
+  };
+}
diff --git a/pkgs/applications/misc/green-pdfviewer/gdk-libs.patch b/pkgs/applications/misc/green-pdfviewer/gdk-libs.patch
new file mode 100644
index 000000000000..cfcab32aac99
--- /dev/null
+++ b/pkgs/applications/misc/green-pdfviewer/gdk-libs.patch
@@ -0,0 +1,55 @@
+Common subdirectories: green.old/debian and green.new/debian
+diff -u green.old/green.h green.new/green.h
+--- green.old/green.h	2016-06-12 18:11:56.779434416 -0700
++++ green.new/green.h	2016-06-12 18:14:38.830557379 -0700
+@@ -19,7 +19,14 @@
+ 
+ 
+ #include <stdbool.h>
+-#include "glib/poppler.h"
++#include "poppler.h"
++#include "gdk-pixbuf/gdk-pixbuf.h"
++#include "gdk-pixbuf/gdk-pixbuf-core.h"
++#include "gdk-pixbuf/gdk-pixbuf-features.h"
++#include "gdk-pixbuf/gdk-pixbuf-enum-types.h"
++ 
++ #define GREEN_FULLSCREEN	0x0001
++ 
+ 
+ 
+ #define GREEN_FULLSCREEN	0x0001
+diff -u green.old/Makefile green.new/Makefile
+--- green.old/Makefile	2016-06-12 18:11:56.779434416 -0700
++++ green.new/Makefile	2016-06-12 18:13:09.591974048 -0700
+@@ -17,6 +17,12 @@
+ SDL_CFLAGS	:=	$$(sdl-config --cflags)
+ SDL_LIBS	:=	$$(sdl-config --libs)
+ 
++GDKPIXBUF_CFLAGS	:=	$$(pkg-config gdk-pixbuf-2.0 --cflags)
++GDKPIXBUF_LIBS	:=	$$(pkg-config gdk-pixbuf-2.0 --libs)
++
++GTK_CFLAGS	:=	$$(pkg-config gtk+-2.0 --cflags)
++GTK_LIBS	:=	$$(pkg-config gtk+-2.0 --libs)
++
+ 
+ all: green
+ 
+@@ -28,13 +34,14 @@
+ 	$(INSTALL) green.1 $(MANDIR)/man1/
+ 
+ green: main.o green.o sdl.o
+-	$(CC) $^ $(POPPLER_LIBS) $(SDL_LIBS) -o $@
++	$(CC) $^ $(POPPLER_LIBS) $(SDL_LIBS) $(GDKPIXBUF_LIBS) $(GTK_LIBS) -o $@
+ 
+ main.o: main.c green.h
+-	$(CC) $(CONFIG) $(CFLAGS) -c $< $(POPPLER_CFLAGS) -o $@
++	$(CC) $(CONFIG) $(CFLAGS) $(GDKPIXBUF_CFLAGS) -c $< $(POPPLER_CFLAGS) -o $@
+ 
+ green.o: green.c green.h
+-	$(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) -o $@
++	$(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS)  $(GDKPIXBUF_CFLAGS) -o $@
+ 
+ sdl.o: sdl.c green.h
+-	$(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) $(SDL_CFLAGS) -o $@
++	$(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) $(SDL_CFLAGS) $(GDKPIXBUF_CFLAGS) $(GTK_CFLAGS) -o $@
++
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c294b498aac..c76e72201767 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -475,6 +475,10 @@ in
 
   grc = callPackage ../tools/misc/grc { };
 
+  green-pdfviewer = callPackage ../applications/misc/green-pdfviewer {
+   SDL = SDL_sixel;
+  };
+
   lastpass-cli = callPackage ../tools/security/lastpass-cli { };
 
   pass = callPackage ../tools/security/pass { };

From ff45ea743f0a82adab8013eca29dc6fb9bae6e84 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Sun, 12 Jun 2016 19:39:07 -0400
Subject: [PATCH 272/436] qtpass: 1.1.1 -> 1.1.3

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

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 342a03f89843..cca8d05ea5cf 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
-  version = "1.1.1";
+  version = "1.1.3";
 
   src = fetchzip {
     url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
-    sha256 = "1x1ic9as0a60gz664sf8d1qiq64ji7q60g19x0rlm3bvcp2612c8";
+    sha256 = "114rqvd2jl98c75zmhdwfmp44kxa4v459naiivb4w020d60ziq7l";
   };
 
   buildInputs = [ git gnupg pass qtbase qtsvg qttools ];

From c33cf023374050f6c3a70cc34d83256b6f1bc544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 10 Jun 2016 10:24:44 -0300
Subject: [PATCH 273/436] faba-icon-theme: init at 2016-06-02

---
 pkgs/data/icons/faba-icon-theme/default.nix | 30 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/data/icons/faba-icon-theme/default.nix

diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix
new file mode 100644
index 000000000000..b83abbe7e80c
--- /dev/null
+++ b/pkgs/data/icons/faba-icon-theme/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, elementary-icon-theme }:
+
+stdenv.mkDerivation rec {
+  name = "${package-name}-${version}";
+  package-name = "faba-icon-theme";
+  version = "2016-06-02";
+
+  src = fetchFromGitHub {
+    owner = "moka-project";
+    repo = package-name;
+    rev = "e50649d0171fd8cce42404c7c5002d77710ffcfc";
+    sha256 = "1fn969a6l58asnl9181c2z1fsj4dybl2mgbcpwig20bri6q7yz20";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ elementary-icon-theme ];
+
+  postPatch = ''
+    substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A sexy and modern icon theme with Tango influences";
+    homepage = https://snwh.org/moka;
+    license = with licenses; [ cc-by-sa-40 gpl3 ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 530ccb5d1598..a984763bf8b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11562,6 +11562,8 @@ in
 
   eb-garamond = callPackage ../data/fonts/eb-garamond { };
 
+  faba-icon-theme = callPackage ../data/icons/faba-icon-theme { };
+
   fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {};
 
   fira = callPackage ../data/fonts/fira { };

From 4e44a330cb0ee3a13ee2372293fedf54f354b66e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 10 Jun 2016 10:25:14 -0300
Subject: [PATCH 274/436] moka-icon-theme: init at 2016-06-07

---
 pkgs/data/icons/moka-icon-theme/default.nix | 30 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/data/icons/moka-icon-theme/default.nix

diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix
new file mode 100644
index 000000000000..4d98a50c0c4b
--- /dev/null
+++ b/pkgs/data/icons/moka-icon-theme/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, faba-icon-theme }:
+
+stdenv.mkDerivation rec {
+  name = "${package-name}-${version}";
+  package-name = "moka-icon-theme";
+  version = "2016-06-07";
+
+  src = fetchFromGitHub {
+    owner = "moka-project";
+    repo = package-name;
+    rev = "a03d14e30dbdf05e8ea904994b8081ad0824e155";
+    sha256 = "1j1cnrrg0gfr4vfzxlabrv8090fg4yni99g61s82vnyszkiy1rcm";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ faba-icon-theme ];
+
+  postPatch = ''
+    substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An icon theme designed with a minimal flat style using simple geometry and bright colours";
+    homepage = https://snwh.org/moka;
+    license = with licenses; [ cc-by-sa-40 gpl3 ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a984763bf8b9..f4bdba170521 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11652,6 +11652,8 @@ in
 
   mononoki = callPackage ../data/fonts/mononoki { };
 
+  moka-icon-theme = callPackage ../data/icons/moka-icon-theme { };
+
   montserrat = callPackage ../data/fonts/montserrat { };
 
   mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };

From fa447287b05928f389a565971711739a6293dc83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 10 Jun 2016 10:25:57 -0300
Subject: [PATCH 275/436] arc-icon-theme: init at 2016-06-06

---
 pkgs/data/icons/arc-icon-theme/default.nix | 26 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/data/icons/arc-icon-theme/default.nix

diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix
new file mode 100644
index 000000000000..07900eebeefa
--- /dev/null
+++ b/pkgs/data/icons/arc-icon-theme/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, moka-icon-theme }:
+
+stdenv.mkDerivation rec {
+  name = "${package-name}-${version}";
+  package-name = "arc-icon-theme";
+  version = "2016-06-06";
+
+  src = fetchFromGitHub {
+    owner = "horst3180";
+    repo = package-name;
+    rev = "69da5eed0761237fd287ea2fc95c708353ccc332";
+    sha256 = "04ym3ix2cpjh1q7lwvhl578pv41mn9zsadlsygl0nck8yd22widq";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ moka-icon-theme ];
+
+  meta = with stdenv.lib; {
+    description = "Arc icon theme";
+    homepage = https://github.com/horst3180/arc-icon-theme;
+    license = with licenses; [ gpl3 ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4bdba170521..0dd2e643afa2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11486,6 +11486,8 @@ in
 
   anonymousPro = callPackage ../data/fonts/anonymous-pro { };
 
+  arc-icon-theme = callPackage ../data/icons/arc-icon-theme { };
+
   arkpandora_ttf = callPackage ../data/fonts/arkpandora { };
 
   aurulent-sans = callPackage ../data/fonts/aurulent-sans { };

From 0072cb8ff1aaf5e1808fa282c88f912860c1547e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 10 Jun 2016 10:26:35 -0300
Subject: [PATCH 276/436] faba-mono-icons: init at 2016-04-30

Closes #16109.
---
 pkgs/data/icons/faba-mono-icons/default.nix | 26 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/data/icons/faba-mono-icons/default.nix

diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix
new file mode 100644
index 000000000000..16fa63c5424c
--- /dev/null
+++ b/pkgs/data/icons/faba-mono-icons/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, moka-icon-theme  }:
+
+stdenv.mkDerivation rec {
+  name = "${package-name}-${version}";
+  package-name = "faba-mono-icons";
+  version = "2016-04-30";
+
+  src = fetchFromGitHub {
+    owner = "moka-project";
+    repo = package-name;
+    rev = "2006c5281eb988c799068734f289a85443800cda";
+    sha256 = "0nisfl92y6hrbakp9qxi0ygayl6avkzrhwirg6854bwqjy2dvjv9";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ moka-icon-theme ];
+
+  meta = with stdenv.lib; {
+    description = "The full set of Faba monochrome panel icons";
+    homepage = https://snwh.org/moka;
+    license = with licenses; [ gpl3 ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0dd2e643afa2..071c34824b17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11566,6 +11566,8 @@ in
 
   faba-icon-theme = callPackage ../data/icons/faba-icon-theme { };
 
+  faba-mono-icons = callPackage ../data/icons/faba-mono-icons { };
+
   fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {};
 
   fira = callPackage ../data/fonts/fira { };

From b40e1efe000ec5c4616cecc9d6836eade419434e Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 12 Jun 2016 17:07:46 -0400
Subject: [PATCH 277/436] haskell generic-builder: don't propagate
 setupHaskellDepends
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without this patch, attempts to install at least some of the packages
that start to use setupHaskellDepends (mostly gtk-related packages)
results in collisions:

    building path(s) ‘/nix/store/63k5smns43f5r2ad8wcc242x0gwd70m3-ghc-8.0.1’
    collision between `/nix/store/k18i1nm5hgnb82y9w2g9hmlwhk3szjld-ghc-8.0.1/lib/ghc-8.0.1/Cabal-1.24.0.0/Distribution/Compat/Binary.dyn_hi' and `/nix/store/0rwhbwsg9kmywgbrib2bs29p2hmi80za-Cabal-1.24.0.0/lib/ghc-8.0.1/Cabal-1.24.0.0/Distribution/Compat/Binary.dyn_hi'
    builder for ‘/nix/store/vrjkfpm8sb96m9i5k74h8vn0rwddgy4v-ghc-8.0.1.drv’ failed with exit code 25

This would appear to me to be a consequence of setupHaskellDepends
entries being added to propagateBuildInputs.  It is sufficient in the
cases I'm familiar with (taffyBar), and I think correct, to simply add
it to the otherBuildInputs.
---
 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 866c8b002990..72110227140b 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -119,8 +119,8 @@ let
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
                         optionals doCheck testPkgconfigDepends;
 
-  propagatedBuildInputs = buildDepends ++ setupHaskellDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
-  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
+  propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
+  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ setupHaskellDepends ++
                      buildTools ++ libraryToolDepends ++ executableToolDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends);

From 25d37fc4ebfeea9bccfff1d09c2d152a17d9e3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 16:54:25 -0300
Subject: [PATCH 278/436] paper-icon-theme: 2016-05-25 -> 2016-06-08

---
 pkgs/data/icons/paper-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix
index 93c39b9eddd5..4baaca194bf3 100644
--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${package-name}-${version}";
   package-name = "paper-icon-theme";
-  version = "2016-05-25";
+  version = "2016-06-08";
 
   src = fetchFromGitHub {
     owner = "snwh";
     repo = package-name;
-    rev = "f221537532181a71938faaa1f695c762defe2626";
-    sha256 = "0knsdhgssh1wyhcrbk6lddqy7zn24528lnajqij467mpgiliabfy";
+    rev = "6aa0a2c8d802199d0a9f71579f136bd6476d5d8e";
+    sha256 = "07ak1lnvd0gwaclkcvccjbxikh701vfi07gmjp4zcqi6b5crl7f5";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 0bd6b9ce98b82fad81571dd6204f28009d9f1207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 16:59:05 -0300
Subject: [PATCH 279/436] paper-gtk-theme: 2016-05-25 -> 2016-05-27

Closes #16194.
---
 pkgs/misc/themes/paper-gtk-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/themes/paper-gtk-theme/default.nix b/pkgs/misc/themes/paper-gtk-theme/default.nix
index ff778b86f9c2..5dfb54fa493c 100644
--- a/pkgs/misc/themes/paper-gtk-theme/default.nix
+++ b/pkgs/misc/themes/paper-gtk-theme/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }:
 
 stdenv.mkDerivation rec {
-  version = "2016-05-25";
+  version = "2016-05-27";
   name = "paper-gtk-theme-${version}";
 
   src = fetchFromGitHub {
     owner = "snwh";
     repo = "paper-gtk-theme";
-    rev = "dea5f97b12e4f41dddbd01a1529760761aa3784e";
-    sha256 = "0fln555827hrn554qcil3rwl9x4x3vdfbh2vplkc8r46a3bn8yng";
+    rev = "06fb8b41743dd99410c08a9beabc323e6631d009";
+    sha256 = "1gffjsgs43rvxs8ryd5c3yfrp3a69d5wvjmiixwwp1qn1fr46dni";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 8edc102336cd0b3a1971c82ccf8cc9dfee9c742a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 16:14:24 -0300
Subject: [PATCH 280/436] numix-icon-theme: 2016-05-18 -> 2016-06-10

---
 pkgs/data/icons/numix-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 45f5d2f5ae76..735d1544cf55 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "2016-05-18";
+  version = "2016-06-10";
 
   package-name = "numix-icon-theme";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = package-name;
-    rev = "d571e845b9db0e5cc5a50e6d4423d25fc0d613bd";
-    sha256 = "0d9ajh12n1ms7wbgaa3nsdhlwsjwj4flm67cxzsb3dwhpql75z0c";
+    rev = "8196e9eaa5a60b5c02a9e37a4ca768b07966b41f";
+    sha256 = "0cyv0r66vil54y6w317msddq2fjs9zhrdx17m3bx85xpqz67zq5i";
   };
 
   dontBuild = true;

From d76e2f24c25fe725221c92da28034b22a4f15510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 16:27:16 -0300
Subject: [PATCH 281/436] numix-icon-theme-circle: 2016-05-25 -> 2016-06-10

---
 pkgs/data/icons/numix-icon-theme-circle/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index ace58a4d703e..414360f2d7a4 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, numix-icon-theme }:
 
 stdenv.mkDerivation rec {
-  version = "2016-05-25";
+  version = "2016-06-10";
 
   package-name = "numix-icon-theme-circle";
   
@@ -10,10 +10,12 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = package-name;
-    rev = "e2d2fe68e34e1650584f798c3cdb7e91ef62e6d3";
-    sha256 = "0fah812ymc6kczjhjsz0ai57ih6d8r6pknhvc54i7r3xqxshryc8";
+    rev = "577b8a2a8dd6429f7d3df37b15d9fd7fcbb58d56";
+    sha256 = "1zx26ng6z45j1yff2m0cng4nffk8swdq1pya1l2dm7841mx5ram4";
   };
 
+  buildInputs = [ numix-icon-theme ];
+
   dontBuild = true;
 
   installPhase = ''

From ce50ba74dc614ad21ceaa6c6e941eb80efd7902f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Jun 2016 16:36:41 -0300
Subject: [PATCH 282/436] numix-gtk-theme: 2016-05-25 -> 2016-06-12

Closes #16188.
---
 pkgs/misc/themes/numix-gtk-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/themes/numix-gtk-theme/default.nix b/pkgs/misc/themes/numix-gtk-theme/default.nix
index 4a37a16d5509..b8dac2540090 100644
--- a/pkgs/misc/themes/numix-gtk-theme/default.nix
+++ b/pkgs/misc/themes/numix-gtk-theme/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2016-05-25";
+  version = "2016-06-12";
   name = "numix-gtk-theme-${version}";
 
   src = fetchFromGitHub {
     repo = "numix-gtk-theme";
     owner = "numixproject";
-    rev = "e99d167adf1310e110e17f8e7c2baf217c2402aa";
-    sha256 = "1418hf034b2bp32wqagbnn5y3i21h8v2ihjqakq2gaqd5fwg0f9g";
+    rev = "1d941a15971f43fb2f5675c7059bf313b78797fc";
+    sha256 = "14b1gl761acdza4bkqr6dvsblvi2wsph79j5jircxfd3wgvm756i";
   };
 
   nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ];

From 3adf86eed6fcfc1baaba46e3052863876f0a91f7 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Mon, 13 Jun 2016 11:42:50 +0200
Subject: [PATCH 283/436] doc(haskell): Remove pesky tabs in code snippets.

---
 doc/languages-frameworks/haskell.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index cdabcbe0379d..2ddec0d9aba4 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -389,10 +389,10 @@ in `stack.yaml` (only works with Stack >= 1.1.3):
 
     let R = pkgs.R.override { enableStrictBarrier = true; };
     in
-	haskell.lib.buildStackProject {
+    haskell.lib.buildStackProject {
       name = "HaskellR";
-	  buildInputs = [ R zeromq zlib ];
-	  inherit ghc;
+      buildInputs = [ R zeromq zlib ];
+      inherit ghc;
     }
 
 [stack-nix-doc]: http://docs.haskellstack.org/en/stable/nix_integration.html

From 17dc0a544c1343227e6143c23c579951b14e788a Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.git@hrdinka.at>
Date: Mon, 13 Jun 2016 11:59:04 +0200
Subject: [PATCH 284/436] mapnik: 3.0.9 -> 3.0.10

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

diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 4f0311f9d92b..122fb710e739 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -5,13 +5,15 @@
 
 stdenv.mkDerivation rec {
   name = "mapnik-${version}";
-  version = "3.0.9";
+  version = "3.0.10";
 
   src = fetchurl {
     url = "https://mapnik.s3.amazonaws.com/dist/v${version}/mapnik-v${version}.tar.bz2";
-    sha256 = "1nnkamwq4vcg4q2lbqn7cn8sannxszzjxcxsllksby055d9nfgrs";
+    sha256 = "0fda6syrfb81930sf7rgw1qmpnik8k1ngrjkh43ywd3s37nbqh1n";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ python scons ];
 
   buildInputs =

From ca17bd0c8ac1b0c6d559137da80ba07a20395100 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Mon, 13 Jun 2016 12:08:18 +0100
Subject: [PATCH 285/436] socat: add readline support

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

diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix
index f57af20739d6..f9eff5b12d55 100644
--- a/pkgs/tools/networking/socat/default.nix
+++ b/pkgs/tools/networking/socat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl }:
+{ stdenv, fetchurl, openssl, readline }:
 
 stdenv.mkDerivation rec {
   name = "socat-1.7.3.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1apvi7sahcl44arnq1ad2y6lbfqnmvx7nhz9i3rkk0f382anbnnj";
   };
 
-  buildInputs = [ openssl ];
+  buildInputs = [ openssl readline ];
 
   patches = [ ./enable-ecdhe.patch ./libressl-fixes.patch ];
 

From de3ccbbdac02371f423745d47aaf2fd4e58fc780 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 13 Jun 2016 13:40:16 +0200
Subject: [PATCH 286/436] jabref: 2.10 -> 3.3

---
 pkgs/applications/office/jabref/default.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index 5f32077104e8..e25457bc1cc0 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, makeWrapper, makeDesktopItem, ant, jdk, jre }:
 
 stdenv.mkDerivation rec {
-  version = "2.10";
+  version = "3.3";
   name = "jabref-${version}";
+
   src = fetchurl {
-    url = "mirror://sourceforge/jabref/${version}/JabRef-${version}-src.tar.bz2";
-    sha256 = "09b57afcfeb1730b58a887dc28f0f4c803e9c00fade1f57245ab70e2a98ce6ad";
+    url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}.jar";
+    sha256 = "19ms68d74xg8jg9n52gh2j7a89dl5pnib3vjsnih1j45hlmfg0ac";
   };
 
   desktopItem = makeDesktopItem {
@@ -18,17 +19,21 @@ stdenv.mkDerivation rec {
     exec = "jabref";
   };
 
-  buildInputs = [ ant jdk makeWrapper ];
+  buildInputs = [ makeWrapper jdk ];
 
-  buildPhase = ''ant'';
+  phases = [ "installPhase" ];
 
   installPhase = ''
     mkdir -p $out/bin $out/share/java $out/share/icons
+
     cp -r ${desktopItem}/share/applications $out/share/
-    cp build/lib/JabRef-${version}.jar $out/share/java/
-    cp src/images/JabRef-icon-mac.svg $out/share/icons/jabref.svg
+
+    jar xf $src images/icons/JabRef-icon-mac.svg
+    cp images/icons/JabRef-icon-mac.svg $out/share/icons/jabref.svg
+
+    ln -s $src $out/share/java/jabref-${version}.jar
     makeWrapper ${jre}/bin/java $out/bin/jabref \
-      --add-flags "-jar $out/share/java/JabRef-${version}.jar"
+      --add-flags "-jar $out/share/java/jabref-${version}.jar"
   '';
 
   meta = with stdenv.lib; {

From 91436641ec3bf54f9f65487567e2ca50a0ef0e17 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 13 Jun 2016 12:20:33 +0000
Subject: [PATCH 287/436] Fix hash for Debian 8.4 Jessie

(cherry picked from commit fd60751ce0c85427423b78d8a46c3f78d65bd0e2)
---
 pkgs/build-support/vm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 7a3d816efc9e..23f781f104d4 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1869,7 +1869,7 @@ rec {
       fullName = "Debian 8.4 Jessie (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
-        sha256 = "0kipisyjkhczghzqj4a8y1n4az9c4c8lsj8sw7js13b053lpj6ga";
+        sha256 = "1vvl4k1c3wqvh4gj64vxj2iwb6s9ys5xrskwdpffhyjlslaylsnz";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From d2b58dd39a43282a3657c591f636674912717aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Pacana?= <pawel.pacana@gmail.com>
Date: Thu, 10 Mar 2016 16:00:09 +0100
Subject: [PATCH 288/436] buildkite-agent: init at 2.1.8

* nixos module included
* install compiled binary
* only one platform now
* limited config options
* relies on providing ssh keys for agent
---
 lib/maintainers.nix                           |   1 +
 nixos/modules/module-list.nix                 |   7 +-
 .../buildkite-agent.nix                       | 100 ++++++++++++++++++
 .../buildkite-agent/default.nix               |  43 ++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 150 insertions(+), 3 deletions(-)
 create mode 100644 nixos/modules/services/continuous-integration/buildkite-agent.nix
 create mode 100644 pkgs/development/tools/continuous-integration/buildkite-agent/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 79cd4c364a77..f561972c9300 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -282,6 +282,7 @@
   pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
   palo = "Ingolf Wanger <palipalo9@googlemail.com>";
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
+  pawelpacana = "Paweł Pacana <pawel.pacana@gmail.com>";
   pesterhazy = "Paulus Esterhazy <pesterhazy@gmail.com>";
   peterhoeg = "Peter Hoeg <peter@hoeg.com>";
   peti = "Peter Simons <simons@cryp.to>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index db159366c4e7..a7d81b8568e5 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -125,10 +125,11 @@
   ./services/computing/torque/server.nix
   ./services/computing/torque/mom.nix
   ./services/computing/slurm/slurm.nix
-  ./services/continuous-integration/jenkins/default.nix
-  ./services/continuous-integration/jenkins/slave.nix
-  ./services/continuous-integration/jenkins/job-builder.nix
+  ./services/continuous-integration/buildkite-agent.nix
   ./services/continuous-integration/hydra/default.nix
+  ./services/continuous-integration/jenkins/default.nix
+  ./services/continuous-integration/jenkins/job-builder.nix
+  ./services/continuous-integration/jenkins/slave.nix
   ./services/databases/4store-endpoint.nix
   ./services/databases/4store.nix
   ./services/databases/couchdb.nix
diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
new file mode 100644
index 000000000000..b1449882b04f
--- /dev/null
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -0,0 +1,100 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.buildkite-agent;
+  configFile = pkgs.writeText "buildkite-agent.cfg"
+    ''
+      token="${cfg.token}"
+      name="${cfg.name}"
+      meta-data="${cfg.meta-data}"
+      hooks-path="${pkgs.buildkite-agent}/share/hooks"
+      build-path="/var/lib/buildkite-agent/builds"
+      bootstrap-script="${pkgs.buildkite-agent}/share/bootstrap.sh"
+    '';
+in
+
+{
+  options = {
+    services.buildkite-agent = {
+      enable = mkEnableOption "buildkite-agent";
+
+      token = mkOption {
+        type = types.str;
+        description = ''
+          The token from your Buildkite "Agents" page.
+        '';
+      };
+
+      name = mkOption {
+        type = types.str;
+        description = ''
+          The name of the agent.
+        '';
+      };
+
+      meta-data = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Meta data for the agent.
+        '';
+      };
+
+      openssh =
+        { privateKey = mkOption {
+            type = types.str;
+            description = ''
+              Private agent key.
+            '';
+          };
+          publicKey = mkOption {
+            type = types.str;
+            description = ''
+              Public agent key.
+            '';
+          };
+        };
+    };
+  };
+
+  config = mkIf config.services.buildkite-agent.enable {
+    users.extraUsers.buildkite-agent =
+      { name = "buildkite-agent";
+        home = "/var/lib/buildkite-agent";
+        createHome = true;
+        description = "Buildkite agent user";
+      };
+
+    environment.systemPackages = [ pkgs.buildkite-agent ];
+
+    systemd.services.buildkite-agent =
+      { description = "Buildkite Agent";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+        environment.HOME = "/var/lib/buildkite-agent";
+        preStart = ''
+            ${pkgs.coreutils}/bin/mkdir -m 0700 -p /var/lib/buildkite-agent/.ssh
+
+            if ! [ -f /var/lib/buildkite-agent/.ssh/id_rsa ]; then
+              echo "${cfg.openssh.privateKey}" > /var/lib/buildkite-agent/.ssh/id_rsa
+              ${pkgs.coreutils}/bin/chmod 600 /var/lib/buildkite-agent/.ssh/id_rsa
+            fi
+
+            if ! [ -f /var/lib/buildkite-agent/.ssh/id_rsa.pub ]; then
+              echo "${cfg.openssh.publicKey}" > /var/lib/buildkite-agent/.ssh/id_rsa.pub
+              ${pkgs.coreutils}/bin/chmod 600 /var/lib/buildkite-agent/.ssh/id_rsa.pub
+            fi
+          '';
+
+        serviceConfig =
+          { ExecStart = "${pkgs.buildkite-agent}/bin/buildkite-agent start --config ${configFile}";
+            User = "buildkite-agent";
+            RestartSec = 5;
+            Restart = "on-failure";
+            TimeoutSec = 10;
+          };
+      };
+  };
+}
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
new file mode 100644
index 000000000000..166c57a9529d
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }:
+
+stdenv.mkDerivation rec {
+  version = "2.1.8";
+  name = "buildkite-agent-${version}";
+  dontBuild = true;
+
+  src = fetchurl {
+    url = "https://github.com/buildkite/agent/releases/download/v${version}/buildkite-agent-linux-386-${version}.tar.gz";
+    sha256 = "f54ca7da4379180700f5038779a7cbb1cef31d49f4a06c42702d68c34387c242";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  sourceRoot = ".";
+  installPhase = ''
+    install -Dt "$out/bin/" buildkite-agent
+
+    mkdir -p $out/share
+    mv hooks bootstrap.sh $out/share/
+  '';
+
+  postFixup = ''
+    substituteInPlace $out/share/bootstrap.sh \
+      --replace "#!/bin/bash" "#!$(type -P bash)"
+    wrapProgram $out/bin/buildkite-agent \
+      --set PATH '"${openssh}/bin/:${git}/bin:${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:$PATH"'
+  '';
+
+  meta = {
+    description = "Build runner for buildkite.com";
+    longDescription = ''
+      The buildkite-agent is a small, reliable, and cross-platform build runner
+      that makes it easy to run automated builds on your own infrastructure.
+      It’s main responsibilities are polling buildkite.com for work, running
+      build jobs, reporting back the status code and output log of the job,
+      and uploading the job's artifacts.
+    '';
+    homepage = https://buildkite.com/docs/agent;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.pawelpacana ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 071c34824b17..9fbc40ed4481 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5951,6 +5951,8 @@ in
     inherit (pythonPackages) twisted;
   };
 
+  buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };
+
   byacc = callPackage ../development/tools/parsing/byacc { };
 
   cargo = callPackage ../development/tools/build-managers/cargo {

From d1219ba68fddab1a0a714a999ae192bc8dfe722e Mon Sep 17 00:00:00 2001
From: Marc Scholten <marc@pedigital.de>
Date: Mon, 13 Jun 2016 18:25:58 +0200
Subject: [PATCH 289/436] php: Fixed libiconv error

---
 pkgs/development/interpreters/php/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 5d20a0ee8c8d..5dfd1b85567a 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -23,8 +23,7 @@ let
 
       configureFlags = [
         "EXTENSION_DIR=$(out)/lib/php/extensions"
-        "--with-iconv=${libiconv}"
-      ];
+      ] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}";
 
       flags = {
 

From ff04cf2522b55f64dced032d3835d99298efc324 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 13 Jun 2016 19:33:47 +0200
Subject: [PATCH 290/436] gparted: 0.26.0 -> 0.26.1

Key changes include:
- Ensure boot loaders work on ext4 < 16 TiB by using 32bit feature
- Fix core dump crash in OperationDelete::get_partition_new()

More: https://sourceforge.net/projects/gparted/files/gparted/gparted-0.26.1/gparted-0.26.1-README.md/view
---
 pkgs/tools/misc/gparted/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index f9459c72828d..3aa2c41546b8 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -4,10 +4,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.26.0";
+  name = "gparted-0.26.1";
 
   src = fetchurl {
-    sha256 = "1d3zw99yd1v0gqhcxff35wqz34xi6ps7q9j1bn11sghqihr3kwxw";
+    sha256 = "1h9d6x335wxpm49yphzm9n1hbh2hcg0p2rphv76mrvsss91bcm1g";
     url = "mirror://sourceforge/gparted/${name}.tar.gz";
   };
 

From e265f583952c959529666cb5691d002b2b627095 Mon Sep 17 00:00:00 2001
From: Colton Padden <cmp@Coltons-MacBook-Pro.local>
Date: Mon, 13 Jun 2016 14:14:20 -0400
Subject: [PATCH 291/436] neovim: fix neovim on darwin - requires libmpack

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

diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix
index b45d5f3d2ce0..de2bb9334d5a 100644
--- a/pkgs/development/libraries/libmpack/default.nix
+++ b/pkgs/development/libraries/libmpack/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/tarruda/libmpack/";
     license = licenses.mit;
     maintainers = with maintainers; [ lovek323 garbas ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 1a9a72274aecbc090b9e0706236e3d3013de7867 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 13 Jun 2016 21:21:16 +0200
Subject: [PATCH 292/436] meld: 3.14.0 -> 3.16.0

---
 pkgs/applications/version-management/meld/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index d25decf35eb6..2cc4bfe28fc4 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -4,7 +4,7 @@
 
 
 let
-  minor = "3.14";
+  minor = "3.16";
   version = "${minor}.0";
 in
 
@@ -14,7 +14,7 @@ buildPythonApplication rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
-    sha256 = "0g0h9wdr6nqdalqkz4r037569apw253cklwr17x0zjc7nwv2j3j3";
+    sha256 = "02kcnlavlxlk8df456zppmin9xzdvgkw151nskb6f0bwmi9zs6rl";
   };
 
   buildInputs = [

From 1191149cc8973f0bb21e728b7ad7d101f7b7414d Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Mon, 13 Jun 2016 23:13:01 +0300
Subject: [PATCH 293/436] Cython: fix source link

Fixes #16218.
---
 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 7d0b3c05cae5..949079917469 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3836,7 +3836,7 @@ in modules // {
     version = "0.24";
 
     src = pkgs.fetchurl {
-      url = "http://www.cython.org/release/${name}.tar.gz";
+      url = "mirror://pypi/C/Cython/${name}.tar.gz";
       sha256 = "1wd3q97gia3zhsgcdlvxh26hkrf3m53i6r1l4g0yya119264vr3d";
     };
 

From 96fc1e19b84469ab5822b03d3ce555cc5f7fb9c0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 11 May 2016 22:50:49 +0200
Subject: [PATCH 294/436] cacert: remove dependency on LWP

The `mk-ca-bundle.pl` script manages quite well using only curl but
fails without LWP being present due to a `use` statement. This removes
the Perl import of the LWP library and adds curl as a build input.
---
 pkgs/data/misc/cacert/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 0b125485fd45..3ce6dc81a396 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, nss, curl, perl, perlPackages }:
+{ stdenv, nss, curl, perl }:
 
 stdenv.mkDerivation rec {
   name = "nss-cacert-${nss.version}";
@@ -7,9 +7,16 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     unpackFile ${curl.src};
+
+    # Remove dependency on LWP, curl is enough. Also, since curl here
+    # is working on a local file it will not actually get a 200 OK, so
+    # remove that expectation.
+    substituteInPlace curl-*/lib/mk-ca-bundle.pl \
+      --replace 'use LWP::UserAgent;' "" \
+      --replace ' && $out[0] == 200' ""
   '';
 
-  nativeBuildInputs = [ perl perlPackages.LWP ];
+  nativeBuildInputs = [ curl perl ];
 
   buildPhase = ''
     perl curl-*/lib/mk-ca-bundle.pl -d "file://$(pwd)/nss/lib/ckfw/builtins/certdata.txt" ca-bundle.crt

From ee933f5d73c4b4ab394155ac5e8806f252bdbdb6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Jun 2016 09:36:35 +0200
Subject: [PATCH 295/436] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20160613 using the following inputs:

  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/b9e58743e7306da155ed866b797f543556d3c479
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/2a2cddb4431c7e6766c0fef56c72540787e804a8
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/4b8c8abac5f38c31d90cf256565821716aa89a50
---
 .../haskell-modules/configuration-lts-0.0.nix |   10 +
 .../haskell-modules/configuration-lts-0.1.nix |   10 +
 .../haskell-modules/configuration-lts-0.2.nix |   10 +
 .../haskell-modules/configuration-lts-0.3.nix |   10 +
 .../haskell-modules/configuration-lts-0.4.nix |   10 +
 .../haskell-modules/configuration-lts-0.5.nix |   10 +
 .../haskell-modules/configuration-lts-0.6.nix |   10 +
 .../haskell-modules/configuration-lts-0.7.nix |   10 +
 .../haskell-modules/configuration-lts-1.0.nix |   11 +
 .../haskell-modules/configuration-lts-1.1.nix |   11 +
 .../configuration-lts-1.10.nix                |   11 +
 .../configuration-lts-1.11.nix                |   11 +
 .../configuration-lts-1.12.nix                |   11 +
 .../configuration-lts-1.13.nix                |   11 +
 .../configuration-lts-1.14.nix                |   11 +
 .../configuration-lts-1.15.nix                |   11 +
 .../haskell-modules/configuration-lts-1.2.nix |   11 +
 .../haskell-modules/configuration-lts-1.4.nix |   11 +
 .../haskell-modules/configuration-lts-1.5.nix |   11 +
 .../haskell-modules/configuration-lts-1.7.nix |   11 +
 .../haskell-modules/configuration-lts-1.8.nix |   11 +
 .../haskell-modules/configuration-lts-1.9.nix |   11 +
 .../haskell-modules/configuration-lts-2.0.nix |   11 +
 .../haskell-modules/configuration-lts-2.1.nix |   11 +
 .../configuration-lts-2.10.nix                |   11 +
 .../configuration-lts-2.11.nix                |   11 +
 .../configuration-lts-2.12.nix                |   11 +
 .../configuration-lts-2.13.nix                |   11 +
 .../configuration-lts-2.14.nix                |   11 +
 .../configuration-lts-2.15.nix                |   11 +
 .../configuration-lts-2.16.nix                |   11 +
 .../configuration-lts-2.17.nix                |   11 +
 .../configuration-lts-2.18.nix                |   11 +
 .../configuration-lts-2.19.nix                |   11 +
 .../haskell-modules/configuration-lts-2.2.nix |   11 +
 .../configuration-lts-2.20.nix                |   11 +
 .../configuration-lts-2.21.nix                |   11 +
 .../configuration-lts-2.22.nix                |   11 +
 .../haskell-modules/configuration-lts-2.3.nix |   11 +
 .../haskell-modules/configuration-lts-2.4.nix |   11 +
 .../haskell-modules/configuration-lts-2.5.nix |   11 +
 .../haskell-modules/configuration-lts-2.6.nix |   11 +
 .../haskell-modules/configuration-lts-2.7.nix |   11 +
 .../haskell-modules/configuration-lts-2.8.nix |   11 +
 .../haskell-modules/configuration-lts-2.9.nix |   11 +
 .../haskell-modules/configuration-lts-3.0.nix |   12 +
 .../haskell-modules/configuration-lts-3.1.nix |   12 +
 .../configuration-lts-3.10.nix                |   13 +
 .../configuration-lts-3.11.nix                |   13 +
 .../configuration-lts-3.12.nix                |   13 +
 .../configuration-lts-3.13.nix                |   13 +
 .../configuration-lts-3.14.nix                |   13 +
 .../configuration-lts-3.15.nix                |   13 +
 .../configuration-lts-3.16.nix                |   14 +
 .../configuration-lts-3.17.nix                |   14 +
 .../configuration-lts-3.18.nix                |   14 +
 .../configuration-lts-3.19.nix                |   14 +
 .../haskell-modules/configuration-lts-3.2.nix |   12 +
 .../configuration-lts-3.20.nix                |   14 +
 .../configuration-lts-3.21.nix                |   14 +
 .../configuration-lts-3.22.nix                |   14 +
 .../haskell-modules/configuration-lts-3.3.nix |   12 +
 .../haskell-modules/configuration-lts-3.4.nix |   12 +
 .../haskell-modules/configuration-lts-3.5.nix |   12 +
 .../haskell-modules/configuration-lts-3.6.nix |   12 +
 .../haskell-modules/configuration-lts-3.7.nix |   13 +
 .../haskell-modules/configuration-lts-3.8.nix |   13 +
 .../haskell-modules/configuration-lts-3.9.nix |   13 +
 .../haskell-modules/configuration-lts-4.0.nix |   15 +
 .../haskell-modules/configuration-lts-4.1.nix |   16 +
 .../haskell-modules/configuration-lts-4.2.nix |   16 +
 .../haskell-modules/configuration-lts-5.0.nix |   18 +
 .../haskell-modules/configuration-lts-5.1.nix |   18 +
 .../configuration-lts-5.10.nix                |   19 +
 .../configuration-lts-5.11.nix                |   19 +
 .../configuration-lts-5.12.nix                |   21 +
 .../configuration-lts-5.13.nix                |   22 +
 .../configuration-lts-5.14.nix                |   22 +
 .../configuration-lts-5.15.nix                |   22 +
 .../configuration-lts-5.16.nix                |   22 +
 .../configuration-lts-5.17.nix                |   22 +
 .../configuration-lts-5.18.nix                |   23 +
 .../haskell-modules/configuration-lts-5.2.nix |   18 +
 .../haskell-modules/configuration-lts-5.3.nix |   18 +
 .../haskell-modules/configuration-lts-5.4.nix |   18 +
 .../haskell-modules/configuration-lts-5.5.nix |   18 +
 .../haskell-modules/configuration-lts-5.6.nix |   18 +
 .../haskell-modules/configuration-lts-5.7.nix |   19 +
 .../haskell-modules/configuration-lts-5.8.nix |   19 +
 .../haskell-modules/configuration-lts-5.9.nix |   19 +
 .../haskell-modules/configuration-lts-6.0.nix |   27 +
 .../haskell-modules/configuration-lts-6.1.nix |   27 +
 .../haskell-modules/configuration-lts-6.2.nix |   30 +
 .../haskell-modules/configuration-lts-6.3.nix | 7958 +++++++++++++++++
 .../haskell-modules/hackage-packages.nix      | 1146 ++-
 95 files changed, 10048 insertions(+), 348 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-6.3.nix

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 9fd4c90f0c3c..5742694a6fa2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1236,6 +1236,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1927,6 +1928,7 @@ self: super: {
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
   "bzlib" = doDistribute super."bzlib_0_5_0_4";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3359,6 +3361,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5558,6 +5561,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5942,6 +5946,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7788,6 +7793,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7885,6 +7891,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8202,6 +8209,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8216,6 +8224,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9356,6 +9365,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 77ade8e3c1b7..3e7b3275d9c2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1236,6 +1236,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1927,6 +1928,7 @@ self: super: {
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
   "bzlib" = doDistribute super."bzlib_0_5_0_4";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3359,6 +3361,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5558,6 +5561,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5942,6 +5946,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7788,6 +7793,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7885,6 +7891,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8202,6 +8209,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8216,6 +8224,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9356,6 +9365,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 621109dc2ffc..24891d39c208 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1236,6 +1236,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1927,6 +1928,7 @@ self: super: {
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
   "bzlib" = doDistribute super."bzlib_0_5_0_4";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3359,6 +3361,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5558,6 +5561,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5942,6 +5946,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7788,6 +7793,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7885,6 +7891,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8202,6 +8209,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8216,6 +8224,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9356,6 +9365,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 88141d78e112..2e1ca440f708 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1236,6 +1236,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1927,6 +1928,7 @@ self: super: {
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
   "bzlib" = doDistribute super."bzlib_0_5_0_4";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3359,6 +3361,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5558,6 +5561,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5942,6 +5946,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7788,6 +7793,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7885,6 +7891,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8202,6 +8209,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8216,6 +8224,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9356,6 +9365,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index b26216c83ca1..43831ddae192 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1236,6 +1236,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1927,6 +1928,7 @@ self: super: {
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
   "bzlib" = doDistribute super."bzlib_0_5_0_4";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3359,6 +3361,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5556,6 +5559,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5940,6 +5944,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7785,6 +7790,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7882,6 +7888,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8199,6 +8206,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8213,6 +8221,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_8";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9353,6 +9362,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 80885a3d3fae..cdcc13118464 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1236,6 +1236,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1927,6 +1928,7 @@ self: super: {
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
   "bzlib" = doDistribute super."bzlib_0_5_0_4";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3359,6 +3361,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5556,6 +5559,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5940,6 +5944,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7785,6 +7790,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7882,6 +7888,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8199,6 +8206,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8213,6 +8221,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_8";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9353,6 +9362,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index eea580cbc3b9..84de48986d16 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1235,6 +1235,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1926,6 +1927,7 @@ self: super: {
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
   "bzlib" = doDistribute super."bzlib_0_5_0_4";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3358,6 +3360,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5554,6 +5557,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5938,6 +5942,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7782,6 +7787,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7879,6 +7885,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8196,6 +8203,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8210,6 +8218,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_8";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9350,6 +9359,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 4b388209814b..12803bb1d5af 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1235,6 +1235,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1926,6 +1927,7 @@ self: super: {
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
   "bzlib" = doDistribute super."bzlib_0_5_0_4";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3358,6 +3360,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5554,6 +5557,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5938,6 +5942,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7782,6 +7787,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7879,6 +7885,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8196,6 +8203,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8210,6 +8218,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_8";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9350,6 +9359,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index b2788d7ad80c..9524c9d20521 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1233,6 +1233,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1668,6 +1669,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1921,6 +1923,7 @@ self: super: {
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
   "bzlib" = doDistribute super."bzlib_0_5_0_4";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3351,6 +3354,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5546,6 +5550,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5930,6 +5935,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7773,6 +7779,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7870,6 +7877,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8186,6 +8194,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8200,6 +8209,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_8";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9339,6 +9349,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 9c8c01581061..76d093aa35a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1233,6 +1233,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1668,6 +1669,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1920,6 +1922,7 @@ self: super: {
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
   "bzlib" = doDistribute super."bzlib_0_5_0_4";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3348,6 +3351,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5540,6 +5544,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5924,6 +5929,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7765,6 +7771,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7862,6 +7869,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8177,6 +8185,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8191,6 +8200,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_8_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9328,6 +9338,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 2195eb712489..8e1f7b76658f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1232,6 +1232,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1667,6 +1668,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1918,6 +1920,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3341,6 +3344,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5524,6 +5528,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5907,6 +5912,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7745,6 +7751,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7841,6 +7848,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8156,6 +8164,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8170,6 +8179,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9300,6 +9310,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 78eab3c96b2d..26a495423c0e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1232,6 +1232,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1667,6 +1668,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1918,6 +1920,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3340,6 +3343,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5521,6 +5525,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5904,6 +5909,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7742,6 +7748,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7838,6 +7845,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8153,6 +8161,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8167,6 +8176,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9297,6 +9307,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 94b2a6f7758f..a70a4271d2c3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1232,6 +1232,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1667,6 +1668,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1918,6 +1920,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3340,6 +3343,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5521,6 +5525,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5904,6 +5909,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7742,6 +7748,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7838,6 +7845,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8153,6 +8161,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8167,6 +8176,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9297,6 +9307,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index b54795b55676..b9a17ca0df9f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1232,6 +1232,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1667,6 +1668,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1918,6 +1920,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3340,6 +3343,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5520,6 +5524,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5903,6 +5908,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7741,6 +7747,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7837,6 +7844,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8152,6 +8160,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8166,6 +8175,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9295,6 +9305,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 0a6d5785e71f..f78230efb6d4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1231,6 +1231,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1665,6 +1666,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1916,6 +1918,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3337,6 +3340,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5517,6 +5521,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5900,6 +5905,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7737,6 +7743,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7833,6 +7840,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8148,6 +8156,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8162,6 +8171,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9291,6 +9301,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index acec6559fc0f..42d2e2181e15 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1230,6 +1230,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1664,6 +1665,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1915,6 +1917,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3333,6 +3336,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5513,6 +5517,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5896,6 +5901,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7730,6 +7736,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7826,6 +7833,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8141,6 +8149,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8155,6 +8164,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9282,6 +9292,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index e755131dbd93..285871ee4d9b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1233,6 +1233,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1668,6 +1669,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1920,6 +1922,7 @@ self: super: {
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
   "bzlib" = doDistribute super."bzlib_0_5_0_4";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3346,6 +3349,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5537,6 +5541,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5921,6 +5926,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7760,6 +7766,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7857,6 +7864,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8172,6 +8180,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8186,6 +8195,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9323,6 +9333,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 88cfd3ba9fda..c4240081da89 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1232,6 +1232,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1667,6 +1668,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1919,6 +1921,7 @@ self: super: {
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
   "bzlib" = doDistribute super."bzlib_0_5_0_4";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3344,6 +3347,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5534,6 +5538,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5918,6 +5923,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7756,6 +7762,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7853,6 +7860,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8168,6 +8176,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8182,6 +8191,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9318,6 +9328,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index a9a1b471957b..ee5543333b99 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1232,6 +1232,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1667,6 +1668,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1918,6 +1920,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3343,6 +3346,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5533,6 +5537,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5917,6 +5922,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7755,6 +7761,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7852,6 +7859,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8167,6 +8175,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8181,6 +8190,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9315,6 +9325,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 4ace5cedcd66..366a5e152295 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1232,6 +1232,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1667,6 +1668,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1918,6 +1920,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3343,6 +3346,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5528,6 +5532,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5912,6 +5917,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7750,6 +7756,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7847,6 +7854,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8162,6 +8170,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8176,6 +8185,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9310,6 +9320,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index cc26126b5fb5..fa0f97d33483 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1232,6 +1232,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1667,6 +1668,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1918,6 +1920,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3341,6 +3344,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5525,6 +5529,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5908,6 +5913,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7746,6 +7752,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7843,6 +7850,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8158,6 +8166,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8172,6 +8181,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9305,6 +9315,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index dabdb009bced..d73347288dab 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1232,6 +1232,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1667,6 +1668,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1918,6 +1920,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3341,6 +3344,7 @@ self: super: {
   "floatshow" = dontDistribute super."floatshow";
   "flock" = dontDistribute super."flock";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5524,6 +5528,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5907,6 +5912,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7745,6 +7751,7 @@ self: super: {
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7842,6 +7849,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8157,6 +8165,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8171,6 +8180,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9304,6 +9314,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 92a7324d206d..a10dc99017f3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -1224,6 +1224,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1657,6 +1658,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1908,6 +1910,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3323,6 +3326,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5489,6 +5493,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5867,6 +5872,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7692,6 +7698,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7787,6 +7794,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8099,6 +8107,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8113,6 +8122,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9234,6 +9244,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 122cd3ff24ee..fd572d72805e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -1224,6 +1224,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1657,6 +1658,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1908,6 +1910,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3323,6 +3326,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5489,6 +5493,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5867,6 +5872,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7692,6 +7698,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7787,6 +7794,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8099,6 +8107,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8113,6 +8122,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9234,6 +9244,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index c619e1ac4914..aeec177fd1b6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -1220,6 +1220,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1650,6 +1651,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1900,6 +1902,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3309,6 +3312,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5470,6 +5474,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5847,6 +5852,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7668,6 +7674,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7763,6 +7770,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8069,6 +8077,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8083,6 +8092,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9199,6 +9209,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 6faa2bd2cd04..3206256936c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1649,6 +1650,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1899,6 +1901,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3308,6 +3311,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5469,6 +5473,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5846,6 +5851,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7665,6 +7671,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7760,6 +7767,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8065,6 +8073,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8079,6 +8088,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9194,6 +9204,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index f573ae627913..f57f07fe4549 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1649,6 +1650,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1899,6 +1901,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3308,6 +3311,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5469,6 +5473,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5846,6 +5851,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7664,6 +7670,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7759,6 +7766,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8064,6 +8072,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8078,6 +8087,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9193,6 +9203,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index c7475950fede..2e445206b6ba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1649,6 +1650,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1899,6 +1901,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3308,6 +3311,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5468,6 +5472,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5845,6 +5850,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7663,6 +7669,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7758,6 +7765,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8063,6 +8071,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8077,6 +8086,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9192,6 +9202,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index e6239bf52642..d09497eb38d7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1649,6 +1650,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1899,6 +1901,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3307,6 +3310,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5466,6 +5470,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5843,6 +5848,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7661,6 +7667,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7756,6 +7763,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8061,6 +8069,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8075,6 +8084,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9189,6 +9199,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index cdb508f6450a..671e067536c0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1649,6 +1650,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1899,6 +1901,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3306,6 +3309,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5465,6 +5469,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5842,6 +5847,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7659,6 +7665,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7754,6 +7761,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8058,6 +8066,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8072,6 +8081,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9186,6 +9196,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 66932ca59d61..6476d75ae665 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1649,6 +1650,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1899,6 +1901,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3303,6 +3306,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5461,6 +5465,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5838,6 +5843,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7655,6 +7661,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7750,6 +7757,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8054,6 +8062,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8068,6 +8077,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9182,6 +9192,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 9bf122de2cb7..320f96399466 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1649,6 +1650,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1898,6 +1900,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3300,6 +3303,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5458,6 +5462,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5835,6 +5840,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7651,6 +7657,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7746,6 +7753,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8050,6 +8058,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8064,6 +8073,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9178,6 +9188,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 5607371ab84c..f73fd049b52d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1649,6 +1650,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1897,6 +1899,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3298,6 +3301,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5456,6 +5460,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5833,6 +5838,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7648,6 +7654,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7743,6 +7750,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8047,6 +8055,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8061,6 +8070,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9174,6 +9184,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 59e751fdfbd2..c331ed44872b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1649,6 +1650,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1897,6 +1899,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3298,6 +3301,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5455,6 +5459,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5832,6 +5837,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7647,6 +7653,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7742,6 +7749,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8046,6 +8054,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8060,6 +8069,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9173,6 +9183,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 306422bbf2ce..b96d09e19962 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -1223,6 +1223,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1656,6 +1657,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1906,6 +1908,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3321,6 +3324,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5487,6 +5491,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5865,6 +5870,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7690,6 +7696,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7785,6 +7792,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8097,6 +8105,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8111,6 +8120,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9231,6 +9241,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index ed26e69ca327..98a1080204ed 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1649,6 +1650,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1897,6 +1899,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3298,6 +3301,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5455,6 +5459,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5832,6 +5837,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7647,6 +7653,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7741,6 +7748,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8045,6 +8053,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8059,6 +8068,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9172,6 +9182,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index a9bf9fee36e7..a3e430f6043f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1649,6 +1650,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1897,6 +1899,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3298,6 +3301,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5455,6 +5459,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5832,6 +5837,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7646,6 +7652,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7740,6 +7747,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8044,6 +8052,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8058,6 +8067,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9171,6 +9181,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 9a62e1401063..64a305ddd93d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1649,6 +1650,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1897,6 +1899,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3298,6 +3301,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5454,6 +5458,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5831,6 +5836,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7645,6 +7651,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7739,6 +7746,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8043,6 +8051,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8057,6 +8066,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9170,6 +9180,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index fcb54ecc2d60..6919b09cb074 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -1223,6 +1223,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1656,6 +1657,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1906,6 +1908,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3320,6 +3323,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5485,6 +5489,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5863,6 +5868,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7688,6 +7694,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7783,6 +7790,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8095,6 +8103,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8109,6 +8118,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_11";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9229,6 +9239,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 706055b71089..7a5dddccdcbf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -1223,6 +1223,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1656,6 +1657,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1906,6 +1908,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3320,6 +3323,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5485,6 +5489,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5863,6 +5868,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7686,6 +7692,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7781,6 +7788,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8093,6 +8101,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8107,6 +8116,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9227,6 +9237,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 49ec0590c8b2..569e0244fd61 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -1223,6 +1223,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1656,6 +1657,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1906,6 +1908,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3319,6 +3322,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5484,6 +5488,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5862,6 +5867,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7685,6 +7691,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7780,6 +7787,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8092,6 +8100,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8106,6 +8115,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9226,6 +9236,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_4";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 6422171ac13b..a503dcadb7c0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -1221,6 +1221,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1653,6 +1654,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1903,6 +1905,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3316,6 +3319,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5480,6 +5484,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5858,6 +5863,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7680,6 +7686,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7775,6 +7782,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8087,6 +8095,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8101,6 +8110,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9219,6 +9229,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_4";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index d482d0a570dc..73900dd499ba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -1221,6 +1221,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1653,6 +1654,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1903,6 +1905,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3316,6 +3319,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5480,6 +5484,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5858,6 +5863,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7681,6 +7687,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7776,6 +7783,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8088,6 +8096,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8102,6 +8111,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9220,6 +9230,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_4";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index c8189bb01d9f..b126a892bcbb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -1220,6 +1220,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1652,6 +1653,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1902,6 +1904,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3314,6 +3317,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5478,6 +5482,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5856,6 +5861,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7678,6 +7684,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7773,6 +7780,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8082,6 +8090,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8096,6 +8105,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9214,6 +9224,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 0adc4484107e..a09e300bbbe2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -1220,6 +1220,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1650,6 +1651,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1900,6 +1902,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3310,6 +3313,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = dontDistribute super."flow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -5473,6 +5477,7 @@ self: super: {
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-csv" = doDistribute super."lazy-csv_0_5";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5850,6 +5855,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -7672,6 +7678,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
   "shapely-data" = dontDistribute super."shapely-data";
@@ -7767,6 +7774,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -8074,6 +8082,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -8088,6 +8097,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -9204,6 +9214,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_2_6";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 7ed1dc7a8d48..f55a8e6e2e48 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1200,6 +1200,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1611,6 +1612,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1850,6 +1852,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3227,6 +3230,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_1";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5349,6 +5353,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5717,6 +5722,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6562,6 +6568,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_2";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7501,6 +7508,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7595,6 +7603,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7892,6 +7901,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7906,6 +7916,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8999,6 +9010,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index e5923a0b7665..0c5c23dad7eb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1199,6 +1199,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1610,6 +1611,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1849,6 +1851,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3225,6 +3228,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_1";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5347,6 +5351,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5714,6 +5719,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6558,6 +6564,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_2";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7496,6 +7503,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7590,6 +7598,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7887,6 +7896,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7901,6 +7911,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8993,6 +9004,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 1f39731090af..5a0d5f3a2b0c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1197,6 +1197,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1408,6 +1409,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1-types" = doDistribute super."asn1-types_0_3_1";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
@@ -1604,6 +1606,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1840,6 +1843,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3210,6 +3214,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5323,6 +5328,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5688,6 +5694,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6527,6 +6534,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7461,6 +7469,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7555,6 +7564,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7848,6 +7858,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7862,6 +7873,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8942,6 +8954,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index a8a64a4c821c..a5882ee5f72d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1197,6 +1197,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1408,6 +1409,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1-types" = doDistribute super."asn1-types_0_3_1";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
@@ -1604,6 +1606,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1840,6 +1843,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3209,6 +3213,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5322,6 +5327,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5687,6 +5693,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6526,6 +6533,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7460,6 +7468,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7554,6 +7563,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7847,6 +7857,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7861,6 +7872,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8941,6 +8953,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 9fa1b3db3eb5..ea10b878f7c2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -1197,6 +1197,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1408,6 +1409,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1-types" = doDistribute super."asn1-types_0_3_1";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
@@ -1604,6 +1606,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1840,6 +1843,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3208,6 +3212,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5320,6 +5325,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5685,6 +5691,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6523,6 +6530,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7457,6 +7465,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7551,6 +7560,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7844,6 +7854,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7858,6 +7869,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8937,6 +8949,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 68501a67aac9..427feb8f3918 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -1197,6 +1197,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1408,6 +1409,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1-types" = doDistribute super."asn1-types_0_3_1";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
@@ -1604,6 +1606,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1840,6 +1843,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3208,6 +3212,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5319,6 +5324,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5683,6 +5689,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6520,6 +6527,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7454,6 +7462,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7548,6 +7557,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7841,6 +7851,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7855,6 +7866,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8934,6 +8946,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index f334241cdab7..2f19425d7e0d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -1197,6 +1197,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1408,6 +1409,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1-types" = doDistribute super."asn1-types_0_3_1";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
@@ -1604,6 +1606,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1840,6 +1843,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3207,6 +3211,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5317,6 +5322,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5681,6 +5687,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6518,6 +6525,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7452,6 +7460,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7546,6 +7555,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7839,6 +7849,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7853,6 +7864,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8931,6 +8943,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 8376c7671f45..cafeb1694950 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -1197,6 +1197,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1408,6 +1409,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1-types" = doDistribute super."asn1-types_0_3_1";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
@@ -1604,6 +1606,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1840,6 +1843,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3207,6 +3211,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5314,6 +5319,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5678,6 +5684,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6515,6 +6522,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7448,6 +7456,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7542,6 +7551,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7835,6 +7845,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7849,6 +7860,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8927,6 +8939,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index aba5c47240b1..2d590d7ad7fa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -1196,6 +1196,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1407,6 +1408,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1-types" = doDistribute super."asn1-types_0_3_1";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
@@ -1603,6 +1605,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1839,6 +1842,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3206,6 +3210,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5312,6 +5317,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5675,6 +5681,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6512,6 +6519,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7443,6 +7451,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7537,6 +7546,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7830,6 +7840,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7844,6 +7855,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8212,6 +8224,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
@@ -8919,6 +8932,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 451f906ec941..1796ee6816c6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -1196,6 +1196,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1406,6 +1407,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1-types" = doDistribute super."asn1-types_0_3_1";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
@@ -1602,6 +1604,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1838,6 +1841,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3205,6 +3209,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5309,6 +5314,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5671,6 +5677,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6507,6 +6514,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7438,6 +7446,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7532,6 +7541,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7825,6 +7835,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7839,6 +7850,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8207,6 +8219,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
@@ -8914,6 +8927,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 98dbb84ced67..dbca5637c3df 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -1196,6 +1196,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1406,6 +1407,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1-types" = doDistribute super."asn1-types_0_3_1";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
@@ -1602,6 +1604,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1838,6 +1841,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3205,6 +3209,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5309,6 +5314,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5671,6 +5677,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6507,6 +6514,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7438,6 +7446,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7532,6 +7541,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7825,6 +7835,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7839,6 +7850,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8207,6 +8219,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
@@ -8914,6 +8927,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 6f931a665ad0..92b3243775cc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -1196,6 +1196,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1406,6 +1407,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1601,6 +1603,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1836,6 +1839,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3202,6 +3206,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5303,6 +5308,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5665,6 +5671,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6500,6 +6507,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7431,6 +7439,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7525,6 +7534,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7817,6 +7827,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7831,6 +7842,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8199,6 +8211,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
@@ -8905,6 +8918,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index a4c77cdbe059..964359f005a3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1198,6 +1198,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1608,6 +1609,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1847,6 +1849,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3222,6 +3225,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_1";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5343,6 +5347,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5709,6 +5714,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6553,6 +6559,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7490,6 +7497,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7584,6 +7592,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7880,6 +7889,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7894,6 +7904,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8986,6 +8997,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 5e4ddc00bced..9262e91bb94f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -1195,6 +1195,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1405,6 +1406,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1600,6 +1602,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1835,6 +1838,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3201,6 +3205,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5302,6 +5307,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5664,6 +5670,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6499,6 +6506,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7429,6 +7437,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7523,6 +7532,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7814,6 +7824,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7828,6 +7839,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8196,6 +8208,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
@@ -8901,6 +8914,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 38f722a40705..bf7fade77af2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -1195,6 +1195,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1405,6 +1406,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1600,6 +1602,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1835,6 +1838,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3198,6 +3202,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5297,6 +5302,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5659,6 +5665,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6492,6 +6499,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7418,6 +7426,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7512,6 +7521,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7802,6 +7812,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7816,6 +7827,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8184,6 +8196,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
@@ -8887,6 +8900,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index f8abe547ef19..929b0099e14c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -1195,6 +1195,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1405,6 +1406,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1600,6 +1602,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1835,6 +1838,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3197,6 +3201,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5294,6 +5299,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5656,6 +5662,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6489,6 +6496,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7415,6 +7423,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7509,6 +7518,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7799,6 +7809,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7813,6 +7824,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8181,6 +8193,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-parsers" = dontDistribute super."time-parsers";
   "time-patterns" = dontDistribute super."time-patterns";
@@ -8884,6 +8897,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 01afd2e914d2..f1a5ca54ee6f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1198,6 +1198,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1608,6 +1609,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1847,6 +1849,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3221,6 +3224,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_1";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5341,6 +5345,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5707,6 +5712,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6551,6 +6557,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7488,6 +7495,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7582,6 +7590,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7877,6 +7886,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7891,6 +7901,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8982,6 +8993,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index ccab948157df..577cd9911a95 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1198,6 +1198,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1608,6 +1609,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1847,6 +1849,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3221,6 +3224,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_1";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5341,6 +5345,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5707,6 +5712,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6551,6 +6557,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7488,6 +7495,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7582,6 +7590,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7876,6 +7885,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7890,6 +7900,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8980,6 +8991,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index bc55eb86f768..f36d2fd5b850 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1198,6 +1198,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1607,6 +1608,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1846,6 +1848,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3219,6 +3222,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_1";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5336,6 +5340,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5702,6 +5707,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6544,6 +6550,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7480,6 +7487,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7574,6 +7582,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7868,6 +7877,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7882,6 +7892,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_13";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8968,6 +8979,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 74f84ebcd87d..c3ff6dd17f7c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1198,6 +1198,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1607,6 +1608,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1846,6 +1848,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3219,6 +3222,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_1";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5333,6 +5337,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5698,6 +5703,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6540,6 +6546,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7476,6 +7483,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7570,6 +7578,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7864,6 +7873,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7878,6 +7888,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_13";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8962,6 +8973,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 7100d604816d..5993a35d22ec 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1198,6 +1198,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1409,6 +1410,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1-types" = doDistribute super."asn1-types_0_3_1";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
@@ -1605,6 +1607,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1844,6 +1847,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3216,6 +3220,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_1";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5329,6 +5334,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5694,6 +5700,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6536,6 +6543,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7470,6 +7478,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7564,6 +7573,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7857,6 +7867,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7871,6 +7882,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8953,6 +8965,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index e91f93cb9d94..16ba33824abe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1198,6 +1198,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1409,6 +1410,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1-types" = doDistribute super."asn1-types_0_3_1";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
@@ -1605,6 +1607,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1842,6 +1845,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3213,6 +3217,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_1";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5326,6 +5331,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5691,6 +5697,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6532,6 +6539,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7466,6 +7474,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7560,6 +7569,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7853,6 +7863,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7867,6 +7878,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8948,6 +8960,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 4f1cb49ec6fb..b6a16fefd1a2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1197,6 +1197,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1408,6 +1409,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1-types" = doDistribute super."asn1-types_0_3_1";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
@@ -1604,6 +1606,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1840,6 +1843,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3210,6 +3214,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -5323,6 +5328,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysplines" = dontDistribute super."lazysplines";
@@ -5688,6 +5694,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6529,6 +6536,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -7463,6 +7471,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7557,6 +7566,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7850,6 +7860,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7864,6 +7875,7 @@ self: super: {
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8945,6 +8957,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index 1489ad8b8c46..f0f19c374a35 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -1175,6 +1175,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1385,6 +1386,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1577,6 +1579,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1806,6 +1809,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3149,6 +3153,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -4899,6 +4904,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_5_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5199,6 +5205,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5553,6 +5560,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6990,6 +6998,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -7259,6 +7268,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7354,6 +7364,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7638,6 +7649,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7652,6 +7664,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8011,6 +8024,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8684,6 +8698,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 405337bd5905..5b2bd8399275 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -1117,6 +1117,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1174,6 +1175,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1383,6 +1385,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1575,6 +1578,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1804,6 +1808,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3145,6 +3150,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -4891,6 +4897,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_5_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5189,6 +5196,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5543,6 +5551,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6980,6 +6989,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -7249,6 +7259,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7344,6 +7355,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7628,6 +7640,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7642,6 +7655,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -8001,6 +8015,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8674,6 +8689,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index 7ab7b8bd3487..db7e4388deb5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -1117,6 +1117,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1174,6 +1175,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1383,6 +1385,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1575,6 +1578,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1803,6 +1807,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3138,6 +3143,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -4874,6 +4880,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5172,6 +5179,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5526,6 +5534,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6956,6 +6965,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -7224,6 +7234,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7315,6 +7326,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7598,6 +7610,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7612,6 +7625,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7971,6 +7985,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8643,6 +8658,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 5211d725f1b8..ccbb0576feeb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -1111,6 +1111,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1167,6 +1168,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1376,6 +1378,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1566,6 +1569,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1791,6 +1795,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3111,6 +3116,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4837,6 +4843,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5133,6 +5140,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5487,6 +5495,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6285,6 +6294,7 @@ self: super: {
   "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6903,6 +6913,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -7169,6 +7180,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7258,6 +7270,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7538,6 +7551,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7552,6 +7566,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7783,6 +7798,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7906,6 +7922,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8573,6 +8590,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index 0c8cd4363053..dc96b1cf60d9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -1110,6 +1110,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1166,6 +1167,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1374,6 +1376,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1564,6 +1567,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1787,6 +1791,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3106,6 +3111,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4831,6 +4837,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5127,6 +5134,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5481,6 +5489,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6278,6 +6287,7 @@ self: super: {
   "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6895,6 +6905,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -7160,6 +7171,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7249,6 +7261,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7529,6 +7542,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7543,6 +7557,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7774,6 +7789,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7897,6 +7913,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8563,6 +8580,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.10.nix b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
index f0ee3c234bdf..85d9465afb20 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
@@ -1104,6 +1104,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1159,6 +1160,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1367,6 +1369,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1557,6 +1560,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1778,6 +1782,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3075,6 +3080,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_5";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4781,6 +4787,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5075,6 +5082,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5425,6 +5433,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6200,6 +6209,7 @@ self: super: {
   "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6812,6 +6822,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6927,6 +6938,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -7075,6 +7087,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7163,6 +7176,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7440,6 +7454,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7454,6 +7469,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_2";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7683,6 +7699,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7805,6 +7822,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8460,6 +8478,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_4";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.11.nix b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
index 0c9d35778f15..5f43e0234aa5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
@@ -1103,6 +1103,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1158,6 +1159,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1365,6 +1367,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1554,6 +1557,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1774,6 +1778,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3069,6 +3074,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_6";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4770,6 +4776,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5064,6 +5071,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5414,6 +5422,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6189,6 +6198,7 @@ self: super: {
   "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6800,6 +6810,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6915,6 +6926,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -7063,6 +7075,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7151,6 +7164,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7428,6 +7442,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7442,6 +7457,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_2";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7670,6 +7686,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7792,6 +7809,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8444,6 +8462,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_4";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.12.nix b/pkgs/development/haskell-modules/configuration-lts-5.12.nix
index e44d12108557..0ca297a6d157 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.12.nix
@@ -1102,6 +1102,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1157,6 +1158,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1364,6 +1366,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1553,6 +1556,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1773,6 +1777,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3066,6 +3071,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_6";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4766,6 +4772,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5060,6 +5067,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5407,6 +5415,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6176,7 +6185,10 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_3";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_4";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6788,6 +6800,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6903,6 +6916,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -7050,6 +7064,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7138,6 +7153,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7414,6 +7430,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7428,6 +7445,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_1";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_3";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7656,6 +7674,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7778,6 +7797,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8430,6 +8450,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_4_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.13.nix b/pkgs/development/haskell-modules/configuration-lts-5.13.nix
index ce64aa59fb08..480bf35aa93e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.13.nix
@@ -1101,6 +1101,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1156,6 +1157,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1363,6 +1365,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1549,6 +1552,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1768,6 +1772,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3057,6 +3062,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_6";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4753,6 +4759,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5047,6 +5054,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5393,6 +5401,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6146,6 +6155,7 @@ self: super: {
   "pipes" = doDistribute super."pipes_4_1_8";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_2";
   "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
@@ -6158,7 +6168,10 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_3";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_4";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6770,6 +6783,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6885,6 +6899,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -7032,6 +7047,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7120,6 +7136,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7396,6 +7413,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7410,6 +7428,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_1";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_3";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7638,6 +7657,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7760,6 +7780,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8410,6 +8431,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_4_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.14.nix b/pkgs/development/haskell-modules/configuration-lts-5.14.nix
index 99379eb967aa..454525b91769 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.14.nix
@@ -1099,6 +1099,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1154,6 +1155,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1360,6 +1362,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1545,6 +1548,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1763,6 +1767,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3047,6 +3052,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_6";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4741,6 +4747,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5034,6 +5041,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5380,6 +5388,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6130,6 +6139,7 @@ self: super: {
   "pipes" = doDistribute super."pipes_4_1_8";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_2";
   "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
@@ -6142,7 +6152,10 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_3";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_4";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6753,6 +6766,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6868,6 +6882,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -7014,6 +7029,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7101,6 +7117,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7376,6 +7393,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7390,6 +7408,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_1";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_3";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_4";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7617,6 +7636,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7738,6 +7758,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8384,6 +8405,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_4_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.15.nix b/pkgs/development/haskell-modules/configuration-lts-5.15.nix
index 38f3a5856478..6c9037849572 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.15.nix
@@ -1098,6 +1098,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1153,6 +1154,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1359,6 +1361,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1544,6 +1547,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1762,6 +1766,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3042,6 +3047,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_6";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4734,6 +4740,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5027,6 +5034,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5372,6 +5380,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6122,6 +6131,7 @@ self: super: {
   "pipes" = doDistribute super."pipes_4_1_8";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_2";
   "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
@@ -6134,7 +6144,10 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_3";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_4";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6743,6 +6756,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6858,6 +6872,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -7004,6 +7019,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7091,6 +7107,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7366,6 +7383,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7380,6 +7398,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_1";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_3";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_4";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7606,6 +7625,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7727,6 +7747,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8372,6 +8393,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_4_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.16.nix b/pkgs/development/haskell-modules/configuration-lts-5.16.nix
index b66daa8e1678..a91ca4d68802 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.16.nix
@@ -1095,6 +1095,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1150,6 +1151,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1356,6 +1358,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1537,6 +1540,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1755,6 +1759,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3026,6 +3031,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_6";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4715,6 +4721,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5007,6 +5014,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5350,6 +5358,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6097,6 +6106,7 @@ self: super: {
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_2";
   "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
@@ -6109,7 +6119,10 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_3";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_4";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6712,6 +6725,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6827,6 +6841,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -6973,6 +6988,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7060,6 +7076,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7331,6 +7348,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7345,6 +7363,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_1";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_3";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_4";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7569,6 +7588,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7689,6 +7709,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8333,6 +8354,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_4_2";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.17.nix b/pkgs/development/haskell-modules/configuration-lts-5.17.nix
index 5b7523cca501..88c155edc1ec 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.17.nix
@@ -1093,6 +1093,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1148,6 +1149,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1354,6 +1356,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1534,6 +1537,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1752,6 +1756,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3022,6 +3027,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_6";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4711,6 +4717,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5003,6 +5010,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5345,6 +5353,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6090,6 +6099,7 @@ self: super: {
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_2";
   "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
@@ -6102,7 +6112,10 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_3";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_4";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6704,6 +6717,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6819,6 +6833,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -6965,6 +6980,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7052,6 +7068,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7323,6 +7340,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7336,6 +7354,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = doDistribute super."streaming_0_1_4_1";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_3";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7560,6 +7579,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7680,6 +7700,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8321,6 +8342,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.18.nix b/pkgs/development/haskell-modules/configuration-lts-5.18.nix
index 8a31ac270099..7023c96e1b78 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.18.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1147,6 +1148,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1353,6 +1355,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1533,6 +1536,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1751,6 +1755,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3014,6 +3019,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_6";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4697,6 +4703,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -4777,6 +4784,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_4";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-dom" = dontDistribute super."jsaddle-dom";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
@@ -4988,6 +4996,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5330,6 +5339,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6070,6 +6080,7 @@ self: super: {
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_2";
   "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
@@ -6082,7 +6093,10 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_3";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_4";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6683,6 +6697,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6798,6 +6813,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -6944,6 +6960,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7031,6 +7048,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7302,6 +7320,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7315,6 +7334,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = doDistribute super."streaming_0_1_4_1";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_3";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7539,6 +7559,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7658,6 +7679,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8296,6 +8318,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index bd08bd4cc6c6..3875ee7f63de 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -1110,6 +1110,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1166,6 +1167,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1374,6 +1376,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1564,6 +1567,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1787,6 +1791,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3103,6 +3108,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4824,6 +4830,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5120,6 +5127,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5474,6 +5482,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6265,6 +6274,7 @@ self: super: {
   "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6880,6 +6890,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -7145,6 +7156,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7234,6 +7246,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7514,6 +7527,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7528,6 +7542,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7758,6 +7773,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7881,6 +7897,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8547,6 +8564,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
index 64f98014e50c..da2679a84611 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
@@ -1108,6 +1108,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1164,6 +1165,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1372,6 +1374,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1562,6 +1565,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1784,6 +1788,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3093,6 +3098,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4812,6 +4818,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5108,6 +5115,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5461,6 +5469,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6250,6 +6259,7 @@ self: super: {
   "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6862,6 +6872,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -7127,6 +7138,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7216,6 +7228,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7494,6 +7507,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7508,6 +7522,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7738,6 +7753,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7861,6 +7877,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8524,6 +8541,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
index eade3de4f0ce..b7a1882d2408 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
@@ -1107,6 +1107,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1163,6 +1164,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1371,6 +1373,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1561,6 +1564,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1783,6 +1787,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3086,6 +3091,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4804,6 +4810,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5100,6 +5107,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5452,6 +5460,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6237,6 +6246,7 @@ self: super: {
   "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6849,6 +6859,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -7114,6 +7125,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7203,6 +7215,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7481,6 +7494,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7495,6 +7509,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7724,6 +7739,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7847,6 +7863,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8510,6 +8527,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
index 08edfc3d3acb..8c100f0276a2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
@@ -1107,6 +1107,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1163,6 +1164,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1371,6 +1373,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1561,6 +1564,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1782,6 +1786,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3085,6 +3090,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4802,6 +4808,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5098,6 +5105,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5450,6 +5458,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6235,6 +6244,7 @@ self: super: {
   "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6847,6 +6857,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -7112,6 +7123,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7201,6 +7213,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7479,6 +7492,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7493,6 +7507,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_1";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7722,6 +7737,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7845,6 +7861,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8506,6 +8523,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_3_1";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.6.nix b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
index 2106714d40a0..36927ea97659 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
@@ -1106,6 +1106,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1162,6 +1163,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1370,6 +1372,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1560,6 +1563,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1781,6 +1785,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3083,6 +3088,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4797,6 +4803,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5092,6 +5099,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5443,6 +5451,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6225,6 +6234,7 @@ self: super: {
   "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6837,6 +6847,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -7102,6 +7113,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7191,6 +7203,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7469,6 +7482,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7483,6 +7497,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7712,6 +7727,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7835,6 +7851,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8493,6 +8510,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_4";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.7.nix b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
index 66db2ec58b5c..a46720c431a5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
@@ -1106,6 +1106,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1162,6 +1163,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1370,6 +1372,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1560,6 +1563,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1781,6 +1785,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3080,6 +3085,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4793,6 +4799,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5088,6 +5095,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5439,6 +5447,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6220,6 +6229,7 @@ self: super: {
   "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6832,6 +6842,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6947,6 +6958,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -7096,6 +7108,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7185,6 +7198,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7463,6 +7477,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7477,6 +7492,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7706,6 +7722,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7829,6 +7846,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8486,6 +8504,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_4";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.8.nix b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
index 1f1a93514cd1..f6bd1ff89dc6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
@@ -1106,6 +1106,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1162,6 +1163,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1370,6 +1372,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1560,6 +1563,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1781,6 +1785,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3080,6 +3085,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_2";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4793,6 +4799,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5088,6 +5095,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5439,6 +5447,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6220,6 +6229,7 @@ self: super: {
   "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6832,6 +6842,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6947,6 +6958,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -7096,6 +7108,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7185,6 +7198,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7463,6 +7477,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7477,6 +7492,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7706,6 +7722,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7829,6 +7846,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8485,6 +8503,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_4";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.9.nix b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
index 1337abf23faf..500b5f9ea89b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
@@ -1106,6 +1106,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1161,6 +1162,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1369,6 +1371,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1559,6 +1562,7 @@ self: super: {
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1780,6 +1784,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -3077,6 +3082,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_5";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -4785,6 +4791,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_2_6_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = dontDistribute super."irc-dcc";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -5080,6 +5087,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5431,6 +5439,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6209,6 +6218,7 @@ self: super: {
   "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6821,6 +6831,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6936,6 +6947,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -7084,6 +7096,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -7172,6 +7185,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7449,6 +7463,7 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
   "stratosphere" = dontDistribute super."stratosphere";
   "stratum-tool" = dontDistribute super."stratum-tool";
@@ -7463,6 +7478,7 @@ self: super: {
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_2";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7692,6 +7708,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7814,6 +7831,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -8470,6 +8488,7 @@ self: super: {
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
   "xml-conduit" = doDistribute super."xml-conduit_1_3_4";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-6.0.nix b/pkgs/development/haskell-modules/configuration-lts-6.0.nix
index e987d0ebc9a0..fc51dda6e097 100644
--- a/pkgs/development/haskell-modules/configuration-lts-6.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-6.0.nix
@@ -1078,6 +1078,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1129,6 +1130,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1332,6 +1334,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1503,6 +1506,7 @@ self: super: {
   "billeksah-services" = dontDistribute super."billeksah-services";
   "bimaps" = dontDistribute super."bimaps";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1718,6 +1722,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -2932,6 +2937,7 @@ self: super: {
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
   "flow" = doDistribute super."flow_1_0_6";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -4562,6 +4568,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_3_0_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-dcc" = doDistribute super."irc-dcc_1_2_0";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -4642,6 +4649,7 @@ self: super: {
   "jose" = doDistribute super."jose_0_4_0_1";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_4";
   "jsaddle" = doDistribute super."jsaddle_0_3_0_3";
   "jsaddle-dom" = dontDistribute super."jsaddle-dom";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
@@ -4844,6 +4852,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5176,6 +5185,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5343,6 +5353,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_6_0";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mp" = dontDistribute super."mp";
@@ -5894,6 +5905,7 @@ self: super: {
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_2";
   "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = doDistribute super."pipes-cacophony_0_2_1";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
@@ -5906,7 +5918,10 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_3";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_4";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6475,6 +6490,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6585,6 +6601,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -6716,6 +6733,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -6799,6 +6817,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -7064,7 +7083,9 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
+  "stratosphere" = doDistribute super."stratosphere_0_1_1";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
   "stratux-http" = dontDistribute super."stratux-http";
@@ -7076,6 +7097,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = doDistribute super."streaming_0_1_4_1";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_3";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7291,6 +7313,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7316,6 +7339,7 @@ self: super: {
   "text-icu-translit" = dontDistribute super."text-icu-translit";
   "text-json-qq" = dontDistribute super."text-json-qq";
   "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = doDistribute super."text-ldap_0_1_1_6";
   "text-locale-encoding" = dontDistribute super."text-locale-encoding";
   "text-normal" = dontDistribute super."text-normal";
   "text-position" = dontDistribute super."text-position";
@@ -7405,6 +7429,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -7923,6 +7948,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = doDistribute super."werewolf_1_0_2_2";
+  "werewolf-slack" = doDistribute super."werewolf-slack_1_0_1_2";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8015,6 +8041,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-6.1.nix b/pkgs/development/haskell-modules/configuration-lts-6.1.nix
index 17faa92a3a97..441d46d25086 100644
--- a/pkgs/development/haskell-modules/configuration-lts-6.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-6.1.nix
@@ -1075,6 +1075,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1126,6 +1127,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1329,6 +1331,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1499,6 +1502,7 @@ self: super: {
   "billeksah-services" = dontDistribute super."billeksah-services";
   "bimaps" = dontDistribute super."bimaps";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1709,6 +1713,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -2908,6 +2913,7 @@ self: super: {
   "float-binstring" = dontDistribute super."float-binstring";
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -4524,6 +4530,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_3_0_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
   "irc-fun-client" = dontDistribute super."irc-fun-client";
@@ -4602,6 +4609,7 @@ self: super: {
   "jose" = doDistribute super."jose_0_4_0_1";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_4";
   "jsaddle" = doDistribute super."jsaddle_0_3_0_3";
   "jsaddle-dom" = dontDistribute super."jsaddle-dom";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
@@ -4802,6 +4810,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5131,6 +5140,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5296,6 +5306,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_6_0";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mp" = dontDistribute super."mp";
@@ -5843,6 +5854,7 @@ self: super: {
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_2";
   "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = doDistribute super."pipes-cacophony_0_2_1";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
@@ -5854,7 +5866,10 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_3";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_4";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6411,6 +6426,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6520,6 +6536,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -6651,6 +6668,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -6734,6 +6752,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -6998,7 +7017,9 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
+  "stratosphere" = doDistribute super."stratosphere_0_1_1";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
   "stratux-http" = dontDistribute super."stratux-http";
@@ -7010,6 +7031,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = doDistribute super."streaming_0_1_4_1";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_3";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7223,6 +7245,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7247,6 +7270,7 @@ self: super: {
   "text-icu-translit" = dontDistribute super."text-icu-translit";
   "text-json-qq" = dontDistribute super."text-json-qq";
   "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = doDistribute super."text-ldap_0_1_1_6";
   "text-locale-encoding" = dontDistribute super."text-locale-encoding";
   "text-normal" = dontDistribute super."text-normal";
   "text-position" = dontDistribute super."text-position";
@@ -7336,6 +7360,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -7847,6 +7872,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = doDistribute super."werewolf_1_0_2_2";
+  "werewolf-slack" = doDistribute super."werewolf-slack_1_0_1_2";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7938,6 +7964,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-6.2.nix b/pkgs/development/haskell-modules/configuration-lts-6.2.nix
index 41957b889ec5..83cb0fc4cb73 100644
--- a/pkgs/development/haskell-modules/configuration-lts-6.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-6.2.nix
@@ -534,6 +534,7 @@ self: super: {
   "InfixApplicative" = dontDistribute super."InfixApplicative";
   "Interpolation" = dontDistribute super."Interpolation";
   "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "IntervalMap" = doDistribute super."IntervalMap_0_5_1_0";
   "Irc" = dontDistribute super."Irc";
   "IrrHaskell" = dontDistribute super."IrrHaskell";
   "IsNull" = dontDistribute super."IsNull";
@@ -1068,6 +1069,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_2";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1117,6 +1119,7 @@ self: super: {
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
   "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
@@ -1318,6 +1321,7 @@ self: super: {
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
+  "asn1-encoding" = doDistribute super."asn1-encoding_0_9_3";
   "asn1dump" = dontDistribute super."asn1dump";
   "assembler" = dontDistribute super."assembler";
   "assert" = dontDistribute super."assert";
@@ -1488,6 +1492,7 @@ self: super: {
   "billeksah-services" = dontDistribute super."billeksah-services";
   "bimaps" = dontDistribute super."bimaps";
   "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-conduit" = doDistribute super."binary-conduit_1_2_3";
   "binary-derive" = dontDistribute super."binary-derive";
   "binary-enum" = dontDistribute super."binary-enum";
   "binary-file" = dontDistribute super."binary-file";
@@ -1696,6 +1701,7 @@ self: super: {
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
   "c-dsl" = dontDistribute super."c-dsl";
   "c-io" = dontDistribute super."c-io";
   "c-storable-deriving" = dontDistribute super."c-storable-deriving";
@@ -2886,6 +2892,7 @@ self: super: {
   "float-binstring" = dontDistribute super."float-binstring";
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
+  "flow-er" = dontDistribute super."flow-er";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock" = dontDistribute super."flowdock";
   "flowdock-api" = dontDistribute super."flowdock-api";
@@ -4492,6 +4499,7 @@ self: super: {
   "irc-bytestring" = dontDistribute super."irc-bytestring";
   "irc-client" = doDistribute super."irc-client_0_3_0_0";
   "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
   "irc-fun-client" = dontDistribute super."irc-fun-client";
@@ -4570,6 +4578,7 @@ self: super: {
   "jose" = doDistribute super."jose_0_4_0_1";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_4";
   "jsaddle" = doDistribute super."jsaddle_0_3_0_3";
   "jsaddle-dom" = dontDistribute super."jsaddle-dom";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
@@ -4768,6 +4777,7 @@ self: super: {
   "layout" = dontDistribute super."layout";
   "layout-bootstrap" = dontDistribute super."layout-bootstrap";
   "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
   "lazyarray" = dontDistribute super."lazyarray";
   "lazyio" = dontDistribute super."lazyio";
   "lazysmallcheck" = dontDistribute super."lazysmallcheck";
@@ -5096,6 +5106,7 @@ self: super: {
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
   "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5261,6 +5272,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_6_0";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mp" = dontDistribute super."mp";
@@ -5801,6 +5813,7 @@ self: super: {
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_2";
   "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = doDistribute super."pipes-cacophony_0_2_1";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
@@ -5812,7 +5825,10 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_3";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_4";
+  "pipes-http" = doDistribute super."pipes-http_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6365,6 +6381,7 @@ self: super: {
   "roots" = dontDistribute super."roots";
   "rope" = dontDistribute super."rope";
   "rosa" = dontDistribute super."rosa";
+  "rose-trees" = doDistribute super."rose-trees_0_0_3";
   "rose-trie" = dontDistribute super."rose-trie";
   "roshask" = dontDistribute super."roshask";
   "rosso" = dontDistribute super."rosso";
@@ -6472,6 +6489,7 @@ self: super: {
   "sci-ratio" = dontDistribute super."sci-ratio";
   "science-constants" = dontDistribute super."science-constants";
   "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scientific" = doDistribute super."scientific_0_3_4_6";
   "scion" = dontDistribute super."scion";
   "scion-browser" = dontDistribute super."scion-browser";
   "scons2dot" = dontDistribute super."scons2dot";
@@ -6592,6 +6610,7 @@ self: super: {
   "shadowsocks" = dontDistribute super."shadowsocks";
   "shady-gen" = dontDistribute super."shady-gen";
   "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake" = doDistribute super."shake_0_15_8";
   "shake-cabal-build" = dontDistribute super."shake-cabal-build";
   "shake-extras" = dontDistribute super."shake-extras";
   "shake-minify" = dontDistribute super."shake-minify";
@@ -6602,6 +6621,7 @@ self: super: {
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
   "shakespeare-text" = dontDistribute super."shakespeare-text";
   "shana" = dontDistribute super."shana";
   "shapefile" = dontDistribute super."shapefile";
@@ -6685,6 +6705,7 @@ self: super: {
   "sink" = dontDistribute super."sink";
   "sirkel" = dontDistribute super."sirkel";
   "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
   "sized" = dontDistribute super."sized";
   "sized-types" = dontDistribute super."sized-types";
   "sized-vector" = dontDistribute super."sized-vector";
@@ -6947,7 +6968,9 @@ self: super: {
   "storablevector-carray" = dontDistribute super."storablevector-carray";
   "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
   "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
   "str" = dontDistribute super."str";
+  "stratosphere" = doDistribute super."stratosphere_0_1_1";
   "stratum-tool" = dontDistribute super."stratum-tool";
   "stratux" = dontDistribute super."stratux";
   "stratux-http" = dontDistribute super."stratux-http";
@@ -6957,6 +6980,8 @@ self: super: {
   "stream-fusion" = dontDistribute super."stream-fusion";
   "stream-monad" = dontDistribute super."stream-monad";
   "streamed" = dontDistribute super."streamed";
+  "streaming" = doDistribute super."streaming_0_1_4_2";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7168,6 +7193,7 @@ self: super: {
   "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
   "test-framework-skip" = dontDistribute super."test-framework-skip";
   "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
   "test-invariant" = dontDistribute super."test-invariant";
   "test-pkg" = dontDistribute super."test-pkg";
   "test-sandbox" = dontDistribute super."test-sandbox";
@@ -7192,6 +7218,7 @@ self: super: {
   "text-icu-translit" = dontDistribute super."text-icu-translit";
   "text-json-qq" = dontDistribute super."text-json-qq";
   "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = doDistribute super."text-ldap_0_1_1_6";
   "text-locale-encoding" = dontDistribute super."text-locale-encoding";
   "text-normal" = dontDistribute super."text-normal";
   "text-position" = dontDistribute super."text-position";
@@ -7281,6 +7308,7 @@ self: super: {
   "time-http" = dontDistribute super."time-http";
   "time-interval" = dontDistribute super."time-interval";
   "time-io-access" = dontDistribute super."time-io-access";
+  "time-locale-compat" = doDistribute super."time-locale-compat_0_1_1_1";
   "time-out" = dontDistribute super."time-out";
   "time-patterns" = dontDistribute super."time-patterns";
   "time-qq" = dontDistribute super."time-qq";
@@ -7789,6 +7817,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = doDistribute super."werewolf_1_0_2_2";
+  "werewolf-slack" = doDistribute super."werewolf-slack_1_0_1_2";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7878,6 +7907,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
diff --git a/pkgs/development/haskell-modules/configuration-lts-6.3.nix b/pkgs/development/haskell-modules/configuration-lts-6.3.nix
new file mode 100644
index 000000000000..709ba0834c8c
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-6.3.nix
@@ -0,0 +1,7958 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # core libraries provided by the compiler
+  Cabal = null;
+  array = null;
+  base = null;
+  bin-package-db = null;
+  binary = null;
+  bytestring = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  time = null;
+  transformers = null;
+  unix = null;
+
+  # lts-6.3 packages
+  "3d-graphics-examples" = dontDistribute super."3d-graphics-examples";
+  "3dmodels" = dontDistribute super."3dmodels";
+  "4Blocks" = dontDistribute super."4Blocks";
+  "AAI" = dontDistribute super."AAI";
+  "ABList" = dontDistribute super."ABList";
+  "AC-Angle" = dontDistribute super."AC-Angle";
+  "AC-Boolean" = dontDistribute super."AC-Boolean";
+  "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform";
+  "AC-Colour" = dontDistribute super."AC-Colour";
+  "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK";
+  "AC-HalfInteger" = dontDistribute super."AC-HalfInteger";
+  "AC-MiniTest" = dontDistribute super."AC-MiniTest";
+  "AC-PPM" = dontDistribute super."AC-PPM";
+  "AC-Random" = dontDistribute super."AC-Random";
+  "AC-Terminal" = dontDistribute super."AC-Terminal";
+  "AC-VanillaArray" = dontDistribute super."AC-VanillaArray";
+  "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy";
+  "ACME" = dontDistribute super."ACME";
+  "ADPfusion" = dontDistribute super."ADPfusion";
+  "AERN-Basics" = dontDistribute super."AERN-Basics";
+  "AERN-Net" = dontDistribute super."AERN-Net";
+  "AERN-Real" = dontDistribute super."AERN-Real";
+  "AERN-Real-Double" = dontDistribute super."AERN-Real-Double";
+  "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval";
+  "AERN-RnToRm" = dontDistribute super."AERN-RnToRm";
+  "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot";
+  "AES" = dontDistribute super."AES";
+  "AFSM" = dontDistribute super."AFSM";
+  "AGI" = dontDistribute super."AGI";
+  "ALUT" = dontDistribute super."ALUT";
+  "AMI" = dontDistribute super."AMI";
+  "ANum" = dontDistribute super."ANum";
+  "ASN1" = dontDistribute super."ASN1";
+  "AVar" = dontDistribute super."AVar";
+  "AWin32Console" = dontDistribute super."AWin32Console";
+  "AbortT-monadstf" = dontDistribute super."AbortT-monadstf";
+  "AbortT-mtl" = dontDistribute super."AbortT-mtl";
+  "AbortT-transformers" = dontDistribute super."AbortT-transformers";
+  "ActionKid" = dontDistribute super."ActionKid";
+  "Adaptive" = dontDistribute super."Adaptive";
+  "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade";
+  "Advgame" = dontDistribute super."Advgame";
+  "AesonBson" = dontDistribute super."AesonBson";
+  "Agata" = dontDistribute super."Agata";
+  "Agda-executable" = dontDistribute super."Agda-executable";
+  "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlgorithmW" = dontDistribute super."AlgorithmW";
+  "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
+  "Allure" = dontDistribute super."Allure";
+  "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter";
+  "Animas" = dontDistribute super."Animas";
+  "Annotations" = dontDistribute super."Annotations";
+  "Ansi2Html" = dontDistribute super."Ansi2Html";
+  "ApplePush" = dontDistribute super."ApplePush";
+  "AppleScript" = dontDistribute super."AppleScript";
+  "ApproxFun-hs" = dontDistribute super."ApproxFun-hs";
+  "ArrayRef" = dontDistribute super."ArrayRef";
+  "ArrowVHDL" = dontDistribute super."ArrowVHDL";
+  "AspectAG" = dontDistribute super."AspectAG";
+  "AttoBencode" = dontDistribute super."AttoBencode";
+  "AttoJson" = dontDistribute super."AttoJson";
+  "Attrac" = dontDistribute super."Attrac";
+  "Aurochs" = dontDistribute super."Aurochs";
+  "AutoForms" = dontDistribute super."AutoForms";
+  "AvlTree" = dontDistribute super."AvlTree";
+  "BASIC" = dontDistribute super."BASIC";
+  "BCMtools" = dontDistribute super."BCMtools";
+  "BNFC" = dontDistribute super."BNFC";
+  "BNFC-meta" = dontDistribute super."BNFC-meta";
+  "Baggins" = dontDistribute super."Baggins";
+  "Bang" = dontDistribute super."Bang";
+  "Barracuda" = dontDistribute super."Barracuda";
+  "Befunge93" = dontDistribute super."Befunge93";
+  "BenchmarkHistory" = dontDistribute super."BenchmarkHistory";
+  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
+  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
+  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BiGUL" = dontDistribute super."BiGUL";
+  "BigPixel" = dontDistribute super."BigPixel";
+  "Binpack" = dontDistribute super."Binpack";
+  "Biobase" = dontDistribute super."Biobase";
+  "BiobaseBlast" = dontDistribute super."BiobaseBlast";
+  "BiobaseDotP" = dontDistribute super."BiobaseDotP";
+  "BiobaseFR3D" = dontDistribute super."BiobaseFR3D";
+  "BiobaseFasta" = dontDistribute super."BiobaseFasta";
+  "BiobaseInfernal" = dontDistribute super."BiobaseInfernal";
+  "BiobaseMAF" = dontDistribute super."BiobaseMAF";
+  "BiobaseNewick" = dontDistribute super."BiobaseNewick";
+  "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData";
+  "BiobaseTurner" = dontDistribute super."BiobaseTurner";
+  "BiobaseTypes" = dontDistribute super."BiobaseTypes";
+  "BiobaseVienna" = dontDistribute super."BiobaseVienna";
+  "BiobaseXNA" = dontDistribute super."BiobaseXNA";
+  "BirdPP" = dontDistribute super."BirdPP";
+  "BitSyntax" = dontDistribute super."BitSyntax";
+  "Bitly" = dontDistribute super."Bitly";
+  "Blobs" = dontDistribute super."Blobs";
+  "BluePrintCSS" = dontDistribute super."BluePrintCSS";
+  "Blueprint" = dontDistribute super."Blueprint";
+  "Bookshelf" = dontDistribute super."Bookshelf";
+  "Bravo" = dontDistribute super."Bravo";
+  "BufferedSocket" = dontDistribute super."BufferedSocket";
+  "Buster" = dontDistribute super."Buster";
+  "CBOR" = dontDistribute super."CBOR";
+  "CC-delcont" = dontDistribute super."CC-delcont";
+  "CC-delcont-alt" = dontDistribute super."CC-delcont-alt";
+  "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe";
+  "CC-delcont-exc" = dontDistribute super."CC-delcont-exc";
+  "CC-delcont-ref" = dontDistribute super."CC-delcont-ref";
+  "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf";
+  "CCA" = dontDistribute super."CCA";
+  "CHXHtml" = dontDistribute super."CHXHtml";
+  "CLASE" = dontDistribute super."CLASE";
+  "CLI" = dontDistribute super."CLI";
+  "CMCompare" = dontDistribute super."CMCompare";
+  "CMQ" = dontDistribute super."CMQ";
+  "COrdering" = dontDistribute super."COrdering";
+  "CPBrainfuck" = dontDistribute super."CPBrainfuck";
+  "CPL" = dontDistribute super."CPL";
+  "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage";
+  "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules";
+  "CSPM-Frontend" = dontDistribute super."CSPM-Frontend";
+  "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter";
+  "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog";
+  "CSPM-cspm" = dontDistribute super."CSPM-cspm";
+  "CTRex" = dontDistribute super."CTRex";
+  "CV" = dontDistribute super."CV";
+  "CabalSearch" = dontDistribute super."CabalSearch";
+  "Capabilities" = dontDistribute super."Capabilities";
+  "Cardinality" = dontDistribute super."Cardinality";
+  "CarneadesDSL" = dontDistribute super."CarneadesDSL";
+  "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung";
+  "Cartesian" = dontDistribute super."Cartesian";
+  "Cascade" = dontDistribute super."Cascade";
+  "Catana" = dontDistribute super."Catana";
+  "Chart" = doDistribute super."Chart_1_6";
+  "Chart-cairo" = doDistribute super."Chart-cairo_1_6";
+  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_6";
+  "Chart-gtk" = dontDistribute super."Chart-gtk";
+  "Chart-simple" = dontDistribute super."Chart-simple";
+  "CheatSheet" = dontDistribute super."CheatSheet";
+  "Checked" = dontDistribute super."Checked";
+  "Chitra" = dontDistribute super."Chitra";
+  "ChristmasTree" = dontDistribute super."ChristmasTree";
+  "CirruParser" = dontDistribute super."CirruParser";
+  "ClassLaws" = dontDistribute super."ClassLaws";
+  "ClassyPrelude" = dontDistribute super."ClassyPrelude";
+  "Clean" = dontDistribute super."Clean";
+  "Clipboard" = dontDistribute super."Clipboard";
+  "Coadjute" = dontDistribute super."Coadjute";
+  "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF";
+  "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL";
+  "Combinatorrent" = dontDistribute super."Combinatorrent";
+  "Command" = dontDistribute super."Command";
+  "Commando" = dontDistribute super."Commando";
+  "ComonadSheet" = dontDistribute super."ComonadSheet";
+  "ConcurrentUtils" = dontDistribute super."ConcurrentUtils";
+  "Concurrential" = dontDistribute super."Concurrential";
+  "Condor" = dontDistribute super."Condor";
+  "ConfigFileTH" = dontDistribute super."ConfigFileTH";
+  "Configger" = dontDistribute super."Configger";
+  "Configurable" = dontDistribute super."Configurable";
+  "ConsStream" = dontDistribute super."ConsStream";
+  "Conscript" = dontDistribute super."Conscript";
+  "ConstraintKinds" = dontDistribute super."ConstraintKinds";
+  "Consumer" = dontDistribute super."Consumer";
+  "ContArrow" = dontDistribute super."ContArrow";
+  "ContextAlgebra" = dontDistribute super."ContextAlgebra";
+  "Contract" = dontDistribute super."Contract";
+  "Control-Engine" = dontDistribute super."Control-Engine";
+  "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass";
+  "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2";
+  "CoreDump" = dontDistribute super."CoreDump";
+  "CoreErlang" = dontDistribute super."CoreErlang";
+  "CoreFoundation" = dontDistribute super."CoreFoundation";
+  "Coroutine" = dontDistribute super."Coroutine";
+  "CouchDB" = dontDistribute super."CouchDB";
+  "Craft3e" = dontDistribute super."Craft3e";
+  "Crypto" = dontDistribute super."Crypto";
+  "CurryDB" = dontDistribute super."CurryDB";
+  "DAG-Tournament" = dontDistribute super."DAG-Tournament";
+  "DBlimited" = dontDistribute super."DBlimited";
+  "DBus" = dontDistribute super."DBus";
+  "DCFL" = dontDistribute super."DCFL";
+  "DMuCheck" = dontDistribute super."DMuCheck";
+  "DOM" = dontDistribute super."DOM";
+  "DP" = dontDistribute super."DP";
+  "DPM" = dontDistribute super."DPM";
+  "DSA" = dontDistribute super."DSA";
+  "DSH" = dontDistribute super."DSH";
+  "DSTM" = dontDistribute super."DSTM";
+  "DTC" = dontDistribute super."DTC";
+  "Dangerous" = dontDistribute super."Dangerous";
+  "Dao" = dontDistribute super."Dao";
+  "DarcsHelpers" = dontDistribute super."DarcsHelpers";
+  "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent";
+  "Data-Rope" = dontDistribute super."Data-Rope";
+  "DataTreeView" = dontDistribute super."DataTreeView";
+  "Deadpan-DDP" = dontDistribute super."Deadpan-DDP";
+  "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers";
+  "DecisionTree" = dontDistribute super."DecisionTree";
+  "DeepArrow" = dontDistribute super."DeepArrow";
+  "DefendTheKing" = dontDistribute super."DefendTheKing";
+  "Delta-Lambda" = dontDistribute super."Delta-Lambda";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "Diff" = doDistribute super."Diff_0_3_2";
+  "DifferenceLogic" = dontDistribute super."DifferenceLogic";
+  "DifferentialEvolution" = dontDistribute super."DifferentialEvolution";
+  "Digit" = dontDistribute super."Digit";
+  "DigitalOcean" = dontDistribute super."DigitalOcean";
+  "DimensionalHash" = dontDistribute super."DimensionalHash";
+  "DirectSound" = dontDistribute super."DirectSound";
+  "DisTract" = dontDistribute super."DisTract";
+  "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem";
+  "Dish" = dontDistribute super."Dish";
+  "Dist" = dontDistribute super."Dist";
+  "DistanceTransform" = dontDistribute super."DistanceTransform";
+  "DistanceUnits" = dontDistribute super."DistanceUnits";
+  "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment";
+  "DocTest" = dontDistribute super."DocTest";
+  "Docs" = dontDistribute super."Docs";
+  "DrHylo" = dontDistribute super."DrHylo";
+  "DrIFT" = dontDistribute super."DrIFT";
+  "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized";
+  "Dung" = dontDistribute super."Dung";
+  "Dust" = dontDistribute super."Dust";
+  "Dust-crypto" = dontDistribute super."Dust-crypto";
+  "Dust-tools" = dontDistribute super."Dust-tools";
+  "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap";
+  "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp";
+  "DysFRP" = dontDistribute super."DysFRP";
+  "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
+  "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
+  "EEConfig" = dontDistribute super."EEConfig";
+  "EdisonAPI" = doDistribute super."EdisonAPI_1_3";
+  "EditTimeReport" = dontDistribute super."EditTimeReport";
+  "EitherT" = dontDistribute super."EitherT";
+  "Elm" = dontDistribute super."Elm";
+  "Emping" = dontDistribute super."Emping";
+  "Encode" = dontDistribute super."Encode";
+  "EnumContainers" = dontDistribute super."EnumContainers";
+  "EnumMap" = dontDistribute super."EnumMap";
+  "Eq" = dontDistribute super."Eq";
+  "EqualitySolver" = dontDistribute super."EqualitySolver";
+  "EsounD" = dontDistribute super."EsounD";
+  "EstProgress" = dontDistribute super."EstProgress";
+  "EtaMOO" = dontDistribute super."EtaMOO";
+  "Etage" = dontDistribute super."Etage";
+  "Etage-Graph" = dontDistribute super."Etage-Graph";
+  "Eternal10Seconds" = dontDistribute super."Eternal10Seconds";
+  "Etherbunny" = dontDistribute super."Etherbunny";
+  "EuroIT" = dontDistribute super."EuroIT";
+  "Euterpea" = dontDistribute super."Euterpea";
+  "EventSocket" = dontDistribute super."EventSocket";
+  "Extra" = dontDistribute super."Extra";
+  "FComp" = dontDistribute super."FComp";
+  "FM-SBLEX" = dontDistribute super."FM-SBLEX";
+  "FModExRaw" = dontDistribute super."FModExRaw";
+  "FPretty" = dontDistribute super."FPretty";
+  "FTGL" = dontDistribute super."FTGL";
+  "FTGL-bytestring" = dontDistribute super."FTGL-bytestring";
+  "FTPLine" = dontDistribute super."FTPLine";
+  "Facts" = dontDistribute super."Facts";
+  "FailureT" = dontDistribute super."FailureT";
+  "FastxPipe" = dontDistribute super."FastxPipe";
+  "FermatsLastMargin" = dontDistribute super."FermatsLastMargin";
+  "FerryCore" = dontDistribute super."FerryCore";
+  "Feval" = dontDistribute super."Feval";
+  "FieldTrip" = dontDistribute super."FieldTrip";
+  "FileManip" = dontDistribute super."FileManip";
+  "FileManipCompat" = dontDistribute super."FileManipCompat";
+  "FilePather" = dontDistribute super."FilePather";
+  "FileSystem" = dontDistribute super."FileSystem";
+  "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo";
+  "Finance-Treasury" = dontDistribute super."Finance-Treasury";
+  "FiniteMap" = dontDistribute super."FiniteMap";
+  "FirstOrderTheory" = dontDistribute super."FirstOrderTheory";
+  "FixedPoint-simple" = dontDistribute super."FixedPoint-simple";
+  "Flippi" = dontDistribute super."Flippi";
+  "Focus" = dontDistribute super."Focus";
+  "Folly" = dontDistribute super."Folly";
+  "ForSyDe" = dontDistribute super."ForSyDe";
+  "ForestStructures" = dontDistribute super."ForestStructures";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frank" = dontDistribute super."Frank";
+  "FreeTypeGL" = dontDistribute super."FreeTypeGL";
+  "FunGEn" = dontDistribute super."FunGEn";
+  "Fungi" = dontDistribute super."Fungi";
+  "GA" = dontDistribute super."GA";
+  "GGg" = dontDistribute super."GGg";
+  "GHood" = dontDistribute super."GHood";
+  "GLFW" = dontDistribute super."GLFW";
+  "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
+  "GLFW-task" = dontDistribute super."GLFW-task";
+  "GLHUI" = dontDistribute super."GLHUI";
+  "GLM" = dontDistribute super."GLM";
+  "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
+  "GTALib" = dontDistribute super."GTALib";
+  "Gamgine" = dontDistribute super."Gamgine";
+  "Ganymede" = dontDistribute super."Ganymede";
+  "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration";
+  "GeBoP" = dontDistribute super."GeBoP";
+  "GenI" = dontDistribute super."GenI";
+  "GenSmsPdu" = dontDistribute super."GenSmsPdu";
+  "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe";
+  "GenussFold" = dontDistribute super."GenussFold";
+  "GeoIp" = dontDistribute super."GeoIp";
+  "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage";
+  "Geodetic" = dontDistribute super."Geodetic";
+  "GeomPredicates" = dontDistribute super."GeomPredicates";
+  "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
+  "GiST" = dontDistribute super."GiST";
+  "Gifcurry" = dontDistribute super."Gifcurry";
+  "GiveYouAHead" = dontDistribute super."GiveYouAHead";
+  "GlomeTrace" = dontDistribute super."GlomeTrace";
+  "GlomeVec" = dontDistribute super."GlomeVec";
+  "GlomeView" = dontDistribute super."GlomeView";
+  "GoogleChart" = dontDistribute super."GoogleChart";
+  "GoogleDirections" = dontDistribute super."GoogleDirections";
+  "GoogleSB" = dontDistribute super."GoogleSB";
+  "GoogleSuggest" = dontDistribute super."GoogleSuggest";
+  "GoogleTranslate" = dontDistribute super."GoogleTranslate";
+  "GotoT-transformers" = dontDistribute super."GotoT-transformers";
+  "GrammarProducts" = dontDistribute super."GrammarProducts";
+  "Graph500" = dontDistribute super."Graph500";
+  "GraphHammer" = dontDistribute super."GraphHammer";
+  "GraphHammer-examples" = dontDistribute super."GraphHammer-examples";
+  "Graphalyze" = dontDistribute super."Graphalyze";
+  "Grempa" = dontDistribute super."Grempa";
+  "GroteTrap" = dontDistribute super."GroteTrap";
+  "Grow" = dontDistribute super."Grow";
+  "GrowlNotify" = dontDistribute super."GrowlNotify";
+  "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics";
+  "GtkGLTV" = dontDistribute super."GtkGLTV";
+  "GtkTV" = dontDistribute super."GtkTV";
+  "GuiHaskell" = dontDistribute super."GuiHaskell";
+  "GuiTV" = dontDistribute super."GuiTV";
+  "HARM" = dontDistribute super."HARM";
+  "HAppS-Data" = dontDistribute super."HAppS-Data";
+  "HAppS-IxSet" = dontDistribute super."HAppS-IxSet";
+  "HAppS-Server" = dontDistribute super."HAppS-Server";
+  "HAppS-State" = dontDistribute super."HAppS-State";
+  "HAppS-Util" = dontDistribute super."HAppS-Util";
+  "HAppSHelpers" = dontDistribute super."HAppSHelpers";
+  "HCL" = dontDistribute super."HCL";
+  "HCard" = dontDistribute super."HCard";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDRUtils" = dontDistribute super."HDRUtils";
+  "HERA" = dontDistribute super."HERA";
+  "HFrequencyQueue" = dontDistribute super."HFrequencyQueue";
+  "HFuse" = dontDistribute super."HFuse";
+  "HGL" = dontDistribute super."HGL";
+  "HGamer3D" = dontDistribute super."HGamer3D";
+  "HGamer3D-API" = dontDistribute super."HGamer3D-API";
+  "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio";
+  "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding";
+  "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding";
+  "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding";
+  "HGamer3D-Common" = dontDistribute super."HGamer3D-Common";
+  "HGamer3D-Data" = dontDistribute super."HGamer3D-Data";
+  "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding";
+  "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI";
+  "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D";
+  "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem";
+  "HGamer3D-Network" = dontDistribute super."HGamer3D-Network";
+  "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding";
+  "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding";
+  "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding";
+  "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding";
+  "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent";
+  "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire";
+  "HGraphStorage" = dontDistribute super."HGraphStorage";
+  "HHDL" = dontDistribute super."HHDL";
+  "HJScript" = dontDistribute super."HJScript";
+  "HJVM" = dontDistribute super."HJVM";
+  "HJavaScript" = dontDistribute super."HJavaScript";
+  "HLearn-algebra" = dontDistribute super."HLearn-algebra";
+  "HLearn-approximation" = dontDistribute super."HLearn-approximation";
+  "HLearn-classification" = dontDistribute super."HLearn-classification";
+  "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
+  "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HListPP" = dontDistribute super."HListPP";
+  "HLogger" = dontDistribute super."HLogger";
+  "HMM" = dontDistribute super."HMM";
+  "HMap" = dontDistribute super."HMap";
+  "HNM" = dontDistribute super."HNM";
+  "HODE" = dontDistribute super."HODE";
+  "HOpenCV" = dontDistribute super."HOpenCV";
+  "HPath" = dontDistribute super."HPath";
+  "HPi" = dontDistribute super."HPi";
+  "HPlot" = dontDistribute super."HPlot";
+  "HPong" = dontDistribute super."HPong";
+  "HROOT" = dontDistribute super."HROOT";
+  "HROOT-core" = dontDistribute super."HROOT-core";
+  "HROOT-graf" = dontDistribute super."HROOT-graf";
+  "HROOT-hist" = dontDistribute super."HROOT-hist";
+  "HROOT-io" = dontDistribute super."HROOT-io";
+  "HROOT-math" = dontDistribute super."HROOT-math";
+  "HRay" = dontDistribute super."HRay";
+  "HSFFIG" = dontDistribute super."HSFFIG";
+  "HSGEP" = dontDistribute super."HSGEP";
+  "HSH" = dontDistribute super."HSH";
+  "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSlippyMap" = dontDistribute super."HSlippyMap";
+  "HSmarty" = dontDistribute super."HSmarty";
+  "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
+  "HSvm" = dontDistribute super."HSvm";
+  "HTTP-Simple" = dontDistribute super."HTTP-Simple";
+  "HTab" = dontDistribute super."HTab";
+  "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit-Diff" = dontDistribute super."HUnit-Diff";
+  "HUnit-Plus" = dontDistribute super."HUnit-Plus";
+  "HUnit-approx" = dontDistribute super."HUnit-approx";
+  "HXMPP" = dontDistribute super."HXMPP";
+  "HXQ" = dontDistribute super."HXQ";
+  "HaLeX" = dontDistribute super."HaLeX";
+  "HaMinitel" = dontDistribute super."HaMinitel";
+  "HaPy" = dontDistribute super."HaPy";
+  "HaTeX-meta" = dontDistribute super."HaTeX-meta";
+  "HaTeX-qq" = dontDistribute super."HaTeX-qq";
+  "HaVSA" = dontDistribute super."HaVSA";
+  "Hach" = dontDistribute super."Hach";
+  "HackMail" = dontDistribute super."HackMail";
+  "Haggressive" = dontDistribute super."Haggressive";
+  "HandlerSocketClient" = dontDistribute super."HandlerSocketClient";
+  "Hangman" = dontDistribute super."Hangman";
+  "HarmTrace" = dontDistribute super."HarmTrace";
+  "HarmTrace-Base" = dontDistribute super."HarmTrace-Base";
+  "HasGP" = dontDistribute super."HasGP";
+  "Haschoo" = dontDistribute super."Haschoo";
+  "Hashell" = dontDistribute super."Hashell";
+  "HaskRel" = dontDistribute super."HaskRel";
+  "HaskellForMaths" = dontDistribute super."HaskellForMaths";
+  "HaskellLM" = dontDistribute super."HaskellLM";
+  "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellTorrent" = dontDistribute super."HaskellTorrent";
+  "HaskellTutorials" = dontDistribute super."HaskellTutorials";
+  "Haskelloids" = dontDistribute super."Haskelloids";
+  "Hate" = dontDistribute super."Hate";
+  "Hawk" = dontDistribute super."Hawk";
+  "Hayoo" = dontDistribute super."Hayoo";
+  "Hedi" = dontDistribute super."Hedi";
+  "HerbiePlugin" = dontDistribute super."HerbiePlugin";
+  "Hermes" = dontDistribute super."Hermes";
+  "Hieroglyph" = dontDistribute super."Hieroglyph";
+  "HiggsSet" = dontDistribute super."HiggsSet";
+  "Hipmunk" = dontDistribute super."Hipmunk";
+  "HipmunkPlayground" = dontDistribute super."HipmunkPlayground";
+  "Hish" = dontDistribute super."Hish";
+  "Histogram" = dontDistribute super."Histogram";
+  "Hmpf" = dontDistribute super."Hmpf";
+  "Hoed" = dontDistribute super."Hoed";
+  "HoleyMonoid" = dontDistribute super."HoleyMonoid";
+  "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution";
+  "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce";
+  "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine";
+  "Holumbus-Storage" = dontDistribute super."Holumbus-Storage";
+  "Homology" = dontDistribute super."Homology";
+  "HongoDB" = dontDistribute super."HongoDB";
+  "HostAndPort" = dontDistribute super."HostAndPort";
+  "Hricket" = dontDistribute super."Hricket";
+  "Hs2lib" = dontDistribute super."Hs2lib";
+  "HsASA" = dontDistribute super."HsASA";
+  "HsHaruPDF" = dontDistribute super."HsHaruPDF";
+  "HsHyperEstraier" = dontDistribute super."HsHyperEstraier";
+  "HsJudy" = dontDistribute super."HsJudy";
+  "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system";
+  "HsParrot" = dontDistribute super."HsParrot";
+  "HsPerl5" = dontDistribute super."HsPerl5";
+  "HsSVN" = dontDistribute super."HsSVN";
+  "HsTools" = dontDistribute super."HsTools";
+  "Hsed" = dontDistribute super."Hsed";
+  "Hsmtlib" = dontDistribute super."Hsmtlib";
+  "HueAPI" = dontDistribute super."HueAPI";
+  "HulkImport" = dontDistribute super."HulkImport";
+  "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres";
+  "IDynamic" = dontDistribute super."IDynamic";
+  "IFS" = dontDistribute super."IFS";
+  "INblobs" = dontDistribute super."INblobs";
+  "IOR" = dontDistribute super."IOR";
+  "IORefCAS" = dontDistribute super."IORefCAS";
+  "IOSpec" = dontDistribute super."IOSpec";
+  "IcoGrid" = dontDistribute super."IcoGrid";
+  "Imlib" = dontDistribute super."Imlib";
+  "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
+  "IndentParser" = dontDistribute super."IndentParser";
+  "IndexedList" = dontDistribute super."IndexedList";
+  "InfixApplicative" = dontDistribute super."InfixApplicative";
+  "Interpolation" = dontDistribute super."Interpolation";
+  "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JuicyPixels-extra" = dontDistribute super."JuicyPixels-extra";
+  "JunkDB" = dontDistribute super."JunkDB";
+  "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
+  "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables";
+  "JustParse" = dontDistribute super."JustParse";
+  "KMP" = dontDistribute super."KMP";
+  "KSP" = dontDistribute super."KSP";
+  "Kalman" = dontDistribute super."Kalman";
+  "KdTree" = dontDistribute super."KdTree";
+  "Ketchup" = dontDistribute super."Ketchup";
+  "KiCS" = dontDistribute super."KiCS";
+  "KiCS-debugger" = dontDistribute super."KiCS-debugger";
+  "KiCS-prophecy" = dontDistribute super."KiCS-prophecy";
+  "Kleislify" = dontDistribute super."Kleislify";
+  "Konf" = dontDistribute super."Konf";
+  "Kriens" = dontDistribute super."Kriens";
+  "KyotoCabinet" = dontDistribute super."KyotoCabinet";
+  "L-seed" = dontDistribute super."L-seed";
+  "LATS" = dontDistribute super."LATS";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "LambdaDB" = dontDistribute super."LambdaDB";
+  "LambdaHack" = dontDistribute super."LambdaHack";
+  "LambdaINet" = dontDistribute super."LambdaINet";
+  "LambdaNet" = dontDistribute super."LambdaNet";
+  "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote";
+  "LambdaShell" = dontDistribute super."LambdaShell";
+  "Lambdajudge" = dontDistribute super."Lambdajudge";
+  "Lambdaya" = dontDistribute super."Lambdaya";
+  "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
+  "Lastik" = dontDistribute super."Lastik";
+  "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "LibZip" = dontDistribute super."LibZip";
+  "Limit" = dontDistribute super."Limit";
+  "LinearSplit" = dontDistribute super."LinearSplit";
+  "LinguisticsTypes" = dontDistribute super."LinguisticsTypes";
+  "LinkChecker" = dontDistribute super."LinkChecker";
+  "ListTree" = dontDistribute super."ListTree";
+  "ListWriter" = dontDistribute super."ListWriter";
+  "ListZipper" = dontDistribute super."ListZipper";
+  "Logic" = dontDistribute super."Logic";
+  "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees";
+  "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI";
+  "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network";
+  "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
+  "LslPlus" = dontDistribute super."LslPlus";
+  "Lucu" = dontDistribute super."Lucu";
+  "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
+  "MHask" = dontDistribute super."MHask";
+  "MSQueue" = dontDistribute super."MSQueue";
+  "MTGBuilder" = dontDistribute super."MTGBuilder";
+  "MagicHaskeller" = dontDistribute super."MagicHaskeller";
+  "MailchimpSimple" = dontDistribute super."MailchimpSimple";
+  "MaybeT" = dontDistribute super."MaybeT";
+  "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf";
+  "MaybeT-transformers" = dontDistribute super."MaybeT-transformers";
+  "MazesOfMonad" = dontDistribute super."MazesOfMonad";
+  "MeanShift" = dontDistribute super."MeanShift";
+  "Measure" = dontDistribute super."Measure";
+  "MetaHDBC" = dontDistribute super."MetaHDBC";
+  "MetaObject" = dontDistribute super."MetaObject";
+  "Metrics" = dontDistribute super."Metrics";
+  "Mhailist" = dontDistribute super."Mhailist";
+  "Michelangelo" = dontDistribute super."Michelangelo";
+  "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator";
+  "MiniAgda" = dontDistribute super."MiniAgda";
+  "MissingH" = doDistribute super."MissingH_1_3_0_2";
+  "MissingK" = dontDistribute super."MissingK";
+  "MissingM" = dontDistribute super."MissingM";
+  "MissingPy" = dontDistribute super."MissingPy";
+  "Modulo" = dontDistribute super."Modulo";
+  "Moe" = dontDistribute super."Moe";
+  "MoeDict" = dontDistribute super."MoeDict";
+  "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl";
+  "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign";
+  "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
+  "MonadCompose" = dontDistribute super."MonadCompose";
+  "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
+  "MonadStack" = dontDistribute super."MonadStack";
+  "Monadius" = dontDistribute super."Monadius";
+  "Monaris" = dontDistribute super."Monaris";
+  "Monatron" = dontDistribute super."Monatron";
+  "Monatron-IO" = dontDistribute super."Monatron-IO";
+  "Monocle" = dontDistribute super."Monocle";
+  "MorseCode" = dontDistribute super."MorseCode";
+  "MuCheck" = dontDistribute super."MuCheck";
+  "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit";
+  "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec";
+  "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck";
+  "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck";
+  "Munkres" = dontDistribute super."Munkres";
+  "Munkres-simple" = dontDistribute super."Munkres-simple";
+  "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid";
+  "MyPrimes" = dontDistribute super."MyPrimes";
+  "NGrams" = dontDistribute super."NGrams";
+  "NTRU" = dontDistribute super."NTRU";
+  "NXT" = dontDistribute super."NXT";
+  "NXTDSL" = dontDistribute super."NXTDSL";
+  "NanoProlog" = dontDistribute super."NanoProlog";
+  "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets";
+  "NaturalSort" = dontDistribute super."NaturalSort";
+  "NearContextAlgebra" = dontDistribute super."NearContextAlgebra";
+  "Neks" = dontDistribute super."Neks";
+  "NestedFunctor" = dontDistribute super."NestedFunctor";
+  "NestedSampling" = dontDistribute super."NestedSampling";
+  "NetSNMP" = dontDistribute super."NetSNMP";
+  "NewBinary" = dontDistribute super."NewBinary";
+  "Ninjas" = dontDistribute super."Ninjas";
+  "NoSlow" = dontDistribute super."NoSlow";
+  "Noise" = dontDistribute super."Noise";
+  "Nomyx" = dontDistribute super."Nomyx";
+  "Nomyx-Core" = dontDistribute super."Nomyx-Core";
+  "Nomyx-Language" = dontDistribute super."Nomyx-Language";
+  "Nomyx-Rules" = dontDistribute super."Nomyx-Rules";
+  "Nomyx-Web" = dontDistribute super."Nomyx-Web";
+  "NonEmpty" = dontDistribute super."NonEmpty";
+  "NonEmptyList" = dontDistribute super."NonEmptyList";
+  "NumLazyByteString" = dontDistribute super."NumLazyByteString";
+  "NumberSieves" = dontDistribute super."NumberSieves";
+  "NumberTheory" = dontDistribute super."NumberTheory";
+  "Numbers" = dontDistribute super."Numbers";
+  "Nussinov78" = dontDistribute super."Nussinov78";
+  "Nutri" = dontDistribute super."Nutri";
+  "OGL" = dontDistribute super."OGL";
+  "OSM" = dontDistribute super."OSM";
+  "OTP" = dontDistribute super."OTP";
+  "Object" = dontDistribute super."Object";
+  "ObjectIO" = dontDistribute super."ObjectIO";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
+  "OpenSCAD" = dontDistribute super."OpenSCAD";
+  "OpenVG" = dontDistribute super."OpenVG";
+  "OpenVGRaw" = dontDistribute super."OpenVGRaw";
+  "Operads" = dontDistribute super."Operads";
+  "OptDir" = dontDistribute super."OptDir";
+  "OrPatterns" = dontDistribute super."OrPatterns";
+  "OrchestrateDB" = dontDistribute super."OrchestrateDB";
+  "OrderedBits" = dontDistribute super."OrderedBits";
+  "Ordinals" = dontDistribute super."Ordinals";
+  "PArrows" = dontDistribute super."PArrows";
+  "PBKDF2" = dontDistribute super."PBKDF2";
+  "PCLT" = dontDistribute super."PCLT";
+  "PCLT-DB" = dontDistribute super."PCLT-DB";
+  "PDBtools" = dontDistribute super."PDBtools";
+  "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
+  "PageIO" = dontDistribute super."PageIO";
+  "Paillier" = dontDistribute super."Paillier";
+  "PandocAgda" = dontDistribute super."PandocAgda";
+  "Paraiso" = dontDistribute super."Paraiso";
+  "Parry" = dontDistribute super."Parry";
+  "ParsecTools" = dontDistribute super."ParsecTools";
+  "ParserFunction" = dontDistribute super."ParserFunction";
+  "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures";
+  "PasswordGenerator" = dontDistribute super."PasswordGenerator";
+  "PastePipe" = dontDistribute super."PastePipe";
+  "Pathfinder" = dontDistribute super."Pathfinder";
+  "Peano" = dontDistribute super."Peano";
+  "PeanoWitnesses" = dontDistribute super."PeanoWitnesses";
+  "PerfectHash" = dontDistribute super."PerfectHash";
+  "PermuteEffects" = dontDistribute super."PermuteEffects";
+  "Phsu" = dontDistribute super."Phsu";
+  "Pipe" = dontDistribute super."Pipe";
+  "Piso" = dontDistribute super."Piso";
+  "PlayHangmanGame" = dontDistribute super."PlayHangmanGame";
+  "PlayingCards" = dontDistribute super."PlayingCards";
+  "Plot-ho-matic" = dontDistribute super."Plot-ho-matic";
+  "PlslTools" = dontDistribute super."PlslTools";
+  "Plural" = dontDistribute super."Plural";
+  "Pollutocracy" = dontDistribute super."Pollutocracy";
+  "PortFusion" = dontDistribute super."PortFusion";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "PrimitiveArray-Pretty" = dontDistribute super."PrimitiveArray-Pretty";
+  "Printf-TH" = dontDistribute super."Printf-TH";
+  "PriorityChansConverger" = dontDistribute super."PriorityChansConverger";
+  "ProbabilityMonads" = dontDistribute super."ProbabilityMonads";
+  "PropLogic" = dontDistribute super."PropLogic";
+  "Proper" = dontDistribute super."Proper";
+  "ProxN" = dontDistribute super."ProxN";
+  "Pugs" = dontDistribute super."Pugs";
+  "Pup-Events" = dontDistribute super."Pup-Events";
+  "Pup-Events-Client" = dontDistribute super."Pup-Events-Client";
+  "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo";
+  "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
+  "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
+  "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickCheck-safe" = dontDistribute super."QuickCheck-safe";
+  "QuickPlot" = dontDistribute super."QuickPlot";
+  "Quickson" = dontDistribute super."Quickson";
+  "R-pandoc" = dontDistribute super."R-pandoc";
+  "RANSAC" = dontDistribute super."RANSAC";
+  "RBTree" = dontDistribute super."RBTree";
+  "RESTng" = dontDistribute super."RESTng";
+  "RFC1751" = dontDistribute super."RFC1751";
+  "RJson" = dontDistribute super."RJson";
+  "RMP" = dontDistribute super."RMP";
+  "RNAFold" = dontDistribute super."RNAFold";
+  "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
+  "RNAdesign" = dontDistribute super."RNAdesign";
+  "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "Semantique" = dontDistribute super."Semantique";
+  "Semigroup" = dontDistribute super."Semigroup";
+  "SeqAlign" = dontDistribute super."SeqAlign";
+  "SessionLogger" = dontDistribute super."SessionLogger";
+  "ShellCheck" = dontDistribute super."ShellCheck";
+  "Shellac" = dontDistribute super."Shellac";
+  "Shellac-compatline" = dontDistribute super."Shellac-compatline";
+  "Shellac-editline" = dontDistribute super."Shellac-editline";
+  "Shellac-haskeline" = dontDistribute super."Shellac-haskeline";
+  "Shellac-readline" = dontDistribute super."Shellac-readline";
+  "ShowF" = dontDistribute super."ShowF";
+  "Shrub" = dontDistribute super."Shrub";
+  "Shu-thing" = dontDistribute super."Shu-thing";
+  "SimpleAES" = dontDistribute super."SimpleAES";
+  "SimpleEA" = dontDistribute super."SimpleEA";
+  "SimpleGL" = dontDistribute super."SimpleGL";
+  "SimpleH" = dontDistribute super."SimpleH";
+  "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
+  "SizeCompare" = dontDistribute super."SizeCompare";
+  "Slides" = dontDistribute super."Slides";
+  "Smooth" = dontDistribute super."Smooth";
+  "SmtLib" = dontDistribute super."SmtLib";
+  "Snusmumrik" = dontDistribute super."Snusmumrik";
+  "SoOSiM" = dontDistribute super."SoOSiM";
+  "SoccerFun" = dontDistribute super."SoccerFun";
+  "SoccerFunGL" = dontDistribute super."SoccerFunGL";
+  "Sonnex" = dontDistribute super."Sonnex";
+  "SourceGraph" = dontDistribute super."SourceGraph";
+  "Southpaw" = dontDistribute super."Southpaw";
+  "SpaceInvaders" = dontDistribute super."SpaceInvaders";
+  "SpacePrivateers" = dontDistribute super."SpacePrivateers";
+  "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "SpreadsheetML" = dontDistribute super."SpreadsheetML";
+  "Sprig" = dontDistribute super."Sprig";
+  "Stasis" = dontDistribute super."Stasis";
+  "StateVar-transformer" = dontDistribute super."StateVar-transformer";
+  "StatisticalMethods" = dontDistribute super."StatisticalMethods";
+  "Stomp" = dontDistribute super."Stomp";
+  "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib";
+  "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "Stream" = dontDistribute super."Stream";
+  "StrictBench" = dontDistribute super."StrictBench";
+  "SuffixStructures" = dontDistribute super."SuffixStructures";
+  "SybWidget" = dontDistribute super."SybWidget";
+  "SyntaxMacros" = dontDistribute super."SyntaxMacros";
+  "Sysmon" = dontDistribute super."Sysmon";
+  "TBC" = dontDistribute super."TBC";
+  "TBit" = dontDistribute super."TBit";
+  "THEff" = dontDistribute super."THEff";
+  "TTTAS" = dontDistribute super."TTTAS";
+  "TV" = dontDistribute super."TV";
+  "TYB" = dontDistribute super."TYB";
+  "TableAlgebra" = dontDistribute super."TableAlgebra";
+  "Tables" = dontDistribute super."Tables";
+  "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
+  "Tainted" = dontDistribute super."Tainted";
+  "Takusen" = dontDistribute super."Takusen";
+  "Tape" = dontDistribute super."Tape";
+  "TeaHS" = dontDistribute super."TeaHS";
+  "Tensor" = dontDistribute super."Tensor";
+  "TernaryTrees" = dontDistribute super."TernaryTrees";
+  "TestExplode" = dontDistribute super."TestExplode";
+  "Theora" = dontDistribute super."Theora";
+  "Thingie" = dontDistribute super."Thingie";
+  "ThreadObjects" = dontDistribute super."ThreadObjects";
+  "Thrift" = dontDistribute super."Thrift";
+  "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe";
+  "TicTacToe" = dontDistribute super."TicTacToe";
+  "TigerHash" = dontDistribute super."TigerHash";
+  "TimePiece" = dontDistribute super."TimePiece";
+  "TinyLaunchbury" = dontDistribute super."TinyLaunchbury";
+  "TinyURL" = dontDistribute super."TinyURL";
+  "Titim" = dontDistribute super."Titim";
+  "Top" = dontDistribute super."Top";
+  "Tournament" = dontDistribute super."Tournament";
+  "TraceUtils" = dontDistribute super."TraceUtils";
+  "TransformersStepByStep" = dontDistribute super."TransformersStepByStep";
+  "Transhare" = dontDistribute super."Transhare";
+  "TreeCounter" = dontDistribute super."TreeCounter";
+  "TreeStructures" = dontDistribute super."TreeStructures";
+  "TreeT" = dontDistribute super."TreeT";
+  "Treiber" = dontDistribute super."Treiber";
+  "TrendGraph" = dontDistribute super."TrendGraph";
+  "TrieMap" = dontDistribute super."TrieMap";
+  "Twofish" = dontDistribute super."Twofish";
+  "TypeClass" = dontDistribute super."TypeClass";
+  "TypeCompose" = dontDistribute super."TypeCompose";
+  "TypeIlluminator" = dontDistribute super."TypeIlluminator";
+  "TypeNat" = dontDistribute super."TypeNat";
+  "TypingTester" = dontDistribute super."TypingTester";
+  "UISF" = dontDistribute super."UISF";
+  "UMM" = dontDistribute super."UMM";
+  "URLT" = dontDistribute super."URLT";
+  "URLb" = dontDistribute super."URLb";
+  "UTFTConverter" = dontDistribute super."UTFTConverter";
+  "Unique" = dontDistribute super."Unique";
+  "Unixutils-shadow" = dontDistribute super."Unixutils-shadow";
+  "Updater" = dontDistribute super."Updater";
+  "UrlDisp" = dontDistribute super."UrlDisp";
+  "Useful" = dontDistribute super."Useful";
+  "UtilityTM" = dontDistribute super."UtilityTM";
+  "VKHS" = dontDistribute super."VKHS";
+  "Validation" = dontDistribute super."Validation";
+  "Vec" = dontDistribute super."Vec";
+  "Vec-Boolean" = dontDistribute super."Vec-Boolean";
+  "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
+  "Vec-Transform" = dontDistribute super."Vec-Transform";
+  "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "Vulkan" = dontDistribute super."Vulkan";
+  "WAVE" = dontDistribute super."WAVE";
+  "WL500gPControl" = dontDistribute super."WL500gPControl";
+  "WL500gPLib" = dontDistribute super."WL500gPLib";
+  "WMSigner" = dontDistribute super."WMSigner";
+  "WURFL" = dontDistribute super."WURFL";
+  "WXDiffCtrl" = dontDistribute super."WXDiffCtrl";
+  "WashNGo" = dontDistribute super."WashNGo";
+  "WaveFront" = dontDistribute super."WaveFront";
+  "Weather" = dontDistribute super."Weather";
+  "WebBits" = dontDistribute super."WebBits";
+  "WebBits-Html" = dontDistribute super."WebBits-Html";
+  "WebBits-multiplate" = dontDistribute super."WebBits-multiplate";
+  "WebCont" = dontDistribute super."WebCont";
+  "WeberLogic" = dontDistribute super."WeberLogic";
+  "Webrexp" = dontDistribute super."Webrexp";
+  "Wheb" = dontDistribute super."Wheb";
+  "WikimediaParser" = dontDistribute super."WikimediaParser";
+  "Win32" = doDistribute super."Win32_2_3_1_0";
+  "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server";
+  "Win32-errors" = dontDistribute super."Win32-errors";
+  "Win32-junction-point" = dontDistribute super."Win32-junction-point";
+  "Win32-security" = dontDistribute super."Win32-security";
+  "Win32-services" = dontDistribute super."Win32-services";
+  "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper";
+  "Wired" = dontDistribute super."Wired";
+  "WordAlignment" = dontDistribute super."WordAlignment";
+  "WordNet" = dontDistribute super."WordNet";
+  "WordNet-ghc74" = dontDistribute super."WordNet-ghc74";
+  "Wordlint" = dontDistribute super."Wordlint";
+  "WxGeneric" = dontDistribute super."WxGeneric";
+  "X11-extras" = dontDistribute super."X11-extras";
+  "X11-rm" = dontDistribute super."X11-rm";
+  "X11-xdamage" = dontDistribute super."X11-xdamage";
+  "X11-xfixes" = dontDistribute super."X11-xfixes";
+  "X11-xft" = dontDistribute super."X11-xft";
+  "X11-xshape" = dontDistribute super."X11-xshape";
+  "XAttr" = dontDistribute super."XAttr";
+  "XInput" = dontDistribute super."XInput";
+  "XMMS" = dontDistribute super."XMMS";
+  "XMPP" = dontDistribute super."XMPP";
+  "XSaiga" = dontDistribute super."XSaiga";
+  "Xec" = dontDistribute super."Xec";
+  "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter";
+  "Xorshift128Plus" = dontDistribute super."Xorshift128Plus";
+  "YACPong" = dontDistribute super."YACPong";
+  "YFrob" = dontDistribute super."YFrob";
+  "Yablog" = dontDistribute super."Yablog";
+  "YamlReference" = dontDistribute super."YamlReference";
+  "Yampa-core" = dontDistribute super."Yampa-core";
+  "Yocto" = dontDistribute super."Yocto";
+  "Yogurt" = dontDistribute super."Yogurt";
+  "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone";
+  "ZEBEDDE" = dontDistribute super."ZEBEDDE";
+  "ZFS" = dontDistribute super."ZFS";
+  "ZMachine" = dontDistribute super."ZMachine";
+  "ZipFold" = dontDistribute super."ZipFold";
+  "ZipperAG" = dontDistribute super."ZipperAG";
+  "Zora" = dontDistribute super."Zora";
+  "Zwaluw" = dontDistribute super."Zwaluw";
+  "a50" = dontDistribute super."a50";
+  "abacate" = dontDistribute super."abacate";
+  "abc-puzzle" = dontDistribute super."abc-puzzle";
+  "abcBridge" = dontDistribute super."abcBridge";
+  "abcnotation" = dontDistribute super."abcnotation";
+  "abeson" = dontDistribute super."abeson";
+  "abnf" = dontDistribute super."abnf";
+  "abstract-deque-tests" = dontDistribute super."abstract-deque-tests";
+  "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate";
+  "abt" = dontDistribute super."abt";
+  "ac-machine" = dontDistribute super."ac-machine";
+  "ac-machine-conduit" = dontDistribute super."ac-machine-conduit";
+  "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic";
+  "accelerate-cublas" = dontDistribute super."accelerate-cublas";
+  "accelerate-cuda" = dontDistribute super."accelerate-cuda";
+  "accelerate-cufft" = dontDistribute super."accelerate-cufft";
+  "accelerate-examples" = dontDistribute super."accelerate-examples";
+  "accelerate-fft" = dontDistribute super."accelerate-fft";
+  "accelerate-fftw" = dontDistribute super."accelerate-fftw";
+  "accelerate-fourier" = dontDistribute super."accelerate-fourier";
+  "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark";
+  "accelerate-io" = dontDistribute super."accelerate-io";
+  "accelerate-random" = dontDistribute super."accelerate-random";
+  "accelerate-typelits" = dontDistribute super."accelerate-typelits";
+  "accelerate-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "accuerr" = dontDistribute super."accuerr";
+  "acid-state-dist" = dontDistribute super."acid-state-dist";
+  "acid-state-tls" = dontDistribute super."acid-state-tls";
+  "acl2" = dontDistribute super."acl2";
+  "acme-all-monad" = dontDistribute super."acme-all-monad";
+  "acme-box" = dontDistribute super."acme-box";
+  "acme-cadre" = dontDistribute super."acme-cadre";
+  "acme-cofunctor" = dontDistribute super."acme-cofunctor";
+  "acme-colosson" = dontDistribute super."acme-colosson";
+  "acme-comonad" = dontDistribute super."acme-comonad";
+  "acme-cutegirl" = dontDistribute super."acme-cutegirl";
+  "acme-dont" = dontDistribute super."acme-dont";
+  "acme-flipping-tables" = dontDistribute super."acme-flipping-tables";
+  "acme-grawlix" = dontDistribute super."acme-grawlix";
+  "acme-hq9plus" = dontDistribute super."acme-hq9plus";
+  "acme-http" = dontDistribute super."acme-http";
+  "acme-inator" = dontDistribute super."acme-inator";
+  "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
+  "acme-lolcat" = dontDistribute super."acme-lolcat";
+  "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
+  "acme-memorandom" = dontDistribute super."acme-memorandom";
+  "acme-microwave" = dontDistribute super."acme-microwave";
+  "acme-miscorder" = dontDistribute super."acme-miscorder";
+  "acme-missiles" = dontDistribute super."acme-missiles";
+  "acme-now" = dontDistribute super."acme-now";
+  "acme-numbersystem" = dontDistribute super."acme-numbersystem";
+  "acme-omitted" = dontDistribute super."acme-omitted";
+  "acme-one" = dontDistribute super."acme-one";
+  "acme-operators" = dontDistribute super."acme-operators";
+  "acme-php" = dontDistribute super."acme-php";
+  "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers";
+  "acme-realworld" = dontDistribute super."acme-realworld";
+  "acme-safe" = dontDistribute super."acme-safe";
+  "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel";
+  "acme-strfry" = dontDistribute super."acme-strfry";
+  "acme-stringly-typed" = dontDistribute super."acme-stringly-typed";
+  "acme-strtok" = dontDistribute super."acme-strtok";
+  "acme-timemachine" = dontDistribute super."acme-timemachine";
+  "acme-year" = dontDistribute super."acme-year";
+  "acme-zero" = dontDistribute super."acme-zero";
+  "activehs" = dontDistribute super."activehs";
+  "activehs-base" = dontDistribute super."activehs-base";
+  "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
+  "actor" = dontDistribute super."actor";
+  "adaptive-containers" = dontDistribute super."adaptive-containers";
+  "adaptive-tuple" = dontDistribute super."adaptive-tuple";
+  "adb" = dontDistribute super."adb";
+  "adblock2privoxy" = dontDistribute super."adblock2privoxy";
+  "addLicenseInfo" = dontDistribute super."addLicenseInfo";
+  "adhoc-network" = dontDistribute super."adhoc-network";
+  "adict" = dontDistribute super."adict";
+  "adler32" = dontDistribute super."adler32";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-flatten" = dontDistribute super."aeson-flatten";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-json-ast" = dontDistribute super."aeson-json-ast";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "aeson-prefix" = dontDistribute super."aeson-prefix";
+  "aeson-schema" = dontDistribute super."aeson-schema";
+  "aeson-serialize" = dontDistribute super."aeson-serialize";
+  "aeson-smart" = dontDistribute super."aeson-smart";
+  "aeson-streams" = dontDistribute super."aeson-streams";
+  "aeson-t" = dontDistribute super."aeson-t";
+  "aeson-toolkit" = dontDistribute super."aeson-toolkit";
+  "aeson-value-parser" = dontDistribute super."aeson-value-parser";
+  "aeson-yak" = dontDistribute super."aeson-yak";
+  "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
+  "afis" = dontDistribute super."afis";
+  "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
+  "agda-server" = dontDistribute super."agda-server";
+  "agum" = dontDistribute super."agum";
+  "aig" = dontDistribute super."aig";
+  "air" = dontDistribute super."air";
+  "air-extra" = dontDistribute super."air-extra";
+  "air-spec" = dontDistribute super."air-spec";
+  "air-th" = dontDistribute super."air-th";
+  "airbrake" = dontDistribute super."airbrake";
+  "airship" = doDistribute super."airship_0_5_0";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
+  "aivika-experiment" = dontDistribute super."aivika-experiment";
+  "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
+  "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
+  "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-lattice" = dontDistribute super."aivika-lattice";
+  "aivika-transformers" = dontDistribute super."aivika-transformers";
+  "ajhc" = dontDistribute super."ajhc";
+  "al" = dontDistribute super."al";
+  "alea" = dontDistribute super."alea";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "amazonka-application-autoscaling" = dontDistribute super."amazonka-application-autoscaling";
+  "amazonka-discovery" = dontDistribute super."amazonka-discovery";
+  "ampersand" = dontDistribute super."ampersand";
+  "amqp-conduit" = dontDistribute super."amqp-conduit";
+  "amrun" = dontDistribute super."amrun";
+  "analyze-client" = dontDistribute super."analyze-client";
+  "anansi" = dontDistribute super."anansi";
+  "anansi-hscolour" = dontDistribute super."anansi-hscolour";
+  "anansi-pandoc" = dontDistribute super."anansi-pandoc";
+  "anatomy" = dontDistribute super."anatomy";
+  "android" = dontDistribute super."android";
+  "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
+  "annihilator" = dontDistribute super."annihilator";
+  "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
+  "ansi-pretty" = dontDistribute super."ansi-pretty";
+  "ansigraph" = dontDistribute super."ansigraph";
+  "antagonist" = dontDistribute super."antagonist";
+  "antfarm" = dontDistribute super."antfarm";
+  "anticiv" = dontDistribute super."anticiv";
+  "antigate" = dontDistribute super."antigate";
+  "antimirov" = dontDistribute super."antimirov";
+  "antiquoter" = dontDistribute super."antiquoter";
+  "antisplice" = dontDistribute super."antisplice";
+  "antlrc" = dontDistribute super."antlrc";
+  "anydbm" = dontDistribute super."anydbm";
+  "aosd" = dontDistribute super."aosd";
+  "ap-reflect" = dontDistribute super."ap-reflect";
+  "apache-md5" = dontDistribute super."apache-md5";
+  "apelsin" = dontDistribute super."apelsin";
+  "api-builder" = dontDistribute super."api-builder";
+  "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
+  "api-tools" = dontDistribute super."api-tools";
+  "apiary-helics" = dontDistribute super."apiary-helics";
+  "apiary-http-client" = dontDistribute super."apiary-http-client";
+  "apiary-purescript" = dontDistribute super."apiary-purescript";
+  "apis" = dontDistribute super."apis";
+  "apotiki" = dontDistribute super."apotiki";
+  "app-lens" = dontDistribute super."app-lens";
+  "appc" = dontDistribute super."appc";
+  "applicative-extras" = dontDistribute super."applicative-extras";
+  "applicative-fail" = dontDistribute super."applicative-fail";
+  "applicative-numbers" = dontDistribute super."applicative-numbers";
+  "applicative-parsec" = dontDistribute super."applicative-parsec";
+  "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "applicative-splice" = dontDistribute super."applicative-splice";
+  "apportionment" = dontDistribute super."apportionment";
+  "approx-rand-test" = dontDistribute super."approx-rand-test";
+  "approximate-equality" = dontDistribute super."approximate-equality";
+  "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
+  "arb-fft" = dontDistribute super."arb-fft";
+  "arbb-vm" = dontDistribute super."arbb-vm";
+  "archive" = dontDistribute super."archive";
+  "archiver" = dontDistribute super."archiver";
+  "archlinux" = dontDistribute super."archlinux";
+  "archlinux-web" = dontDistribute super."archlinux-web";
+  "archnews" = dontDistribute super."archnews";
+  "arena" = dontDistribute super."arena";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
+  "argparser" = dontDistribute super."argparser";
+  "arguedit" = dontDistribute super."arguedit";
+  "ariadne" = dontDistribute super."ariadne";
+  "arion" = dontDistribute super."arion";
+  "arith-encode" = dontDistribute super."arith-encode";
+  "arithmatic" = dontDistribute super."arithmatic";
+  "arithmetic" = dontDistribute super."arithmetic";
+  "armada" = dontDistribute super."armada";
+  "arpa" = dontDistribute super."arpa";
+  "array-forth" = dontDistribute super."array-forth";
+  "array-memoize" = dontDistribute super."array-memoize";
+  "array-primops" = dontDistribute super."array-primops";
+  "array-utils" = dontDistribute super."array-utils";
+  "arrow-improve" = dontDistribute super."arrow-improve";
+  "arrowapply-utils" = dontDistribute super."arrowapply-utils";
+  "arrowp" = dontDistribute super."arrowp";
+  "arrows" = dontDistribute super."arrows";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-flatten" = dontDistribute super."ascii-flatten";
+  "ascii-table" = dontDistribute super."ascii-table";
+  "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asic" = dontDistribute super."asic";
+  "asil" = dontDistribute super."asil";
+  "asn1-data" = dontDistribute super."asn1-data";
+  "asn1dump" = dontDistribute super."asn1dump";
+  "assembler" = dontDistribute super."assembler";
+  "assert" = dontDistribute super."assert";
+  "assert-failure" = dontDistribute super."assert-failure";
+  "assertions" = dontDistribute super."assertions";
+  "assimp" = dontDistribute super."assimp";
+  "astar" = dontDistribute super."astar";
+  "astrds" = dontDistribute super."astrds";
+  "astview" = dontDistribute super."astview";
+  "astview-utils" = dontDistribute super."astview-utils";
+  "async-extras" = dontDistribute super."async-extras";
+  "async-manager" = dontDistribute super."async-manager";
+  "async-pool" = dontDistribute super."async-pool";
+  "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions";
+  "aterm" = dontDistribute super."aterm";
+  "aterm-utils" = dontDistribute super."aterm-utils";
+  "atl" = dontDistribute super."atl";
+  "atlassian-connect-core" = dontDistribute super."atlassian-connect-core";
+  "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor";
+  "atmos" = dontDistribute super."atmos";
+  "atmos-dimensional" = dontDistribute super."atmos-dimensional";
+  "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atom" = dontDistribute super."atom";
+  "atom-basic" = dontDistribute super."atom-basic";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomo" = dontDistribute super."atomo";
+  "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec-arff" = dontDistribute super."attoparsec-arff";
+  "attoparsec-binary" = dontDistribute super."attoparsec-binary";
+  "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
+  "attoparsec-csv" = dontDistribute super."attoparsec-csv";
+  "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee";
+  "attoparsec-parsec" = dontDistribute super."attoparsec-parsec";
+  "attoparsec-text" = dontDistribute super."attoparsec-text";
+  "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator";
+  "attosplit" = dontDistribute super."attosplit";
+  "atuin" = dontDistribute super."atuin";
+  "audacity" = dontDistribute super."audacity";
+  "audiovisual" = dontDistribute super."audiovisual";
+  "augeas" = dontDistribute super."augeas";
+  "augur" = dontDistribute super."augur";
+  "aur" = dontDistribute super."aur";
+  "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
+  "authenticate-ldap" = dontDistribute super."authenticate-ldap";
+  "authinfo-hs" = dontDistribute super."authinfo-hs";
+  "authoring" = dontDistribute super."authoring";
+  "automitive-cse" = dontDistribute super."automitive-cse";
+  "automotive-cse" = dontDistribute super."automotive-cse";
+  "autonix-deps" = dontDistribute super."autonix-deps";
+  "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
+  "autoproc" = dontDistribute super."autoproc";
+  "avahi" = dontDistribute super."avahi";
+  "avatar-generator" = dontDistribute super."avatar-generator";
+  "average" = dontDistribute super."average";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesome-prelude" = dontDistribute super."awesome-prelude";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "aws" = doDistribute super."aws_0_13_2";
+  "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer";
+  "aws-configuration-tools" = dontDistribute super."aws-configuration-tools";
+  "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit";
+  "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams";
+  "aws-ec2" = dontDistribute super."aws-ec2";
+  "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder";
+  "aws-general" = dontDistribute super."aws-general";
+  "aws-kinesis" = dontDistribute super."aws-kinesis";
+  "aws-kinesis-client" = dontDistribute super."aws-kinesis-client";
+  "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard";
+  "aws-lambda" = dontDistribute super."aws-lambda";
+  "aws-performance-tests" = dontDistribute super."aws-performance-tests";
+  "aws-route53" = dontDistribute super."aws-route53";
+  "aws-sdk" = dontDistribute super."aws-sdk";
+  "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter";
+  "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered";
+  "aws-sign4" = dontDistribute super."aws-sign4";
+  "aws-sns" = dontDistribute super."aws-sns";
+  "azure-acs" = dontDistribute super."azure-acs";
+  "azure-service-api" = dontDistribute super."azure-service-api";
+  "azure-servicebus" = dontDistribute super."azure-servicebus";
+  "azurify" = dontDistribute super."azurify";
+  "b-tree" = dontDistribute super."b-tree";
+  "babylon" = dontDistribute super."babylon";
+  "backdropper" = dontDistribute super."backdropper";
+  "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
+  "backward-state" = dontDistribute super."backward-state";
+  "bacteria" = dontDistribute super."bacteria";
+  "bag" = dontDistribute super."bag";
+  "bamboo" = dontDistribute super."bamboo";
+  "bamboo-launcher" = dontDistribute super."bamboo-launcher";
+  "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight";
+  "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo";
+  "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint";
+  "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
+  "bamse" = dontDistribute super."bamse";
+  "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
+  "banwords" = dontDistribute super."banwords";
+  "barchart" = dontDistribute super."barchart";
+  "barcodes-code128" = dontDistribute super."barcodes-code128";
+  "barecheck" = dontDistribute super."barecheck";
+  "barley" = dontDistribute super."barley";
+  "barrie" = dontDistribute super."barrie";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base-noprelude" = doDistribute super."base-noprelude_4_8_2_0";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bcrypt" = doDistribute super."bcrypt_0_0_8";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "bearriver" = dontDistribute super."bearriver";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "bench" = dontDistribute super."bench";
+  "benchmark-function" = dontDistribute super."benchmark-function";
+  "bencoding" = dontDistribute super."bencoding";
+  "berkeleydb" = dontDistribute super."berkeleydb";
+  "berp" = dontDistribute super."berp";
+  "bert" = dontDistribute super."bert";
+  "besout" = dontDistribute super."besout";
+  "bet" = dontDistribute super."bet";
+  "betacode" = dontDistribute super."betacode";
+  "between" = dontDistribute super."between";
+  "bf-cata" = dontDistribute super."bf-cata";
+  "bff" = dontDistribute super."bff";
+  "bff-mono" = dontDistribute super."bff-mono";
+  "bgmax" = dontDistribute super."bgmax";
+  "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bifunctors" = doDistribute super."bifunctors_5_2";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
+  "billboard-parser" = dontDistribute super."billboard-parser";
+  "billeksah-forms" = dontDistribute super."billeksah-forms";
+  "billeksah-main" = dontDistribute super."billeksah-main";
+  "billeksah-main-static" = dontDistribute super."billeksah-main-static";
+  "billeksah-pane" = dontDistribute super."billeksah-pane";
+  "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-derive" = dontDistribute super."binary-derive";
+  "binary-enum" = dontDistribute super."binary-enum";
+  "binary-file" = dontDistribute super."binary-file";
+  "binary-generic" = dontDistribute super."binary-generic";
+  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
+  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-protocol" = dontDistribute super."binary-protocol";
+  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-state" = dontDistribute super."binary-state";
+  "binary-store" = dontDistribute super."binary-store";
+  "binary-streams" = dontDistribute super."binary-streams";
+  "binary-strict" = dontDistribute super."binary-strict";
+  "binarydefer" = dontDistribute super."binarydefer";
+  "bind-marshal" = dontDistribute super."bind-marshal";
+  "binding-core" = dontDistribute super."binding-core";
+  "binding-gtk" = dontDistribute super."binding-gtk";
+  "binding-wx" = dontDistribute super."binding-wx";
+  "bindings" = dontDistribute super."bindings";
+  "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-K8055" = dontDistribute super."bindings-K8055";
+  "bindings-apr" = dontDistribute super."bindings-apr";
+  "bindings-apr-util" = dontDistribute super."bindings-apr-util";
+  "bindings-audiofile" = dontDistribute super."bindings-audiofile";
+  "bindings-bfd" = dontDistribute super."bindings-bfd";
+  "bindings-cctools" = dontDistribute super."bindings-cctools";
+  "bindings-codec2" = dontDistribute super."bindings-codec2";
+  "bindings-common" = dontDistribute super."bindings-common";
+  "bindings-dc1394" = dontDistribute super."bindings-dc1394";
+  "bindings-directfb" = dontDistribute super."bindings-directfb";
+  "bindings-eskit" = dontDistribute super."bindings-eskit";
+  "bindings-fann" = dontDistribute super."bindings-fann";
+  "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth";
+  "bindings-friso" = dontDistribute super."bindings-friso";
+  "bindings-glib" = dontDistribute super."bindings-glib";
+  "bindings-gobject" = dontDistribute super."bindings-gobject";
+  "bindings-gpgme" = dontDistribute super."bindings-gpgme";
+  "bindings-gsl" = dontDistribute super."bindings-gsl";
+  "bindings-gts" = dontDistribute super."bindings-gts";
+  "bindings-hamlib" = dontDistribute super."bindings-hamlib";
+  "bindings-hdf5" = dontDistribute super."bindings-hdf5";
+  "bindings-levmar" = dontDistribute super."bindings-levmar";
+  "bindings-libcddb" = dontDistribute super."bindings-libcddb";
+  "bindings-libffi" = dontDistribute super."bindings-libffi";
+  "bindings-libftdi" = dontDistribute super."bindings-libftdi";
+  "bindings-librrd" = dontDistribute super."bindings-librrd";
+  "bindings-libstemmer" = dontDistribute super."bindings-libstemmer";
+  "bindings-libusb" = dontDistribute super."bindings-libusb";
+  "bindings-libv4l2" = dontDistribute super."bindings-libv4l2";
+  "bindings-libzip" = dontDistribute super."bindings-libzip";
+  "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2";
+  "bindings-lxc" = dontDistribute super."bindings-lxc";
+  "bindings-mmap" = dontDistribute super."bindings-mmap";
+  "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal";
+  "bindings-nettle" = dontDistribute super."bindings-nettle";
+  "bindings-parport" = dontDistribute super."bindings-parport";
+  "bindings-portaudio" = dontDistribute super."bindings-portaudio";
+  "bindings-potrace" = dontDistribute super."bindings-potrace";
+  "bindings-ppdev" = dontDistribute super."bindings-ppdev";
+  "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd";
+  "bindings-sane" = dontDistribute super."bindings-sane";
+  "bindings-sc3" = dontDistribute super."bindings-sc3";
+  "bindings-sipc" = dontDistribute super."bindings-sipc";
+  "bindings-sophia" = dontDistribute super."bindings-sophia";
+  "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
+  "bindings-svm" = dontDistribute super."bindings-svm";
+  "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
+  "bindings-yices" = dontDistribute super."bindings-yices";
+  "bindynamic" = dontDistribute super."bindynamic";
+  "binembed" = dontDistribute super."binembed";
+  "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
+  "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biophd" = doDistribute super."biophd_0_0_4";
+  "biosff" = dontDistribute super."biosff";
+  "biostockholm" = dontDistribute super."biostockholm";
+  "bird" = dontDistribute super."bird";
+  "bit-array" = dontDistribute super."bit-array";
+  "bit-vector" = dontDistribute super."bit-vector";
+  "bitarray" = dontDistribute super."bitarray";
+  "bitcoin-payment-channel" = dontDistribute super."bitcoin-payment-channel";
+  "bitcoin-rpc" = dontDistribute super."bitcoin-rpc";
+  "bitly-cli" = dontDistribute super."bitly-cli";
+  "bitmap" = dontDistribute super."bitmap";
+  "bitmap-opengl" = dontDistribute super."bitmap-opengl";
+  "bitmaps" = dontDistribute super."bitmaps";
+  "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
+  "bits-conduit" = dontDistribute super."bits-conduit";
+  "bits-extras" = dontDistribute super."bits-extras";
+  "bitset" = dontDistribute super."bitset";
+  "bitspeak" = dontDistribute super."bitspeak";
+  "bitstream" = dontDistribute super."bitstream";
+  "bitstring" = dontDistribute super."bitstring";
+  "bittorrent" = dontDistribute super."bittorrent";
+  "bitvec" = dontDistribute super."bitvec";
+  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
+  "bk-tree" = dontDistribute super."bk-tree";
+  "bkr" = dontDistribute super."bkr";
+  "bktrees" = dontDistribute super."bktrees";
+  "bla" = dontDistribute super."bla";
+  "black-jewel" = dontDistribute super."black-jewel";
+  "blacktip" = dontDistribute super."blacktip";
+  "blakesum" = dontDistribute super."blakesum";
+  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blas" = dontDistribute super."blas";
+  "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
+  "blaze-from-html" = dontDistribute super."blaze-from-html";
+  "blaze-html-contrib" = dontDistribute super."blaze-html-contrib";
+  "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat";
+  "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
+  "blaze-json" = dontDistribute super."blaze-json";
+  "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-textual-native" = dontDistribute super."blaze-textual-native";
+  "blazeMarker" = dontDistribute super."blazeMarker";
+  "blink1" = dontDistribute super."blink1";
+  "blip" = dontDistribute super."blip";
+  "bliplib" = dontDistribute super."bliplib";
+  "blocking-transactions" = dontDistribute super."blocking-transactions";
+  "blogination" = dontDistribute super."blogination";
+  "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth";
+  "bloomfilter-redis" = dontDistribute super."bloomfilter-redis";
+  "blosum" = dontDistribute super."blosum";
+  "bloxorz" = dontDistribute super."bloxorz";
+  "blubber" = dontDistribute super."blubber";
+  "blubber-server" = dontDistribute super."blubber-server";
+  "bluetile" = dontDistribute super."bluetile";
+  "bluetileutils" = dontDistribute super."bluetileutils";
+  "blunt" = dontDistribute super."blunt";
+  "board-games" = dontDistribute super."board-games";
+  "bogre-banana" = dontDistribute super."bogre-banana";
+  "bond" = dontDistribute super."bond";
+  "bond-haskell" = dontDistribute super."bond-haskell";
+  "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler";
+  "boolean-list" = dontDistribute super."boolean-list";
+  "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
+  "boolexpr" = dontDistribute super."boolexpr";
+  "bools" = dontDistribute super."bools";
+  "boolsimplifier" = dontDistribute super."boolsimplifier";
+  "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "botpp" = dontDistribute super."botpp";
+  "bound-gen" = dontDistribute super."bound-gen";
+  "bounded-tchan" = dontDistribute super."bounded-tchan";
+  "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
+  "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
+  "brainfuck" = dontDistribute super."brainfuck";
+  "brainfuck-monad" = dontDistribute super."brainfuck-monad";
+  "brainfuck-tut" = dontDistribute super."brainfuck-tut";
+  "break" = dontDistribute super."break";
+  "breakout" = dontDistribute super."breakout";
+  "breve" = dontDistribute super."breve";
+  "brians-brain" = dontDistribute super."brians-brain";
+  "brick" = doDistribute super."brick_0_4_1";
+  "brillig" = dontDistribute super."brillig";
+  "broccoli" = dontDistribute super."broccoli";
+  "broker-haskell" = dontDistribute super."broker-haskell";
+  "bsd-sysctl" = dontDistribute super."bsd-sysctl";
+  "bson-generic" = dontDistribute super."bson-generic";
+  "bson-generics" = dontDistribute super."bson-generics";
+  "bson-mapping" = dontDistribute super."bson-mapping";
+  "bspack" = dontDistribute super."bspack";
+  "bsparse" = dontDistribute super."bsparse";
+  "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
+  "buffon" = dontDistribute super."buffon";
+  "bugzilla" = dontDistribute super."bugzilla";
+  "buildable" = dontDistribute super."buildable";
+  "buildbox" = dontDistribute super."buildbox";
+  "buildbox-tools" = dontDistribute super."buildbox-tools";
+  "buildwrapper" = dontDistribute super."buildwrapper";
+  "bullet" = dontDistribute super."bullet";
+  "burst-detection" = dontDistribute super."burst-detection";
+  "bus-pirate" = dontDistribute super."bus-pirate";
+  "buster" = dontDistribute super."buster";
+  "buster-gtk" = dontDistribute super."buster-gtk";
+  "buster-network" = dontDistribute super."buster-network";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
+  "bytestring-builder" = doDistribute super."bytestring-builder_0_10_6_0_0";
+  "bytestring-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-nums" = dontDistribute super."bytestring-nums";
+  "bytestring-plain" = dontDistribute super."bytestring-plain";
+  "bytestring-rematch" = dontDistribute super."bytestring-rematch";
+  "bytestring-short" = dontDistribute super."bytestring-short";
+  "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "bzlib-conduit" = doDistribute super."bzlib-conduit_0_2_1_3";
+  "c-dsl" = dontDistribute super."c-dsl";
+  "c-io" = dontDistribute super."c-io";
+  "c-storable-deriving" = dontDistribute super."c-storable-deriving";
+  "c0check" = dontDistribute super."c0check";
+  "c0parser" = dontDistribute super."c0parser";
+  "c10k" = dontDistribute super."c10k";
+  "c2hsc" = dontDistribute super."c2hsc";
+  "cab" = dontDistribute super."cab";
+  "cabal-audit" = dontDistribute super."cabal-audit";
+  "cabal-bounds" = dontDistribute super."cabal-bounds";
+  "cabal-cargs" = dontDistribute super."cabal-cargs";
+  "cabal-constraints" = dontDistribute super."cabal-constraints";
+  "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-dev" = dontDistribute super."cabal-dev";
+  "cabal-dir" = dontDistribute super."cabal-dir";
+  "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
+  "cabal-ghci" = dontDistribute super."cabal-ghci";
+  "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-helper" = doDistribute super."cabal-helper_0_6_3_1";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install" = doDistribute super."cabal-install_1_22_9_0";
+  "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
+  "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
+  "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
+  "cabal-lenses" = dontDistribute super."cabal-lenses";
+  "cabal-macosx" = dontDistribute super."cabal-macosx";
+  "cabal-meta" = dontDistribute super."cabal-meta";
+  "cabal-mon" = dontDistribute super."cabal-mon";
+  "cabal-nirvana" = dontDistribute super."cabal-nirvana";
+  "cabal-progdeps" = dontDistribute super."cabal-progdeps";
+  "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-scripts" = dontDistribute super."cabal-scripts";
+  "cabal-setup" = dontDistribute super."cabal-setup";
+  "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-test" = dontDistribute super."cabal-test";
+  "cabal-test-bin" = dontDistribute super."cabal-test-bin";
+  "cabal-test-compat" = dontDistribute super."cabal-test-compat";
+  "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck";
+  "cabal-uninstall" = dontDistribute super."cabal-uninstall";
+  "cabal-upload" = dontDistribute super."cabal-upload";
+  "cabal2arch" = dontDistribute super."cabal2arch";
+  "cabal2doap" = dontDistribute super."cabal2doap";
+  "cabal2ebuild" = dontDistribute super."cabal2ebuild";
+  "cabal2ghci" = dontDistribute super."cabal2ghci";
+  "cabal2nix" = dontDistribute super."cabal2nix";
+  "cabal2spec" = dontDistribute super."cabal2spec";
+  "cabalQuery" = dontDistribute super."cabalQuery";
+  "cabalg" = dontDistribute super."cabalg";
+  "cabalgraph" = dontDistribute super."cabalgraph";
+  "cabalmdvrpm" = dontDistribute super."cabalmdvrpm";
+  "cabalrpmdeps" = dontDistribute super."cabalrpmdeps";
+  "cabalvchk" = dontDistribute super."cabalvchk";
+  "cabin" = dontDistribute super."cabin";
+  "cabocha" = dontDistribute super."cabocha";
+  "cache" = dontDistribute super."cache";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_6_0";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "cairo" = doDistribute super."cairo_0_13_1_1";
+  "cairo-appbase" = dontDistribute super."cairo-appbase";
+  "cake" = dontDistribute super."cake";
+  "cake3" = dontDistribute super."cake3";
+  "cakyrespa" = dontDistribute super."cakyrespa";
+  "cal3d" = dontDistribute super."cal3d";
+  "cal3d-examples" = dontDistribute super."cal3d-examples";
+  "cal3d-opengl" = dontDistribute super."cal3d-opengl";
+  "calc" = dontDistribute super."calc";
+  "caldims" = dontDistribute super."caldims";
+  "caledon" = dontDistribute super."caledon";
+  "call" = dontDistribute super."call";
+  "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything";
+  "camfort" = dontDistribute super."camfort";
+  "camh" = dontDistribute super."camh";
+  "campfire" = dontDistribute super."campfire";
+  "canonical-filepath" = dontDistribute super."canonical-filepath";
+  "canteven-config" = dontDistribute super."canteven-config";
+  "canteven-listen-http" = dontDistribute super."canteven-listen-http";
+  "canteven-log" = dontDistribute super."canteven-log";
+  "canteven-template" = dontDistribute super."canteven-template";
+  "cantor" = dontDistribute super."cantor";
+  "cao" = dontDistribute super."cao";
+  "cap" = dontDistribute super."cap";
+  "capped-list" = dontDistribute super."capped-list";
+  "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
+  "caramia" = dontDistribute super."caramia";
+  "carboncopy" = dontDistribute super."carboncopy";
+  "carettah" = dontDistribute super."carettah";
+  "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms";
+  "casadi-bindings" = dontDistribute super."casadi-bindings";
+  "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
+  "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
+  "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal";
+  "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface";
+  "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
+  "cascading" = dontDistribute super."cascading";
+  "case-conversion" = dontDistribute super."case-conversion";
+  "cash" = dontDistribute super."cash";
+  "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
+  "cassandra-cql" = dontDistribute super."cassandra-cql";
+  "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava-conduit" = dontDistribute super."cassava-conduit";
+  "cassava-streams" = dontDistribute super."cassava-streams";
+  "cassette" = dontDistribute super."cassette";
+  "cassy" = dontDistribute super."cassy";
+  "castle" = dontDistribute super."castle";
+  "casui" = dontDistribute super."casui";
+  "catamorphism" = dontDistribute super."catamorphism";
+  "catch-fd" = dontDistribute super."catch-fd";
+  "categorical-algebra" = dontDistribute super."categorical-algebra";
+  "categories" = dontDistribute super."categories";
+  "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
+  "category-traced" = dontDistribute super."category-traced";
+  "cayley-dickson" = dontDistribute super."cayley-dickson";
+  "cblrepo" = dontDistribute super."cblrepo";
+  "cci" = dontDistribute super."cci";
+  "ccnx" = dontDistribute super."ccnx";
+  "cctools-workqueue" = dontDistribute super."cctools-workqueue";
+  "cedict" = dontDistribute super."cedict";
+  "cef" = dontDistribute super."cef";
+  "ceilometer-common" = dontDistribute super."ceilometer-common";
+  "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
+  "cerberus" = dontDistribute super."cerberus";
+  "cereal-derive" = dontDistribute super."cereal-derive";
+  "cereal-enumerator" = dontDistribute super."cereal-enumerator";
+  "cereal-ieee754" = dontDistribute super."cereal-ieee754";
+  "cereal-plus" = dontDistribute super."cereal-plus";
+  "cereal-text" = dontDistribute super."cereal-text";
+  "certificate" = dontDistribute super."certificate";
+  "cf" = dontDistribute super."cf";
+  "cfipu" = dontDistribute super."cfipu";
+  "cflp" = dontDistribute super."cflp";
+  "cfopu" = dontDistribute super."cfopu";
+  "cg" = dontDistribute super."cg";
+  "cgen" = dontDistribute super."cgen";
+  "cgi-undecidable" = dontDistribute super."cgi-undecidable";
+  "cgi-utils" = dontDistribute super."cgi-utils";
+  "cgrep" = dontDistribute super."cgrep";
+  "chain-codes" = dontDistribute super."chain-codes";
+  "chalk" = dontDistribute super."chalk";
+  "chalkboard" = dontDistribute super."chalkboard";
+  "chalkboard-viewer" = dontDistribute super."chalkboard-viewer";
+  "chalmers-lava2000" = dontDistribute super."chalmers-lava2000";
+  "chan-split" = dontDistribute super."chan-split";
+  "change-monger" = dontDistribute super."change-monger";
+  "charade" = dontDistribute super."charade";
+  "charsetdetect" = dontDistribute super."charsetdetect";
+  "chart-histogram" = dontDistribute super."chart-histogram";
+  "chaselev-deque" = dontDistribute super."chaselev-deque";
+  "chatter" = dontDistribute super."chatter";
+  "chatty" = dontDistribute super."chatty";
+  "chatty-text" = dontDistribute super."chatty-text";
+  "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
+  "check-pvp" = dontDistribute super."check-pvp";
+  "checked" = dontDistribute super."checked";
+  "chell-hunit" = dontDistribute super."chell-hunit";
+  "chesshs" = dontDistribute super."chesshs";
+  "chevalier-common" = dontDistribute super."chevalier-common";
+  "chorale" = dontDistribute super."chorale";
+  "chorale-geo" = dontDistribute super."chorale-geo";
+  "chp" = dontDistribute super."chp";
+  "chp-mtl" = dontDistribute super."chp-mtl";
+  "chp-plus" = dontDistribute super."chp-plus";
+  "chp-spec" = dontDistribute super."chp-spec";
+  "chp-transformers" = dontDistribute super."chp-transformers";
+  "chronograph" = dontDistribute super."chronograph";
+  "chu2" = dontDistribute super."chu2";
+  "chuchu" = dontDistribute super."chuchu";
+  "chunks" = dontDistribute super."chunks";
+  "chunky" = dontDistribute super."chunky";
+  "church-list" = dontDistribute super."church-list";
+  "cil" = dontDistribute super."cil";
+  "cinvoke" = dontDistribute super."cinvoke";
+  "cio" = dontDistribute super."cio";
+  "cipher-rc5" = dontDistribute super."cipher-rc5";
+  "ciphersaber2" = dontDistribute super."ciphersaber2";
+  "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
+  "cirru-parser" = dontDistribute super."cirru-parser";
+  "citation-resolve" = dontDistribute super."citation-resolve";
+  "citeproc-hs" = dontDistribute super."citeproc-hs";
+  "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter";
+  "cityhash" = dontDistribute super."cityhash";
+  "cjk" = dontDistribute super."cjk";
+  "clac" = dontDistribute super."clac";
+  "clafer" = dontDistribute super."clafer";
+  "claferIG" = dontDistribute super."claferIG";
+  "claferwiki" = dontDistribute super."claferwiki";
+  "clang-pure" = dontDistribute super."clang-pure";
+  "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
+  "clash" = dontDistribute super."clash";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
+  "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
+  "cld2" = dontDistribute super."cld2";
+  "clean-home" = dontDistribute super."clean-home";
+  "clean-unions" = dontDistribute super."clean-unions";
+  "cless" = dontDistribute super."cless";
+  "clevercss" = dontDistribute super."clevercss";
+  "cli" = dontDistribute super."cli";
+  "click-clack" = dontDistribute super."click-clack";
+  "clifford" = dontDistribute super."clifford";
+  "clippard" = dontDistribute super."clippard";
+  "clipper" = dontDistribute super."clipper";
+  "clippings" = dontDistribute super."clippings";
+  "clist" = dontDistribute super."clist";
+  "cloben" = dontDistribute super."cloben";
+  "clocked" = dontDistribute super."clocked";
+  "clogparse" = dontDistribute super."clogparse";
+  "clone-all" = dontDistribute super."clone-all";
+  "closure" = dontDistribute super."closure";
+  "cloud-haskell" = dontDistribute super."cloud-haskell";
+  "cloudfront-signer" = dontDistribute super."cloudfront-signer";
+  "cloudyfs" = dontDistribute super."cloudyfs";
+  "cltw" = dontDistribute super."cltw";
+  "clua" = dontDistribute super."clua";
+  "cluss" = dontDistribute super."cluss";
+  "clustertools" = dontDistribute super."clustertools";
+  "clutterhs" = dontDistribute super."clutterhs";
+  "cmaes" = dontDistribute super."cmaes";
+  "cmath" = dontDistribute super."cmath";
+  "cmathml3" = dontDistribute super."cmathml3";
+  "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
+  "cmu" = dontDistribute super."cmu";
+  "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
+  "cndict" = dontDistribute super."cndict";
+  "codec" = dontDistribute super."codec";
+  "codec-libevent" = dontDistribute super."codec-libevent";
+  "codec-mbox" = dontDistribute super."codec-mbox";
+  "codecov-haskell" = dontDistribute super."codecov-haskell";
+  "codemonitor" = dontDistribute super."codemonitor";
+  "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_10";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "coin" = dontDistribute super."coin";
+  "coinbase-exchange" = dontDistribute super."coinbase-exchange";
+  "colada" = dontDistribute super."colada";
+  "colchis" = dontDistribute super."colchis";
+  "collada-output" = dontDistribute super."collada-output";
+  "collada-types" = dontDistribute super."collada-types";
+  "collapse-util" = dontDistribute super."collapse-util";
+  "collection-json" = dontDistribute super."collection-json";
+  "collections" = dontDistribute super."collections";
+  "collections-api" = dontDistribute super."collections-api";
+  "collections-base-instances" = dontDistribute super."collections-base-instances";
+  "colock" = dontDistribute super."colock";
+  "color-counter" = dontDistribute super."color-counter";
+  "colorize-haskell" = dontDistribute super."colorize-haskell";
+  "colors" = dontDistribute super."colors";
+  "coltrane" = dontDistribute super."coltrane";
+  "com" = dontDistribute super."com";
+  "combinat" = dontDistribute super."combinat";
+  "combinat-diagrams" = dontDistribute super."combinat-diagrams";
+  "combinator-interactive" = dontDistribute super."combinator-interactive";
+  "combinatorial-problems" = dontDistribute super."combinatorial-problems";
+  "combinatorics" = dontDistribute super."combinatorics";
+  "combobuffer" = dontDistribute super."combobuffer";
+  "comfort-graph" = dontDistribute super."comfort-graph";
+  "command" = dontDistribute super."command";
+  "command-qq" = dontDistribute super."command-qq";
+  "commander" = dontDistribute super."commander";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "comonad" = doDistribute super."comonad_4_2_7_2";
+  "comonad-extras" = dontDistribute super."comonad-extras";
+  "comonad-random" = dontDistribute super."comonad-random";
+  "compact-map" = dontDistribute super."compact-map";
+  "compact-socket" = dontDistribute super."compact-socket";
+  "compact-string" = dontDistribute super."compact-string";
+  "compact-string-fix" = dontDistribute super."compact-string-fix";
+  "compare-type" = dontDistribute super."compare-type";
+  "compdata-automata" = dontDistribute super."compdata-automata";
+  "compdata-dags" = dontDistribute super."compdata-dags";
+  "compdata-param" = dontDistribute super."compdata-param";
+  "compensated" = dontDistribute super."compensated";
+  "competition" = dontDistribute super."competition";
+  "compilation" = dontDistribute super."compilation";
+  "complex-generic" = dontDistribute super."complex-generic";
+  "complex-integrate" = dontDistribute super."complex-integrate";
+  "complexity" = dontDistribute super."complexity";
+  "compose-ltr" = dontDistribute super."compose-ltr";
+  "compose-trans" = dontDistribute super."compose-trans";
+  "compression" = dontDistribute super."compression";
+  "compstrat" = dontDistribute super."compstrat";
+  "comptrans" = dontDistribute super."comptrans";
+  "computational-algebra" = dontDistribute super."computational-algebra";
+  "computations" = dontDistribute super."computations";
+  "concorde" = dontDistribute super."concorde";
+  "concraft" = dontDistribute super."concraft";
+  "concraft-hr" = dontDistribute super."concraft-hr";
+  "concraft-pl" = dontDistribute super."concraft-pl";
+  "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser";
+  "concrete-typerep" = dontDistribute super."concrete-typerep";
+  "concurrent-barrier" = dontDistribute super."concurrent-barrier";
+  "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
+  "concurrent-sa" = dontDistribute super."concurrent-sa";
+  "concurrent-split" = dontDistribute super."concurrent-split";
+  "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-utilities" = dontDistribute super."concurrent-utilities";
+  "concurrentoutput" = dontDistribute super."concurrentoutput";
+  "cond" = dontDistribute super."cond";
+  "condor" = dontDistribute super."condor";
+  "condorcet" = dontDistribute super."condorcet";
+  "conductive-base" = dontDistribute super."conductive-base";
+  "conductive-clock" = dontDistribute super."conductive-clock";
+  "conductive-hsc3" = dontDistribute super."conductive-hsc3";
+  "conductive-song" = dontDistribute super."conductive-song";
+  "conduit-audio" = dontDistribute super."conduit-audio";
+  "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
+  "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
+  "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
+  "conf" = dontDistribute super."conf";
+  "config-manager" = dontDistribute super."config-manager";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "config-value-getopt" = dontDistribute super."config-value-getopt";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "confsolve" = dontDistribute super."confsolve";
+  "congruence-relation" = dontDistribute super."congruence-relation";
+  "conjugateGradient" = dontDistribute super."conjugateGradient";
+  "conjure" = dontDistribute super."conjure";
+  "conlogger" = dontDistribute super."conlogger";
+  "connection-pool" = dontDistribute super."connection-pool";
+  "consistent" = dontDistribute super."consistent";
+  "console-program" = dontDistribute super."console-program";
+  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
+  "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraint-classes" = dontDistribute super."constraint-classes";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "container-builder" = dontDistribute super."container-builder";
+  "container-classes" = dontDistribute super."container-classes";
+  "containers-benchmark" = dontDistribute super."containers-benchmark";
+  "containers-deepseq" = dontDistribute super."containers-deepseq";
+  "context-free-grammar" = dontDistribute super."context-free-grammar";
+  "context-stack" = dontDistribute super."context-stack";
+  "continue" = dontDistribute super."continue";
+  "continuum" = dontDistribute super."continuum";
+  "continuum-client" = dontDistribute super."continuum-client";
+  "control-event" = dontDistribute super."control-event";
+  "control-monad-attempt" = dontDistribute super."control-monad-attempt";
+  "control-monad-exception" = dontDistribute super."control-monad-exception";
+  "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd";
+  "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf";
+  "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl";
+  "control-monad-failure" = dontDistribute super."control-monad-failure";
+  "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl";
+  "control-monad-queue" = dontDistribute super."control-monad-queue";
+  "control-timeout" = dontDistribute super."control-timeout";
+  "contstuff" = dontDistribute super."contstuff";
+  "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf";
+  "contstuff-transformers" = dontDistribute super."contstuff-transformers";
+  "conversion" = dontDistribute super."conversion";
+  "conversion-bytestring" = dontDistribute super."conversion-bytestring";
+  "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive";
+  "conversion-text" = dontDistribute super."conversion-text";
+  "convert" = dontDistribute super."convert";
+  "convertible-ascii" = dontDistribute super."convertible-ascii";
+  "convertible-text" = dontDistribute super."convertible-text";
+  "cookbook" = dontDistribute super."cookbook";
+  "coordinate" = dontDistribute super."coordinate";
+  "copilot" = dontDistribute super."copilot";
+  "copilot-c99" = dontDistribute super."copilot-c99";
+  "copilot-cbmc" = dontDistribute super."copilot-cbmc";
+  "copilot-core" = dontDistribute super."copilot-core";
+  "copilot-language" = dontDistribute super."copilot-language";
+  "copilot-libraries" = dontDistribute super."copilot-libraries";
+  "copilot-sbv" = dontDistribute super."copilot-sbv";
+  "copilot-theorem" = dontDistribute super."copilot-theorem";
+  "copr" = dontDistribute super."copr";
+  "core" = dontDistribute super."core";
+  "core-haskell" = dontDistribute super."core-haskell";
+  "corebot-bliki" = dontDistribute super."corebot-bliki";
+  "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
+  "coroutine-iteratee" = dontDistribute super."coroutine-iteratee";
+  "coroutine-object" = dontDistribute super."coroutine-object";
+  "couch-hs" = dontDistribute super."couch-hs";
+  "couch-simple" = dontDistribute super."couch-simple";
+  "couchdb-conduit" = dontDistribute super."couchdb-conduit";
+  "couchdb-enumerator" = dontDistribute super."couchdb-enumerator";
+  "count" = dontDistribute super."count";
+  "countable" = dontDistribute super."countable";
+  "counter" = dontDistribute super."counter";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "cplex-hs" = dontDistribute super."cplex-hs";
+  "cplusplus-th" = dontDistribute super."cplusplus-th";
+  "cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
+  "cpsa" = dontDistribute super."cpsa";
+  "cpuid" = dontDistribute super."cpuid";
+  "cpuperf" = dontDistribute super."cpuperf";
+  "cpython" = dontDistribute super."cpython";
+  "cqrs" = dontDistribute super."cqrs";
+  "cqrs-core" = dontDistribute super."cqrs-core";
+  "cqrs-example" = dontDistribute super."cqrs-example";
+  "cqrs-memory" = dontDistribute super."cqrs-memory";
+  "cqrs-postgresql" = dontDistribute super."cqrs-postgresql";
+  "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3";
+  "cqrs-test" = dontDistribute super."cqrs-test";
+  "cqrs-testkit" = dontDistribute super."cqrs-testkit";
+  "cqrs-types" = dontDistribute super."cqrs-types";
+  "cr" = dontDistribute super."cr";
+  "crack" = dontDistribute super."crack";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
+  "crc16" = dontDistribute super."crc16";
+  "crc16-table" = dontDistribute super."crc16-table";
+  "creatur" = dontDistribute super."creatur";
+  "crf-chain1" = dontDistribute super."crf-chain1";
+  "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained";
+  "crf-chain2-generic" = dontDistribute super."crf-chain2-generic";
+  "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers";
+  "critbit" = dontDistribute super."critbit";
+  "criterion-plus" = dontDistribute super."criterion-plus";
+  "criterion-to-html" = dontDistribute super."criterion-to-html";
+  "crockford" = dontDistribute super."crockford";
+  "crocodile" = dontDistribute super."crocodile";
+  "cron-compat" = dontDistribute super."cron-compat";
+  "cruncher-types" = dontDistribute super."cruncher-types";
+  "crunghc" = dontDistribute super."crunghc";
+  "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks";
+  "crypto-classical" = dontDistribute super."crypto-classical";
+  "crypto-conduit" = dontDistribute super."crypto-conduit";
+  "crypto-enigma" = dontDistribute super."crypto-enigma";
+  "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
+  "crypto-random-effect" = dontDistribute super."crypto-random-effect";
+  "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptohash-md5" = dontDistribute super."cryptohash-md5";
+  "cryptohash-sha1" = dontDistribute super."cryptohash-sha1";
+  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
+  "cryptonite" = doDistribute super."cryptonite_0_15";
+  "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
+  "cryptsy-api" = dontDistribute super."cryptsy-api";
+  "crystalfontz" = dontDistribute super."crystalfontz";
+  "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
+  "csound-catalog" = dontDistribute super."csound-catalog";
+  "csound-expression" = dontDistribute super."csound-expression";
+  "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic";
+  "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes";
+  "csound-expression-typed" = dontDistribute super."csound-expression-typed";
+  "csound-sampler" = dontDistribute super."csound-sampler";
+  "csp" = dontDistribute super."csp";
+  "cspmchecker" = dontDistribute super."cspmchecker";
+  "css" = dontDistribute super."css";
+  "csv-enumerator" = dontDistribute super."csv-enumerator";
+  "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
+  "csv-to-qif" = dontDistribute super."csv-to-qif";
+  "ctemplate" = dontDistribute super."ctemplate";
+  "ctkl" = dontDistribute super."ctkl";
+  "ctpl" = dontDistribute super."ctpl";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cublas" = dontDistribute super."cublas";
+  "cuboid" = dontDistribute super."cuboid";
+  "cuda" = dontDistribute super."cuda";
+  "cudd" = dontDistribute super."cudd";
+  "cufft" = dontDistribute super."cufft";
+  "curl-aeson" = dontDistribute super."curl-aeson";
+  "curlhs" = dontDistribute super."curlhs";
+  "currency" = dontDistribute super."currency";
+  "current-locale" = dontDistribute super."current-locale";
+  "curry-base" = dontDistribute super."curry-base";
+  "curry-frontend" = dontDistribute super."curry-frontend";
+  "cursedcsv" = dontDistribute super."cursedcsv";
+  "curve25519" = dontDistribute super."curve25519";
+  "curves" = dontDistribute super."curves";
+  "custom-prelude" = dontDistribute super."custom-prelude";
+  "cv-combinators" = dontDistribute super."cv-combinators";
+  "cyclotomic" = dontDistribute super."cyclotomic";
+  "cypher" = dontDistribute super."cypher";
+  "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "danibot" = dontDistribute super."danibot";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs-benchmark" = dontDistribute super."darcs-benchmark";
+  "darcs-beta" = dontDistribute super."darcs-beta";
+  "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
+  "darcs-cabalized" = dontDistribute super."darcs-cabalized";
+  "darcs-fastconvert" = dontDistribute super."darcs-fastconvert";
+  "darcs-graph" = dontDistribute super."darcs-graph";
+  "darcs-monitor" = dontDistribute super."darcs-monitor";
+  "darcs-scripts" = dontDistribute super."darcs-scripts";
+  "darcs2dot" = dontDistribute super."darcs2dot";
+  "darcsden" = dontDistribute super."darcsden";
+  "darcswatch" = dontDistribute super."darcswatch";
+  "darkplaces-demo" = dontDistribute super."darkplaces-demo";
+  "darkplaces-rcon" = dontDistribute super."darkplaces-rcon";
+  "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
+  "darkplaces-text" = dontDistribute super."darkplaces-text";
+  "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
+  "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
+  "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
+  "data-accessor-template" = dontDistribute super."data-accessor-template";
+  "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
+  "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
+  "data-bword" = dontDistribute super."data-bword";
+  "data-carousel" = dontDistribute super."data-carousel";
+  "data-category" = dontDistribute super."data-category";
+  "data-cell" = dontDistribute super."data-cell";
+  "data-checked" = dontDistribute super."data-checked";
+  "data-clist" = dontDistribute super."data-clist";
+  "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
+  "data-construction" = dontDistribute super."data-construction";
+  "data-cycle" = dontDistribute super."data-cycle";
+  "data-default" = doDistribute super."data-default_0_5_3";
+  "data-default-extra" = dontDistribute super."data-default-extra";
+  "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
+  "data-dispersal" = dontDistribute super."data-dispersal";
+  "data-dword" = dontDistribute super."data-dword";
+  "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
+  "data-endian" = dontDistribute super."data-endian";
+  "data-extend-generic" = dontDistribute super."data-extend-generic";
+  "data-extra" = dontDistribute super."data-extra";
+  "data-filepath" = dontDistribute super."data-filepath";
+  "data-fin" = dontDistribute super."data-fin";
+  "data-fin-simple" = dontDistribute super."data-fin-simple";
+  "data-fix" = dontDistribute super."data-fix";
+  "data-fix-cse" = dontDistribute super."data-fix-cse";
+  "data-flags" = dontDistribute super."data-flags";
+  "data-flagset" = dontDistribute super."data-flagset";
+  "data-fresh" = dontDistribute super."data-fresh";
+  "data-function-meld" = dontDistribute super."data-function-meld";
+  "data-function-tacit" = dontDistribute super."data-function-tacit";
+  "data-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
+  "data-kiln" = dontDistribute super."data-kiln";
+  "data-layer" = dontDistribute super."data-layer";
+  "data-layout" = dontDistribute super."data-layout";
+  "data-lens" = dontDistribute super."data-lens";
+  "data-lens-fd" = dontDistribute super."data-lens-fd";
+  "data-lens-ixset" = dontDistribute super."data-lens-ixset";
+  "data-lens-template" = dontDistribute super."data-lens-template";
+  "data-list-sequences" = dontDistribute super."data-list-sequences";
+  "data-map-multikey" = dontDistribute super."data-map-multikey";
+  "data-named" = dontDistribute super."data-named";
+  "data-nat" = dontDistribute super."data-nat";
+  "data-object" = dontDistribute super."data-object";
+  "data-object-json" = dontDistribute super."data-object-json";
+  "data-object-yaml" = dontDistribute super."data-object-yaml";
+  "data-partition" = dontDistribute super."data-partition";
+  "data-pprint" = dontDistribute super."data-pprint";
+  "data-quotientref" = dontDistribute super."data-quotientref";
+  "data-r-tree" = dontDistribute super."data-r-tree";
+  "data-ref" = dontDistribute super."data-ref";
+  "data-reify-cse" = dontDistribute super."data-reify-cse";
+  "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
+  "data-rev" = dontDistribute super."data-rev";
+  "data-rope" = dontDistribute super."data-rope";
+  "data-rtuple" = dontDistribute super."data-rtuple";
+  "data-size" = dontDistribute super."data-size";
+  "data-spacepart" = dontDistribute super."data-spacepart";
+  "data-store" = dontDistribute super."data-store";
+  "data-stringmap" = dontDistribute super."data-stringmap";
+  "data-structure-inferrer" = dontDistribute super."data-structure-inferrer";
+  "data-tensor" = dontDistribute super."data-tensor";
+  "data-textual" = dontDistribute super."data-textual";
+  "data-timeout" = dontDistribute super."data-timeout";
+  "data-transform" = dontDistribute super."data-transform";
+  "data-treify" = dontDistribute super."data-treify";
+  "data-type" = dontDistribute super."data-type";
+  "data-util" = dontDistribute super."data-util";
+  "data-variant" = dontDistribute super."data-variant";
+  "database-migrate" = dontDistribute super."database-migrate";
+  "database-study" = dontDistribute super."database-study";
+  "datadog" = dontDistribute super."datadog";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "date-cache" = dontDistribute super."date-cache";
+  "dates" = dontDistribute super."dates";
+  "datetime" = dontDistribute super."datetime";
+  "datetime-sb" = dontDistribute super."datetime-sb";
+  "dawdle" = dontDistribute super."dawdle";
+  "dawg" = dontDistribute super."dawg";
+  "dbcleaner" = dontDistribute super."dbcleaner";
+  "dbf" = dontDistribute super."dbf";
+  "dbjava" = dontDistribute super."dbjava";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "dbus-th-introspection" = dontDistribute super."dbus-th-introspection";
+  "dclabel" = dontDistribute super."dclabel";
+  "dclabel-eci11" = dontDistribute super."dclabel-eci11";
+  "ddc-base" = dontDistribute super."ddc-base";
+  "ddc-build" = dontDistribute super."ddc-build";
+  "ddc-code" = dontDistribute super."ddc-code";
+  "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
+  "ddc-core-eval" = dontDistribute super."ddc-core-eval";
+  "ddc-core-flow" = dontDistribute super."ddc-core-flow";
+  "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
+  "ddc-core-salt" = dontDistribute super."ddc-core-salt";
+  "ddc-core-simpl" = dontDistribute super."ddc-core-simpl";
+  "ddc-core-tetra" = dontDistribute super."ddc-core-tetra";
+  "ddc-driver" = dontDistribute super."ddc-driver";
+  "ddc-interface" = dontDistribute super."ddc-interface";
+  "ddc-source-tetra" = dontDistribute super."ddc-source-tetra";
+  "ddc-tools" = dontDistribute super."ddc-tools";
+  "ddc-war" = dontDistribute super."ddc-war";
+  "ddci-core" = dontDistribute super."ddci-core";
+  "dead-code-detection" = dontDistribute super."dead-code-detection";
+  "dead-simple-json" = dontDistribute super."dead-simple-json";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
+  "decode-utf8" = dontDistribute super."decode-utf8";
+  "decoder-conduit" = dontDistribute super."decoder-conduit";
+  "dedukti" = dontDistribute super."dedukti";
+  "deepcontrol" = dontDistribute super."deepcontrol";
+  "deeplearning-hs" = dontDistribute super."deeplearning-hs";
+  "deepseq-bounded" = dontDistribute super."deepseq-bounded";
+  "deepseq-generics" = doDistribute super."deepseq-generics_0_1_1_2";
+  "deepseq-magic" = dontDistribute super."deepseq-magic";
+  "deepseq-th" = dontDistribute super."deepseq-th";
+  "deepzoom" = dontDistribute super."deepzoom";
+  "defargs" = dontDistribute super."defargs";
+  "definitive-base" = dontDistribute super."definitive-base";
+  "definitive-filesystem" = dontDistribute super."definitive-filesystem";
+  "definitive-graphics" = dontDistribute super."definitive-graphics";
+  "definitive-parser" = dontDistribute super."definitive-parser";
+  "definitive-reactive" = dontDistribute super."definitive-reactive";
+  "definitive-sound" = dontDistribute super."definitive-sound";
+  "deiko-config" = dontDistribute super."deiko-config";
+  "deka" = dontDistribute super."deka";
+  "deka-tests" = dontDistribute super."deka-tests";
+  "delaunay" = dontDistribute super."delaunay";
+  "delay" = dontDistribute super."delay";
+  "delicious" = dontDistribute super."delicious";
+  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
+  "delta" = dontDistribute super."delta";
+  "delta-h" = dontDistribute super."delta-h";
+  "delude" = dontDistribute super."delude";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "dependent-state" = dontDistribute super."dependent-state";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "derive-monoid" = dontDistribute super."derive-monoid";
+  "derive-topdown" = dontDistribute super."derive-topdown";
+  "derive-trie" = dontDistribute super."derive-trie";
+  "derp" = dontDistribute super."derp";
+  "derp-lib" = dontDistribute super."derp-lib";
+  "descrilo" = dontDistribute super."descrilo";
+  "despair" = dontDistribute super."despair";
+  "deterministic-game-engine" = dontDistribute super."deterministic-game-engine";
+  "detrospector" = dontDistribute super."detrospector";
+  "deunicode" = dontDistribute super."deunicode";
+  "devil" = dontDistribute super."devil";
+  "dewdrop" = dontDistribute super."dewdrop";
+  "dfrac" = dontDistribute super."dfrac";
+  "dfsbuild" = dontDistribute super."dfsbuild";
+  "dgim" = dontDistribute super."dgim";
+  "dgs" = dontDistribute super."dgs";
+  "dia-base" = dontDistribute super."dia-base";
+  "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
+  "diagrams-pdf" = dontDistribute super."diagrams-pdf";
+  "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
+  "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_10";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "diagrams-wx" = dontDistribute super."diagrams-wx";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "dictionary-sharing" = dontDistribute super."dictionary-sharing";
+  "dictparser" = dontDistribute super."dictparser";
+  "diet" = dontDistribute super."diet";
+  "diff-gestalt" = dontDistribute super."diff-gestalt";
+  "diff-parse" = dontDistribute super."diff-parse";
+  "diffarray" = dontDistribute super."diffarray";
+  "diffcabal" = dontDistribute super."diffcabal";
+  "diffdump" = dontDistribute super."diffdump";
+  "digamma" = dontDistribute super."digamma";
+  "digest-pure" = dontDistribute super."digest-pure";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
+  "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
+  "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
+  "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty";
+  "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
+  "digit" = dontDistribute super."digit";
+  "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
+  "dimensional-tf" = dontDistribute super."dimensional-tf";
+  "dingo-core" = dontDistribute super."dingo-core";
+  "dingo-example" = dontDistribute super."dingo-example";
+  "dingo-widgets" = dontDistribute super."dingo-widgets";
+  "diophantine" = dontDistribute super."diophantine";
+  "diplomacy" = dontDistribute super."diplomacy";
+  "diplomacy-server" = dontDistribute super."diplomacy-server";
+  "direct-binary-files" = dontDistribute super."direct-binary-files";
+  "direct-daemonize" = dontDistribute super."direct-daemonize";
+  "direct-fastcgi" = dontDistribute super."direct-fastcgi";
+  "direct-http" = dontDistribute super."direct-http";
+  "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
+  "direct-plugins" = dontDistribute super."direct-plugins";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discrete-space-map" = dontDistribute super."discrete-space-map";
+  "discrimination" = dontDistribute super."discrimination";
+  "disjoint-set" = dontDistribute super."disjoint-set";
+  "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
+  "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
+  "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
+  "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
+  "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "djembe" = dontDistribute super."djembe";
+  "djinn" = dontDistribute super."djinn";
+  "djinn-th" = dontDistribute super."djinn-th";
+  "dnscache" = dontDistribute super."dnscache";
+  "dnsrbl" = dontDistribute super."dnsrbl";
+  "dnssd" = dontDistribute super."dnssd";
+  "doc-review" = dontDistribute super."doc-review";
+  "doccheck" = dontDistribute super."doccheck";
+  "docidx" = dontDistribute super."docidx";
+  "docker" = dontDistribute super."docker";
+  "dockercook" = dontDistribute super."dockercook";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "docvim" = dontDistribute super."docvim";
+  "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
+  "dom-selector" = dontDistribute super."dom-selector";
+  "domain-auth" = dontDistribute super."domain-auth";
+  "dominion" = dontDistribute super."dominion";
+  "domplate" = dontDistribute super."domplate";
+  "dot2graphml" = dontDistribute super."dot2graphml";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download-curl" = dontDistribute super."download-curl";
+  "download-media-content" = dontDistribute super."download-media-content";
+  "dozenal" = dontDistribute super."dozenal";
+  "dozens" = dontDistribute super."dozens";
+  "dph-base" = dontDistribute super."dph-base";
+  "dph-examples" = dontDistribute super."dph-examples";
+  "dph-lifted-base" = dontDistribute super."dph-lifted-base";
+  "dph-lifted-copy" = dontDistribute super."dph-lifted-copy";
+  "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg";
+  "dph-par" = dontDistribute super."dph-par";
+  "dph-prim-interface" = dontDistribute super."dph-prim-interface";
+  "dph-prim-par" = dontDistribute super."dph-prim-par";
+  "dph-prim-seq" = dontDistribute super."dph-prim-seq";
+  "dph-seq" = dontDistribute super."dph-seq";
+  "dpkg" = dontDistribute super."dpkg";
+  "dpor" = doDistribute super."dpor_0_1_0_1";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "drmaa" = dontDistribute super."drmaa";
+  "dropbox-sdk" = dontDistribute super."dropbox-sdk";
+  "dropsolve" = dontDistribute super."dropsolve";
+  "ds-kanren" = dontDistribute super."ds-kanren";
+  "dsh-sql" = dontDistribute super."dsh-sql";
+  "dsmc" = dontDistribute super."dsmc";
+  "dsmc-tools" = dontDistribute super."dsmc-tools";
+  "dson" = dontDistribute super."dson";
+  "dson-parsec" = dontDistribute super."dson-parsec";
+  "dsp" = dontDistribute super."dsp";
+  "dstring" = dontDistribute super."dstring";
+  "dtab" = dontDistribute super."dtab";
+  "dtd" = dontDistribute super."dtd";
+  "dtd-text" = dontDistribute super."dtd-text";
+  "dtd-types" = dontDistribute super."dtd-types";
+  "dtrace" = dontDistribute super."dtrace";
+  "dtw" = dontDistribute super."dtw";
+  "dump" = dontDistribute super."dump";
+  "dunai" = dontDistribute super."dunai";
+  "duplo" = dontDistribute super."duplo";
+  "dvda" = dontDistribute super."dvda";
+  "dvdread" = dontDistribute super."dvdread";
+  "dvi-processing" = dontDistribute super."dvi-processing";
+  "dvorak" = dontDistribute super."dvorak";
+  "dwarf" = dontDistribute super."dwarf";
+  "dwarf-el" = dontDistribute super."dwarf-el";
+  "dwarfadt" = dontDistribute super."dwarfadt";
+  "dx9base" = dontDistribute super."dx9base";
+  "dx9d3d" = dontDistribute super."dx9d3d";
+  "dx9d3dx" = dontDistribute super."dx9d3dx";
+  "dynamic-cabal" = dontDistribute super."dynamic-cabal";
+  "dynamic-graph" = dontDistribute super."dynamic-graph";
+  "dynamic-linker-template" = dontDistribute super."dynamic-linker-template";
+  "dynamic-loader" = dontDistribute super."dynamic-loader";
+  "dynamic-mvector" = dontDistribute super."dynamic-mvector";
+  "dynamic-object" = dontDistribute super."dynamic-object";
+  "dynamic-plot" = dontDistribute super."dynamic-plot";
+  "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynobud" = dontDistribute super."dynobud";
+  "dywapitchtrack" = dontDistribute super."dywapitchtrack";
+  "dzen-utils" = dontDistribute super."dzen-utils";
+  "eager-sockets" = dontDistribute super."eager-sockets";
+  "easy-api" = dontDistribute super."easy-api";
+  "easy-bitcoin" = dontDistribute super."easy-bitcoin";
+  "easyjson" = dontDistribute super."easyjson";
+  "easyplot" = dontDistribute super."easyplot";
+  "easyrender" = dontDistribute super."easyrender";
+  "ebeats" = dontDistribute super."ebeats";
+  "ebnf-bff" = dontDistribute super."ebnf-bff";
+  "ec2-signature" = dontDistribute super."ec2-signature";
+  "ecdsa" = dontDistribute super."ecdsa";
+  "ecma262" = dontDistribute super."ecma262";
+  "ecu" = dontDistribute super."ecu";
+  "ed25519" = dontDistribute super."ed25519";
+  "ed25519-donna" = dontDistribute super."ed25519-donna";
+  "eddie" = dontDistribute super."eddie";
+  "edenmodules" = dontDistribute super."edenmodules";
+  "edenskel" = dontDistribute super."edenskel";
+  "edentv" = dontDistribute super."edentv";
+  "edge" = dontDistribute super."edge";
+  "edis" = dontDistribute super."edis";
+  "edit-lenses" = dontDistribute super."edit-lenses";
+  "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
+  "editable" = dontDistribute super."editable";
+  "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
+  "effect-monad" = dontDistribute super."effect-monad";
+  "effective-aspects" = dontDistribute super."effective-aspects";
+  "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
+  "effects" = dontDistribute super."effects";
+  "effects-parser" = dontDistribute super."effects-parser";
+  "effin" = dontDistribute super."effin";
+  "egison" = dontDistribute super."egison";
+  "egison-quote" = dontDistribute super."egison-quote";
+  "egison-tutorial" = dontDistribute super."egison-tutorial";
+  "ehaskell" = dontDistribute super."ehaskell";
+  "ehs" = dontDistribute super."ehs";
+  "eibd-client-simple" = dontDistribute super."eibd-client-simple";
+  "eigen" = dontDistribute super."eigen";
+  "eithers" = dontDistribute super."eithers";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-log" = dontDistribute super."ekg-log";
+  "ekg-push" = dontDistribute super."ekg-push";
+  "ekg-rrd" = dontDistribute super."ekg-rrd";
+  "electrum-mnemonic" = dontDistribute super."electrum-mnemonic";
+  "elerea" = dontDistribute super."elerea";
+  "elerea-examples" = dontDistribute super."elerea-examples";
+  "elerea-sdl" = dontDistribute super."elerea-sdl";
+  "elevator" = dontDistribute super."elevator";
+  "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-export" = dontDistribute super."elm-export";
+  "elm-get" = dontDistribute super."elm-get";
+  "elm-hybrid" = dontDistribute super."elm-hybrid";
+  "elm-init" = dontDistribute super."elm-init";
+  "elm-make" = dontDistribute super."elm-make";
+  "elm-package" = dontDistribute super."elm-package";
+  "elm-reactor" = dontDistribute super."elm-reactor";
+  "elm-repl" = dontDistribute super."elm-repl";
+  "elm-server" = dontDistribute super."elm-server";
+  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
+  "elocrypt" = dontDistribute super."elocrypt";
+  "emacs-keys" = dontDistribute super."emacs-keys";
+  "email" = dontDistribute super."email";
+  "email-header" = dontDistribute super."email-header";
+  "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate-json" = dontDistribute super."email-validate-json";
+  "email-validator" = dontDistribute super."email-validator";
+  "embeddock" = dontDistribute super."embeddock";
+  "embeddock-example" = dontDistribute super."embeddock-example";
+  "embroidery" = dontDistribute super."embroidery";
+  "emgm" = dontDistribute super."emgm";
+  "empty" = dontDistribute super."empty";
+  "encoding" = dontDistribute super."encoding";
+  "endo" = dontDistribute super."endo";
+  "engine-io-growler" = dontDistribute super."engine-io-growler";
+  "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engineering-units" = dontDistribute super."engineering-units";
+  "enumerable" = dontDistribute super."enumerable";
+  "enumerate" = dontDistribute super."enumerate";
+  "enumeration" = dontDistribute super."enumeration";
+  "enumerator-fd" = dontDistribute super."enumerator-fd";
+  "enumerator-tf" = dontDistribute super."enumerator-tf";
+  "enumfun" = dontDistribute super."enumfun";
+  "enummapmap" = dontDistribute super."enummapmap";
+  "enummapset" = dontDistribute super."enummapset";
+  "enummapset-th" = dontDistribute super."enummapset-th";
+  "enumset" = dontDistribute super."enumset";
+  "env-parser" = dontDistribute super."env-parser";
+  "envparse" = dontDistribute super."envparse";
+  "epanet-haskell" = dontDistribute super."epanet-haskell";
+  "epass" = dontDistribute super."epass";
+  "epic" = dontDistribute super."epic";
+  "epoll" = dontDistribute super."epoll";
+  "eprocess" = dontDistribute super."eprocess";
+  "epub" = dontDistribute super."epub";
+  "epub-metadata" = dontDistribute super."epub-metadata";
+  "epub-tools" = dontDistribute super."epub-tools";
+  "epubname" = dontDistribute super."epubname";
+  "equal-files" = dontDistribute super."equal-files";
+  "equational-reasoning" = dontDistribute super."equational-reasoning";
+  "erd" = dontDistribute super."erd";
+  "erf-native" = dontDistribute super."erf-native";
+  "erlang" = dontDistribute super."erlang";
+  "eros" = dontDistribute super."eros";
+  "eros-client" = dontDistribute super."eros-client";
+  "eros-http" = dontDistribute super."eros-http";
+  "errno" = dontDistribute super."errno";
+  "error-analyze" = dontDistribute super."error-analyze";
+  "error-continuations" = dontDistribute super."error-continuations";
+  "error-list" = dontDistribute super."error-list";
+  "error-loc" = dontDistribute super."error-loc";
+  "error-location" = dontDistribute super."error-location";
+  "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
+  "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "ersatz" = dontDistribute super."ersatz";
+  "ersatz-toysat" = dontDistribute super."ersatz-toysat";
+  "ert" = dontDistribute super."ert";
+  "esotericbot" = dontDistribute super."esotericbot";
+  "ess" = dontDistribute super."ess";
+  "estimator" = dontDistribute super."estimator";
+  "estimators" = dontDistribute super."estimators";
+  "estreps" = dontDistribute super."estreps";
+  "eternal" = dontDistribute super."eternal";
+  "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
+  "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
+  "ethereum-rlp" = dontDistribute super."ethereum-rlp";
+  "ety" = dontDistribute super."ety";
+  "euler" = dontDistribute super."euler";
+  "euphoria" = dontDistribute super."euphoria";
+  "eurofxref" = dontDistribute super."eurofxref";
+  "event-driven" = dontDistribute super."event-driven";
+  "event-handlers" = dontDistribute super."event-handlers";
+  "event-list" = dontDistribute super."event-list";
+  "event-monad" = dontDistribute super."event-monad";
+  "eventloop" = dontDistribute super."eventloop";
+  "eventsourced" = dontDistribute super."eventsourced";
+  "eventstore" = doDistribute super."eventstore_0_12_0_0";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
+  "exists" = dontDistribute super."exists";
+  "exit-codes" = dontDistribute super."exit-codes";
+  "exp-extended" = dontDistribute super."exp-extended";
+  "exp-pairs" = dontDistribute super."exp-pairs";
+  "expand" = dontDistribute super."expand";
+  "expat-enumerator" = dontDistribute super."expat-enumerator";
+  "expiring-mvar" = dontDistribute super."expiring-mvar";
+  "explain" = dontDistribute super."explain";
+  "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-iomodes" = dontDistribute super."explicit-iomodes";
+  "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
+  "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
+  "explicit-sharing" = dontDistribute super."explicit-sharing";
+  "explore" = dontDistribute super."explore";
+  "exposed-containers" = dontDistribute super."exposed-containers";
+  "expression-parser" = dontDistribute super."expression-parser";
+  "extcore" = dontDistribute super."extcore";
+  "extemp" = dontDistribute super."extemp";
+  "extended-categories" = dontDistribute super."extended-categories";
+  "extended-reals" = dontDistribute super."extended-reals";
+  "extensible" = dontDistribute super."extensible";
+  "extensible-data" = dontDistribute super."extensible-data";
+  "external-sort" = dontDistribute super."external-sort";
+  "extractelf" = dontDistribute super."extractelf";
+  "ez-couch" = dontDistribute super."ez-couch";
+  "faceted" = dontDistribute super."faceted";
+  "factory" = dontDistribute super."factory";
+  "factual-api" = dontDistribute super."factual-api";
+  "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "failure-detector" = dontDistribute super."failure-detector";
+  "fair-predicates" = dontDistribute super."fair-predicates";
+  "fake-type" = dontDistribute super."fake-type";
+  "faker" = dontDistribute super."faker";
+  "falling-turnip" = dontDistribute super."falling-turnip";
+  "fallingblocks" = dontDistribute super."fallingblocks";
+  "family-tree" = dontDistribute super."family-tree";
+  "fast-digits" = dontDistribute super."fast-digits";
+  "fast-math" = dontDistribute super."fast-math";
+  "fast-tags" = dontDistribute super."fast-tags";
+  "fast-tagsoup" = dontDistribute super."fast-tagsoup";
+  "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fbmessenger-api" = dontDistribute super."fbmessenger-api";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
+  "fdo-trash" = dontDistribute super."fdo-trash";
+  "fec" = dontDistribute super."fec";
+  "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed-cli" = dontDistribute super."feed-cli";
+  "feed-collect" = dontDistribute super."feed-collect";
+  "feed-crawl" = dontDistribute super."feed-crawl";
+  "feed-gipeda" = dontDistribute super."feed-gipeda";
+  "feed-translator" = dontDistribute super."feed-translator";
+  "feed2lj" = dontDistribute super."feed2lj";
+  "feed2twitter" = dontDistribute super."feed2twitter";
+  "feldspar-compiler" = dontDistribute super."feldspar-compiler";
+  "feldspar-language" = dontDistribute super."feldspar-language";
+  "feldspar-signal" = dontDistribute super."feldspar-signal";
+  "fen2s" = dontDistribute super."fen2s";
+  "fences" = dontDistribute super."fences";
+  "fenfire" = dontDistribute super."fenfire";
+  "fez-conf" = dontDistribute super."fez-conf";
+  "ffeed" = dontDistribute super."ffeed";
+  "fficxx" = dontDistribute super."fficxx";
+  "fficxx-runtime" = dontDistribute super."fficxx-runtime";
+  "ffmpeg-light" = dontDistribute super."ffmpeg-light";
+  "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
+  "fgl-visualize" = dontDistribute super."fgl-visualize";
+  "fibon" = dontDistribute super."fibon";
+  "fibonacci" = dontDistribute super."fibonacci";
+  "fields" = dontDistribute super."fields";
+  "fields-json" = dontDistribute super."fields-json";
+  "fieldwise" = dontDistribute super."fieldwise";
+  "fig" = dontDistribute super."fig";
+  "file-collection" = dontDistribute super."file-collection";
+  "file-command-qq" = dontDistribute super."file-command-qq";
+  "filediff" = dontDistribute super."filediff";
+  "filepath-io-access" = dontDistribute super."filepath-io-access";
+  "filepather" = dontDistribute super."filepather";
+  "filestore" = dontDistribute super."filestore";
+  "filesystem-conduit" = dontDistribute super."filesystem-conduit";
+  "filesystem-enumerator" = dontDistribute super."filesystem-enumerator";
+  "filesystem-trees" = dontDistribute super."filesystem-trees";
+  "filtrable" = dontDistribute super."filtrable";
+  "final" = dontDistribute super."final";
+  "find-conduit" = dontDistribute super."find-conduit";
+  "fingertree-tf" = dontDistribute super."fingertree-tf";
+  "finite-field" = dontDistribute super."finite-field";
+  "finite-typelits" = dontDistribute super."finite-typelits";
+  "first-and-last" = dontDistribute super."first-and-last";
+  "first-class-patterns" = dontDistribute super."first-class-patterns";
+  "firstify" = dontDistribute super."firstify";
+  "fishfood" = dontDistribute super."fishfood";
+  "fit" = dontDistribute super."fit";
+  "fitsio" = dontDistribute super."fitsio";
+  "fix-imports" = dontDistribute super."fix-imports";
+  "fix-parser-simple" = dontDistribute super."fix-parser-simple";
+  "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit";
+  "fixed-length" = dontDistribute super."fixed-length";
+  "fixed-point" = dontDistribute super."fixed-point";
+  "fixed-point-vector" = dontDistribute super."fixed-point-vector";
+  "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space";
+  "fixed-precision" = dontDistribute super."fixed-precision";
+  "fixed-storable-array" = dontDistribute super."fixed-storable-array";
+  "fixed-vector-binary" = dontDistribute super."fixed-vector-binary";
+  "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
+  "fixedprec" = dontDistribute super."fixedprec";
+  "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
+  "fixhs" = dontDistribute super."fixhs";
+  "fixplate" = dontDistribute super."fixplate";
+  "fixpoint" = dontDistribute super."fixpoint";
+  "fixtime" = dontDistribute super."fixtime";
+  "fizz-buzz" = dontDistribute super."fizz-buzz";
+  "flaccuraterip" = dontDistribute super."flaccuraterip";
+  "flamethrower" = dontDistribute super."flamethrower";
+  "flamingra" = dontDistribute super."flamingra";
+  "flat-maybe" = dontDistribute super."flat-maybe";
+  "flat-tex" = dontDistribute super."flat-tex";
+  "flexible-time" = dontDistribute super."flexible-time";
+  "flexible-unlit" = dontDistribute super."flexible-unlit";
+  "flexiwrap" = dontDistribute super."flexiwrap";
+  "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck";
+  "flickr" = dontDistribute super."flickr";
+  "flippers" = dontDistribute super."flippers";
+  "flite" = dontDistribute super."flite";
+  "flo" = dontDistribute super."flo";
+  "float-binstring" = dontDistribute super."float-binstring";
+  "floating-bits" = dontDistribute super."floating-bits";
+  "floatshow" = dontDistribute super."floatshow";
+  "flow-er" = dontDistribute super."flow-er";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "flowdock" = dontDistribute super."flowdock";
+  "flowdock-api" = dontDistribute super."flowdock-api";
+  "flowdock-rest" = dontDistribute super."flowdock-rest";
+  "flower" = dontDistribute super."flower";
+  "flowlocks-framework" = dontDistribute super."flowlocks-framework";
+  "flowsim" = dontDistribute super."flowsim";
+  "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
+  "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "foldl-incremental" = dontDistribute super."foldl-incremental";
+  "foldl-transduce" = dontDistribute super."foldl-transduce";
+  "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
+  "folds" = dontDistribute super."folds";
+  "folds-common" = dontDistribute super."folds-common";
+  "follower" = dontDistribute super."follower";
+  "foma" = dontDistribute super."foma";
+  "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6";
+  "foo" = dontDistribute super."foo";
+  "for-free" = dontDistribute super."for-free";
+  "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "fordo" = dontDistribute super."fordo";
+  "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
+  "foreign-var" = dontDistribute super."foreign-var";
+  "forger" = dontDistribute super."forger";
+  "forkable-monad" = dontDistribute super."forkable-monad";
+  "formal" = dontDistribute super."formal";
+  "format" = dontDistribute super."format";
+  "format-status" = dontDistribute super."format-status";
+  "formattable" = dontDistribute super."formattable";
+  "forml" = dontDistribute super."forml";
+  "formlets" = dontDistribute super."formlets";
+  "formlets-hsp" = dontDistribute super."formlets-hsp";
+  "formura" = dontDistribute super."formura";
+  "forth-hll" = dontDistribute super."forth-hll";
+  "foscam-directory" = dontDistribute super."foscam-directory";
+  "foscam-filename" = dontDistribute super."foscam-filename";
+  "foscam-sort" = dontDistribute super."foscam-sort";
+  "fountain" = dontDistribute super."fountain";
+  "fpco-api" = dontDistribute super."fpco-api";
+  "fpipe" = dontDistribute super."fpipe";
+  "fpnla" = dontDistribute super."fpnla";
+  "fpnla-examples" = dontDistribute super."fpnla-examples";
+  "fptest" = dontDistribute super."fptest";
+  "fquery" = dontDistribute super."fquery";
+  "fractal" = dontDistribute super."fractal";
+  "fractals" = dontDistribute super."fractals";
+  "fraction" = dontDistribute super."fraction";
+  "frag" = dontDistribute super."frag";
+  "frame" = dontDistribute super."frame";
+  "frame-markdown" = dontDistribute super."frame-markdown";
+  "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
+  "free-concurrent" = dontDistribute super."free-concurrent";
+  "free-functors" = dontDistribute super."free-functors";
+  "free-game" = dontDistribute super."free-game";
+  "free-http" = dontDistribute super."free-http";
+  "free-operational" = dontDistribute super."free-operational";
+  "free-theorems" = dontDistribute super."free-theorems";
+  "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples";
+  "free-theorems-seq" = dontDistribute super."free-theorems-seq";
+  "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
+  "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "freekick2" = dontDistribute super."freekick2";
+  "freer" = dontDistribute super."freer";
+  "freesect" = dontDistribute super."freesect";
+  "freesound" = dontDistribute super."freesound";
+  "freetype-simple" = dontDistribute super."freetype-simple";
+  "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
+  "fresh" = dontDistribute super."fresh";
+  "friday" = dontDistribute super."friday";
+  "friday-devil" = dontDistribute super."friday-devil";
+  "friday-juicypixels" = dontDistribute super."friday-juicypixels";
+  "friday-scale-dct" = dontDistribute super."friday-scale-dct";
+  "friendly-time" = dontDistribute super."friendly-time";
+  "frown" = dontDistribute super."frown";
+  "frp-arduino" = dontDistribute super."frp-arduino";
+  "frpnow" = dontDistribute super."frpnow";
+  "frpnow-gloss" = dontDistribute super."frpnow-gloss";
+  "frpnow-gtk" = dontDistribute super."frpnow-gtk";
+  "frquotes" = dontDistribute super."frquotes";
+  "fs-events" = dontDistribute super."fs-events";
+  "fsharp" = dontDistribute super."fsharp";
+  "fsmActions" = dontDistribute super."fsmActions";
+  "fst" = dontDistribute super."fst";
+  "fsutils" = dontDistribute super."fsutils";
+  "fswatcher" = dontDistribute super."fswatcher";
+  "ftdi" = dontDistribute super."ftdi";
+  "ftp-conduit" = dontDistribute super."ftp-conduit";
+  "ftphs" = dontDistribute super."ftphs";
+  "ftree" = dontDistribute super."ftree";
+  "ftshell" = dontDistribute super."ftshell";
+  "fugue" = dontDistribute super."fugue";
+  "full-sessions" = dontDistribute super."full-sessions";
+  "full-text-search" = dontDistribute super."full-text-search";
+  "fullstop" = dontDistribute super."fullstop";
+  "funbot" = dontDistribute super."funbot";
+  "funbot-client" = dontDistribute super."funbot-client";
+  "funbot-ext-events" = dontDistribute super."funbot-ext-events";
+  "funbot-git-hook" = dontDistribute super."funbot-git-hook";
+  "funcons-tools" = dontDistribute super."funcons-tools";
+  "function-combine" = dontDistribute super."function-combine";
+  "function-instances-algebra" = dontDistribute super."function-instances-algebra";
+  "functional-arrow" = dontDistribute super."functional-arrow";
+  "functional-kmp" = dontDistribute super."functional-kmp";
+  "functor-apply" = dontDistribute super."functor-apply";
+  "functor-combo" = dontDistribute super."functor-combo";
+  "functor-infix" = dontDistribute super."functor-infix";
+  "functor-monadic" = dontDistribute super."functor-monadic";
+  "functor-utils" = dontDistribute super."functor-utils";
+  "functorm" = dontDistribute super."functorm";
+  "functors" = dontDistribute super."functors";
+  "funion" = dontDistribute super."funion";
+  "funnyprint" = dontDistribute super."funnyprint";
+  "funpat" = dontDistribute super."funpat";
+  "funsat" = dontDistribute super."funsat";
+  "fusion" = dontDistribute super."fusion";
+  "futun" = dontDistribute super."futun";
+  "future" = dontDistribute super."future";
+  "future-resource" = dontDistribute super."future-resource";
+  "fuzzy" = dontDistribute super."fuzzy";
+  "fuzzy-timings" = dontDistribute super."fuzzy-timings";
+  "fuzzytime" = dontDistribute super."fuzzytime";
+  "fwgl" = dontDistribute super."fwgl";
+  "fwgl-glfw" = dontDistribute super."fwgl-glfw";
+  "fwgl-javascript" = dontDistribute super."fwgl-javascript";
+  "g-npm" = dontDistribute super."g-npm";
+  "gact" = dontDistribute super."gact";
+  "game-of-life" = dontDistribute super."game-of-life";
+  "game-probability" = dontDistribute super."game-probability";
+  "game-tree" = dontDistribute super."game-tree";
+  "gameclock" = dontDistribute super."gameclock";
+  "gang-of-threads" = dontDistribute super."gang-of-threads";
+  "garepinoh" = dontDistribute super."garepinoh";
+  "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gbu" = dontDistribute super."gbu";
+  "gc" = dontDistribute super."gc";
+  "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
+  "gconf" = dontDistribute super."gconf";
+  "gdiff" = dontDistribute super."gdiff";
+  "gdiff-ig" = dontDistribute super."gdiff-ig";
+  "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
+  "gearbox" = dontDistribute super."gearbox";
+  "geek" = dontDistribute super."geek";
+  "geek-server" = dontDistribute super."geek-server";
+  "gelatin" = dontDistribute super."gelatin";
+  "gemstone" = dontDistribute super."gemstone";
+  "gencheck" = dontDistribute super."gencheck";
+  "gender" = dontDistribute super."gender";
+  "genders" = dontDistribute super."genders";
+  "general-prelude" = dontDistribute super."general-prelude";
+  "generator" = dontDistribute super."generator";
+  "generators" = dontDistribute super."generators";
+  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-random" = dontDistribute super."generic-random";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "generics-sop-lens" = dontDistribute super."generics-sop-lens";
+  "genericserialize" = dontDistribute super."genericserialize";
+  "genetics" = dontDistribute super."genetics";
+  "geni-gui" = dontDistribute super."geni-gui";
+  "geni-util" = dontDistribute super."geni-util";
+  "geniconvert" = dontDistribute super."geniconvert";
+  "genifunctors" = dontDistribute super."genifunctors";
+  "geniplate" = dontDistribute super."geniplate";
+  "geniserver" = dontDistribute super."geniserver";
+  "genprog" = dontDistribute super."genprog";
+  "gentlemark" = dontDistribute super."gentlemark";
+  "geo-resolver" = dontDistribute super."geo-resolver";
+  "geo-uk" = dontDistribute super."geo-uk";
+  "geocalc" = dontDistribute super."geocalc";
+  "geocode-google" = dontDistribute super."geocode-google";
+  "geodetic" = dontDistribute super."geodetic";
+  "geodetics" = dontDistribute super."geodetics";
+  "geohash" = dontDistribute super."geohash";
+  "geoip2" = dontDistribute super."geoip2";
+  "geojson" = dontDistribute super."geojson";
+  "geojson-types" = dontDistribute super."geojson-types";
+  "geom2d" = dontDistribute super."geom2d";
+  "getemx" = dontDistribute super."getemx";
+  "getflag" = dontDistribute super."getflag";
+  "getopt-simple" = dontDistribute super."getopt-simple";
+  "gf" = dontDistribute super."gf";
+  "ggtsTC" = dontDistribute super."ggtsTC";
+  "ghc-core" = dontDistribute super."ghc-core";
+  "ghc-core-html" = dontDistribute super."ghc-core-html";
+  "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
+  "ghc-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-options" = dontDistribute super."ghc-options";
+  "ghc-parmake" = dontDistribute super."ghc-parmake";
+  "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
+  "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
+  "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-simple" = dontDistribute super."ghc-simple";
+  "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
+  "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-vis" = dontDistribute super."ghc-vis";
+  "ghci-diagrams" = dontDistribute super."ghci-diagrams";
+  "ghci-haskeline" = dontDistribute super."ghci-haskeline";
+  "ghci-lib" = dontDistribute super."ghci-lib";
+  "ghci-ng" = dontDistribute super."ghci-ng";
+  "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
+  "ghcjs-dom" = doDistribute super."ghcjs-dom_0_2_4_0";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-hplay" = dontDistribute super."ghcjs-hplay";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
+  "gi-gtk" = doDistribute super."gi-gtk_3_0_3";
+  "gi-gtk-hs" = dontDistribute super."gi-gtk-hs";
+  "gi-gtkosxapplication" = dontDistribute super."gi-gtkosxapplication";
+  "gi-gtksource" = dontDistribute super."gi-gtksource";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pangocairo" = dontDistribute super."gi-pangocairo";
+  "gi-poppler" = dontDistribute super."gi-poppler";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "gio" = doDistribute super."gio_0_13_1_1";
+  "gipeda" = doDistribute super."gipeda_0_2_0_1";
+  "gist" = dontDistribute super."gist";
+  "git" = dontDistribute super."git";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160511";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-freq" = dontDistribute super."git-freq";
+  "git-gpush" = dontDistribute super."git-gpush";
+  "git-jump" = dontDistribute super."git-jump";
+  "git-monitor" = dontDistribute super."git-monitor";
+  "git-object" = dontDistribute super."git-object";
+  "git-repair" = dontDistribute super."git-repair";
+  "git-sanity" = dontDistribute super."git-sanity";
+  "git-vogue" = dontDistribute super."git-vogue";
+  "gitHUD" = dontDistribute super."gitHUD";
+  "gitcache" = dontDistribute super."gitcache";
+  "gitdo" = dontDistribute super."gitdo";
+  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-utils" = dontDistribute super."github-utils";
+  "gitignore" = dontDistribute super."gitignore";
+  "gitit" = dontDistribute super."gitit";
+  "gitlib-cmdline" = dontDistribute super."gitlib-cmdline";
+  "gitlib-cross" = dontDistribute super."gitlib-cross";
+  "gitlib-s3" = dontDistribute super."gitlib-s3";
+  "gitlib-sample" = dontDistribute super."gitlib-sample";
+  "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitter" = dontDistribute super."gitter";
+  "givegif" = dontDistribute super."givegif";
+  "gl-capture" = dontDistribute super."gl-capture";
+  "glade" = dontDistribute super."glade";
+  "gladexml-accessor" = dontDistribute super."gladexml-accessor";
+  "glambda" = dontDistribute super."glambda";
+  "glapp" = dontDistribute super."glapp";
+  "glasso" = dontDistribute super."glasso";
+  "glib" = doDistribute super."glib_0_13_2_2";
+  "glicko" = dontDistribute super."glicko";
+  "glider-nlp" = dontDistribute super."glider-nlp";
+  "glintcollider" = dontDistribute super."glintcollider";
+  "gll" = dontDistribute super."gll";
+  "global" = dontDistribute super."global";
+  "global-config" = dontDistribute super."global-config";
+  "global-lock" = dontDistribute super."global-lock";
+  "global-variables" = dontDistribute super."global-variables";
+  "glome-hs" = dontDistribute super."glome-hs";
+  "gloss" = dontDistribute super."gloss";
+  "gloss-accelerate" = dontDistribute super."gloss-accelerate";
+  "gloss-algorithms" = dontDistribute super."gloss-algorithms";
+  "gloss-banana" = dontDistribute super."gloss-banana";
+  "gloss-devil" = dontDistribute super."gloss-devil";
+  "gloss-examples" = dontDistribute super."gloss-examples";
+  "gloss-game" = dontDistribute super."gloss-game";
+  "gloss-juicy" = dontDistribute super."gloss-juicy";
+  "gloss-raster" = dontDistribute super."gloss-raster";
+  "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate";
+  "gloss-rendering" = dontDistribute super."gloss-rendering";
+  "gloss-sodium" = dontDistribute super."gloss-sodium";
+  "glpk-hs" = dontDistribute super."glpk-hs";
+  "glue" = dontDistribute super."glue";
+  "glue-common" = dontDistribute super."glue-common";
+  "glue-core" = dontDistribute super."glue-core";
+  "glue-ekg" = dontDistribute super."glue-ekg";
+  "glue-example" = dontDistribute super."glue-example";
+  "gluturtle" = dontDistribute super."gluturtle";
+  "gmap" = dontDistribute super."gmap";
+  "gmndl" = dontDistribute super."gmndl";
+  "gnome-desktop" = dontDistribute super."gnome-desktop";
+  "gnome-keyring" = dontDistribute super."gnome-keyring";
+  "gnomevfs" = dontDistribute super."gnomevfs";
+  "gnss-converters" = dontDistribute super."gnss-converters";
+  "gnuplot" = dontDistribute super."gnuplot";
+  "goa" = dontDistribute super."goa";
+  "goal-core" = dontDistribute super."goal-core";
+  "goal-geometry" = dontDistribute super."goal-geometry";
+  "goal-probability" = dontDistribute super."goal-probability";
+  "goal-simulation" = dontDistribute super."goal-simulation";
+  "goatee" = dontDistribute super."goatee";
+  "goatee-gtk" = dontDistribute super."goatee-gtk";
+  "gofer-prelude" = dontDistribute super."gofer-prelude";
+  "gogol" = dontDistribute super."gogol";
+  "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer";
+  "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller";
+  "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer";
+  "gogol-admin-directory" = dontDistribute super."gogol-admin-directory";
+  "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration";
+  "gogol-admin-reports" = dontDistribute super."gogol-admin-reports";
+  "gogol-adsense" = dontDistribute super."gogol-adsense";
+  "gogol-adsense-host" = dontDistribute super."gogol-adsense-host";
+  "gogol-affiliates" = dontDistribute super."gogol-affiliates";
+  "gogol-analytics" = dontDistribute super."gogol-analytics";
+  "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise";
+  "gogol-android-publisher" = dontDistribute super."gogol-android-publisher";
+  "gogol-appengine" = dontDistribute super."gogol-appengine";
+  "gogol-apps-activity" = dontDistribute super."gogol-apps-activity";
+  "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar";
+  "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing";
+  "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller";
+  "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks";
+  "gogol-appstate" = dontDistribute super."gogol-appstate";
+  "gogol-autoscaler" = dontDistribute super."gogol-autoscaler";
+  "gogol-bigquery" = dontDistribute super."gogol-bigquery";
+  "gogol-billing" = dontDistribute super."gogol-billing";
+  "gogol-blogger" = dontDistribute super."gogol-blogger";
+  "gogol-books" = dontDistribute super."gogol-books";
+  "gogol-civicinfo" = dontDistribute super."gogol-civicinfo";
+  "gogol-classroom" = dontDistribute super."gogol-classroom";
+  "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace";
+  "gogol-compute" = dontDistribute super."gogol-compute";
+  "gogol-container" = dontDistribute super."gogol-container";
+  "gogol-core" = dontDistribute super."gogol-core";
+  "gogol-customsearch" = dontDistribute super."gogol-customsearch";
+  "gogol-dataflow" = dontDistribute super."gogol-dataflow";
+  "gogol-datastore" = dontDistribute super."gogol-datastore";
+  "gogol-debugger" = dontDistribute super."gogol-debugger";
+  "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager";
+  "gogol-dfareporting" = dontDistribute super."gogol-dfareporting";
+  "gogol-discovery" = dontDistribute super."gogol-discovery";
+  "gogol-dns" = dontDistribute super."gogol-dns";
+  "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids";
+  "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search";
+  "gogol-drive" = dontDistribute super."gogol-drive";
+  "gogol-fitness" = dontDistribute super."gogol-fitness";
+  "gogol-fonts" = dontDistribute super."gogol-fonts";
+  "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch";
+  "gogol-fusiontables" = dontDistribute super."gogol-fusiontables";
+  "gogol-games" = dontDistribute super."gogol-games";
+  "gogol-games-configuration" = dontDistribute super."gogol-games-configuration";
+  "gogol-games-management" = dontDistribute super."gogol-games-management";
+  "gogol-genomics" = dontDistribute super."gogol-genomics";
+  "gogol-gmail" = dontDistribute super."gogol-gmail";
+  "gogol-groups-migration" = dontDistribute super."gogol-groups-migration";
+  "gogol-groups-settings" = dontDistribute super."gogol-groups-settings";
+  "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit";
+  "gogol-latencytest" = dontDistribute super."gogol-latencytest";
+  "gogol-logging" = dontDistribute super."gogol-logging";
+  "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate";
+  "gogol-maps-engine" = dontDistribute super."gogol-maps-engine";
+  "gogol-mirror" = dontDistribute super."gogol-mirror";
+  "gogol-monitoring" = dontDistribute super."gogol-monitoring";
+  "gogol-oauth2" = dontDistribute super."gogol-oauth2";
+  "gogol-pagespeed" = dontDistribute super."gogol-pagespeed";
+  "gogol-partners" = dontDistribute super."gogol-partners";
+  "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner";
+  "gogol-plus" = dontDistribute super."gogol-plus";
+  "gogol-plus-domains" = dontDistribute super."gogol-plus-domains";
+  "gogol-prediction" = dontDistribute super."gogol-prediction";
+  "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon";
+  "gogol-pubsub" = dontDistribute super."gogol-pubsub";
+  "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress";
+  "gogol-replicapool" = dontDistribute super."gogol-replicapool";
+  "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater";
+  "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager";
+  "gogol-resourceviews" = dontDistribute super."gogol-resourceviews";
+  "gogol-shopping-content" = dontDistribute super."gogol-shopping-content";
+  "gogol-siteverification" = dontDistribute super."gogol-siteverification";
+  "gogol-spectrum" = dontDistribute super."gogol-spectrum";
+  "gogol-sqladmin" = dontDistribute super."gogol-sqladmin";
+  "gogol-storage" = dontDistribute super."gogol-storage";
+  "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer";
+  "gogol-tagmanager" = dontDistribute super."gogol-tagmanager";
+  "gogol-taskqueue" = dontDistribute super."gogol-taskqueue";
+  "gogol-translate" = dontDistribute super."gogol-translate";
+  "gogol-urlshortener" = dontDistribute super."gogol-urlshortener";
+  "gogol-useraccounts" = dontDistribute super."gogol-useraccounts";
+  "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools";
+  "gogol-youtube" = dontDistribute super."gogol-youtube";
+  "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics";
+  "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting";
+  "gooey" = dontDistribute super."gooey";
+  "google-dictionary" = dontDistribute super."google-dictionary";
+  "google-drive" = dontDistribute super."google-drive";
+  "google-html5-slide" = dontDistribute super."google-html5-slide";
+  "google-mail-filters" = dontDistribute super."google-mail-filters";
+  "google-oauth2" = dontDistribute super."google-oauth2";
+  "google-search" = dontDistribute super."google-search";
+  "google-translate" = dontDistribute super."google-translate";
+  "googleplus" = dontDistribute super."googleplus";
+  "googlepolyline" = dontDistribute super."googlepolyline";
+  "gopherbot" = dontDistribute super."gopherbot";
+  "gore-and-ash" = dontDistribute super."gore-and-ash";
+  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
+  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
+  "gore-and-ash-glfw" = dontDistribute super."gore-and-ash-glfw";
+  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
+  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
+  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
+  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpio" = dontDistribute super."gpio";
+  "gps" = dontDistribute super."gps";
+  "gps2htmlReport" = dontDistribute super."gps2htmlReport";
+  "gpx-conduit" = dontDistribute super."gpx-conduit";
+  "graceful" = dontDistribute super."graceful";
+  "grammar-combinators" = dontDistribute super."grammar-combinators";
+  "grapefruit-examples" = dontDistribute super."grapefruit-examples";
+  "grapefruit-frp" = dontDistribute super."grapefruit-frp";
+  "grapefruit-records" = dontDistribute super."grapefruit-records";
+  "grapefruit-ui" = dontDistribute super."grapefruit-ui";
+  "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-generators" = dontDistribute super."graph-generators";
+  "graph-matchings" = dontDistribute super."graph-matchings";
+  "graph-rewriting" = dontDistribute super."graph-rewriting";
+  "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl";
+  "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl";
+  "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope";
+  "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout";
+  "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski";
+  "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies";
+  "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs";
+  "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww";
+  "graph-serialize" = dontDistribute super."graph-serialize";
+  "graph-utils" = dontDistribute super."graph-utils";
+  "graph-visit" = dontDistribute super."graph-visit";
+  "graphbuilder" = dontDistribute super."graphbuilder";
+  "graphene" = dontDistribute super."graphene";
+  "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators";
+  "graphics-formats-collada" = dontDistribute super."graphics-formats-collada";
+  "graphicsFormats" = dontDistribute super."graphicsFormats";
+  "graphicstools" = dontDistribute super."graphicstools";
+  "graphmod" = dontDistribute super."graphmod";
+  "graphql" = dontDistribute super."graphql";
+  "graphtype" = dontDistribute super."graphtype";
+  "grasp" = dontDistribute super."grasp";
+  "gray-code" = dontDistribute super."gray-code";
+  "gray-extended" = dontDistribute super."gray-extended";
+  "greencard" = dontDistribute super."greencard";
+  "greencard-lib" = dontDistribute super."greencard-lib";
+  "greg-client" = dontDistribute super."greg-client";
+  "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
+  "grid" = dontDistribute super."grid";
+  "gridfs" = dontDistribute super."gridfs";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groundhog-converters" = dontDistribute super."groundhog-converters";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "groupoid" = dontDistribute super."groupoid";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk" = doDistribute super."gtk_0_14_2";
+  "gtk-helpers" = dontDistribute super."gtk-helpers";
+  "gtk-jsinput" = dontDistribute super."gtk-jsinput";
+  "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore";
+  "gtk-mac-integration" = dontDistribute super."gtk-mac-integration";
+  "gtk-serialized-event" = dontDistribute super."gtk-serialized-event";
+  "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view";
+  "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list";
+  "gtk-toy" = dontDistribute super."gtk-toy";
+  "gtk-traymanager" = dontDistribute super."gtk-traymanager";
+  "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_5";
+  "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade";
+  "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib";
+  "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs";
+  "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk";
+  "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext";
+  "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2";
+  "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th";
+  "gtk2hs-hello" = dontDistribute super."gtk2hs-hello";
+  "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn";
+  "gtk3" = doDistribute super."gtk3_0_14_2";
+  "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = doDistribute super."gtksourceview3_0_13_2_1";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "guid" = dontDistribute super."guid";
+  "gulcii" = dontDistribute super."gulcii";
+  "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis";
+  "gyah-bin" = dontDistribute super."gyah-bin";
+  "h-booru" = dontDistribute super."h-booru";
+  "h-gpgme" = dontDistribute super."h-gpgme";
+  "h2048" = dontDistribute super."h2048";
+  "hArduino" = dontDistribute super."hArduino";
+  "hBDD" = dontDistribute super."hBDD";
+  "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD";
+  "hBDD-CUDD" = dontDistribute super."hBDD-CUDD";
+  "hCsound" = dontDistribute super."hCsound";
+  "hDFA" = dontDistribute super."hDFA";
+  "hF2" = dontDistribute super."hF2";
+  "hGelf" = dontDistribute super."hGelf";
+  "hLLVM" = dontDistribute super."hLLVM";
+  "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4";
+  "hPDB-examples" = dontDistribute super."hPDB-examples";
+  "hPushover" = dontDistribute super."hPushover";
+  "hR" = dontDistribute super."hR";
+  "hRESP" = dontDistribute super."hRESP";
+  "hS3" = dontDistribute super."hS3";
+  "hScraper" = dontDistribute super."hScraper";
+  "hSimpleDB" = dontDistribute super."hSimpleDB";
+  "hTalos" = dontDistribute super."hTalos";
+  "hTensor" = dontDistribute super."hTensor";
+  "hVOIDP" = dontDistribute super."hVOIDP";
+  "hXmixer" = dontDistribute super."hXmixer";
+  "haar" = dontDistribute super."haar";
+  "hablog" = dontDistribute super."hablog";
+  "hacanon-light" = dontDistribute super."hacanon-light";
+  "hack" = dontDistribute super."hack";
+  "hack-contrib" = dontDistribute super."hack-contrib";
+  "hack-contrib-press" = dontDistribute super."hack-contrib-press";
+  "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack";
+  "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi";
+  "hack-handler-cgi" = dontDistribute super."hack-handler-cgi";
+  "hack-handler-epoll" = dontDistribute super."hack-handler-epoll";
+  "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp";
+  "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi";
+  "hack-handler-happstack" = dontDistribute super."hack-handler-happstack";
+  "hack-handler-hyena" = dontDistribute super."hack-handler-hyena";
+  "hack-handler-kibro" = dontDistribute super."hack-handler-kibro";
+  "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver";
+  "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath";
+  "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession";
+  "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip";
+  "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp";
+  "hack2" = dontDistribute super."hack2";
+  "hack2-contrib" = dontDistribute super."hack2-contrib";
+  "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra";
+  "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server";
+  "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http";
+  "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server";
+  "hack2-handler-warp" = dontDistribute super."hack2-handler-warp";
+  "hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
+  "hackage-diff" = dontDistribute super."hackage-diff";
+  "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
+  "hackage-proxy" = dontDistribute super."hackage-proxy";
+  "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
+  "hackage-security" = dontDistribute super."hackage-security";
+  "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
+  "hackage-server" = dontDistribute super."hackage-server";
+  "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackport" = dontDistribute super."hackport";
+  "hactor" = dontDistribute super."hactor";
+  "hactors" = dontDistribute super."hactors";
+  "haddock" = dontDistribute super."haddock";
+  "haddock-api" = doDistribute super."haddock-api_2_16_1";
+  "haddock-leksah" = dontDistribute super."haddock-leksah";
+  "haddock-library" = doDistribute super."haddock-library_1_2_1";
+  "haddock-test" = dontDistribute super."haddock-test";
+  "hadoop-formats" = dontDistribute super."hadoop-formats";
+  "hadoop-rpc" = dontDistribute super."hadoop-rpc";
+  "hadoop-tools" = dontDistribute super."hadoop-tools";
+  "haeredes" = dontDistribute super."haeredes";
+  "haggis" = dontDistribute super."haggis";
+  "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
+  "haiji" = dontDistribute super."haiji";
+  "hailgun" = dontDistribute super."hailgun";
+  "hailgun-send" = dontDistribute super."hailgun-send";
+  "hails" = dontDistribute super."hails";
+  "hails-bin" = dontDistribute super."hails-bin";
+  "hairy" = dontDistribute super."hairy";
+  "hakaru" = dontDistribute super."hakaru";
+  "hake" = dontDistribute super."hake";
+  "hakismet" = dontDistribute super."hakismet";
+  "hako" = dontDistribute super."hako";
+  "hakyll-R" = dontDistribute super."hakyll-R";
+  "hakyll-agda" = dontDistribute super."hakyll-agda";
+  "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
+  "hakyll-contrib" = dontDistribute super."hakyll-contrib";
+  "hakyll-contrib-csv" = dontDistribute super."hakyll-contrib-csv";
+  "hakyll-contrib-elm" = dontDistribute super."hakyll-contrib-elm";
+  "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation";
+  "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links";
+  "hakyll-convert" = dontDistribute super."hakyll-convert";
+  "hakyll-elm" = dontDistribute super."hakyll-elm";
+  "hakyll-filestore" = dontDistribute super."hakyll-filestore";
+  "halberd" = dontDistribute super."halberd";
+  "halfs" = dontDistribute super."halfs";
+  "halipeto" = dontDistribute super."halipeto";
+  "halive" = dontDistribute super."halive";
+  "halma" = dontDistribute super."halma";
+  "haltavista" = dontDistribute super."haltavista";
+  "hamid" = dontDistribute super."hamid";
+  "hampp" = dontDistribute super."hampp";
+  "hamtmap" = dontDistribute super."hamtmap";
+  "hamusic" = dontDistribute super."hamusic";
+  "handa-gdata" = dontDistribute super."handa-gdata";
+  "handa-geodata" = dontDistribute super."handa-geodata";
+  "handa-opengl" = dontDistribute super."handa-opengl";
+  "handle-like" = dontDistribute super."handle-like";
+  "handsy" = dontDistribute super."handsy";
+  "hangman" = dontDistribute super."hangman";
+  "hannahci" = dontDistribute super."hannahci";
+  "hans" = dontDistribute super."hans";
+  "hans-pcap" = dontDistribute super."hans-pcap";
+  "hans-pfq" = dontDistribute super."hans-pfq";
+  "haphviz" = dontDistribute super."haphviz";
+  "happindicator" = dontDistribute super."happindicator";
+  "happindicator3" = dontDistribute super."happindicator3";
+  "happraise" = dontDistribute super."happraise";
+  "happs-hsp" = dontDistribute super."happs-hsp";
+  "happs-hsp-template" = dontDistribute super."happs-hsp-template";
+  "happs-tutorial" = dontDistribute super."happs-tutorial";
+  "happstack" = dontDistribute super."happstack";
+  "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-contrib" = dontDistribute super."happstack-contrib";
+  "happstack-data" = dontDistribute super."happstack-data";
+  "happstack-dlg" = dontDistribute super."happstack-dlg";
+  "happstack-facebook" = dontDistribute super."happstack-facebook";
+  "happstack-fastcgi" = dontDistribute super."happstack-fastcgi";
+  "happstack-fay" = dontDistribute super."happstack-fay";
+  "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax";
+  "happstack-foundation" = dontDistribute super."happstack-foundation";
+  "happstack-hamlet" = dontDistribute super."happstack-hamlet";
+  "happstack-heist" = dontDistribute super."happstack-heist";
+  "happstack-helpers" = dontDistribute super."happstack-helpers";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
+  "happstack-state" = dontDistribute super."happstack-state";
+  "happstack-static-routing" = dontDistribute super."happstack-static-routing";
+  "happstack-util" = dontDistribute super."happstack-util";
+  "happstack-yui" = dontDistribute super."happstack-yui";
+  "happy-meta" = dontDistribute super."happy-meta";
+  "happybara" = dontDistribute super."happybara";
+  "happybara-webkit" = dontDistribute super."happybara-webkit";
+  "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
+  "har" = dontDistribute super."har";
+  "harchive" = dontDistribute super."harchive";
+  "hardware-edsl" = dontDistribute super."hardware-edsl";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harpy" = dontDistribute super."harpy";
+  "harvest-api" = dontDistribute super."harvest-api";
+  "has" = dontDistribute super."has";
+  "has-th" = dontDistribute super."has-th";
+  "hascal" = dontDistribute super."hascal";
+  "hascat" = dontDistribute super."hascat";
+  "hascat-lib" = dontDistribute super."hascat-lib";
+  "hascat-setup" = dontDistribute super."hascat-setup";
+  "hascat-system" = dontDistribute super."hascat-system";
+  "hash" = dontDistribute super."hash";
+  "hashable-generics" = dontDistribute super."hashable-generics";
+  "hashabler" = dontDistribute super."hashabler";
+  "hashed-storage" = dontDistribute super."hashed-storage";
+  "hashids" = dontDistribute super."hashids";
+  "hashing" = dontDistribute super."hashing";
+  "hashmap" = dontDistribute super."hashmap";
+  "hashring" = dontDistribute super."hashring";
+  "hashtables-plus" = dontDistribute super."hashtables-plus";
+  "hasim" = dontDistribute super."hasim";
+  "hask" = dontDistribute super."hask";
+  "hask-home" = dontDistribute super."hask-home";
+  "haskades" = dontDistribute super."haskades";
+  "haskakafka" = dontDistribute super."haskakafka";
+  "haskanoid" = dontDistribute super."haskanoid";
+  "haskarrow" = dontDistribute super."haskarrow";
+  "haskbot-core" = dontDistribute super."haskbot-core";
+  "haskdeep" = dontDistribute super."haskdeep";
+  "haskdogs" = dontDistribute super."haskdogs";
+  "haskeem" = dontDistribute super."haskeem";
+  "haskeline" = doDistribute super."haskeline_0_7_2_3";
+  "haskeline-class" = dontDistribute super."haskeline-class";
+  "haskell-aliyun" = dontDistribute super."haskell-aliyun";
+  "haskell-awk" = dontDistribute super."haskell-awk";
+  "haskell-bcrypt" = dontDistribute super."haskell-bcrypt";
+  "haskell-brainfuck" = dontDistribute super."haskell-brainfuck";
+  "haskell-cnc" = dontDistribute super."haskell-cnc";
+  "haskell-coffee" = dontDistribute super."haskell-coffee";
+  "haskell-compression" = dontDistribute super."haskell-compression";
+  "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
+  "haskell-docs" = dontDistribute super."haskell-docs";
+  "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent";
+  "haskell-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-packages" = dontDistribute super."haskell-packages";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "haskell-player" = dontDistribute super."haskell-player";
+  "haskell-plot" = dontDistribute super."haskell-plot";
+  "haskell-qrencode" = dontDistribute super."haskell-qrencode";
+  "haskell-read-editor" = dontDistribute super."haskell-read-editor";
+  "haskell-reflect" = dontDistribute super."haskell-reflect";
+  "haskell-rules" = dontDistribute super."haskell-rules";
+  "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
+  "haskell-token-utils" = dontDistribute super."haskell-token-utils";
+  "haskell-tor" = dontDistribute super."haskell-tor";
+  "haskell-type-exts" = dontDistribute super."haskell-type-exts";
+  "haskell-typescript" = dontDistribute super."haskell-typescript";
+  "haskell-tyrant" = dontDistribute super."haskell-tyrant";
+  "haskell-updater" = dontDistribute super."haskell-updater";
+  "haskell-xmpp" = dontDistribute super."haskell-xmpp";
+  "haskell2010" = dontDistribute super."haskell2010";
+  "haskell98" = dontDistribute super."haskell98";
+  "haskell98libraries" = dontDistribute super."haskell98libraries";
+  "haskelldb" = dontDistribute super."haskelldb";
+  "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc";
+  "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl";
+  "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf";
+  "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers";
+  "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted";
+  "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic";
+  "haskelldb-flat" = dontDistribute super."haskelldb-flat";
+  "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc";
+  "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql";
+  "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc";
+  "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql";
+  "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3";
+  "haskelldb-hsql" = dontDistribute super."haskelldb-hsql";
+  "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql";
+  "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc";
+  "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle";
+  "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql";
+  "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite";
+  "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3";
+  "haskelldb-th" = dontDistribute super."haskelldb-th";
+  "haskelldb-wx" = dontDistribute super."haskelldb-wx";
+  "haskellscrabble" = dontDistribute super."haskellscrabble";
+  "haskellscript" = dontDistribute super."haskellscript";
+  "haskelm" = dontDistribute super."haskelm";
+  "haskgame" = dontDistribute super."haskgame";
+  "haskheap" = dontDistribute super."haskheap";
+  "haskhol-core" = dontDistribute super."haskhol-core";
+  "haskmon" = dontDistribute super."haskmon";
+  "haskoin" = dontDistribute super."haskoin";
+  "haskoin-core" = dontDistribute super."haskoin-core";
+  "haskoin-crypto" = dontDistribute super."haskoin-crypto";
+  "haskoin-node" = dontDistribute super."haskoin-node";
+  "haskoin-protocol" = dontDistribute super."haskoin-protocol";
+  "haskoin-script" = dontDistribute super."haskoin-script";
+  "haskoin-util" = dontDistribute super."haskoin-util";
+  "haskoin-wallet" = dontDistribute super."haskoin-wallet";
+  "haskoon" = dontDistribute super."haskoon";
+  "haskoon-httpspec" = dontDistribute super."haskoon-httpspec";
+  "haskoon-salvia" = dontDistribute super."haskoon-salvia";
+  "haskore" = dontDistribute super."haskore";
+  "haskore-realtime" = dontDistribute super."haskore-realtime";
+  "haskore-supercollider" = dontDistribute super."haskore-supercollider";
+  "haskore-synthesizer" = dontDistribute super."haskore-synthesizer";
+  "haskore-vintage" = dontDistribute super."haskore-vintage";
+  "hasktags" = dontDistribute super."hasktags";
+  "haslo" = dontDistribute super."haslo";
+  "hasloGUI" = dontDistribute super."hasloGUI";
+  "hasparql-client" = dontDistribute super."hasparql-client";
+  "haspell" = dontDistribute super."haspell";
+  "hasql-backend" = dontDistribute super."hasql-backend";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "hasql-postgres" = dontDistribute super."hasql-postgres";
+  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
+  "hasql-transaction" = dontDistribute super."hasql-transaction";
+  "hastache-aeson" = dontDistribute super."hastache-aeson";
+  "haste" = dontDistribute super."haste";
+  "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
+  "haste-markup" = dontDistribute super."haste-markup";
+  "haste-perch" = dontDistribute super."haste-perch";
+  "hastily" = dontDistribute super."hastily";
+  "hat" = dontDistribute super."hat";
+  "hatex-guide" = dontDistribute super."hatex-guide";
+  "hath" = dontDistribute super."hath";
+  "hatt" = dontDistribute super."hatt";
+  "haverer" = dontDistribute super."haverer";
+  "hawitter" = dontDistribute super."hawitter";
+  "haxl-facebook" = dontDistribute super."haxl-facebook";
+  "haxparse" = dontDistribute super."haxparse";
+  "haxr-th" = dontDistribute super."haxr-th";
+  "haxy" = dontDistribute super."haxy";
+  "hayland" = dontDistribute super."hayland";
+  "hayoo-cli" = dontDistribute super."hayoo-cli";
+  "hback" = dontDistribute super."hback";
+  "hbb" = dontDistribute super."hbb";
+  "hbcd" = dontDistribute super."hbcd";
+  "hbeat" = dontDistribute super."hbeat";
+  "hblas" = dontDistribute super."hblas";
+  "hblock" = dontDistribute super."hblock";
+  "hbro" = dontDistribute super."hbro";
+  "hbro-contrib" = dontDistribute super."hbro-contrib";
+  "hburg" = dontDistribute super."hburg";
+  "hcc" = dontDistribute super."hcc";
+  "hcg-minus" = dontDistribute super."hcg-minus";
+  "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo";
+  "hcheat" = dontDistribute super."hcheat";
+  "hchesslib" = dontDistribute super."hchesslib";
+  "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
+  "hcron" = dontDistribute super."hcron";
+  "hcube" = dontDistribute super."hcube";
+  "hcwiid" = dontDistribute super."hcwiid";
+  "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix";
+  "hdbc-aeson" = dontDistribute super."hdbc-aeson";
+  "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore";
+  "hdbc-tuple" = dontDistribute super."hdbc-tuple";
+  "hdbi" = dontDistribute super."hdbi";
+  "hdbi-conduit" = dontDistribute super."hdbi-conduit";
+  "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
+  "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
+  "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdo" = dontDistribute super."hdo";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_10";
+  "hedis-config" = dontDistribute super."hedis-config";
+  "hedis-monadic" = dontDistribute super."hedis-monadic";
+  "hedis-pile" = dontDistribute super."hedis-pile";
+  "hedis-simple" = dontDistribute super."hedis-simple";
+  "hedis-tags" = dontDistribute super."hedis-tags";
+  "hedn" = dontDistribute super."hedn";
+  "hein" = dontDistribute super."hein";
+  "heist-aeson" = dontDistribute super."heist-aeson";
+  "heist-async" = dontDistribute super."heist-async";
+  "helics" = dontDistribute super."helics";
+  "helics-wai" = dontDistribute super."helics-wai";
+  "helisp" = dontDistribute super."helisp";
+  "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
+  "hell" = dontDistribute super."hell";
+  "hellage" = dontDistribute super."hellage";
+  "hellnet" = dontDistribute super."hellnet";
+  "hello" = dontDistribute super."hello";
+  "helm" = dontDistribute super."helm";
+  "help-esb" = dontDistribute super."help-esb";
+  "hemkay" = dontDistribute super."hemkay";
+  "hemkay-core" = dontDistribute super."hemkay-core";
+  "hemokit" = dontDistribute super."hemokit";
+  "hen" = dontDistribute super."hen";
+  "henet" = dontDistribute super."henet";
+  "hepevt" = dontDistribute super."hepevt";
+  "her-lexer" = dontDistribute super."her-lexer";
+  "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
+  "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
+  "herf-time" = dontDistribute super."herf-time";
+  "hermit" = dontDistribute super."hermit";
+  "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
+  "heroku" = dontDistribute super."heroku";
+  "heroku-persistent" = dontDistribute super."heroku-persistent";
+  "herringbone" = dontDistribute super."herringbone";
+  "herringbone-embed" = dontDistribute super."herringbone-embed";
+  "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
+  "hesql" = dontDistribute super."hesql";
+  "hetero-dict" = dontDistribute super."hetero-dict";
+  "hetero-map" = dontDistribute super."hetero-map";
+  "hetris" = dontDistribute super."hetris";
+  "heukarya" = dontDistribute super."heukarya";
+  "hevolisa" = dontDistribute super."hevolisa";
+  "hevolisa-dph" = dontDistribute super."hevolisa-dph";
+  "hexdump" = dontDistribute super."hexdump";
+  "hexif" = dontDistribute super."hexif";
+  "hexpat-iteratee" = dontDistribute super."hexpat-iteratee";
+  "hexpat-lens" = dontDistribute super."hexpat-lens";
+  "hexpat-pickle" = dontDistribute super."hexpat-pickle";
+  "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic";
+  "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup";
+  "hexpr" = dontDistribute super."hexpr";
+  "hexquote" = dontDistribute super."hexquote";
+  "heyefi" = dontDistribute super."heyefi";
+  "hfann" = dontDistribute super."hfann";
+  "hfd" = dontDistribute super."hfd";
+  "hfiar" = dontDistribute super."hfiar";
+  "hfmt" = dontDistribute super."hfmt";
+  "hfoil" = dontDistribute super."hfoil";
+  "hfov" = dontDistribute super."hfov";
+  "hfractal" = dontDistribute super."hfractal";
+  "hfusion" = dontDistribute super."hfusion";
+  "hg-buildpackage" = dontDistribute super."hg-buildpackage";
+  "hgal" = dontDistribute super."hgal";
+  "hgalib" = dontDistribute super."hgalib";
+  "hgdbmi" = dontDistribute super."hgdbmi";
+  "hgearman" = dontDistribute super."hgearman";
+  "hgen" = dontDistribute super."hgen";
+  "hgeometric" = dontDistribute super."hgeometric";
+  "hgeometry" = dontDistribute super."hgeometry";
+  "hgithub" = dontDistribute super."hgithub";
+  "hgl-example" = dontDistribute super."hgl-example";
+  "hgom" = dontDistribute super."hgom";
+  "hgopher" = dontDistribute super."hgopher";
+  "hgrev" = dontDistribute super."hgrev";
+  "hgrib" = dontDistribute super."hgrib";
+  "hharp" = dontDistribute super."hharp";
+  "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams";
+  "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions";
+  "hierarchy" = dontDistribute super."hierarchy";
+  "hiernotify" = dontDistribute super."hiernotify";
+  "highWaterMark" = dontDistribute super."highWaterMark";
+  "higher-leveldb" = dontDistribute super."higher-leveldb";
+  "higherorder" = dontDistribute super."higherorder";
+  "highlight-versions" = dontDistribute super."highlight-versions";
+  "highlighter" = dontDistribute super."highlighter";
+  "highlighter2" = dontDistribute super."highlighter2";
+  "hills" = dontDistribute super."hills";
+  "himerge" = dontDistribute super."himerge";
+  "himg" = dontDistribute super."himg";
+  "himpy" = dontDistribute super."himpy";
+  "hindley-milner" = dontDistribute super."hindley-milner";
+  "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
+  "hinduce-classifier" = dontDistribute super."hinduce-classifier";
+  "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
+  "hinduce-examples" = dontDistribute super."hinduce-examples";
+  "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint" = doDistribute super."hint_0_5_2";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
+  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
+  "hipe" = dontDistribute super."hipe";
+  "hips" = dontDistribute super."hips";
+  "hircules" = dontDistribute super."hircules";
+  "hirt" = dontDistribute super."hirt";
+  "hissmetrics" = dontDistribute super."hissmetrics";
+  "hist-pl" = dontDistribute super."hist-pl";
+  "hist-pl-dawg" = dontDistribute super."hist-pl-dawg";
+  "hist-pl-fusion" = dontDistribute super."hist-pl-fusion";
+  "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon";
+  "hist-pl-lmf" = dontDistribute super."hist-pl-lmf";
+  "hist-pl-transliter" = dontDistribute super."hist-pl-transliter";
+  "hist-pl-types" = dontDistribute super."hist-pl-types";
+  "histogram-fill-binary" = dontDistribute super."histogram-fill-binary";
+  "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal";
+  "historian" = dontDistribute super."historian";
+  "hit-graph" = dontDistribute super."hit-graph";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjs" = dontDistribute super."hjs";
+  "hjson-query" = dontDistribute super."hjson-query";
+  "hjsonpointer" = dontDistribute super."hjsonpointer";
+  "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
+  "hledger" = doDistribute super."hledger_0_27";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_27";
+  "hledger-ui" = doDistribute super."hledger-ui_0_27_4";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlogger" = dontDistribute super."hlogger";
+  "hlongurl" = dontDistribute super."hlongurl";
+  "hls" = dontDistribute super."hls";
+  "hlwm" = dontDistribute super."hlwm";
+  "hly" = dontDistribute super."hly";
+  "hmark" = dontDistribute super."hmark";
+  "hmarkup" = dontDistribute super."hmarkup";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "hmatrix-repa" = dontDistribute super."hmatrix-repa";
+  "hmatrix-special" = dontDistribute super."hmatrix-special";
+  "hmatrix-static" = dontDistribute super."hmatrix-static";
+  "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc";
+  "hmatrix-syntax" = dontDistribute super."hmatrix-syntax";
+  "hmatrix-tests" = dontDistribute super."hmatrix-tests";
+  "hmeap" = dontDistribute super."hmeap";
+  "hmeap-utils" = dontDistribute super."hmeap-utils";
+  "hmemdb" = dontDistribute super."hmemdb";
+  "hmenu" = dontDistribute super."hmenu";
+  "hmidi" = dontDistribute super."hmidi";
+  "hmk" = dontDistribute super."hmk";
+  "hmm" = dontDistribute super."hmm";
+  "hmm-hmatrix" = dontDistribute super."hmm-hmatrix";
+  "hmp3" = dontDistribute super."hmp3";
+  "hmpfr" = dontDistribute super."hmpfr";
+  "hmt-diagrams" = dontDistribute super."hmt-diagrams";
+  "hmumps" = dontDistribute super."hmumps";
+  "hnetcdf" = dontDistribute super."hnetcdf";
+  "hnix" = dontDistribute super."hnix";
+  "hnn" = dontDistribute super."hnn";
+  "hnop" = dontDistribute super."hnop";
+  "ho-rewriting" = dontDistribute super."ho-rewriting";
+  "hoauth" = dontDistribute super."hoauth";
+  "hob" = dontDistribute super."hob";
+  "hobbes" = dontDistribute super."hobbes";
+  "hobbits" = dontDistribute super."hobbits";
+  "hoe" = dontDistribute super."hoe";
+  "hofix-mtl" = dontDistribute super."hofix-mtl";
+  "hog" = dontDistribute super."hog";
+  "hogg" = dontDistribute super."hogg";
+  "hogre" = dontDistribute super."hogre";
+  "hogre-examples" = dontDistribute super."hogre-examples";
+  "hois" = dontDistribute super."hois";
+  "hoist-error" = dontDistribute super."hoist-error";
+  "hold-em" = dontDistribute super."hold-em";
+  "hole" = dontDistribute super."hole";
+  "holey-format" = dontDistribute super."holey-format";
+  "homeomorphic" = dontDistribute super."homeomorphic";
+  "hommage" = dontDistribute super."hommage";
+  "hommage-ds" = dontDistribute super."hommage-ds";
+  "homplexity" = dontDistribute super."homplexity";
+  "honi" = dontDistribute super."honi";
+  "honk" = dontDistribute super."honk";
+  "hoobuddy" = dontDistribute super."hoobuddy";
+  "hood" = dontDistribute super."hood";
+  "hood-off" = dontDistribute super."hood-off";
+  "hood2" = dontDistribute super."hood2";
+  "hoodie" = dontDistribute super."hoodie";
+  "hoodle" = dontDistribute super."hoodle";
+  "hoodle-builder" = dontDistribute super."hoodle-builder";
+  "hoodle-core" = dontDistribute super."hoodle-core";
+  "hoodle-extra" = dontDistribute super."hoodle-extra";
+  "hoodle-parser" = dontDistribute super."hoodle-parser";
+  "hoodle-publish" = dontDistribute super."hoodle-publish";
+  "hoodle-render" = dontDistribute super."hoodle-render";
+  "hoodle-types" = dontDistribute super."hoodle-types";
+  "hoogle-index" = dontDistribute super."hoogle-index";
+  "hooks-dir" = dontDistribute super."hooks-dir";
+  "hoovie" = dontDistribute super."hoovie";
+  "hopencc" = dontDistribute super."hopencc";
+  "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_18";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hoppy-generator" = dontDistribute super."hoppy-generator";
+  "hoppy-runtime" = dontDistribute super."hoppy-runtime";
+  "hoppy-std" = dontDistribute super."hoppy-std";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc-json" = dontDistribute super."hosc-json";
+  "hosc-utils" = dontDistribute super."hosc-utils";
+  "hosts-server" = dontDistribute super."hosts-server";
+  "hothasktags" = dontDistribute super."hothasktags";
+  "hotswap" = dontDistribute super."hotswap";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "houseman" = dontDistribute super."houseman";
+  "hp2any-core" = dontDistribute super."hp2any-core";
+  "hp2any-graph" = dontDistribute super."hp2any-graph";
+  "hp2any-manager" = dontDistribute super."hp2any-manager";
+  "hp2html" = dontDistribute super."hp2html";
+  "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpaco" = dontDistribute super."hpaco";
+  "hpaco-lib" = dontDistribute super."hpaco-lib";
+  "hpage" = dontDistribute super."hpage";
+  "hpapi" = dontDistribute super."hpapi";
+  "hpaste" = dontDistribute super."hpaste";
+  "hpasteit" = dontDistribute super."hpasteit";
+  "hpath" = dontDistribute super."hpath";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
+  "hpio" = dontDistribute super."hpio";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "hprotoc" = doDistribute super."hprotoc_2_2_0";
+  "hprotoc-fork" = dontDistribute super."hprotoc-fork";
+  "hps" = dontDistribute super."hps";
+  "hps-cairo" = dontDistribute super."hps-cairo";
+  "hps-kmeans" = dontDistribute super."hps-kmeans";
+  "hpuz" = dontDistribute super."hpuz";
+  "hpygments" = dontDistribute super."hpygments";
+  "hpylos" = dontDistribute super."hpylos";
+  "hpyrg" = dontDistribute super."hpyrg";
+  "hquantlib" = dontDistribute super."hquantlib";
+  "hquery" = dontDistribute super."hquery";
+  "hranker" = dontDistribute super."hranker";
+  "hreader" = dontDistribute super."hreader";
+  "hricket" = dontDistribute super."hricket";
+  "hruby" = dontDistribute super."hruby";
+  "hs-blake2" = dontDistribute super."hs-blake2";
+  "hs-captcha" = dontDistribute super."hs-captcha";
+  "hs-carbon" = dontDistribute super."hs-carbon";
+  "hs-carbon-examples" = dontDistribute super."hs-carbon-examples";
+  "hs-cdb" = dontDistribute super."hs-cdb";
+  "hs-dotnet" = dontDistribute super."hs-dotnet";
+  "hs-duktape" = dontDistribute super."hs-duktape";
+  "hs-excelx" = dontDistribute super."hs-excelx";
+  "hs-ffmpeg" = dontDistribute super."hs-ffmpeg";
+  "hs-fltk" = dontDistribute super."hs-fltk";
+  "hs-gchart" = dontDistribute super."hs-gchart";
+  "hs-gen-iface" = dontDistribute super."hs-gen-iface";
+  "hs-gizapp" = dontDistribute super."hs-gizapp";
+  "hs-inspector" = dontDistribute super."hs-inspector";
+  "hs-java" = dontDistribute super."hs-java";
+  "hs-json-rpc" = dontDistribute super."hs-json-rpc";
+  "hs-logo" = dontDistribute super."hs-logo";
+  "hs-mesos" = dontDistribute super."hs-mesos";
+  "hs-nombre-generator" = dontDistribute super."hs-nombre-generator";
+  "hs-pgms" = dontDistribute super."hs-pgms";
+  "hs-php-session" = dontDistribute super."hs-php-session";
+  "hs-pkg-config" = dontDistribute super."hs-pkg-config";
+  "hs-pkpass" = dontDistribute super."hs-pkpass";
+  "hs-re" = dontDistribute super."hs-re";
+  "hs-scrape" = dontDistribute super."hs-scrape";
+  "hs-twitter" = dontDistribute super."hs-twitter";
+  "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver";
+  "hs-vcard" = dontDistribute super."hs-vcard";
+  "hs2048" = dontDistribute super."hs2048";
+  "hs2bf" = dontDistribute super."hs2bf";
+  "hs2dot" = dontDistribute super."hs2dot";
+  "hsConfigure" = dontDistribute super."hsConfigure";
+  "hsSqlite3" = dontDistribute super."hsSqlite3";
+  "hsXenCtrl" = dontDistribute super."hsXenCtrl";
+  "hsay" = dontDistribute super."hsay";
+  "hsbackup" = dontDistribute super."hsbackup";
+  "hsbencher" = dontDistribute super."hsbencher";
+  "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed";
+  "hsbencher-fusion" = dontDistribute super."hsbencher-fusion";
+  "hsc2hs" = dontDistribute super."hsc2hs";
+  "hsc3" = dontDistribute super."hsc3";
+  "hsc3-auditor" = dontDistribute super."hsc3-auditor";
+  "hsc3-cairo" = dontDistribute super."hsc3-cairo";
+  "hsc3-data" = dontDistribute super."hsc3-data";
+  "hsc3-db" = dontDistribute super."hsc3-db";
+  "hsc3-dot" = dontDistribute super."hsc3-dot";
+  "hsc3-forth" = dontDistribute super."hsc3-forth";
+  "hsc3-graphs" = dontDistribute super."hsc3-graphs";
+  "hsc3-lang" = dontDistribute super."hsc3-lang";
+  "hsc3-lisp" = dontDistribute super."hsc3-lisp";
+  "hsc3-plot" = dontDistribute super."hsc3-plot";
+  "hsc3-process" = dontDistribute super."hsc3-process";
+  "hsc3-rec" = dontDistribute super."hsc3-rec";
+  "hsc3-rw" = dontDistribute super."hsc3-rw";
+  "hsc3-server" = dontDistribute super."hsc3-server";
+  "hsc3-sf" = dontDistribute super."hsc3-sf";
+  "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
+  "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
+  "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscamwire" = dontDistribute super."hscamwire";
+  "hscassandra" = dontDistribute super."hscassandra";
+  "hscd" = dontDistribute super."hscd";
+  "hsclock" = dontDistribute super."hsclock";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdif" = dontDistribute super."hsdif";
+  "hsdip" = dontDistribute super."hsdip";
+  "hsdns" = dontDistribute super."hsdns";
+  "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsemail-ns" = dontDistribute super."hsemail-ns";
+  "hsenv" = dontDistribute super."hsenv";
+  "hserv" = dontDistribute super."hserv";
+  "hset" = dontDistribute super."hset";
+  "hsfacter" = dontDistribute super."hsfacter";
+  "hsfcsh" = dontDistribute super."hsfcsh";
+  "hsfilt" = dontDistribute super."hsfilt";
+  "hsgnutls" = dontDistribute super."hsgnutls";
+  "hsgnutls-yj" = dontDistribute super."hsgnutls-yj";
+  "hsgsom" = dontDistribute super."hsgsom";
+  "hsgtd" = dontDistribute super."hsgtd";
+  "hsharc" = dontDistribute super."hsharc";
+  "hsilop" = dontDistribute super."hsilop";
+  "hsimport" = dontDistribute super."hsimport";
+  "hsini" = dontDistribute super."hsini";
+  "hskeleton" = dontDistribute super."hskeleton";
+  "hslackbuilder" = dontDistribute super."hslackbuilder";
+  "hslibsvm" = dontDistribute super."hslibsvm";
+  "hslinks" = dontDistribute super."hslinks";
+  "hslogger-reader" = dontDistribute super."hslogger-reader";
+  "hslogger-template" = dontDistribute super."hslogger-template";
+  "hslogger4j" = dontDistribute super."hslogger4j";
+  "hslogstash" = dontDistribute super."hslogstash";
+  "hsmagick" = dontDistribute super."hsmagick";
+  "hsmisc" = dontDistribute super."hsmisc";
+  "hsmtpclient" = dontDistribute super."hsmtpclient";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsnock" = dontDistribute super."hsnock";
+  "hsnoise" = dontDistribute super."hsnoise";
+  "hsns" = dontDistribute super."hsns";
+  "hsnsq" = dontDistribute super."hsnsq";
+  "hsntp" = dontDistribute super."hsntp";
+  "hsoptions" = dontDistribute super."hsoptions";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
+  "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
+  "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
+  "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
+  "hspec-test-framework" = dontDistribute super."hspec-test-framework";
+  "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
+  "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec2" = dontDistribute super."hspec2";
+  "hspr-sh" = dontDistribute super."hspr-sh";
+  "hspread" = dontDistribute super."hspread";
+  "hspresent" = dontDistribute super."hspresent";
+  "hsprocess" = dontDistribute super."hsprocess";
+  "hsql" = dontDistribute super."hsql";
+  "hsql-mysql" = dontDistribute super."hsql-mysql";
+  "hsql-odbc" = dontDistribute super."hsql-odbc";
+  "hsql-postgresql" = dontDistribute super."hsql-postgresql";
+  "hsql-sqlite3" = dontDistribute super."hsql-sqlite3";
+  "hsqml" = dontDistribute super."hsqml";
+  "hsqml-datamodel" = dontDistribute super."hsqml-datamodel";
+  "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl";
+  "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris";
+  "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes";
+  "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples";
+  "hsqml-morris" = dontDistribute super."hsqml-morris";
+  "hsreadability" = dontDistribute super."hsreadability";
+  "hsseccomp" = dontDistribute super."hsseccomp";
+  "hsshellscript" = dontDistribute super."hsshellscript";
+  "hssourceinfo" = dontDistribute super."hssourceinfo";
+  "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
+  "hstats" = dontDistribute super."hstats";
+  "hstest" = dontDistribute super."hstest";
+  "hstidy" = dontDistribute super."hstidy";
+  "hstorchat" = dontDistribute super."hstorchat";
+  "hstradeking" = dontDistribute super."hstradeking";
+  "hstyle" = dontDistribute super."hstyle";
+  "hstzaar" = dontDistribute super."hstzaar";
+  "hsubconvert" = dontDistribute super."hsubconvert";
+  "hsverilog" = dontDistribute super."hsverilog";
+  "hswip" = dontDistribute super."hswip";
+  "hsx" = dontDistribute super."hsx";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htags" = dontDistribute super."htags";
+  "htar" = dontDistribute super."htar";
+  "htiled" = dontDistribute super."htiled";
+  "htime" = dontDistribute super."htime";
+  "html-email-validate" = dontDistribute super."html-email-validate";
+  "html-entities" = dontDistribute super."html-entities";
+  "html-kure" = dontDistribute super."html-kure";
+  "html-minimalist" = dontDistribute super."html-minimalist";
+  "html-parse" = dontDistribute super."html-parse";
+  "html-rules" = dontDistribute super."html-rules";
+  "html-tokenizer" = dontDistribute super."html-tokenizer";
+  "html-truncate" = dontDistribute super."html-truncate";
+  "html2hamlet" = dontDistribute super."html2hamlet";
+  "html5-entity" = dontDistribute super."html5-entity";
+  "htodo" = dontDistribute super."htodo";
+  "htrace" = dontDistribute super."htrace";
+  "hts" = dontDistribute super."hts";
+  "htsn" = dontDistribute super."htsn";
+  "htsn-common" = dontDistribute super."htsn-common";
+  "htsn-import" = dontDistribute super."htsn-import";
+  "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client-auth" = dontDistribute super."http-client-auth";
+  "http-client-conduit" = dontDistribute super."http-client-conduit";
+  "http-client-lens" = dontDistribute super."http-client-lens";
+  "http-client-multipart" = dontDistribute super."http-client-multipart";
+  "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers";
+  "http-client-session" = dontDistribute super."http-client-session";
+  "http-client-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
+  "http-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
+  "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
+  "httpspec" = dontDistribute super."httpspec";
+  "htune" = dontDistribute super."htune";
+  "htzaar" = dontDistribute super."htzaar";
+  "hub" = dontDistribute super."hub";
+  "hubigraph" = dontDistribute super."hubigraph";
+  "hubris" = dontDistribute super."hubris";
+  "huckleberry" = dontDistribute super."huckleberry";
+  "huffman" = dontDistribute super."huffman";
+  "hugs2yc" = dontDistribute super."hugs2yc";
+  "hulk" = dontDistribute super."hulk";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-gui" = dontDistribute super."hunit-gui";
+  "hunit-parsec" = dontDistribute super."hunit-parsec";
+  "hunit-rematch" = dontDistribute super."hunit-rematch";
+  "hunp" = dontDistribute super."hunp";
+  "hunt-searchengine" = dontDistribute super."hunt-searchengine";
+  "hunt-server" = dontDistribute super."hunt-server";
+  "hunt-server-cli" = dontDistribute super."hunt-server-cli";
+  "hurdle" = dontDistribute super."hurdle";
+  "husk-scheme" = dontDistribute super."husk-scheme";
+  "husk-scheme-libs" = dontDistribute super."husk-scheme-libs";
+  "husky" = dontDistribute super."husky";
+  "hutton" = dontDistribute super."hutton";
+  "huttons-razor" = dontDistribute super."huttons-razor";
+  "huzzy" = dontDistribute super."huzzy";
+  "hw-json" = doDistribute super."hw-json_0_0_0_2";
+  "hw-prim" = doDistribute super."hw-prim_0_0_0_10";
+  "hw-rankselect" = doDistribute super."hw-rankselect_0_0_0_2";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hws" = dontDistribute super."hws";
+  "hwsl2" = dontDistribute super."hwsl2";
+  "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector";
+  "hwsl2-reducers" = dontDistribute super."hwsl2-reducers";
+  "hx" = dontDistribute super."hx";
+  "hxmppc" = dontDistribute super."hxmppc";
+  "hxournal" = dontDistribute super."hxournal";
+  "hxt-binary" = dontDistribute super."hxt-binary";
+  "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-extras" = dontDistribute super."hxt-extras";
+  "hxt-filter" = dontDistribute super."hxt-filter";
+  "hxt-xpath" = dontDistribute super."hxt-xpath";
+  "hxt-xslt" = dontDistribute super."hxt-xslt";
+  "hxthelper" = dontDistribute super."hxthelper";
+  "hxweb" = dontDistribute super."hxweb";
+  "hyahtzee" = dontDistribute super."hyahtzee";
+  "hyakko" = dontDistribute super."hyakko";
+  "hybrid" = dontDistribute super."hybrid";
+  "hydra-hs" = dontDistribute super."hydra-hs";
+  "hydra-print" = dontDistribute super."hydra-print";
+  "hydrogen" = dontDistribute super."hydrogen";
+  "hydrogen-cli" = dontDistribute super."hydrogen-cli";
+  "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args";
+  "hydrogen-data" = dontDistribute super."hydrogen-data";
+  "hydrogen-multimap" = dontDistribute super."hydrogen-multimap";
+  "hydrogen-parsing" = dontDistribute super."hydrogen-parsing";
+  "hydrogen-prelude" = dontDistribute super."hydrogen-prelude";
+  "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec";
+  "hydrogen-syntax" = dontDistribute super."hydrogen-syntax";
+  "hydrogen-util" = dontDistribute super."hydrogen-util";
+  "hydrogen-version" = dontDistribute super."hydrogen-version";
+  "hyena" = dontDistribute super."hyena";
+  "hylide" = dontDistribute super."hylide";
+  "hylogen" = dontDistribute super."hylogen";
+  "hylolib" = dontDistribute super."hylolib";
+  "hylotab" = dontDistribute super."hylotab";
+  "hyloutils" = dontDistribute super."hyloutils";
+  "hyperdrive" = dontDistribute super."hyperdrive";
+  "hyperfunctions" = dontDistribute super."hyperfunctions";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
+  "hzk" = dontDistribute super."hzk";
+  "i18n" = dontDistribute super."i18n";
+  "iCalendar" = dontDistribute super."iCalendar";
+  "iException" = dontDistribute super."iException";
+  "iap-verifier" = dontDistribute super."iap-verifier";
+  "ib-api" = dontDistribute super."ib-api";
+  "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
+  "ideas" = dontDistribute super."ideas";
+  "ideas-math" = dontDistribute super."ideas-math";
+  "idempotent" = dontDistribute super."idempotent";
+  "identicon" = dontDistribute super."identicon";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "ieee" = dontDistribute super."ieee";
+  "ieee-utils" = dontDistribute super."ieee-utils";
+  "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754-parser" = dontDistribute super."ieee754-parser";
+  "ifcxt" = dontDistribute super."ifcxt";
+  "iff" = dontDistribute super."iff";
+  "ifscs" = dontDistribute super."ifscs";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell-display" = dontDistribute super."ihaskell-display";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "ilist" = dontDistribute super."ilist";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "imap" = dontDistribute super."imap";
+  "imapget" = dontDistribute super."imapget";
+  "imbib" = dontDistribute super."imbib";
+  "imgurder" = dontDistribute super."imgurder";
+  "imm" = dontDistribute super."imm";
+  "imparse" = dontDistribute super."imparse";
+  "imperative-edsl" = dontDistribute super."imperative-edsl";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
+  "implicit" = dontDistribute super."implicit";
+  "implicit-logging" = dontDistribute super."implicit-logging";
+  "implicit-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-maps" = dontDistribute super."incremental-maps";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "indentation-core" = dontDistribute super."indentation-core";
+  "indentation-parsec" = dontDistribute super."indentation-parsec";
+  "indentation-trifecta" = dontDistribute super."indentation-trifecta";
+  "indentparser" = dontDistribute super."indentparser";
+  "index-core" = dontDistribute super."index-core";
+  "indexed" = dontDistribute super."indexed";
+  "indexed-do-notation" = dontDistribute super."indexed-do-notation";
+  "indexed-extras" = dontDistribute super."indexed-extras";
+  "indexed-free" = dontDistribute super."indexed-free";
+  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
+  "indices" = dontDistribute super."indices";
+  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
+  "infer-upstream" = dontDistribute super."infer-upstream";
+  "infernu" = dontDistribute super."infernu";
+  "infinite-search" = dontDistribute super."infinite-search";
+  "infinity" = dontDistribute super."infinity";
+  "infix" = dontDistribute super."infix";
+  "inflist" = dontDistribute super."inflist";
+  "influxdb" = dontDistribute super."influxdb";
+  "informative" = dontDistribute super."informative";
+  "inilist" = dontDistribute super."inilist";
+  "inject" = dontDistribute super."inject";
+  "inject-function" = dontDistribute super."inject-function";
+  "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "instance-control" = dontDistribute super."instance-control";
+  "instant-aeson" = dontDistribute super."instant-aeson";
+  "instant-bytes" = dontDistribute super."instant-bytes";
+  "instant-deepseq" = dontDistribute super."instant-deepseq";
+  "instant-generics" = dontDistribute super."instant-generics";
+  "instant-hashable" = dontDistribute super."instant-hashable";
+  "instant-zipper" = dontDistribute super."instant-zipper";
+  "instinct" = dontDistribute super."instinct";
+  "instrument-chord" = dontDistribute super."instrument-chord";
+  "int-cast" = dontDistribute super."int-cast";
+  "integer-pure" = dontDistribute super."integer-pure";
+  "integer-simple" = dontDistribute super."integer-simple";
+  "intel-aes" = dontDistribute super."intel-aes";
+  "interchangeable" = dontDistribute super."interchangeable";
+  "interleavableGen" = dontDistribute super."interleavableGen";
+  "interleavableIO" = dontDistribute super."interleavableIO";
+  "interleave" = dontDistribute super."interleave";
+  "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "intero" = dontDistribute super."intero";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-streams-http" = dontDistribute super."io-streams-http";
+  "io-throttle" = dontDistribute super."io-throttle";
+  "ioctl" = dontDistribute super."ioctl";
+  "ioref-stable" = dontDistribute super."ioref-stable";
+  "iothread" = dontDistribute super."iothread";
+  "iotransaction" = dontDistribute super."iotransaction";
+  "ip" = dontDistribute super."ip";
+  "ip-quoter" = dontDistribute super."ip-quoter";
+  "ipatch" = dontDistribute super."ipatch";
+  "ipc" = dontDistribute super."ipc";
+  "ipcvar" = dontDistribute super."ipcvar";
+  "ipopt-hs" = dontDistribute super."ipopt-hs";
+  "ipprint" = dontDistribute super."ipprint";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-client" = doDistribute super."irc-client_0_3_0_0";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-fun-bot" = dontDistribute super."irc-fun-bot";
+  "irc-fun-client" = dontDistribute super."irc-fun-client";
+  "irc-fun-color" = dontDistribute super."irc-fun-color";
+  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "iridium" = dontDistribute super."iridium";
+  "iron-mq" = dontDistribute super."iron-mq";
+  "ironforge" = dontDistribute super."ironforge";
+  "is" = dontDistribute super."is";
+  "isdicom" = dontDistribute super."isdicom";
+  "isevaluated" = dontDistribute super."isevaluated";
+  "isiz" = dontDistribute super."isiz";
+  "ismtp" = dontDistribute super."ismtp";
+  "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
+  "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
+  "itanium-abi" = dontDistribute super."itanium-abi";
+  "iter-stats" = dontDistribute super."iter-stats";
+  "iterIO" = dontDistribute super."iterIO";
+  "iteratee" = dontDistribute super."iteratee";
+  "iteratee-compress" = dontDistribute super."iteratee-compress";
+  "iteratee-mtl" = dontDistribute super."iteratee-mtl";
+  "iteratee-parsec" = dontDistribute super."iteratee-parsec";
+  "iteratee-stm" = dontDistribute super."iteratee-stm";
+  "iterio-server" = dontDistribute super."iterio-server";
+  "ivar-simple" = dontDistribute super."ivar-simple";
+  "ivor" = dontDistribute super."ivor";
+  "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
+  "ivory-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
+  "ivory-examples" = dontDistribute super."ivory-examples";
+  "ivory-hw" = dontDistribute super."ivory-hw";
+  "ivory-opts" = dontDistribute super."ivory-opts";
+  "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
+  "ivory-stdlib" = dontDistribute super."ivory-stdlib";
+  "ivy-web" = dontDistribute super."ivy-web";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "iyql" = dontDistribute super."iyql";
+  "j2hs" = dontDistribute super."j2hs";
+  "ja-base-extra" = dontDistribute super."ja-base-extra";
+  "jack" = dontDistribute super."jack";
+  "jack-bindings" = dontDistribute super."jack-bindings";
+  "jackminimix" = dontDistribute super."jackminimix";
+  "jacobi-roots" = dontDistribute super."jacobi-roots";
+  "jail" = dontDistribute super."jail";
+  "jailbreak-cabal" = dontDistribute super."jailbreak-cabal";
+  "jalaali" = dontDistribute super."jalaali";
+  "jalla" = dontDistribute super."jalla";
+  "jammittools" = dontDistribute super."jammittools";
+  "jarfind" = dontDistribute super."jarfind";
+  "java-bridge" = dontDistribute super."java-bridge";
+  "java-bridge-extras" = dontDistribute super."java-bridge-extras";
+  "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
+  "java-reflect" = dontDistribute super."java-reflect";
+  "javaclass" = dontDistribute super."javaclass";
+  "javasf" = dontDistribute super."javasf";
+  "javav" = dontDistribute super."javav";
+  "jcdecaux-vls" = dontDistribute super."jcdecaux-vls";
+  "jdi" = dontDistribute super."jdi";
+  "jespresso" = dontDistribute super."jespresso";
+  "jobqueue" = dontDistribute super."jobqueue";
+  "join" = dontDistribute super."join";
+  "joinlist" = dontDistribute super."joinlist";
+  "jonathanscard" = dontDistribute super."jonathanscard";
+  "jort" = dontDistribute super."jort";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_4";
+  "jsaddle" = doDistribute super."jsaddle_0_3_0_3";
+  "jsaddle-dom" = dontDistribute super."jsaddle-dom";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-b" = dontDistribute super."json-b";
+  "json-encoder" = dontDistribute super."json-encoder";
+  "json-enumerator" = dontDistribute super."json-enumerator";
+  "json-extra" = dontDistribute super."json-extra";
+  "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
+  "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-aeson" = dontDistribute super."json-pointer-aeson";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
+  "json-python" = dontDistribute super."json-python";
+  "json-qq" = dontDistribute super."json-qq";
+  "json-rpc" = dontDistribute super."json-rpc";
+  "json-rpc-client" = dontDistribute super."json-rpc-client";
+  "json-rpc-server" = dontDistribute super."json-rpc-server";
+  "json-sop" = dontDistribute super."json-sop";
+  "json-state" = dontDistribute super."json-state";
+  "json-stream" = dontDistribute super."json-stream";
+  "json-togo" = dontDistribute super."json-togo";
+  "json-tools" = dontDistribute super."json-tools";
+  "json-types" = dontDistribute super."json-types";
+  "json2" = dontDistribute super."json2";
+  "json2-hdbc" = dontDistribute super."json2-hdbc";
+  "json2-types" = dontDistribute super."json2-types";
+  "json2yaml" = dontDistribute super."json2yaml";
+  "jsonresume" = dontDistribute super."jsonresume";
+  "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit";
+  "jsonschema-gen" = dontDistribute super."jsonschema-gen";
+  "jsonsql" = dontDistribute super."jsonsql";
+  "jsontsv" = dontDistribute super."jsontsv";
+  "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jump" = dontDistribute super."jump";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kan-extensions" = doDistribute super."kan-extensions_4_2_3";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-lava" = dontDistribute super."kansas-lava";
+  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
+  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
+  "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
+  "karakuri" = dontDistribute super."karakuri";
+  "karver" = dontDistribute super."karver";
+  "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
+  "kbq-gu" = dontDistribute super."kbq-gu";
+  "kd-tree" = dontDistribute super."kd-tree";
+  "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
+  "keera-callbacks" = dontDistribute super."keera-callbacks";
+  "keera-hails-i18n" = dontDistribute super."keera-hails-i18n";
+  "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller";
+  "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk";
+  "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel";
+  "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel";
+  "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config";
+  "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk";
+  "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view";
+  "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk";
+  "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs";
+  "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk";
+  "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network";
+  "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling";
+  "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx";
+  "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa";
+  "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses";
+  "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues";
+  "keera-posture" = dontDistribute super."keera-posture";
+  "keiretsu" = dontDistribute super."keiretsu";
+  "kevin" = dontDistribute super."kevin";
+  "keyed" = dontDistribute super."keyed";
+  "keyring" = dontDistribute super."keyring";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "khph" = dontDistribute super."khph";
+  "kibro" = dontDistribute super."kibro";
+  "kicad-data" = dontDistribute super."kicad-data";
+  "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
+  "kickchan" = dontDistribute super."kickchan";
+  "kif-parser" = dontDistribute super."kif-parser";
+  "kinds" = dontDistribute super."kinds";
+  "kit" = dontDistribute super."kit";
+  "kmeans-par" = dontDistribute super."kmeans-par";
+  "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knots" = dontDistribute super."knots";
+  "koellner-phonetic" = dontDistribute super."koellner-phonetic";
+  "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
+  "korfu" = dontDistribute super."korfu";
+  "kqueue" = dontDistribute super."kqueue";
+  "krpc" = dontDistribute super."krpc";
+  "ks-test" = dontDistribute super."ks-test";
+  "ktx" = dontDistribute super."ktx";
+  "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate";
+  "kyotocabinet" = dontDistribute super."kyotocabinet";
+  "l-bfgs-b" = dontDistribute super."l-bfgs-b";
+  "labeled-graph" = dontDistribute super."labeled-graph";
+  "labeled-tree" = dontDistribute super."labeled-tree";
+  "laborantin-hs" = dontDistribute super."laborantin-hs";
+  "labyrinth" = dontDistribute super."labyrinth";
+  "labyrinth-server" = dontDistribute super."labyrinth-server";
+  "lagrangian" = dontDistribute super."lagrangian";
+  "laika" = dontDistribute super."laika";
+  "lambda-ast" = dontDistribute super."lambda-ast";
+  "lambda-bridge" = dontDistribute super."lambda-bridge";
+  "lambda-canvas" = dontDistribute super."lambda-canvas";
+  "lambda-devs" = dontDistribute super."lambda-devs";
+  "lambda-options" = dontDistribute super."lambda-options";
+  "lambda-placeholders" = dontDistribute super."lambda-placeholders";
+  "lambda-toolbox" = dontDistribute super."lambda-toolbox";
+  "lambda2js" = dontDistribute super."lambda2js";
+  "lambdaBase" = dontDistribute super."lambdaBase";
+  "lambdaFeed" = dontDistribute super."lambdaFeed";
+  "lambdaLit" = dontDistribute super."lambdaLit";
+  "lambdabot" = dontDistribute super."lambdabot";
+  "lambdabot-core" = dontDistribute super."lambdabot-core";
+  "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins";
+  "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins";
+  "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins";
+  "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins";
+  "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins";
+  "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins";
+  "lambdabot-trusted" = dontDistribute super."lambdabot-trusted";
+  "lambdabot-utils" = dontDistribute super."lambdabot-utils";
+  "lambdacat" = dontDistribute super."lambdacat";
+  "lambdacms-core" = dontDistribute super."lambdacms-core";
+  "lambdacms-media" = dontDistribute super."lambdacms-media";
+  "lambdacube" = dontDistribute super."lambdacube";
+  "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-core" = dontDistribute super."lambdacube-core";
+  "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
+  "lambdacube-engine" = dontDistribute super."lambdacube-engine";
+  "lambdacube-examples" = dontDistribute super."lambdacube-examples";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "lambdaya-bus" = dontDistribute super."lambdaya-bus";
+  "lambdiff" = dontDistribute super."lambdiff";
+  "lame-tester" = dontDistribute super."lame-tester";
+  "language-asn1" = dontDistribute super."language-asn1";
+  "language-bash" = dontDistribute super."language-bash";
+  "language-boogie" = dontDistribute super."language-boogie";
+  "language-c-comments" = dontDistribute super."language-c-comments";
+  "language-c-inline" = dontDistribute super."language-c-inline";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dart" = dontDistribute super."language-dart";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
+  "language-eiffel" = dontDistribute super."language-eiffel";
+  "language-fortran" = dontDistribute super."language-fortran";
+  "language-gcl" = dontDistribute super."language-gcl";
+  "language-go" = dontDistribute super."language-go";
+  "language-guess" = dontDistribute super."language-guess";
+  "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-kort" = dontDistribute super."language-kort";
+  "language-lua" = dontDistribute super."language-lua";
+  "language-lua-qq" = dontDistribute super."language-lua-qq";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-objc" = dontDistribute super."language-objc";
+  "language-openscad" = dontDistribute super."language-openscad";
+  "language-pig" = dontDistribute super."language-pig";
+  "language-puppet" = dontDistribute super."language-puppet";
+  "language-python" = dontDistribute super."language-python";
+  "language-python-colour" = dontDistribute super."language-python-colour";
+  "language-python-test" = dontDistribute super."language-python-test";
+  "language-qux" = dontDistribute super."language-qux";
+  "language-sh" = dontDistribute super."language-sh";
+  "language-slice" = dontDistribute super."language-slice";
+  "language-spelling" = dontDistribute super."language-spelling";
+  "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-thrift" = doDistribute super."language-thrift_0_8_0_1";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "launchpad-control" = dontDistribute super."launchpad-control";
+  "lax" = dontDistribute super."lax";
+  "layers" = dontDistribute super."layers";
+  "layers-game" = dontDistribute super."layers-game";
+  "layout" = dontDistribute super."layout";
+  "layout-bootstrap" = dontDistribute super."layout-bootstrap";
+  "lazy-io" = dontDistribute super."lazy-io";
+  "lazy-search" = dontDistribute super."lazy-search";
+  "lazyarray" = dontDistribute super."lazyarray";
+  "lazyio" = dontDistribute super."lazyio";
+  "lazysmallcheck" = dontDistribute super."lazysmallcheck";
+  "lazysplines" = dontDistribute super."lazysplines";
+  "lbfgs" = dontDistribute super."lbfgs";
+  "lcs" = dontDistribute super."lcs";
+  "lda" = dontDistribute super."lda";
+  "ldap-client" = dontDistribute super."ldap-client";
+  "ldif" = dontDistribute super."ldif";
+  "leaf" = dontDistribute super."leaf";
+  "leaky" = dontDistribute super."leaky";
+  "leancheck" = dontDistribute super."leancheck";
+  "leankit-api" = dontDistribute super."leankit-api";
+  "leapseconds-announced" = dontDistribute super."leapseconds-announced";
+  "learn" = dontDistribute super."learn";
+  "learn-physics" = dontDistribute super."learn-physics";
+  "learn-physics-examples" = dontDistribute super."learn-physics-examples";
+  "learning-hmm" = dontDistribute super."learning-hmm";
+  "leetify" = dontDistribute super."leetify";
+  "leksah" = dontDistribute super."leksah";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens" = doDistribute super."lens_4_13";
+  "lens-family-th" = doDistribute super."lens-family-th_0_4_1_0";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-sop" = dontDistribute super."lens-sop";
+  "lens-text-encoding" = dontDistribute super."lens-text-encoding";
+  "lens-time" = dontDistribute super."lens-time";
+  "lens-tutorial" = dontDistribute super."lens-tutorial";
+  "lens-utils" = dontDistribute super."lens-utils";
+  "lenses" = dontDistribute super."lenses";
+  "lensref" = dontDistribute super."lensref";
+  "lenz" = dontDistribute super."lenz";
+  "lenz-template" = dontDistribute super."lenz-template";
+  "level-monad" = dontDistribute super."level-monad";
+  "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
+  "levmar" = dontDistribute super."levmar";
+  "levmar-chart" = dontDistribute super."levmar-chart";
+  "lfst" = dontDistribute super."lfst";
+  "lgtk" = dontDistribute super."lgtk";
+  "lha" = dontDistribute super."lha";
+  "lhae" = dontDistribute super."lhae";
+  "lhc" = dontDistribute super."lhc";
+  "lhe" = dontDistribute super."lhe";
+  "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl";
+  "lhs2html" = dontDistribute super."lhs2html";
+  "lhslatex" = dontDistribute super."lhslatex";
+  "libGenI" = dontDistribute super."libGenI";
+  "libarchive-conduit" = dontDistribute super."libarchive-conduit";
+  "libconfig" = dontDistribute super."libconfig";
+  "libcspm" = dontDistribute super."libcspm";
+  "libexpect" = dontDistribute super."libexpect";
+  "libffi" = dontDistribute super."libffi";
+  "libgraph" = dontDistribute super."libgraph";
+  "libhbb" = dontDistribute super."libhbb";
+  "libjenkins" = dontDistribute super."libjenkins";
+  "liblastfm" = dontDistribute super."liblastfm";
+  "liblinear-enumerator" = dontDistribute super."liblinear-enumerator";
+  "libltdl" = dontDistribute super."libltdl";
+  "libmpd" = dontDistribute super."libmpd";
+  "libnvvm" = dontDistribute super."libnvvm";
+  "liboleg" = dontDistribute super."liboleg";
+  "libpafe" = dontDistribute super."libpafe";
+  "libpq" = dontDistribute super."libpq";
+  "librandomorg" = dontDistribute super."librandomorg";
+  "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
+  "libssh2" = dontDistribute super."libssh2";
+  "libssh2-conduit" = dontDistribute super."libssh2-conduit";
+  "libstackexchange" = dontDistribute super."libstackexchange";
+  "libsystemd-daemon" = dontDistribute super."libsystemd-daemon";
+  "libtagc" = dontDistribute super."libtagc";
+  "libvirt-hs" = dontDistribute super."libvirt-hs";
+  "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lifted-threads" = dontDistribute super."lifted-threads";
+  "lifter" = dontDistribute super."lifter";
+  "ligature" = dontDistribute super."ligature";
+  "ligd" = dontDistribute super."ligd";
+  "lighttpd-conf" = dontDistribute super."lighttpd-conf";
+  "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq";
+  "lilypond" = dontDistribute super."lilypond";
+  "limp" = dontDistribute super."limp";
+  "limp-cbc" = dontDistribute super."limp-cbc";
+  "lin-alg" = dontDistribute super."lin-alg";
+  "linda" = dontDistribute super."linda";
+  "lindenmayer" = dontDistribute super."lindenmayer";
+  "line-break" = dontDistribute super."line-break";
+  "line2pdf" = dontDistribute super."line2pdf";
+  "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
+  "linear-circuit" = dontDistribute super."linear-circuit";
+  "linear-grammar" = dontDistribute super."linear-grammar";
+  "linear-maps" = dontDistribute super."linear-maps";
+  "linear-opengl" = dontDistribute super."linear-opengl";
+  "linear-vect" = dontDistribute super."linear-vect";
+  "linearEqSolver" = dontDistribute super."linearEqSolver";
+  "linearscan" = dontDistribute super."linearscan";
+  "linearscan-hoopl" = dontDistribute super."linearscan-hoopl";
+  "linebreak" = dontDistribute super."linebreak";
+  "linguistic-ordinals" = dontDistribute super."linguistic-ordinals";
+  "link-relations" = dontDistribute super."link-relations";
+  "linkchk" = dontDistribute super."linkchk";
+  "linkcore" = dontDistribute super."linkcore";
+  "linkedhashmap" = dontDistribute super."linkedhashmap";
+  "linklater" = dontDistribute super."linklater";
+  "linode" = dontDistribute super."linode";
+  "linux-blkid" = dontDistribute super."linux-blkid";
+  "linux-cgroup" = dontDistribute super."linux-cgroup";
+  "linux-evdev" = dontDistribute super."linux-evdev";
+  "linux-inotify" = dontDistribute super."linux-inotify";
+  "linux-kmod" = dontDistribute super."linux-kmod";
+  "linux-mount" = dontDistribute super."linux-mount";
+  "linux-perf" = dontDistribute super."linux-perf";
+  "linux-ptrace" = dontDistribute super."linux-ptrace";
+  "linux-xattr" = dontDistribute super."linux-xattr";
+  "linx-gateway" = dontDistribute super."linx-gateway";
+  "lio" = dontDistribute super."lio";
+  "lio-eci11" = dontDistribute super."lio-eci11";
+  "lio-fs" = dontDistribute super."lio-fs";
+  "lio-simple" = dontDistribute super."lio-simple";
+  "lipsum-gen" = dontDistribute super."lipsum-gen";
+  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
+  "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo";
+  "lispparser" = dontDistribute super."lispparser";
+  "list-extras" = dontDistribute super."list-extras";
+  "list-grouping" = dontDistribute super."list-grouping";
+  "list-mux" = dontDistribute super."list-mux";
+  "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
+  "list-t-html-parser" = dontDistribute super."list-t-html-parser";
+  "list-t-http-client" = dontDistribute super."list-t-http-client";
+  "list-t-libcurl" = dontDistribute super."list-t-libcurl";
+  "list-t-text" = dontDistribute super."list-t-text";
+  "list-tries" = dontDistribute super."list-tries";
+  "list-zip-def" = dontDistribute super."list-zip-def";
+  "listlike-instances" = dontDistribute super."listlike-instances";
+  "lists" = dontDistribute super."lists";
+  "listsafe" = dontDistribute super."listsafe";
+  "lit" = dontDistribute super."lit";
+  "literals" = dontDistribute super."literals";
+  "live-sequencer" = dontDistribute super."live-sequencer";
+  "ll-picosat" = dontDistribute super."ll-picosat";
+  "llrbtree" = dontDistribute super."llrbtree";
+  "llsd" = dontDistribute super."llsd";
+  "llvm" = dontDistribute super."llvm";
+  "llvm-analysis" = dontDistribute super."llvm-analysis";
+  "llvm-base" = dontDistribute super."llvm-base";
+  "llvm-base-types" = dontDistribute super."llvm-base-types";
+  "llvm-base-util" = dontDistribute super."llvm-base-util";
+  "llvm-data-interop" = dontDistribute super."llvm-data-interop";
+  "llvm-extra" = dontDistribute super."llvm-extra";
+  "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-general" = dontDistribute super."llvm-general";
+  "llvm-general-pure" = dontDistribute super."llvm-general-pure";
+  "llvm-general-quote" = dontDistribute super."llvm-general-quote";
+  "llvm-ht" = dontDistribute super."llvm-ht";
+  "llvm-pkg-config" = dontDistribute super."llvm-pkg-config";
+  "llvm-pretty" = dontDistribute super."llvm-pretty";
+  "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser";
+  "llvm-tf" = dontDistribute super."llvm-tf";
+  "llvm-tools" = dontDistribute super."llvm-tools";
+  "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
+  "located-base" = dontDistribute super."located-base";
+  "locators" = dontDistribute super."locators";
+  "loch" = dontDistribute super."loch";
+  "lock-file" = dontDistribute super."lock-file";
+  "locked-poll" = dontDistribute super."locked-poll";
+  "lockfree-queue" = dontDistribute super."lockfree-queue";
+  "log" = dontDistribute super."log";
+  "log-effect" = dontDistribute super."log-effect";
+  "log2json" = dontDistribute super."log2json";
+  "logger" = dontDistribute super."logger";
+  "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade-journald" = dontDistribute super."logging-facade-journald";
+  "logic-TPTP" = dontDistribute super."logic-TPTP";
+  "logic-classes" = dontDistribute super."logic-classes";
+  "logicst" = dontDistribute super."logicst";
+  "logict-state" = dontDistribute super."logict-state";
+  "logplex-parse" = dontDistribute super."logplex-parse";
+  "logsink" = dontDistribute super."logsink";
+  "lojban" = dontDistribute super."lojban";
+  "lojbanParser" = dontDistribute super."lojbanParser";
+  "lojbanXiragan" = dontDistribute super."lojbanXiragan";
+  "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
+  "lol-apps" = dontDistribute super."lol-apps";
+  "loli" = dontDistribute super."loli";
+  "lookup-tables" = dontDistribute super."lookup-tables";
+  "loop-effin" = dontDistribute super."loop-effin";
+  "loop-while" = dontDistribute super."loop-while";
+  "loops" = dontDistribute super."loops";
+  "loopy" = dontDistribute super."loopy";
+  "lord" = dontDistribute super."lord";
+  "lorem" = dontDistribute super."lorem";
+  "loris" = dontDistribute super."loris";
+  "loshadka" = dontDistribute super."loshadka";
+  "lostcities" = dontDistribute super."lostcities";
+  "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
+  "ls-usb" = dontDistribute super."ls-usb";
+  "lscabal" = dontDistribute super."lscabal";
+  "lss" = dontDistribute super."lss";
+  "lsystem" = dontDistribute super."lsystem";
+  "ltiv1p1" = dontDistribute super."ltiv1p1";
+  "ltl" = dontDistribute super."ltl";
+  "lua-bc" = dontDistribute super."lua-bc";
+  "lua-bytecode" = dontDistribute super."lua-bytecode";
+  "luachunk" = dontDistribute super."luachunk";
+  "luautils" = dontDistribute super."luautils";
+  "lub" = dontDistribute super."lub";
+  "lucid-foundation" = dontDistribute super."lucid-foundation";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
+  "luka" = dontDistribute super."luka";
+  "lushtags" = dontDistribute super."lushtags";
+  "luthor" = dontDistribute super."luthor";
+  "lvish" = dontDistribute super."lvish";
+  "lvmlib" = dontDistribute super."lvmlib";
+  "lvmrun" = dontDistribute super."lvmrun";
+  "lxc" = dontDistribute super."lxc";
+  "lye" = dontDistribute super."lye";
+  "lz4" = dontDistribute super."lz4";
+  "lzma" = dontDistribute super."lzma";
+  "lzma-clib" = dontDistribute super."lzma-clib";
+  "lzma-enumerator" = dontDistribute super."lzma-enumerator";
+  "lzma-streams" = dontDistribute super."lzma-streams";
+  "maam" = dontDistribute super."maam";
+  "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines" = doDistribute super."machines_0_5_1";
+  "machines-zlib" = dontDistribute super."machines-zlib";
+  "macho" = dontDistribute super."macho";
+  "maclight" = dontDistribute super."maclight";
+  "macosx-make-standalone" = dontDistribute super."macosx-make-standalone";
+  "mage" = dontDistribute super."mage";
+  "magico" = dontDistribute super."magico";
+  "magma" = dontDistribute super."magma";
+  "mahoro" = dontDistribute super."mahoro";
+  "maid" = dontDistribute super."maid";
+  "mailbox-count" = dontDistribute super."mailbox-count";
+  "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
+  "mailgun" = dontDistribute super."mailgun";
+  "majordomo" = dontDistribute super."majordomo";
+  "majority" = dontDistribute super."majority";
+  "make-hard-links" = dontDistribute super."make-hard-links";
+  "make-package" = dontDistribute super."make-package";
+  "makedo" = dontDistribute super."makedo";
+  "manatee" = dontDistribute super."manatee";
+  "manatee-all" = dontDistribute super."manatee-all";
+  "manatee-anything" = dontDistribute super."manatee-anything";
+  "manatee-browser" = dontDistribute super."manatee-browser";
+  "manatee-core" = dontDistribute super."manatee-core";
+  "manatee-curl" = dontDistribute super."manatee-curl";
+  "manatee-editor" = dontDistribute super."manatee-editor";
+  "manatee-filemanager" = dontDistribute super."manatee-filemanager";
+  "manatee-imageviewer" = dontDistribute super."manatee-imageviewer";
+  "manatee-ircclient" = dontDistribute super."manatee-ircclient";
+  "manatee-mplayer" = dontDistribute super."manatee-mplayer";
+  "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer";
+  "manatee-processmanager" = dontDistribute super."manatee-processmanager";
+  "manatee-reader" = dontDistribute super."manatee-reader";
+  "manatee-template" = dontDistribute super."manatee-template";
+  "manatee-terminal" = dontDistribute super."manatee-terminal";
+  "manatee-welcome" = dontDistribute super."manatee-welcome";
+  "mancala" = dontDistribute super."mancala";
+  "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = dontDistribute super."mangopay";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "map-exts" = dontDistribute super."map-exts";
+  "mappy" = dontDistribute super."mappy";
+  "marionetta" = dontDistribute super."marionetta";
+  "markdown-kate" = dontDistribute super."markdown-kate";
+  "markdown-pap" = dontDistribute super."markdown-pap";
+  "markdown2svg" = dontDistribute super."markdown2svg";
+  "marked-pretty" = dontDistribute super."marked-pretty";
+  "markov" = dontDistribute super."markov";
+  "markov-chain" = dontDistribute super."markov-chain";
+  "markov-processes" = dontDistribute super."markov-processes";
+  "markup-preview" = dontDistribute super."markup-preview";
+  "marmalade-upload" = dontDistribute super."marmalade-upload";
+  "marquise" = dontDistribute super."marquise";
+  "marxup" = dontDistribute super."marxup";
+  "masakazu-bot" = dontDistribute super."masakazu-bot";
+  "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
+  "matchers" = dontDistribute super."matchers";
+  "mathblog" = dontDistribute super."mathblog";
+  "mathgenealogy" = dontDistribute super."mathgenealogy";
+  "mathista" = dontDistribute super."mathista";
+  "mathlink" = dontDistribute super."mathlink";
+  "matlab" = dontDistribute super."matlab";
+  "matrix-market" = dontDistribute super."matrix-market";
+  "matrix-market-pure" = dontDistribute super."matrix-market-pure";
+  "matsuri" = dontDistribute super."matsuri";
+  "maude" = dontDistribute super."maude";
+  "maxent" = dontDistribute super."maxent";
+  "maxsharing" = dontDistribute super."maxsharing";
+  "maybe-justify" = dontDistribute super."maybe-justify";
+  "maybench" = dontDistribute super."maybench";
+  "mbox-tools" = dontDistribute super."mbox-tools";
+  "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples";
+  "mcmc-samplers" = dontDistribute super."mcmc-samplers";
+  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
+  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
+  "mdcat" = dontDistribute super."mdcat";
+  "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
+  "means" = dontDistribute super."means";
+  "mecab" = dontDistribute super."mecab";
+  "mecha" = dontDistribute super."mecha";
+  "mediawiki" = dontDistribute super."mediawiki";
+  "mediawiki2latex" = dontDistribute super."mediawiki2latex";
+  "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
+  "meep" = dontDistribute super."meep";
+  "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_4_0";
+  "meldable-heap" = dontDistribute super."meldable-heap";
+  "melody" = dontDistribute super."melody";
+  "memcache" = dontDistribute super."memcache";
+  "memcache-conduit" = dontDistribute super."memcache-conduit";
+  "memcache-haskell" = dontDistribute super."memcache-haskell";
+  "memcached" = dontDistribute super."memcached";
+  "memexml" = dontDistribute super."memexml";
+  "memo-ptr" = dontDistribute super."memo-ptr";
+  "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memscript" = dontDistribute super."memscript";
+  "mersenne-random" = dontDistribute super."mersenne-random";
+  "messente" = dontDistribute super."messente";
+  "meta-misc" = dontDistribute super."meta-misc";
+  "meta-par" = dontDistribute super."meta-par";
+  "meta-par-accelerate" = dontDistribute super."meta-par-accelerate";
+  "metadata" = dontDistribute super."metadata";
+  "metamorphic" = dontDistribute super."metamorphic";
+  "metaplug" = dontDistribute super."metaplug";
+  "metric" = dontDistribute super."metric";
+  "metricsd-client" = dontDistribute super."metricsd-client";
+  "metronome" = dontDistribute super."metronome";
+  "mezzolens" = dontDistribute super."mezzolens";
+  "mfsolve" = dontDistribute super."mfsolve";
+  "mgeneric" = dontDistribute super."mgeneric";
+  "mi" = dontDistribute super."mi";
+  "microbench" = dontDistribute super."microbench";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microtimer" = dontDistribute super."microtimer";
+  "mida" = dontDistribute super."mida";
+  "midi" = dontDistribute super."midi";
+  "midi-alsa" = dontDistribute super."midi-alsa";
+  "midi-music-box" = dontDistribute super."midi-music-box";
+  "midi-util" = dontDistribute super."midi-util";
+  "midimory" = dontDistribute super."midimory";
+  "midisurface" = dontDistribute super."midisurface";
+  "mighttpd" = dontDistribute super."mighttpd";
+  "mighttpd2" = dontDistribute super."mighttpd2";
+  "mikmod" = dontDistribute super."mikmod";
+  "miku" = dontDistribute super."miku";
+  "milena" = dontDistribute super."milena";
+  "mime" = dontDistribute super."mime";
+  "mime-directory" = dontDistribute super."mime-directory";
+  "mime-string" = dontDistribute super."mime-string";
+  "mines" = dontDistribute super."mines";
+  "minesweeper" = dontDistribute super."minesweeper";
+  "miniball" = dontDistribute super."miniball";
+  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
+  "minimal-configuration" = dontDistribute super."minimal-configuration";
+  "minimorph" = dontDistribute super."minimorph";
+  "minimung" = dontDistribute super."minimung";
+  "minions" = dontDistribute super."minions";
+  "minioperational" = dontDistribute super."minioperational";
+  "miniplex" = dontDistribute super."miniplex";
+  "minirotate" = dontDistribute super."minirotate";
+  "minisat" = dontDistribute super."minisat";
+  "ministg" = dontDistribute super."ministg";
+  "miniutter" = dontDistribute super."miniutter";
+  "minst-idx" = dontDistribute super."minst-idx";
+  "mirror-tweet" = dontDistribute super."mirror-tweet";
+  "missing-py2" = dontDistribute super."missing-py2";
+  "mix-arrows" = dontDistribute super."mix-arrows";
+  "mixed-strategies" = dontDistribute super."mixed-strategies";
+  "mkbndl" = dontDistribute super."mkbndl";
+  "mkcabal" = dontDistribute super."mkcabal";
+  "ml-w" = dontDistribute super."ml-w";
+  "mlist" = dontDistribute super."mlist";
+  "mmtl" = dontDistribute super."mmtl";
+  "mmtl-base" = dontDistribute super."mmtl-base";
+  "mnist-idx" = dontDistribute super."mnist-idx";
+  "moan" = dontDistribute super."moan";
+  "modbus-tcp" = dontDistribute super."modbus-tcp";
+  "modelicaparser" = dontDistribute super."modelicaparser";
+  "modsplit" = dontDistribute super."modsplit";
+  "modular-arithmetic" = dontDistribute super."modular-arithmetic";
+  "modular-prelude" = dontDistribute super."modular-prelude";
+  "modular-prelude-classy" = dontDistribute super."modular-prelude-classy";
+  "module-management" = dontDistribute super."module-management";
+  "modulespection" = dontDistribute super."modulespection";
+  "modulo" = dontDistribute super."modulo";
+  "moe" = dontDistribute super."moe";
+  "mohws" = dontDistribute super."mohws";
+  "monad-abort-fd" = dontDistribute super."monad-abort-fd";
+  "monad-atom" = dontDistribute super."monad-atom";
+  "monad-atom-simple" = dontDistribute super."monad-atom-simple";
+  "monad-bool" = dontDistribute super."monad-bool";
+  "monad-classes" = dontDistribute super."monad-classes";
+  "monad-codec" = dontDistribute super."monad-codec";
+  "monad-connect" = dontDistribute super."monad-connect";
+  "monad-dijkstra" = dontDistribute super."monad-dijkstra";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-hash" = dontDistribute super."monad-hash";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
+  "monad-loops-stm" = dontDistribute super."monad-loops-stm";
+  "monad-lrs" = dontDistribute super."monad-lrs";
+  "monad-memo" = dontDistribute super."monad-memo";
+  "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
+  "monad-open" = dontDistribute super."monad-open";
+  "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
+  "monad-param" = dontDistribute super."monad-param";
+  "monad-ran" = dontDistribute super."monad-ran";
+  "monad-resumption" = dontDistribute super."monad-resumption";
+  "monad-state" = dontDistribute super."monad-state";
+  "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
+  "monad-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
+  "monad-stm" = dontDistribute super."monad-stm";
+  "monad-supply" = dontDistribute super."monad-supply";
+  "monad-task" = dontDistribute super."monad-task";
+  "monad-tx" = dontDistribute super."monad-tx";
+  "monad-unify" = dontDistribute super."monad-unify";
+  "monad-wrap" = dontDistribute super."monad-wrap";
+  "monadIO" = dontDistribute super."monadIO";
+  "monadLib-compose" = dontDistribute super."monadLib-compose";
+  "monadacme" = dontDistribute super."monadacme";
+  "monadbi" = dontDistribute super."monadbi";
+  "monadfibre" = dontDistribute super."monadfibre";
+  "monadiccp" = dontDistribute super."monadiccp";
+  "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
+  "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
+  "monadlist" = dontDistribute super."monadlist";
+  "monadloc-pp" = dontDistribute super."monadloc-pp";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_2";
+  "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidplus" = dontDistribute super."monoidplus";
+  "monoids" = dontDistribute super."monoids";
+  "monomorphic" = dontDistribute super."monomorphic";
+  "montage" = dontDistribute super."montage";
+  "montage-client" = dontDistribute super."montage-client";
+  "monte-carlo" = dontDistribute super."monte-carlo";
+  "moo" = dontDistribute super."moo";
+  "moonshine" = dontDistribute super."moonshine";
+  "morfette" = dontDistribute super."morfette";
+  "morfeusz" = dontDistribute super."morfeusz";
+  "mosaico-lib" = dontDistribute super."mosaico-lib";
+  "mount" = dontDistribute super."mount";
+  "mp" = dontDistribute super."mp";
+  "mp3decoder" = dontDistribute super."mp3decoder";
+  "mpdmate" = dontDistribute super."mpdmate";
+  "mpppc" = dontDistribute super."mpppc";
+  "mpretty" = dontDistribute super."mpretty";
+  "mpris" = dontDistribute super."mpris";
+  "mprover" = dontDistribute super."mprover";
+  "mps" = dontDistribute super."mps";
+  "mpvguihs" = dontDistribute super."mpvguihs";
+  "mqtt-hs" = dontDistribute super."mqtt-hs";
+  "mrm" = dontDistribute super."mrm";
+  "ms" = dontDistribute super."ms";
+  "msgpack" = dontDistribute super."msgpack";
+  "msgpack-aeson" = dontDistribute super."msgpack-aeson";
+  "msgpack-idl" = dontDistribute super."msgpack-idl";
+  "msgpack-rpc" = dontDistribute super."msgpack-rpc";
+  "msh" = dontDistribute super."msh";
+  "msu" = dontDistribute super."msu";
+  "mtgoxapi" = dontDistribute super."mtgoxapi";
+  "mtl-c" = dontDistribute super."mtl-c";
+  "mtl-evil-instances" = dontDistribute super."mtl-evil-instances";
+  "mtl-tf" = dontDistribute super."mtl-tf";
+  "mtl-unleashed" = dontDistribute super."mtl-unleashed";
+  "mtlparse" = dontDistribute super."mtlparse";
+  "mtlx" = dontDistribute super."mtlx";
+  "mtp" = dontDistribute super."mtp";
+  "mtree" = dontDistribute super."mtree";
+  "mucipher" = dontDistribute super."mucipher";
+  "mudbath" = dontDistribute super."mudbath";
+  "muesli" = dontDistribute super."muesli";
+  "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
+  "multifocal" = dontDistribute super."multifocal";
+  "multihash" = dontDistribute super."multihash";
+  "multipart-names" = dontDistribute super."multipart-names";
+  "multipass" = dontDistribute super."multipass";
+  "multiplate-simplified" = dontDistribute super."multiplate-simplified";
+  "multiplicity" = dontDistribute super."multiplicity";
+  "multirec" = dontDistribute super."multirec";
+  "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
+  "multirec-binary" = dontDistribute super."multirec-binary";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
+  "murmur3" = dontDistribute super."murmur3";
+  "murmurhash3" = dontDistribute super."murmurhash3";
+  "music-articulation" = dontDistribute super."music-articulation";
+  "music-diatonic" = dontDistribute super."music-diatonic";
+  "music-dynamics" = dontDistribute super."music-dynamics";
+  "music-dynamics-literal" = dontDistribute super."music-dynamics-literal";
+  "music-graphics" = dontDistribute super."music-graphics";
+  "music-parts" = dontDistribute super."music-parts";
+  "music-pitch" = dontDistribute super."music-pitch";
+  "music-pitch-literal" = dontDistribute super."music-pitch-literal";
+  "music-preludes" = dontDistribute super."music-preludes";
+  "music-score" = dontDistribute super."music-score";
+  "music-sibelius" = dontDistribute super."music-sibelius";
+  "music-suite" = dontDistribute super."music-suite";
+  "music-util" = dontDistribute super."music-util";
+  "musicbrainz-email" = dontDistribute super."musicbrainz-email";
+  "musicxml" = dontDistribute super."musicxml";
+  "musicxml2" = dontDistribute super."musicxml2";
+  "mustache-haskell" = dontDistribute super."mustache-haskell";
+  "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-iter" = dontDistribute super."mutable-iter";
+  "mute-unmute" = dontDistribute super."mute-unmute";
+  "mvc" = dontDistribute super."mvc";
+  "mvc-updates" = dontDistribute super."mvc-updates";
+  "mvclient" = dontDistribute super."mvclient";
+  "mwc-random-monad" = dontDistribute super."mwc-random-monad";
+  "myTestlll" = dontDistribute super."myTestlll";
+  "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
+  "myo" = dontDistribute super."myo";
+  "mysnapsession" = dontDistribute super."mysnapsession";
+  "mysnapsession-example" = dontDistribute super."mysnapsession-example";
+  "mysql-effect" = dontDistribute super."mysql-effect";
+  "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
+  "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mzv" = dontDistribute super."mzv";
+  "n-m" = dontDistribute super."n-m";
+  "nagios-perfdata" = dontDistribute super."nagios-perfdata";
+  "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg";
+  "named-formlet" = dontDistribute super."named-formlet";
+  "named-lock" = dontDistribute super."named-lock";
+  "named-records" = dontDistribute super."named-records";
+  "namelist" = dontDistribute super."namelist";
+  "names" = dontDistribute super."names";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-hmac" = dontDistribute super."nano-hmac";
+  "nano-md5" = dontDistribute super."nano-md5";
+  "nanoAgda" = dontDistribute super."nanoAgda";
+  "nanocurses" = dontDistribute super."nanocurses";
+  "nanomsg" = dontDistribute super."nanomsg";
+  "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
+  "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanovg" = dontDistribute super."nanovg";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "naturalcomp" = dontDistribute super."naturalcomp";
+  "naturals" = dontDistribute super."naturals";
+  "naver-translate" = dontDistribute super."naver-translate";
+  "nbt" = dontDistribute super."nbt";
+  "nc-indicators" = dontDistribute super."nc-indicators";
+  "ncurses" = dontDistribute super."ncurses";
+  "neat" = dontDistribute super."neat";
+  "needle" = dontDistribute super."needle";
+  "neet" = dontDistribute super."neet";
+  "nehe-tuts" = dontDistribute super."nehe-tuts";
+  "neil" = dontDistribute super."neil";
+  "neither" = dontDistribute super."neither";
+  "nemesis" = dontDistribute super."nemesis";
+  "nemesis-titan" = dontDistribute super."nemesis-titan";
+  "nerf" = dontDistribute super."nerf";
+  "nero" = dontDistribute super."nero";
+  "nero-wai" = dontDistribute super."nero-wai";
+  "nero-warp" = dontDistribute super."nero-warp";
+  "nested-routes" = doDistribute super."nested-routes_7_0_0";
+  "nested-sets" = dontDistribute super."nested-sets";
+  "nestedmap" = dontDistribute super."nestedmap";
+  "net-concurrent" = dontDistribute super."net-concurrent";
+  "netclock" = dontDistribute super."netclock";
+  "netcore" = dontDistribute super."netcore";
+  "netlines" = dontDistribute super."netlines";
+  "netlink" = dontDistribute super."netlink";
+  "netlist" = dontDistribute super."netlist";
+  "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl";
+  "netpbm" = dontDistribute super."netpbm";
+  "netrc" = dontDistribute super."netrc";
+  "netspec" = dontDistribute super."netspec";
+  "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle-frp" = dontDistribute super."nettle-frp";
+  "nettle-netkit" = dontDistribute super."nettle-netkit";
+  "nettle-openflow" = dontDistribute super."nettle-openflow";
+  "netwire" = dontDistribute super."netwire";
+  "netwire-input" = dontDistribute super."netwire-input";
+  "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network-address" = dontDistribute super."network-address";
+  "network-api-support" = dontDistribute super."network-api-support";
+  "network-bitcoin" = dontDistribute super."network-bitcoin";
+  "network-builder" = dontDistribute super."network-builder";
+  "network-bytestring" = dontDistribute super."network-bytestring";
+  "network-conduit" = dontDistribute super."network-conduit";
+  "network-connection" = dontDistribute super."network-connection";
+  "network-data" = dontDistribute super."network-data";
+  "network-dbus" = dontDistribute super."network-dbus";
+  "network-dns" = dontDistribute super."network-dns";
+  "network-enumerator" = dontDistribute super."network-enumerator";
+  "network-fancy" = dontDistribute super."network-fancy";
+  "network-hans" = dontDistribute super."network-hans";
+  "network-interfacerequest" = dontDistribute super."network-interfacerequest";
+  "network-ip" = dontDistribute super."network-ip";
+  "network-metrics" = dontDistribute super."network-metrics";
+  "network-minihttp" = dontDistribute super."network-minihttp";
+  "network-msg" = dontDistribute super."network-msg";
+  "network-netpacket" = dontDistribute super."network-netpacket";
+  "network-pgi" = dontDistribute super."network-pgi";
+  "network-rpca" = dontDistribute super."network-rpca";
+  "network-server" = dontDistribute super."network-server";
+  "network-service" = dontDistribute super."network-service";
+  "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr";
+  "network-simple-tls" = dontDistribute super."network-simple-tls";
+  "network-socket-options" = dontDistribute super."network-socket-options";
+  "network-stream" = dontDistribute super."network-stream";
+  "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-uri-static" = dontDistribute super."network-uri-static";
+  "network-wai-router" = dontDistribute super."network-wai-router";
+  "network-websocket" = dontDistribute super."network-websocket";
+  "networked-game" = dontDistribute super."networked-game";
+  "neural" = dontDistribute super."neural";
+  "newports" = dontDistribute super."newports";
+  "newsynth" = dontDistribute super."newsynth";
+  "newt" = dontDistribute super."newt";
+  "newtype-deriving" = dontDistribute super."newtype-deriving";
+  "newtype-th" = dontDistribute super."newtype-th";
+  "newtyper" = dontDistribute super."newtyper";
+  "nextstep-plist" = dontDistribute super."nextstep-plist";
+  "nf" = dontDistribute super."nf";
+  "ngrams-loader" = dontDistribute super."ngrams-loader";
+  "ngx-export" = dontDistribute super."ngx-export";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
+  "nitro" = dontDistribute super."nitro";
+  "nix-eval" = dontDistribute super."nix-eval";
+  "nixfromnpm" = dontDistribute super."nixfromnpm";
+  "nixos-types" = dontDistribute super."nixos-types";
+  "nkjp" = dontDistribute super."nkjp";
+  "nlp-scores" = dontDistribute super."nlp-scores";
+  "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts";
+  "nm" = dontDistribute super."nm";
+  "nme" = dontDistribute super."nme";
+  "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
+  "no-role-annots" = dontDistribute super."no-role-annots";
+  "nofib-analyse" = dontDistribute super."nofib-analyse";
+  "nofib-analyze" = dontDistribute super."nofib-analyze";
+  "noise" = dontDistribute super."noise";
+  "non-empty" = dontDistribute super."non-empty";
+  "non-negative" = dontDistribute super."non-negative";
+  "nondeterminism" = dontDistribute super."nondeterminism";
+  "nonempty-alternative" = dontDistribute super."nonempty-alternative";
+  "nonfree" = dontDistribute super."nonfree";
+  "nonlinear-optimization" = dontDistribute super."nonlinear-optimization";
+  "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad";
+  "noodle" = dontDistribute super."noodle";
+  "normaldistribution" = dontDistribute super."normaldistribution";
+  "not-gloss" = dontDistribute super."not-gloss";
+  "not-gloss-examples" = dontDistribute super."not-gloss-examples";
+  "not-in-base" = dontDistribute super."not-in-base";
+  "notcpp" = dontDistribute super."notcpp";
+  "notmuch-haskell" = dontDistribute super."notmuch-haskell";
+  "notmuch-web" = dontDistribute super."notmuch-web";
+  "notzero" = dontDistribute super."notzero";
+  "np-extras" = dontDistribute super."np-extras";
+  "np-linear" = dontDistribute super."np-linear";
+  "nptools" = dontDistribute super."nptools";
+  "nth-prime" = dontDistribute super."nth-prime";
+  "nthable" = dontDistribute super."nthable";
+  "ntp-control" = dontDistribute super."ntp-control";
+  "null-canvas" = dontDistribute super."null-canvas";
+  "nullary" = dontDistribute super."nullary";
+  "nullpipe" = dontDistribute super."nullpipe";
+  "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
+  "numbering" = dontDistribute super."numbering";
+  "numerals" = dontDistribute super."numerals";
+  "numerals-base" = dontDistribute super."numerals-base";
+  "numeric-limits" = dontDistribute super."numeric-limits";
+  "numeric-prelude" = dontDistribute super."numeric-prelude";
+  "numeric-qq" = dontDistribute super."numeric-qq";
+  "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
+  "numeric-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype" = dontDistribute super."numtype";
+  "numtype-tf" = dontDistribute super."numtype-tf";
+  "nurbs" = dontDistribute super."nurbs";
+  "nvim-hs" = dontDistribute super."nvim-hs";
+  "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib";
+  "nyan" = dontDistribute super."nyan";
+  "nylas" = dontDistribute super."nylas";
+  "nymphaea" = dontDistribute super."nymphaea";
+  "oanda-rest-api" = dontDistribute super."oanda-rest-api";
+  "oauthenticated" = dontDistribute super."oauthenticated";
+  "obdd" = dontDistribute super."obdd";
+  "oberon0" = dontDistribute super."oberon0";
+  "obj" = dontDistribute super."obj";
+  "objectid" = dontDistribute super."objectid";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = doDistribute super."octane_0_4_24";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
+  "oeis" = dontDistribute super."oeis";
+  "off-simple" = dontDistribute super."off-simple";
+  "ohloh-hs" = dontDistribute super."ohloh-hs";
+  "oi" = dontDistribute super."oi";
+  "oidc-client" = dontDistribute super."oidc-client";
+  "ois-input-manager" = dontDistribute super."ois-input-manager";
+  "old-version" = dontDistribute super."old-version";
+  "olwrapper" = dontDistribute super."olwrapper";
+  "omaketex" = dontDistribute super."omaketex";
+  "omega" = dontDistribute super."omega";
+  "omnicodec" = dontDistribute super."omnicodec";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "one-liner" = dontDistribute super."one-liner";
+  "one-time-password" = dontDistribute super."one-time-password";
+  "oneOfN" = dontDistribute super."oneOfN";
+  "oneormore" = dontDistribute super."oneormore";
+  "only" = dontDistribute super."only";
+  "onu-course" = dontDistribute super."onu-course";
+  "opaleye" = doDistribute super."opaleye_0_4_2_0";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "open-signals" = dontDistribute super."open-signals";
+  "open-symbology" = dontDistribute super."open-symbology";
+  "open-typerep" = dontDistribute super."open-typerep";
+  "open-union" = dontDistribute super."open-union";
+  "open-witness" = dontDistribute super."open-witness";
+  "opencog-atomspace" = dontDistribute super."opencog-atomspace";
+  "opencv-raw" = dontDistribute super."opencv-raw";
+  "opendatatable" = dontDistribute super."opendatatable";
+  "openexchangerates" = dontDistribute super."openexchangerates";
+  "openflow" = dontDistribute super."openflow";
+  "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
+  "opengles" = dontDistribute super."opengles";
+  "openid" = dontDistribute super."openid";
+  "openpgp" = dontDistribute super."openpgp";
+  "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
+  "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
+  "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "openssh-github-keys" = dontDistribute super."openssh-github-keys";
+  "openssl-createkey" = dontDistribute super."openssl-createkey";
+  "opentheory" = dontDistribute super."opentheory";
+  "opentheory-bits" = dontDistribute super."opentheory-bits";
+  "opentheory-byte" = dontDistribute super."opentheory-byte";
+  "opentheory-char" = dontDistribute super."opentheory-char";
+  "opentheory-divides" = dontDistribute super."opentheory-divides";
+  "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci";
+  "opentheory-parser" = dontDistribute super."opentheory-parser";
+  "opentheory-prime" = dontDistribute super."opentheory-prime";
+  "opentheory-primitive" = dontDistribute super."opentheory-primitive";
+  "opentheory-probability" = dontDistribute super."opentheory-probability";
+  "opentheory-stream" = dontDistribute super."opentheory-stream";
+  "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational-alacarte" = dontDistribute super."operational-alacarte";
+  "operational-extra" = dontDistribute super."operational-extra";
+  "opml" = dontDistribute super."opml";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "orc" = dontDistribute super."orc";
+  "orchestrate" = dontDistribute super."orchestrate";
+  "orchid" = dontDistribute super."orchid";
+  "orchid-demo" = dontDistribute super."orchid-demo";
+  "ord-adhoc" = dontDistribute super."ord-adhoc";
+  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
+  "order-statistics" = dontDistribute super."order-statistics";
+  "ordered" = dontDistribute super."ordered";
+  "orders" = dontDistribute super."orders";
+  "ordrea" = dontDistribute super."ordrea";
+  "organize-imports" = dontDistribute super."organize-imports";
+  "orgmode" = dontDistribute super."orgmode";
+  "orgmode-parse" = dontDistribute super."orgmode-parse";
+  "origami" = dontDistribute super."origami";
+  "os-release" = dontDistribute super."os-release";
+  "osc" = dontDistribute super."osc";
+  "oscpacking" = dontDistribute super."oscpacking";
+  "osm-conduit" = dontDistribute super."osm-conduit";
+  "osm-download" = dontDistribute super."osm-download";
+  "oso2pdf" = dontDistribute super."oso2pdf";
+  "osx-ar" = dontDistribute super."osx-ar";
+  "ot" = dontDistribute super."ot";
+  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packed-dawg" = dontDistribute super."packed-dawg";
+  "packedstring" = dontDistribute super."packedstring";
+  "packer" = dontDistribute super."packer";
+  "packman" = dontDistribute super."packman";
+  "packunused" = dontDistribute super."packunused";
+  "pacman-memcache" = dontDistribute super."pacman-memcache";
+  "padKONTROL" = dontDistribute super."padKONTROL";
+  "pagarme" = dontDistribute super."pagarme";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_9_1_1";
+  "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
+  "pandoc-crossref" = dontDistribute super."pandoc-crossref";
+  "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
+  "pandoc-include" = dontDistribute super."pandoc-include";
+  "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters";
+  "pandoc-lens" = dontDistribute super."pandoc-lens";
+  "pandoc-placetable" = dontDistribute super."pandoc-placetable";
+  "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-unlit" = dontDistribute super."pandoc-unlit";
+  "pango" = doDistribute super."pango_0_13_1_1";
+  "papillon" = dontDistribute super."papillon";
+  "pappy" = dontDistribute super."pappy";
+  "para" = dontDistribute super."para";
+  "paragon" = dontDistribute super."paragon";
+  "parallel-tasks" = dontDistribute super."parallel-tasks";
+  "parallel-tree-search" = dontDistribute super."parallel-tree-search";
+  "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
+  "parco" = dontDistribute super."parco";
+  "parco-attoparsec" = dontDistribute super."parco-attoparsec";
+  "parco-parsec" = dontDistribute super."parco-parsec";
+  "parcom-lib" = dontDistribute super."parcom-lib";
+  "parconc-examples" = dontDistribute super."parconc-examples";
+  "parport" = dontDistribute super."parport";
+  "parse-dimacs" = dontDistribute super."parse-dimacs";
+  "parse-help" = dontDistribute super."parse-help";
+  "parsec-extra" = dontDistribute super."parsec-extra";
+  "parsec-numbers" = dontDistribute super."parsec-numbers";
+  "parsec-parsers" = dontDistribute super."parsec-parsers";
+  "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
+  "parsec-trace" = dontDistribute super."parsec-trace";
+  "parsec-utils" = dontDistribute super."parsec-utils";
+  "parsec1" = dontDistribute super."parsec1";
+  "parsec2" = dontDistribute super."parsec2";
+  "parsec3" = dontDistribute super."parsec3";
+  "parsec3-numbers" = dontDistribute super."parsec3-numbers";
+  "parsedate" = dontDistribute super."parsedate";
+  "parseerror-eq" = dontDistribute super."parseerror-eq";
+  "parsek" = dontDistribute super."parsek";
+  "parsely" = dontDistribute super."parsely";
+  "parser-helper" = dontDistribute super."parser-helper";
+  "parser241" = dontDistribute super."parser241";
+  "parsergen" = dontDistribute super."parsergen";
+  "parsestar" = dontDistribute super."parsestar";
+  "parsimony" = dontDistribute super."parsimony";
+  "partage" = dontDistribute super."partage";
+  "partial" = dontDistribute super."partial";
+  "partial-lens" = dontDistribute super."partial-lens";
+  "partial-uri" = dontDistribute super."partial-uri";
+  "partly" = dontDistribute super."partly";
+  "passage" = dontDistribute super."passage";
+  "passwords" = dontDistribute super."passwords";
+  "pastis" = dontDistribute super."pastis";
+  "pasty" = dontDistribute super."pasty";
+  "patch-combinators" = dontDistribute super."patch-combinators";
+  "patch-image" = dontDistribute super."patch-image";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "patronscraper" = dontDistribute super."patronscraper";
+  "patterns" = dontDistribute super."patterns";
+  "paymill" = dontDistribute super."paymill";
+  "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops";
+  "paypal-api" = dontDistribute super."paypal-api";
+  "pb" = dontDistribute super."pb";
+  "pbc4hs" = dontDistribute super."pbc4hs";
+  "pbkdf" = dontDistribute super."pbkdf";
+  "pcap-conduit" = dontDistribute super."pcap-conduit";
+  "pcap-enumerator" = dontDistribute super."pcap-enumerator";
+  "pcd-loader" = dontDistribute super."pcd-loader";
+  "pcf" = dontDistribute super."pcf";
+  "pcg-random" = dontDistribute super."pcg-random";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
+  "pdf2line" = dontDistribute super."pdf2line";
+  "pdfsplit" = dontDistribute super."pdfsplit";
+  "pdynload" = dontDistribute super."pdynload";
+  "peakachu" = dontDistribute super."peakachu";
+  "peano" = dontDistribute super."peano";
+  "peano-inf" = dontDistribute super."peano-inf";
+  "pec" = dontDistribute super."pec";
+  "pecoff" = dontDistribute super."pecoff";
+  "peg" = dontDistribute super."peg";
+  "peggy" = dontDistribute super."peggy";
+  "pell" = dontDistribute super."pell";
+  "penn-treebank" = dontDistribute super."penn-treebank";
+  "penny" = dontDistribute super."penny";
+  "penny-bin" = dontDistribute super."penny-bin";
+  "penny-lib" = dontDistribute super."penny-lib";
+  "peparser" = dontDistribute super."peparser";
+  "perceptron" = dontDistribute super."perceptron";
+  "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistent" = doDistribute super."persistent_2_2_4_1";
+  "persistent-audit" = dontDistribute super."persistent-audit";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "persistent-database-url" = dontDistribute super."persistent-database-url";
+  "persistent-equivalence" = dontDistribute super."persistent-equivalence";
+  "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
+  "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
+  "persistent-map" = dontDistribute super."persistent-map";
+  "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_4";
+  "persistent-mysql" = doDistribute super."persistent-mysql_2_3_0_2";
+  "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_2";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-sqlite" = doDistribute super."persistent-sqlite_2_2_1";
+  "persistent-template" = doDistribute super."persistent-template_2_1_8_1";
+  "persistent-vector" = dontDistribute super."persistent-vector";
+  "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
+  "persona" = dontDistribute super."persona";
+  "persona-idp" = dontDistribute super."persona-idp";
+  "pesca" = dontDistribute super."pesca";
+  "peyotls" = dontDistribute super."peyotls";
+  "peyotls-codec" = dontDistribute super."peyotls-codec";
+  "pez" = dontDistribute super."pez";
+  "pg-harness" = dontDistribute super."pg-harness";
+  "pg-harness-client" = dontDistribute super."pg-harness-client";
+  "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phash" = dontDistribute super."phash";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
+  "phone-numbers" = dontDistribute super."phone-numbers";
+  "phone-push" = dontDistribute super."phone-push";
+  "phonetic-code" = dontDistribute super."phonetic-code";
+  "phooey" = dontDistribute super."phooey";
+  "photoname" = dontDistribute super."photoname";
+  "phraskell" = dontDistribute super."phraskell";
+  "phybin" = dontDistribute super."phybin";
+  "pi-calculus" = dontDistribute super."pi-calculus";
+  "pia-forward" = dontDistribute super."pia-forward";
+  "pianola" = dontDistribute super."pianola";
+  "picologic" = dontDistribute super."picologic";
+  "picosat" = dontDistribute super."picosat";
+  "piet" = dontDistribute super."piet";
+  "piki" = dontDistribute super."piki";
+  "pinboard" = dontDistribute super."pinboard";
+  "pinch" = doDistribute super."pinch_0_2_0_1";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_2_1";
+  "pipes-cellular" = dontDistribute super."pipes-cellular";
+  "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
+  "pipes-cereal" = dontDistribute super."pipes-cereal";
+  "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-conduit" = dontDistribute super."pipes-conduit";
+  "pipes-core" = dontDistribute super."pipes-core";
+  "pipes-courier" = dontDistribute super."pipes-courier";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
+  "pipes-lzma" = dontDistribute super."pipes-lzma";
+  "pipes-network-tls" = dontDistribute super."pipes-network-tls";
+  "pipes-p2p" = dontDistribute super."pipes-p2p";
+  "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-rt" = dontDistribute super."pipes-rt";
+  "pipes-s3" = dontDistribute super."pipes-s3";
+  "pipes-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-websockets" = dontDistribute super."pipes-websockets";
+  "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
+  "pipes-zlib" = dontDistribute super."pipes-zlib";
+  "pisigma" = dontDistribute super."pisigma";
+  "pit" = dontDistribute super."pit";
+  "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
+  "pkcs1" = dontDistribute super."pkcs1";
+  "pkcs7" = dontDistribute super."pkcs7";
+  "pkggraph" = dontDistribute super."pkggraph";
+  "pktree" = dontDistribute super."pktree";
+  "plailude" = dontDistribute super."plailude";
+  "planar-graph" = dontDistribute super."planar-graph";
+  "plat" = dontDistribute super."plat";
+  "playlists" = dontDistribute super."playlists";
+  "plist" = dontDistribute super."plist";
+  "plist-buddy" = dontDistribute super."plist-buddy";
+  "plivo" = dontDistribute super."plivo";
+  "plot-lab" = dontDistribute super."plot-lab";
+  "plotfont" = dontDistribute super."plotfont";
+  "plotserver-api" = dontDistribute super."plotserver-api";
+  "plugins" = dontDistribute super."plugins";
+  "plugins-auto" = dontDistribute super."plugins-auto";
+  "plugins-multistage" = dontDistribute super."plugins-multistage";
+  "plumbers" = dontDistribute super."plumbers";
+  "ply-loader" = dontDistribute super."ply-loader";
+  "png-file" = dontDistribute super."png-file";
+  "pngload" = dontDistribute super."pngload";
+  "pngload-fixed" = dontDistribute super."pngload-fixed";
+  "pnm" = dontDistribute super."pnm";
+  "pocket-dns" = dontDistribute super."pocket-dns";
+  "pointed" = doDistribute super."pointed_4_2_0_2";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointless-haskell" = dontDistribute super."pointless-haskell";
+  "pointless-lenses" = dontDistribute super."pointless-lenses";
+  "pointless-rewrite" = dontDistribute super."pointless-rewrite";
+  "poker-eval" = dontDistribute super."poker-eval";
+  "pokitdok" = dontDistribute super."pokitdok";
+  "polar" = dontDistribute super."polar";
+  "polar-configfile" = dontDistribute super."polar-configfile";
+  "polar-shader" = dontDistribute super."polar-shader";
+  "polh-lexicon" = dontDistribute super."polh-lexicon";
+  "polimorf" = dontDistribute super."polimorf";
+  "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
+  "polynomial" = dontDistribute super."polynomial";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "pomodoro" = dontDistribute super."pomodoro";
+  "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
+  "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
+  "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
+  "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
+  "pony" = dontDistribute super."pony";
+  "pool" = dontDistribute super."pool";
+  "pool-conduit" = dontDistribute super."pool-conduit";
+  "pooled-io" = dontDistribute super."pooled-io";
+  "pop3-client" = dontDistribute super."pop3-client";
+  "popenhs" = dontDistribute super."popenhs";
+  "poppler" = dontDistribute super."poppler";
+  "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache";
+  "portable-lines" = dontDistribute super."portable-lines";
+  "portaudio" = dontDistribute super."portaudio";
+  "porte" = dontDistribute super."porte";
+  "porter" = dontDistribute super."porter";
+  "ports" = dontDistribute super."ports";
+  "ports-tools" = dontDistribute super."ports-tools";
+  "positive" = dontDistribute super."positive";
+  "posix-acl" = dontDistribute super."posix-acl";
+  "posix-escape" = dontDistribute super."posix-escape";
+  "posix-filelock" = dontDistribute super."posix-filelock";
+  "posix-paths" = dontDistribute super."posix-paths";
+  "posix-pty" = dontDistribute super."posix-pty";
+  "posix-timer" = dontDistribute super."posix-timer";
+  "posix-waitpid" = dontDistribute super."posix-waitpid";
+  "possible" = dontDistribute super."possible";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-config" = dontDistribute super."postgresql-config";
+  "postgresql-connector" = dontDistribute super."postgresql-connector";
+  "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
+  "postgresql-cube" = dontDistribute super."postgresql-cube";
+  "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple-bind" = dontDistribute super."postgresql-simple-bind";
+  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
+  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
+  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-typed" = dontDistribute super."postgresql-typed";
+  "postgrest" = dontDistribute super."postgrest";
+  "postie" = dontDistribute super."postie";
+  "postmark" = dontDistribute super."postmark";
+  "postmaster" = dontDistribute super."postmaster";
+  "potato-tool" = dontDistribute super."potato-tool";
+  "potrace" = dontDistribute super."potrace";
+  "potrace-diagrams" = dontDistribute super."potrace-diagrams";
+  "powermate" = dontDistribute super."powermate";
+  "powerpc" = dontDistribute super."powerpc";
+  "ppm" = dontDistribute super."ppm";
+  "pqc" = dontDistribute super."pqc";
+  "pqueue" = dontDistribute super."pqueue";
+  "pqueue-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-compat" = dontDistribute super."prelude-compat";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude2010" = dontDistribute super."prelude2010";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "present" = dontDistribute super."present";
+  "press" = dontDistribute super."press";
+  "presto-hdbc" = dontDistribute super."presto-hdbc";
+  "prettify" = dontDistribute super."prettify";
+  "pretty-compact" = dontDistribute super."pretty-compact";
+  "pretty-error" = dontDistribute super."pretty-error";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "pringletons" = dontDistribute super."pringletons";
+  "print-debugger" = dontDistribute super."print-debugger";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
+  "printxosd" = dontDistribute super."printxosd";
+  "priority-queue" = dontDistribute super."priority-queue";
+  "priority-sync" = dontDistribute super."priority-sync";
+  "privileged-concurrency" = dontDistribute super."privileged-concurrency";
+  "prizm" = dontDistribute super."prizm";
+  "probability" = dontDistribute super."probability";
+  "probable" = dontDistribute super."probable";
+  "proc" = dontDistribute super."proc";
+  "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_8";
+  "process-iterio" = dontDistribute super."process-iterio";
+  "process-leksah" = dontDistribute super."process-leksah";
+  "process-listlike" = dontDistribute super."process-listlike";
+  "process-progress" = dontDistribute super."process-progress";
+  "process-qq" = dontDistribute super."process-qq";
+  "processing" = dontDistribute super."processing";
+  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
+  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
+  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
+  "procstat" = dontDistribute super."procstat";
+  "proctest" = dontDistribute super."proctest";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "progress" = dontDistribute super."progress";
+  "progressbar" = dontDistribute super."progressbar";
+  "progression" = dontDistribute super."progression";
+  "progressive" = dontDistribute super."progressive";
+  "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings";
+  "projection" = dontDistribute super."projection";
+  "prolog" = dontDistribute super."prolog";
+  "prolog-graph" = dontDistribute super."prolog-graph";
+  "prolog-graph-lib" = dontDistribute super."prolog-graph-lib";
+  "prologue" = dontDistribute super."prologue";
+  "prometheus" = dontDistribute super."prometheus";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "propane" = dontDistribute super."propane";
+  "propellor" = dontDistribute super."propellor";
+  "properties" = dontDistribute super."properties";
+  "property-list" = dontDistribute super."property-list";
+  "proplang" = dontDistribute super."proplang";
+  "props" = dontDistribute super."props";
+  "prosper" = dontDistribute super."prosper";
+  "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protocol-buffers" = doDistribute super."protocol-buffers_2_2_0";
+  "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_2_0";
+  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
+  "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork";
+  "proton-haskell" = dontDistribute super."proton-haskell";
+  "prototype" = dontDistribute super."prototype";
+  "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = dontDistribute super."psc-ide";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20160522";
+  "publicsuffixlist" = dontDistribute super."publicsuffixlist";
+  "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
+  "pubnub" = dontDistribute super."pubnub";
+  "pubsub" = dontDistribute super."pubsub";
+  "puffytools" = dontDistribute super."puffytools";
+  "pugixml" = dontDistribute super."pugixml";
+  "pugs-DrIFT" = dontDistribute super."pugs-DrIFT";
+  "pugs-HsSyck" = dontDistribute super."pugs-HsSyck";
+  "pugs-compat" = dontDistribute super."pugs-compat";
+  "pugs-hsregex" = dontDistribute super."pugs-hsregex";
+  "pulse" = dontDistribute super."pulse";
+  "pulse-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-fft" = dontDistribute super."pure-fft";
+  "pure-priority-queue" = dontDistribute super."pure-priority-queue";
+  "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
+  "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_8_5_0";
+  "purescript-bridge" = dontDistribute super."purescript-bridge";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
+  "push-notify" = dontDistribute super."push-notify";
+  "push-notify-ccs" = dontDistribute super."push-notify-ccs";
+  "push-notify-general" = dontDistribute super."push-notify-general";
+  "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pusher-ws" = dontDistribute super."pusher-ws";
+  "pushme" = dontDistribute super."pushme";
+  "putlenses" = dontDistribute super."putlenses";
+  "puzzle-draw" = dontDistribute super."puzzle-draw";
+  "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline";
+  "pvd" = dontDistribute super."pvd";
+  "pwstore-cli" = dontDistribute super."pwstore-cli";
+  "pxsl-tools" = dontDistribute super."pxsl-tools";
+  "pyffi" = dontDistribute super."pyffi";
+  "pyfi" = dontDistribute super."pyfi";
+  "python-pickle" = dontDistribute super."python-pickle";
+  "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator";
+  "qd" = dontDistribute super."qd";
+  "qd-vec" = dontDistribute super."qd-vec";
+  "qed" = dontDistribute super."qed";
+  "qhull-simple" = dontDistribute super."qhull-simple";
+  "qrcode" = dontDistribute super."qrcode";
+  "qt" = dontDistribute super."qt";
+  "quadratic-irrational" = dontDistribute super."quadratic-irrational";
+  "quantfin" = dontDistribute super."quantfin";
+  "quantities" = dontDistribute super."quantities";
+  "quantum-arrow" = dontDistribute super."quantum-arrow";
+  "qudb" = dontDistribute super."qudb";
+  "quenya-verb" = dontDistribute super."quenya-verb";
+  "querystring-pickle" = dontDistribute super."querystring-pickle";
+  "queue" = dontDistribute super."queue";
+  "queuelike" = dontDistribute super."queuelike";
+  "quick-generator" = dontDistribute super."quick-generator";
+  "quick-schema" = dontDistribute super."quick-schema";
+  "quickbooks" = dontDistribute super."quickbooks";
+  "quickcheck-combinators" = dontDistribute super."quickcheck-combinators";
+  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
+  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
+  "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
+  "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad";
+  "quickcheck-regex" = dontDistribute super."quickcheck-regex";
+  "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng";
+  "quickcheck-rematch" = dontDistribute super."quickcheck-rematch";
+  "quickcheck-script" = dontDistribute super."quickcheck-script";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
+  "quiver-bytestring" = dontDistribute super."quiver-bytestring";
+  "quiver-cell" = dontDistribute super."quiver-cell";
+  "quiver-csv" = dontDistribute super."quiver-csv";
+  "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
+  "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-instances" = dontDistribute super."quiver-instances";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
+  "quiver-sort" = dontDistribute super."quiver-sort";
+  "quoridor-hs" = dontDistribute super."quoridor-hs";
+  "qux" = dontDistribute super."qux";
+  "rabocsv2qif" = dontDistribute super."rabocsv2qif";
+  "rad" = dontDistribute super."rad";
+  "radian" = dontDistribute super."radian";
+  "radium" = dontDistribute super."radium";
+  "radium-formula-parser" = dontDistribute super."radium-formula-parser";
+  "radix" = dontDistribute super."radix";
+  "rados-haskell" = dontDistribute super."rados-haskell";
+  "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
+  "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rake" = dontDistribute super."rake";
+  "rakhana" = dontDistribute super."rakhana";
+  "ralist" = dontDistribute super."ralist";
+  "rallod" = dontDistribute super."rallod";
+  "raml" = dontDistribute super."raml";
+  "rand-vars" = dontDistribute super."rand-vars";
+  "randfile" = dontDistribute super."randfile";
+  "random-access-list" = dontDistribute super."random-access-list";
+  "random-derive" = dontDistribute super."random-derive";
+  "random-eff" = dontDistribute super."random-eff";
+  "random-effin" = dontDistribute super."random-effin";
+  "random-extras" = dontDistribute super."random-extras";
+  "random-hypergeometric" = dontDistribute super."random-hypergeometric";
+  "random-stream" = dontDistribute super."random-stream";
+  "random-variates" = dontDistribute super."random-variates";
+  "randomgen" = dontDistribute super."randomgen";
+  "randproc" = dontDistribute super."randproc";
+  "randsolid" = dontDistribute super."randsolid";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rapid" = dontDistribute super."rapid";
+  "rascal" = dontDistribute super."rascal";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = doDistribute super."ratel_0_1_3";
+  "ratio-int" = dontDistribute super."ratio-int";
+  "raven-haskell" = dontDistribute super."raven-haskell";
+  "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "rawstring-qm" = dontDistribute super."rawstring-qm";
+  "razom-text-util" = dontDistribute super."razom-text-util";
+  "rbr" = dontDistribute super."rbr";
+  "rclient" = dontDistribute super."rclient";
+  "rcu" = dontDistribute super."rcu";
+  "rdf4h" = dontDistribute super."rdf4h";
+  "rdioh" = dontDistribute super."rdioh";
+  "rdtsc" = dontDistribute super."rdtsc";
+  "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
+  "re2" = dontDistribute super."re2";
+  "react-flux" = dontDistribute super."react-flux";
+  "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
+  "reaction-logic" = dontDistribute super."reaction-logic";
+  "reactive" = dontDistribute super."reactive";
+  "reactive-bacon" = dontDistribute super."reactive-bacon";
+  "reactive-balsa" = dontDistribute super."reactive-balsa";
+  "reactive-banana" = dontDistribute super."reactive-banana";
+  "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
+  "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
+  "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
+  "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
+  "reactive-glut" = dontDistribute super."reactive-glut";
+  "reactive-haskell" = dontDistribute super."reactive-haskell";
+  "reactive-io" = dontDistribute super."reactive-io";
+  "reactive-thread" = dontDistribute super."reactive-thread";
+  "reactivity" = dontDistribute super."reactivity";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
+  "recaptcha" = dontDistribute super."recaptcha";
+  "record" = dontDistribute super."record";
+  "record-aeson" = dontDistribute super."record-aeson";
+  "record-gl" = dontDistribute super."record-gl";
+  "record-preprocessor" = dontDistribute super."record-preprocessor";
+  "record-syntax" = dontDistribute super."record-syntax";
+  "records" = dontDistribute super."records";
+  "records-th" = dontDistribute super."records-th";
+  "recursive-line-count" = dontDistribute super."recursive-line-count";
+  "redHandlers" = dontDistribute super."redHandlers";
+  "reddit" = dontDistribute super."reddit";
+  "redis" = dontDistribute super."redis";
+  "redis-hs" = dontDistribute super."redis-hs";
+  "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-simple" = dontDistribute super."redis-simple";
+  "redo" = dontDistribute super."redo";
+  "reenact" = dontDistribute super."reenact";
+  "reexport-crypto-random" = dontDistribute super."reexport-crypto-random";
+  "ref" = dontDistribute super."ref";
+  "ref-mtl" = dontDistribute super."ref-mtl";
+  "ref-tf" = dontDistribute super."ref-tf";
+  "refcount" = dontDistribute super."refcount";
+  "reference" = dontDistribute super."reference";
+  "references" = dontDistribute super."references";
+  "refh" = dontDistribute super."refh";
+  "refined" = dontDistribute super."refined";
+  "reflection-extras" = dontDistribute super."reflection-extras";
+  "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
+  "reflex" = dontDistribute super."reflex";
+  "reflex-animation" = dontDistribute super."reflex-animation";
+  "reflex-dom" = dontDistribute super."reflex-dom";
+  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
+  "reflex-dom-helpers" = dontDistribute super."reflex-dom-helpers";
+  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-jsx" = dontDistribute super."reflex-jsx";
+  "reflex-orphans" = dontDistribute super."reflex-orphans";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-deriv" = dontDistribute super."regex-deriv";
+  "regex-dfa" = dontDistribute super."regex-dfa";
+  "regex-easy" = dontDistribute super."regex-easy";
+  "regex-genex" = dontDistribute super."regex-genex";
+  "regex-parsec" = dontDistribute super."regex-parsec";
+  "regex-pderiv" = dontDistribute super."regex-pderiv";
+  "regex-posix-unittest" = dontDistribute super."regex-posix-unittest";
+  "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes";
+  "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter";
+  "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
+  "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
+  "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
+  "regex-xmlschema" = dontDistribute super."regex-xmlschema";
+  "regexchar" = dontDistribute super."regexchar";
+  "regexdot" = dontDistribute super."regexdot";
+  "regexp-tries" = dontDistribute super."regexp-tries";
+  "regexpr" = dontDistribute super."regexpr";
+  "regexpr-symbolic" = dontDistribute super."regexpr-symbolic";
+  "regexqq" = dontDistribute super."regexqq";
+  "regional-pointers" = dontDistribute super."regional-pointers";
+  "regions" = dontDistribute super."regions";
+  "regions-monadsfd" = dontDistribute super."regions-monadsfd";
+  "regions-monadstf" = dontDistribute super."regions-monadstf";
+  "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
+  "regress" = dontDistribute super."regress";
+  "regular" = dontDistribute super."regular";
+  "regular-extras" = dontDistribute super."regular-extras";
+  "regular-web" = dontDistribute super."regular-web";
+  "regular-xmlpickler" = dontDistribute super."regular-xmlpickler";
+  "reheat" = dontDistribute super."reheat";
+  "rehoo" = dontDistribute super."rehoo";
+  "rei" = dontDistribute super."rei";
+  "reified-records" = dontDistribute super."reified-records";
+  "reify" = dontDistribute super."reify";
+  "relacion" = dontDistribute super."relacion";
+  "relation" = dontDistribute super."relation";
+  "relational-postgresql8" = dontDistribute super."relational-postgresql8";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-json" = dontDistribute super."remote-json";
+  "remote-json-client" = dontDistribute super."remote-json-client";
+  "remote-json-server" = dontDistribute super."remote-json-server";
+  "remote-monad" = dontDistribute super."remote-monad";
+  "remotion" = dontDistribute super."remotion";
+  "renderable" = dontDistribute super."renderable";
+  "reord" = dontDistribute super."reord";
+  "reorderable" = dontDistribute super."reorderable";
+  "repa-array" = dontDistribute super."repa-array";
+  "repa-bytestring" = dontDistribute super."repa-bytestring";
+  "repa-convert" = dontDistribute super."repa-convert";
+  "repa-eval" = dontDistribute super."repa-eval";
+  "repa-examples" = dontDistribute super."repa-examples";
+  "repa-fftw" = dontDistribute super."repa-fftw";
+  "repa-flow" = dontDistribute super."repa-flow";
+  "repa-linear-algebra" = dontDistribute super."repa-linear-algebra";
+  "repa-plugin" = dontDistribute super."repa-plugin";
+  "repa-scalar" = dontDistribute super."repa-scalar";
+  "repa-series" = dontDistribute super."repa-series";
+  "repa-sndfile" = dontDistribute super."repa-sndfile";
+  "repa-stream" = dontDistribute super."repa-stream";
+  "repa-v4l2" = dontDistribute super."repa-v4l2";
+  "repl" = dontDistribute super."repl";
+  "repl-toolkit" = dontDistribute super."repl-toolkit";
+  "repline" = dontDistribute super."repline";
+  "repo-based-blog" = dontDistribute super."repo-based-blog";
+  "repr" = dontDistribute super."repr";
+  "repr-tree-syb" = dontDistribute super."repr-tree-syb";
+  "representable-functors" = dontDistribute super."representable-functors";
+  "representable-profunctors" = dontDistribute super."representable-profunctors";
+  "representable-tries" = dontDistribute super."representable-tries";
+  "reqcatcher" = dontDistribute super."reqcatcher";
+  "request-monad" = dontDistribute super."request-monad";
+  "reserve" = dontDistribute super."reserve";
+  "resistor-cube" = dontDistribute super."resistor-cube";
+  "resource-effect" = dontDistribute super."resource-effect";
+  "resource-embed" = dontDistribute super."resource-embed";
+  "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
+  "resource-pool-monad" = dontDistribute super."resource-pool-monad";
+  "resource-simple" = dontDistribute super."resource-simple";
+  "respond" = dontDistribute super."respond";
+  "rest-example" = dontDistribute super."rest-example";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_22";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retryer" = dontDistribute super."retryer";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
+  "reverse-geocoding" = dontDistribute super."reverse-geocoding";
+  "reversi" = dontDistribute super."reversi";
+  "rewrite" = dontDistribute super."rewrite";
+  "rewriting" = dontDistribute super."rewriting";
+  "rex" = dontDistribute super."rex";
+  "rezoom" = dontDistribute super."rezoom";
+  "rfc3339" = dontDistribute super."rfc3339";
+  "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial";
+  "richreports" = dontDistribute super."richreports";
+  "riemann" = dontDistribute super."riemann";
+  "riff" = dontDistribute super."riff";
+  "ring-buffer" = dontDistribute super."ring-buffer";
+  "riot" = dontDistribute super."riot";
+  "ripple" = dontDistribute super."ripple";
+  "ripple-federation" = dontDistribute super."ripple-federation";
+  "risc386" = dontDistribute super."risc386";
+  "rison" = dontDistribute super."rison";
+  "rivers" = dontDistribute super."rivers";
+  "rivet" = dontDistribute super."rivet";
+  "rivet-core" = dontDistribute super."rivet-core";
+  "rivet-migration" = dontDistribute super."rivet-migration";
+  "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy";
+  "rlglue" = dontDistribute super."rlglue";
+  "rlist" = dontDistribute super."rlist";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "robin" = dontDistribute super."robin";
+  "robot" = dontDistribute super."robot";
+  "robots-txt" = dontDistribute super."robots-txt";
+  "rocksdb-haskell" = dontDistribute super."rocksdb-haskell";
+  "roguestar" = dontDistribute super."roguestar";
+  "roguestar-engine" = dontDistribute super."roguestar-engine";
+  "roguestar-gl" = dontDistribute super."roguestar-gl";
+  "roguestar-glut" = dontDistribute super."roguestar-glut";
+  "rollbar" = dontDistribute super."rollbar";
+  "roller" = dontDistribute super."roller";
+  "rolling-queue" = dontDistribute super."rolling-queue";
+  "roman-numerals" = dontDistribute super."roman-numerals";
+  "romkan" = dontDistribute super."romkan";
+  "roots" = dontDistribute super."roots";
+  "rope" = dontDistribute super."rope";
+  "rosa" = dontDistribute super."rosa";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "roshask" = dontDistribute super."roshask";
+  "rosso" = dontDistribute super."rosso";
+  "rot13" = dontDistribute super."rot13";
+  "roundRobin" = dontDistribute super."roundRobin";
+  "rounding" = dontDistribute super."rounding";
+  "roundtrip" = dontDistribute super."roundtrip";
+  "roundtrip-aeson" = dontDistribute super."roundtrip-aeson";
+  "roundtrip-string" = dontDistribute super."roundtrip-string";
+  "roundtrip-xml" = dontDistribute super."roundtrip-xml";
+  "route-generator" = dontDistribute super."route-generator";
+  "route-planning" = dontDistribute super."route-planning";
+  "rowrecord" = dontDistribute super."rowrecord";
+  "rpc" = dontDistribute super."rpc";
+  "rpc-framework" = dontDistribute super."rpc-framework";
+  "rpf" = dontDistribute super."rpf";
+  "rpm" = dontDistribute super."rpm";
+  "rsagl" = dontDistribute super."rsagl";
+  "rsagl-frp" = dontDistribute super."rsagl-frp";
+  "rsagl-math" = dontDistribute super."rsagl-math";
+  "rspp" = dontDistribute super."rspp";
+  "rss" = dontDistribute super."rss";
+  "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
+  "rtld" = dontDistribute super."rtld";
+  "rtlsdr" = dontDistribute super."rtlsdr";
+  "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";
+  "rtorrent-state" = dontDistribute super."rtorrent-state";
+  "rubberband" = dontDistribute super."rubberband";
+  "ruby-marshal" = dontDistribute super."ruby-marshal";
+  "ruby-qq" = dontDistribute super."ruby-qq";
+  "ruff" = dontDistribute super."ruff";
+  "ruler" = dontDistribute super."ruler";
+  "ruler-core" = dontDistribute super."ruler-core";
+  "rungekutta" = dontDistribute super."rungekutta";
+  "runghc" = dontDistribute super."runghc";
+  "rwlock" = dontDistribute super."rwlock";
+  "rws" = dontDistribute super."rws";
+  "s-cargot" = dontDistribute super."s-cargot";
+  "safe-access" = dontDistribute super."safe-access";
+  "safe-failure" = dontDistribute super."safe-failure";
+  "safe-failure-cme" = dontDistribute super."safe-failure-cme";
+  "safe-freeze" = dontDistribute super."safe-freeze";
+  "safe-globals" = dontDistribute super."safe-globals";
+  "safe-lazy-io" = dontDistribute super."safe-lazy-io";
+  "safe-length" = dontDistribute super."safe-length";
+  "safe-plugins" = dontDistribute super."safe-plugins";
+  "safe-printf" = dontDistribute super."safe-printf";
+  "safeint" = dontDistribute super."safeint";
+  "safer-file-handles" = dontDistribute super."safer-file-handles";
+  "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
+  "safer-file-handles-text" = dontDistribute super."safer-file-handles-text";
+  "saferoute" = dontDistribute super."saferoute";
+  "sai-shape-syb" = dontDistribute super."sai-shape-syb";
+  "saltine" = dontDistribute super."saltine";
+  "saltine-quickcheck" = dontDistribute super."saltine-quickcheck";
+  "salvia" = dontDistribute super."salvia";
+  "salvia-demo" = dontDistribute super."salvia-demo";
+  "salvia-extras" = dontDistribute super."salvia-extras";
+  "salvia-protocol" = dontDistribute super."salvia-protocol";
+  "salvia-sessions" = dontDistribute super."salvia-sessions";
+  "salvia-websocket" = dontDistribute super."salvia-websocket";
+  "sample-frame" = dontDistribute super."sample-frame";
+  "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_6";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "sarsi" = dontDistribute super."sarsi";
+  "sasl" = dontDistribute super."sasl";
+  "sat" = dontDistribute super."sat";
+  "sat-micro-hs" = dontDistribute super."sat-micro-hs";
+  "satchmo" = dontDistribute super."satchmo";
+  "satchmo-backends" = dontDistribute super."satchmo-backends";
+  "satchmo-examples" = dontDistribute super."satchmo-examples";
+  "satchmo-funsat" = dontDistribute super."satchmo-funsat";
+  "satchmo-minisat" = dontDistribute super."satchmo-minisat";
+  "satchmo-toysat" = dontDistribute super."satchmo-toysat";
+  "sbp" = dontDistribute super."sbp";
+  "sbp2udp" = dontDistribute super."sbp2udp";
+  "sbv" = doDistribute super."sbv_5_11";
+  "sbvPlugin" = dontDistribute super."sbvPlugin";
+  "sc3-rdu" = dontDistribute super."sc3-rdu";
+  "scalable-server" = dontDistribute super."scalable-server";
+  "scaleimage" = dontDistribute super."scaleimage";
+  "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
+  "scat" = dontDistribute super."scat";
+  "scc" = dontDistribute super."scc";
+  "scenegraph" = dontDistribute super."scenegraph";
+  "scgi" = dontDistribute super."scgi";
+  "schedevr" = dontDistribute super."schedevr";
+  "schedule-planner" = dontDistribute super."schedule-planner";
+  "schedyield" = dontDistribute super."schedyield";
+  "scholdoc" = dontDistribute super."scholdoc";
+  "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc";
+  "scholdoc-texmath" = dontDistribute super."scholdoc-texmath";
+  "scholdoc-types" = dontDistribute super."scholdoc-types";
+  "schonfinkeling" = dontDistribute super."schonfinkeling";
+  "sci-ratio" = dontDistribute super."sci-ratio";
+  "science-constants" = dontDistribute super."science-constants";
+  "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scion" = dontDistribute super."scion";
+  "scion-browser" = dontDistribute super."scion-browser";
+  "scons2dot" = dontDistribute super."scons2dot";
+  "scope" = dontDistribute super."scope";
+  "scope-cairo" = dontDistribute super."scope-cairo";
+  "scottish" = dontDistribute super."scottish";
+  "scotty-binding-play" = dontDistribute super."scotty-binding-play";
+  "scotty-blaze" = dontDistribute super."scotty-blaze";
+  "scotty-cookie" = dontDistribute super."scotty-cookie";
+  "scotty-fay" = dontDistribute super."scotty-fay";
+  "scotty-hastache" = dontDistribute super."scotty-hastache";
+  "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
+  "scotty-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scotty-view" = dontDistribute super."scotty-view";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrz" = dontDistribute super."scrz";
+  "scyther-proof" = dontDistribute super."scyther-proof";
+  "sde-solver" = dontDistribute super."sde-solver";
+  "sdf2p1-parser" = dontDistribute super."sdf2p1-parser";
+  "sdl2-cairo" = dontDistribute super."sdl2-cairo";
+  "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image";
+  "sdl2-compositor" = dontDistribute super."sdl2-compositor";
+  "sdl2-image" = dontDistribute super."sdl2-image";
+  "sdl2-ttf" = dontDistribute super."sdl2-ttf";
+  "sdnv" = dontDistribute super."sdnv";
+  "sdr" = dontDistribute super."sdr";
+  "seacat" = dontDistribute super."seacat";
+  "seal-module" = dontDistribute super."seal-module";
+  "search" = dontDistribute super."search";
+  "sec" = dontDistribute super."sec";
+  "secdh" = dontDistribute super."secdh";
+  "seclib" = dontDistribute super."seclib";
+  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
+  "secret-santa" = dontDistribute super."secret-santa";
+  "secret-sharing" = dontDistribute super."secret-sharing";
+  "secrm" = dontDistribute super."secrm";
+  "secure-sockets" = dontDistribute super."secure-sockets";
+  "sednaDBXML" = dontDistribute super."sednaDBXML";
+  "select" = dontDistribute super."select";
+  "selectors" = dontDistribute super."selectors";
+  "selenium" = dontDistribute super."selenium";
+  "selenium-server" = dontDistribute super."selenium-server";
+  "selfrestart" = dontDistribute super."selfrestart";
+  "selinux" = dontDistribute super."selinux";
+  "semaphore-plus" = dontDistribute super."semaphore-plus";
+  "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups-actions" = dontDistribute super."semigroups-actions";
+  "semiring" = dontDistribute super."semiring";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "sensei" = dontDistribute super."sensei";
+  "sensenet" = dontDistribute super."sensenet";
+  "sentry" = dontDistribute super."sentry";
+  "senza" = dontDistribute super."senza";
+  "separated" = dontDistribute super."separated";
+  "seqaid" = dontDistribute super."seqaid";
+  "seqid" = dontDistribute super."seqid";
+  "seqid-streams" = dontDistribute super."seqid-streams";
+  "seqloc-datafiles" = dontDistribute super."seqloc-datafiles";
+  "sequence" = dontDistribute super."sequence";
+  "sequent-core" = dontDistribute super."sequent-core";
+  "sequential-index" = dontDistribute super."sequential-index";
+  "sequor" = dontDistribute super."sequor";
+  "serial" = dontDistribute super."serial";
+  "serial-test-generators" = dontDistribute super."serial-test-generators";
+  "serpentine" = dontDistribute super."serpentine";
+  "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
+  "servant-auth-cookie" = dontDistribute super."servant-auth-cookie";
+  "servant-csharp" = dontDistribute super."servant-csharp";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-elm" = dontDistribute super."servant-elm";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-haxl-client" = dontDistribute super."servant-haxl-client";
+  "servant-jquery" = dontDistribute super."servant-jquery";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-purescript" = dontDistribute super."servant-purescript";
+  "servant-quickcheck" = dontDistribute super."servant-quickcheck";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-router" = dontDistribute super."servant-router";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-subscriber" = dontDistribute super."servant-subscriber";
+  "servant-swagger" = doDistribute super."servant-swagger_1_0_3";
+  "servant-swagger-ui" = dontDistribute super."servant-swagger-ui";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-with" = dontDistribute super."set-with";
+  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
+  "setops" = dontDistribute super."setops";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
+  "sexp-show" = dontDistribute super."sexp-show";
+  "sexpr" = dontDistribute super."sexpr";
+  "sext" = dontDistribute super."sext";
+  "sfml-audio" = dontDistribute super."sfml-audio";
+  "sfmt" = dontDistribute super."sfmt";
+  "sgd" = dontDistribute super."sgd";
+  "sgf" = dontDistribute super."sgf";
+  "sgrep" = dontDistribute super."sgrep";
+  "sha-streams" = dontDistribute super."sha-streams";
+  "shadower" = dontDistribute super."shadower";
+  "shadowsocks" = dontDistribute super."shadowsocks";
+  "shady-gen" = dontDistribute super."shady-gen";
+  "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake-cabal-build" = dontDistribute super."shake-cabal-build";
+  "shake-extras" = dontDistribute super."shake-extras";
+  "shake-minify" = dontDistribute super."shake-minify";
+  "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
+  "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
+  "shakespeare-css" = dontDistribute super."shakespeare-css";
+  "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
+  "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-sass" = dontDistribute super."shakespeare-sass";
+  "shakespeare-text" = dontDistribute super."shakespeare-text";
+  "shana" = dontDistribute super."shana";
+  "shapefile" = dontDistribute super."shapefile";
+  "shapely-data" = dontDistribute super."shapely-data";
+  "sharc-timbre" = dontDistribute super."sharc-timbre";
+  "shared-buffer" = dontDistribute super."shared-buffer";
+  "shared-fields" = dontDistribute super."shared-fields";
+  "shared-memory" = dontDistribute super."shared-memory";
+  "sharedio" = dontDistribute super."sharedio";
+  "she" = dontDistribute super."she";
+  "shelduck" = dontDistribute super."shelduck";
+  "shell-escape" = dontDistribute super."shell-escape";
+  "shell-monad" = dontDistribute super."shell-monad";
+  "shell-pipe" = dontDistribute super."shell-pipe";
+  "shellish" = dontDistribute super."shellish";
+  "shellmate" = dontDistribute super."shellmate";
+  "shellmate-extras" = dontDistribute super."shellmate-extras";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
+  "shivers-cfg" = dontDistribute super."shivers-cfg";
+  "shoap" = dontDistribute super."shoap";
+  "shortcircuit" = dontDistribute super."shortcircuit";
+  "shorten-strings" = dontDistribute super."shorten-strings";
+  "show" = dontDistribute super."show";
+  "show-type" = dontDistribute super."show-type";
+  "showdown" = dontDistribute super."showdown";
+  "shpider" = dontDistribute super."shpider";
+  "shplit" = dontDistribute super."shplit";
+  "shqq" = dontDistribute super."shqq";
+  "shuffle" = dontDistribute super."shuffle";
+  "sieve" = dontDistribute super."sieve";
+  "sifflet" = dontDistribute super."sifflet";
+  "sifflet-lib" = dontDistribute super."sifflet-lib";
+  "sign" = dontDistribute super."sign";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple-actors" = dontDistribute super."simple-actors";
+  "simple-atom" = dontDistribute super."simple-atom";
+  "simple-bluetooth" = dontDistribute super."simple-bluetooth";
+  "simple-c-value" = dontDistribute super."simple-c-value";
+  "simple-conduit" = dontDistribute super."simple-conduit";
+  "simple-config" = dontDistribute super."simple-config";
+  "simple-css" = dontDistribute super."simple-css";
+  "simple-eval" = dontDistribute super."simple-eval";
+  "simple-firewire" = dontDistribute super."simple-firewire";
+  "simple-form" = dontDistribute super."simple-form";
+  "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm";
+  "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr";
+  "simple-get-opt" = dontDistribute super."simple-get-opt";
+  "simple-index" = dontDistribute super."simple-index";
+  "simple-log-syslog" = dontDistribute super."simple-log-syslog";
+  "simple-neural-networks" = dontDistribute super."simple-neural-networks";
+  "simple-nix" = dontDistribute super."simple-nix";
+  "simple-observer" = dontDistribute super."simple-observer";
+  "simple-pascal" = dontDistribute super."simple-pascal";
+  "simple-pipe" = dontDistribute super."simple-pipe";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-sessions" = dontDistribute super."simple-sessions";
+  "simple-sql-parser" = dontDistribute super."simple-sql-parser";
+  "simple-stacked-vm" = dontDistribute super."simple-stacked-vm";
+  "simple-tabular" = dontDistribute super."simple-tabular";
+  "simple-vec3" = dontDistribute super."simple-vec3";
+  "simpleargs" = dontDistribute super."simpleargs";
+  "simpleirc-lens" = dontDistribute super."simpleirc-lens";
+  "simplenote" = dontDistribute super."simplenote";
+  "simpleprelude" = dontDistribute super."simpleprelude";
+  "simplesmtpclient" = dontDistribute super."simplesmtpclient";
+  "simplessh" = dontDistribute super."simplessh";
+  "simplest-sqlite" = dontDistribute super."simplest-sqlite";
+  "simplex" = dontDistribute super."simplex";
+  "simplex-basic" = dontDistribute super."simplex-basic";
+  "simseq" = dontDistribute super."simseq";
+  "simtreelo" = dontDistribute super."simtreelo";
+  "sindre" = dontDistribute super."sindre";
+  "singleton-nats" = dontDistribute super."singleton-nats";
+  "singletons" = doDistribute super."singletons_2_0_1";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "size-based" = dontDistribute super."size-based";
+  "sized" = dontDistribute super."sized";
+  "sized-types" = dontDistribute super."sized-types";
+  "sized-vector" = dontDistribute super."sized-vector";
+  "sizes" = dontDistribute super."sizes";
+  "sjsp" = dontDistribute super."sjsp";
+  "skeleton" = dontDistribute super."skeleton";
+  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
+  "skype4hs" = dontDistribute super."skype4hs";
+  "skypelogexport" = dontDistribute super."skypelogexport";
+  "slack" = dontDistribute super."slack";
+  "slack-api" = dontDistribute super."slack-api";
+  "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "sleep" = dontDistribute super."sleep";
+  "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
+  "slidemews" = dontDistribute super."slidemews";
+  "sloane" = dontDistribute super."sloane";
+  "slot-lambda" = dontDistribute super."slot-lambda";
+  "sloth" = dontDistribute super."sloth";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smsaero" = dontDistribute super."smsaero";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake" = dontDistribute super."snake";
+  "snake-game" = dontDistribute super."snake-game";
+  "snap-accept" = dontDistribute super."snap-accept";
+  "snap-app" = dontDistribute super."snap-app";
+  "snap-auth-cli" = dontDistribute super."snap-auth-cli";
+  "snap-blaze" = dontDistribute super."snap-blaze";
+  "snap-blaze-clay" = dontDistribute super."snap-blaze-clay";
+  "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities";
+  "snap-cors" = dontDistribute super."snap-cors";
+  "snap-elm" = dontDistribute super."snap-elm";
+  "snap-error-collector" = dontDistribute super."snap-error-collector";
+  "snap-extras" = dontDistribute super."snap-extras";
+  "snap-language" = dontDistribute super."snap-language";
+  "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic";
+  "snap-loader-static" = dontDistribute super."snap-loader-static";
+  "snap-predicates" = dontDistribute super."snap-predicates";
+  "snap-routes" = dontDistribute super."snap-routes";
+  "snap-testing" = dontDistribute super."snap-testing";
+  "snap-utils" = dontDistribute super."snap-utils";
+  "snap-web-routes" = dontDistribute super."snap-web-routes";
+  "snaplet-acid-state" = dontDistribute super."snaplet-acid-state";
+  "snaplet-actionlog" = dontDistribute super."snaplet-actionlog";
+  "snaplet-amqp" = dontDistribute super."snaplet-amqp";
+  "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid";
+  "snaplet-coffee" = dontDistribute super."snaplet-coffee";
+  "snaplet-css-min" = dontDistribute super."snaplet-css-min";
+  "snaplet-environments" = dontDistribute super."snaplet-environments";
+  "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs";
+  "snaplet-hasql" = dontDistribute super."snaplet-hasql";
+  "snaplet-haxl" = dontDistribute super."snaplet-haxl";
+  "snaplet-hdbc" = dontDistribute super."snaplet-hdbc";
+  "snaplet-hslogger" = dontDistribute super."snaplet-hslogger";
+  "snaplet-i18n" = dontDistribute super."snaplet-i18n";
+  "snaplet-influxdb" = dontDistribute super."snaplet-influxdb";
+  "snaplet-lss" = dontDistribute super."snaplet-lss";
+  "snaplet-mandrill" = dontDistribute super."snaplet-mandrill";
+  "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB";
+  "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic";
+  "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple";
+  "snaplet-oauth" = dontDistribute super."snaplet-oauth";
+  "snaplet-persistent" = dontDistribute super."snaplet-persistent";
+  "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple";
+  "snaplet-postmark" = dontDistribute super."snaplet-postmark";
+  "snaplet-purescript" = dontDistribute super."snaplet-purescript";
+  "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha";
+  "snaplet-redis" = dontDistribute super."snaplet-redis";
+  "snaplet-redson" = dontDistribute super."snaplet-redson";
+  "snaplet-rest" = dontDistribute super."snaplet-rest";
+  "snaplet-riak" = dontDistribute super."snaplet-riak";
+  "snaplet-sass" = dontDistribute super."snaplet-sass";
+  "snaplet-sedna" = dontDistribute super."snaplet-sedna";
+  "snaplet-ses-html" = dontDistribute super."snaplet-ses-html";
+  "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple";
+  "snaplet-stripe" = dontDistribute super."snaplet-stripe";
+  "snaplet-tasks" = dontDistribute super."snaplet-tasks";
+  "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions";
+  "snaplet-wordpress" = dontDistribute super."snaplet-wordpress";
+  "snappy" = dontDistribute super."snappy";
+  "snappy-conduit" = dontDistribute super."snappy-conduit";
+  "snappy-framing" = dontDistribute super."snappy-framing";
+  "snappy-iteratee" = dontDistribute super."snappy-iteratee";
+  "sndfile-enumerators" = dontDistribute super."sndfile-enumerators";
+  "sneakyterm" = dontDistribute super."sneakyterm";
+  "sneathlane-haste" = dontDistribute super."sneathlane-haste";
+  "snippet-extractor" = dontDistribute super."snippet-extractor";
+  "snm" = dontDistribute super."snm";
+  "snow-white" = dontDistribute super."snow-white";
+  "snowball" = dontDistribute super."snowball";
+  "snowglobe" = dontDistribute super."snowglobe";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket-activation" = dontDistribute super."socket-activation";
+  "socket-sctp" = dontDistribute super."socket-sctp";
+  "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
+  "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "sorted-list" = doDistribute super."sorted-list_0_1_6_1";
+  "sorting" = dontDistribute super."sorting";
+  "sorty" = dontDistribute super."sorty";
+  "sound-collage" = dontDistribute super."sound-collage";
+  "sounddelay" = dontDistribute super."sounddelay";
+  "source-code-server" = dontDistribute super."source-code-server";
+  "sousit" = dontDistribute super."sousit";
+  "sox" = dontDistribute super."sox";
+  "soxlib" = dontDistribute super."soxlib";
+  "soyuz" = dontDistribute super."soyuz";
+  "spacefill" = dontDistribute super."spacefill";
+  "spacepart" = dontDistribute super."spacepart";
+  "spaceprobe" = dontDistribute super."spaceprobe";
+  "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
+  "sparse" = dontDistribute super."sparse";
+  "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
+  "sparsebit" = dontDistribute super."sparsebit";
+  "sparsecheck" = dontDistribute super."sparsecheck";
+  "sparser" = dontDistribute super."sparser";
+  "spata" = dontDistribute super."spata";
+  "spatial-math" = dontDistribute super."spatial-math";
+  "spawn" = dontDistribute super."spawn";
+  "spe" = dontDistribute super."spe";
+  "special-functors" = dontDistribute super."special-functors";
+  "special-keys" = dontDistribute super."special-keys";
+  "specialize-th" = dontDistribute super."specialize-th";
+  "species" = dontDistribute super."species";
+  "speculation-transformers" = dontDistribute super."speculation-transformers";
+  "spelling-suggest" = dontDistribute super."spelling-suggest";
+  "sphero" = dontDistribute super."sphero";
+  "sphinx-cli" = dontDistribute super."sphinx-cli";
+  "spice" = dontDistribute super."spice";
+  "spike" = dontDistribute super."spike";
+  "spine" = dontDistribute super."spine";
+  "spir-v" = dontDistribute super."spir-v";
+  "splay" = dontDistribute super."splay";
+  "splaytree" = dontDistribute super."splaytree";
+  "spline3" = dontDistribute super."spline3";
+  "splines" = dontDistribute super."splines";
+  "split-channel" = dontDistribute super."split-channel";
+  "split-record" = dontDistribute super."split-record";
+  "split-tchan" = dontDistribute super."split-tchan";
+  "splitter" = dontDistribute super."splitter";
+  "splot" = dontDistribute super."splot";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "sproxy" = dontDistribute super."sproxy";
+  "sproxy-web" = dontDistribute super."sproxy-web";
+  "spsa" = dontDistribute super."spsa";
+  "spy" = dontDistribute super."spy";
+  "sql-simple" = dontDistribute super."sql-simple";
+  "sql-simple-mysql" = dontDistribute super."sql-simple-mysql";
+  "sql-simple-pool" = dontDistribute super."sql-simple-pool";
+  "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql";
+  "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite";
+  "sqlite" = dontDistribute super."sqlite";
+  "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed";
+  "sqlvalue-list" = dontDistribute super."sqlvalue-list";
+  "squeeze" = dontDistribute super."squeeze";
+  "sr-extra" = dontDistribute super."sr-extra";
+  "srcinst" = dontDistribute super."srcinst";
+  "srec" = dontDistribute super."srec";
+  "sscgi" = dontDistribute super."sscgi";
+  "sscript" = dontDistribute super."sscript";
+  "ssh" = dontDistribute super."ssh";
+  "sshd-lint" = dontDistribute super."sshd-lint";
+  "sshtun" = dontDistribute super."sshtun";
+  "sssp" = dontDistribute super."sssp";
+  "sstable" = dontDistribute super."sstable";
+  "ssv" = dontDistribute super."ssv";
+  "stable-heap" = dontDistribute super."stable-heap";
+  "stable-maps" = dontDistribute super."stable-maps";
+  "stable-marriage" = dontDistribute super."stable-marriage";
+  "stable-memo" = dontDistribute super."stable-memo";
+  "stable-tree" = dontDistribute super."stable-tree";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
+  "standalone-haddock" = dontDistribute super."standalone-haddock";
+  "star-to-star" = dontDistribute super."star-to-star";
+  "star-to-star-contra" = dontDistribute super."star-to-star-contra";
+  "starling" = dontDistribute super."starling";
+  "starrover2" = dontDistribute super."starrover2";
+  "stash" = dontDistribute super."stash";
+  "state" = dontDistribute super."state";
+  "state-record" = dontDistribute super."state-record";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-conduit" = doDistribute super."stm-conduit_2_8_0";
+  "stm-firehose" = dontDistribute super."stm-firehose";
+  "stm-io-hooks" = dontDistribute super."stm-io-hooks";
+  "stm-lifted" = dontDistribute super."stm-lifted";
+  "stm-linkedlist" = dontDistribute super."stm-linkedlist";
+  "stm-orelse-io" = dontDistribute super."stm-orelse-io";
+  "stm-promise" = dontDistribute super."stm-promise";
+  "stm-queue-extras" = dontDistribute super."stm-queue-extras";
+  "stm-sbchan" = dontDistribute super."stm-sbchan";
+  "stm-split" = dontDistribute super."stm-split";
+  "stm-tlist" = dontDistribute super."stm-tlist";
+  "stmcontrol" = dontDistribute super."stmcontrol";
+  "stomp-conduit" = dontDistribute super."stomp-conduit";
+  "stomp-patterns" = dontDistribute super."stomp-patterns";
+  "stomp-queue" = dontDistribute super."stomp-queue";
+  "stompl" = dontDistribute super."stompl";
+  "storable" = dontDistribute super."storable";
+  "storable-record" = dontDistribute super."storable-record";
+  "storable-static-array" = dontDistribute super."storable-static-array";
+  "storable-tuple" = dontDistribute super."storable-tuple";
+  "storablevector" = dontDistribute super."storablevector";
+  "storablevector-carray" = dontDistribute super."storablevector-carray";
+  "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
+  "store" = dontDistribute super."store";
+  "store-core" = dontDistribute super."store-core";
+  "str" = dontDistribute super."str";
+  "stratosphere" = doDistribute super."stratosphere_0_1_1";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stratux" = dontDistribute super."stratux";
+  "stratux-http" = dontDistribute super."stratux-http";
+  "stratux-types" = dontDistribute super."stratux-types";
+  "stratux-websockets" = dontDistribute super."stratux-websockets";
+  "stream" = dontDistribute super."stream";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-eversion" = dontDistribute super."streaming-eversion";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-concurrency" = dontDistribute super."strict-concurrency";
+  "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
+  "strict-identity" = dontDistribute super."strict-identity";
+  "strict-io" = dontDistribute super."strict-io";
+  "strictify" = dontDistribute super."strictify";
+  "strictly" = dontDistribute super."strictly";
+  "string" = dontDistribute super."string";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
+  "stringlike" = dontDistribute super."stringlike";
+  "stringprep" = dontDistribute super."stringprep";
+  "strings" = dontDistribute super."strings";
+  "stringtable-atom" = dontDistribute super."stringtable-atom";
+  "strio" = dontDistribute super."strio";
+  "stripe" = dontDistribute super."stripe";
+  "stripe-core" = doDistribute super."stripe-core_2_0_3";
+  "stripe-haskell" = doDistribute super."stripe-haskell_2_0_3";
+  "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_3";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "structural-traversal" = dontDistribute super."structural-traversal";
+  "structured-haskell-mode" = dontDistribute super."structured-haskell-mode";
+  "structured-mongoDB" = dontDistribute super."structured-mongoDB";
+  "structures" = dontDistribute super."structures";
+  "stunclient" = dontDistribute super."stunclient";
+  "stunts" = dontDistribute super."stunts";
+  "stylized" = dontDistribute super."stylized";
+  "sub-state" = dontDistribute super."sub-state";
+  "subhask" = dontDistribute super."subhask";
+  "subleq-toolchain" = dontDistribute super."subleq-toolchain";
+  "subnet" = dontDistribute super."subnet";
+  "subtitleParser" = dontDistribute super."subtitleParser";
+  "subtitles" = dontDistribute super."subtitles";
+  "subwordgraph" = dontDistribute super."subwordgraph";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sunlight" = dontDistribute super."sunlight";
+  "sunroof-compiler" = dontDistribute super."sunroof-compiler";
+  "sunroof-examples" = dontDistribute super."sunroof-examples";
+  "sunroof-server" = dontDistribute super."sunroof-server";
+  "super-user-spark" = dontDistribute super."super-user-spark";
+  "supercollider-ht" = dontDistribute super."supercollider-ht";
+  "supercollider-midi" = dontDistribute super."supercollider-midi";
+  "superdoc" = dontDistribute super."superdoc";
+  "supero" = dontDistribute super."supero";
+  "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
+  "suspend" = dontDistribute super."suspend";
+  "svg2q" = dontDistribute super."svg2q";
+  "svgcairo" = dontDistribute super."svgcairo";
+  "svgutils" = dontDistribute super."svgutils";
+  "svm" = dontDistribute super."svm";
+  "svm-light-utils" = dontDistribute super."svm-light-utils";
+  "svm-simple" = dontDistribute super."svm-simple";
+  "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_2_0_2";
+  "swapper" = dontDistribute super."swapper";
+  "swearjure" = dontDistribute super."swearjure";
+  "swf" = dontDistribute super."swf";
+  "swift-lda" = dontDistribute super."swift-lda";
+  "swish" = dontDistribute super."swish";
+  "sws" = dontDistribute super."sws";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text";
+  "sylvia" = dontDistribute super."sylvia";
+  "sym" = dontDistribute super."sym";
+  "sym-plot" = dontDistribute super."sym-plot";
+  "symengine" = dontDistribute super."symengine";
+  "symengine-hs" = dontDistribute super."symengine-hs";
+  "sync" = dontDistribute super."sync";
+  "synchronous-channels" = dontDistribute super."synchronous-channels";
+  "syncthing-hs" = dontDistribute super."syncthing-hs";
+  "synt" = dontDistribute super."synt";
+  "syntactic" = dontDistribute super."syntactic";
+  "syntactical" = dontDistribute super."syntactical";
+  "syntax" = dontDistribute super."syntax";
+  "syntax-attoparsec" = dontDistribute super."syntax-attoparsec";
+  "syntax-example" = dontDistribute super."syntax-example";
+  "syntax-example-json" = dontDistribute super."syntax-example-json";
+  "syntax-pretty" = dontDistribute super."syntax-pretty";
+  "syntax-printer" = dontDistribute super."syntax-printer";
+  "syntax-trees" = dontDistribute super."syntax-trees";
+  "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn";
+  "synthesizer" = dontDistribute super."synthesizer";
+  "synthesizer-alsa" = dontDistribute super."synthesizer-alsa";
+  "synthesizer-core" = dontDistribute super."synthesizer-core";
+  "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional";
+  "synthesizer-filter" = dontDistribute super."synthesizer-filter";
+  "synthesizer-inference" = dontDistribute super."synthesizer-inference";
+  "synthesizer-llvm" = dontDistribute super."synthesizer-llvm";
+  "synthesizer-midi" = dontDistribute super."synthesizer-midi";
+  "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient";
+  "sys-process" = dontDistribute super."sys-process";
+  "system-canonicalpath" = dontDistribute super."system-canonicalpath";
+  "system-command" = dontDistribute super."system-command";
+  "system-gpio" = dontDistribute super."system-gpio";
+  "system-inotify" = dontDistribute super."system-inotify";
+  "system-lifted" = dontDistribute super."system-lifted";
+  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-test" = dontDistribute super."system-test";
+  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
+  "system-util" = dontDistribute super."system-util";
+  "system-uuid" = dontDistribute super."system-uuid";
+  "systemd" = dontDistribute super."systemd";
+  "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
+  "table-tennis" = dontDistribute super."table-tennis";
+  "tableaux" = dontDistribute super."tableaux";
+  "tables" = dontDistribute super."tables";
+  "tablestorage" = dontDistribute super."tablestorage";
+  "tabloid" = dontDistribute super."tabloid";
+  "taffybar" = dontDistribute super."taffybar";
+  "tag-bits" = dontDistribute super."tag-bits";
+  "tag-stream" = dontDistribute super."tag-stream";
+  "tagchup" = dontDistribute super."tagchup";
+  "tagged-exception-core" = dontDistribute super."tagged-exception-core";
+  "tagged-list" = dontDistribute super."tagged-list";
+  "tagged-th" = dontDistribute super."tagged-th";
+  "tagged-timers" = dontDistribute super."tagged-timers";
+  "tagged-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taglib" = dontDistribute super."taglib";
+  "taglib-api" = dontDistribute super."taglib-api";
+  "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup-ht" = dontDistribute super."tagsoup-ht";
+  "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
+  "tak" = dontDistribute super."tak";
+  "tak-ai" = dontDistribute super."tak-ai";
+  "takahashi" = dontDistribute super."takahashi";
+  "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tamarin-prover" = dontDistribute super."tamarin-prover";
+  "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
+  "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
+  "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
+  "tamper" = dontDistribute super."tamper";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "task-distribution" = dontDistribute super."task-distribution";
+  "taskpool" = dontDistribute super."taskpool";
+  "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
+  "tasty-integrate" = dontDistribute super."tasty-integrate";
+  "tasty-laws" = dontDistribute super."tasty-laws";
+  "tasty-lens" = dontDistribute super."tasty-lens";
+  "tasty-program" = dontDistribute super."tasty-program";
+  "tateti-tateti" = dontDistribute super."tateti-tateti";
+  "tau" = dontDistribute super."tau";
+  "tbox" = dontDistribute super."tbox";
+  "tcache-AWS" = dontDistribute super."tcache-AWS";
+  "tccli" = dontDistribute super."tccli";
+  "tce-conf" = dontDistribute super."tce-conf";
+  "tconfig" = dontDistribute super."tconfig";
+  "tcp" = dontDistribute super."tcp";
+  "tdd-util" = dontDistribute super."tdd-util";
+  "tdoc" = dontDistribute super."tdoc";
+  "teams" = dontDistribute super."teams";
+  "teeth" = dontDistribute super."teeth";
+  "telegram" = dontDistribute super."telegram";
+  "teleport" = dontDistribute super."teleport";
+  "template-default" = dontDistribute super."template-default";
+  "template-haskell-util" = dontDistribute super."template-haskell-util";
+  "template-hsml" = dontDistribute super."template-hsml";
+  "template-yj" = dontDistribute super."template-yj";
+  "templatepg" = dontDistribute super."templatepg";
+  "templater" = dontDistribute super."templater";
+  "tempo" = dontDistribute super."tempo";
+  "tempodb" = dontDistribute super."tempodb";
+  "temporal-csound" = dontDistribute super."temporal-csound";
+  "temporal-media" = dontDistribute super."temporal-media";
+  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
+  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
+  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
+  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
+  "tempus" = dontDistribute super."tempus";
+  "tempus-fugit" = dontDistribute super."tempus-fugit";
+  "tensor" = dontDistribute super."tensor";
+  "term-rewriting" = dontDistribute super."term-rewriting";
+  "termbox-bindings" = dontDistribute super."termbox-bindings";
+  "termination-combinators" = dontDistribute super."termination-combinators";
+  "terminfo" = doDistribute super."terminfo_0_4_0_2";
+  "terminfo-hs" = dontDistribute super."terminfo-hs";
+  "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
+  "terrahs" = dontDistribute super."terrahs";
+  "tersmu" = dontDistribute super."tersmu";
+  "test-fixture" = dontDistribute super."test-fixture";
+  "test-framework-doctest" = dontDistribute super."test-framework-doctest";
+  "test-framework-golden" = dontDistribute super."test-framework-golden";
+  "test-framework-program" = dontDistribute super."test-framework-program";
+  "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck";
+  "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
+  "test-framework-skip" = dontDistribute super."test-framework-skip";
+  "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = doDistribute super."test-framework-th-prime_0_0_8";
+  "test-invariant" = dontDistribute super."test-invariant";
+  "test-pkg" = dontDistribute super."test-pkg";
+  "test-sandbox" = dontDistribute super."test-sandbox";
+  "test-sandbox-compose" = dontDistribute super."test-sandbox-compose";
+  "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit";
+  "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
+  "test-shouldbe" = dontDistribute super."test-shouldbe";
+  "testPkg" = dontDistribute super."testPkg";
+  "testbench" = dontDistribute super."testbench";
+  "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
+  "testloop" = dontDistribute super."testloop";
+  "testpack" = dontDistribute super."testpack";
+  "testpattern" = dontDistribute super."testpattern";
+  "testrunner" = dontDistribute super."testrunner";
+  "tetris" = dontDistribute super."tetris";
+  "tex2txt" = dontDistribute super."tex2txt";
+  "texrunner" = dontDistribute super."texrunner";
+  "text-all" = dontDistribute super."text-all";
+  "text-and-plots" = dontDistribute super."text-and-plots";
+  "text-conversions" = dontDistribute super."text-conversions";
+  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-translit" = dontDistribute super."text-icu-translit";
+  "text-json-qq" = dontDistribute super."text-json-qq";
+  "text-latin1" = dontDistribute super."text-latin1";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show" = doDistribute super."text-show_2_1_2";
+  "text-show-instances" = dontDistribute super."text-show-instances";
+  "text-stream-decode" = dontDistribute super."text-stream-decode";
+  "text-utf7" = dontDistribute super."text-utf7";
+  "text-xml-generic" = dontDistribute super."text-xml-generic";
+  "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text1" = dontDistribute super."text1";
+  "textPlot" = dontDistribute super."textPlot";
+  "textmatetags" = dontDistribute super."textmatetags";
+  "textocat-api" = dontDistribute super."textocat-api";
+  "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
+  "tfp" = dontDistribute super."tfp";
+  "tfp-th" = dontDistribute super."tfp-th";
+  "tftp" = dontDistribute super."tftp";
+  "tga" = dontDistribute super."tga";
+  "th-alpha" = dontDistribute super."th-alpha";
+  "th-build" = dontDistribute super."th-build";
+  "th-cas" = dontDistribute super."th-cas";
+  "th-context" = dontDistribute super."th-context";
+  "th-data-compat" = dontDistribute super."th-data-compat";
+  "th-desugar" = doDistribute super."th-desugar_1_5_5";
+  "th-fold" = dontDistribute super."th-fold";
+  "th-inline-io-action" = dontDistribute super."th-inline-io-action";
+  "th-instance-reification" = dontDistribute super."th-instance-reification";
+  "th-instances" = dontDistribute super."th-instances";
+  "th-kinds" = dontDistribute super."th-kinds";
+  "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-orphans" = doDistribute super."th-orphans_0_13_0";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-reify-compat" = dontDistribute super."th-reify-compat";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "th-utilities" = dontDistribute super."th-utilities";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "these" = doDistribute super."these_0_6_2_1";
+  "thespian" = dontDistribute super."thespian";
+  "theta-functions" = dontDistribute super."theta-functions";
+  "thih" = dontDistribute super."thih";
+  "thimk" = dontDistribute super."thimk";
+  "thorn" = dontDistribute super."thorn";
+  "thread-local-storage" = dontDistribute super."thread-local-storage";
+  "threadPool" = dontDistribute super."threadPool";
+  "threadmanager" = dontDistribute super."threadmanager";
+  "threads-pool" = dontDistribute super."threads-pool";
+  "threads-supervisor" = dontDistribute super."threads-supervisor";
+  "threadscope" = dontDistribute super."threadscope";
+  "threefish" = dontDistribute super."threefish";
+  "threepenny-gui" = dontDistribute super."threepenny-gui";
+  "thrift" = dontDistribute super."thrift";
+  "thrist" = dontDistribute super."thrist";
+  "throttle" = dontDistribute super."throttle";
+  "throttled-io-loop" = dontDistribute super."throttled-io-loop";
+  "thumbnail" = dontDistribute super."thumbnail";
+  "tianbar" = dontDistribute super."tianbar";
+  "tic-tac-toe" = dontDistribute super."tic-tac-toe";
+  "tickle" = dontDistribute super."tickle";
+  "tictactoe3d" = dontDistribute super."tictactoe3d";
+  "tidal" = doDistribute super."tidal_0_7_1";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "tidal-serial" = dontDistribute super."tidal-serial";
+  "tidal-vis" = dontDistribute super."tidal-vis";
+  "tie-knot" = dontDistribute super."tie-knot";
+  "tiempo" = dontDistribute super."tiempo";
+  "tiger" = dontDistribute super."tiger";
+  "tight-apply" = dontDistribute super."tight-apply";
+  "tightrope" = dontDistribute super."tightrope";
+  "tighttp" = dontDistribute super."tighttp";
+  "tilings" = dontDistribute super."tilings";
+  "timberc" = dontDistribute super."timberc";
+  "time-cache" = dontDistribute super."time-cache";
+  "time-extras" = dontDistribute super."time-extras";
+  "time-exts" = dontDistribute super."time-exts";
+  "time-http" = dontDistribute super."time-http";
+  "time-interval" = dontDistribute super."time-interval";
+  "time-io-access" = dontDistribute super."time-io-access";
+  "time-out" = dontDistribute super."time-out";
+  "time-patterns" = dontDistribute super."time-patterns";
+  "time-qq" = dontDistribute super."time-qq";
+  "time-recurrence" = dontDistribute super."time-recurrence";
+  "time-series" = dontDistribute super."time-series";
+  "time-w3c" = dontDistribute super."time-w3c";
+  "timecalc" = dontDistribute super."timecalc";
+  "timeconsole" = dontDistribute super."timeconsole";
+  "timeless" = dontDistribute super."timeless";
+  "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
+  "timelike-time" = dontDistribute super."timelike-time";
+  "timeout" = dontDistribute super."timeout";
+  "timeout-control" = dontDistribute super."timeout-control";
+  "timeout-with-results" = dontDistribute super."timeout-with-results";
+  "timeparsers" = dontDistribute super."timeparsers";
+  "timeplot" = dontDistribute super."timeplot";
+  "timeprint" = dontDistribute super."timeprint";
+  "timers" = dontDistribute super."timers";
+  "timers-updatable" = dontDistribute super."timers-updatable";
+  "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines";
+  "timestamper" = dontDistribute super."timestamper";
+  "timezone-olson-th" = dontDistribute super."timezone-olson-th";
+  "timing-convenience" = dontDistribute super."timing-convenience";
+  "tinyMesh" = dontDistribute super."tinyMesh";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls-extra" = dontDistribute super."tls-extra";
+  "tmpl" = dontDistribute super."tmpl";
+  "tn" = dontDistribute super."tn";
+  "tnet" = dontDistribute super."tnet";
+  "to-haskell" = dontDistribute super."to-haskell";
+  "to-string-class" = dontDistribute super."to-string-class";
+  "to-string-instances" = dontDistribute super."to-string-instances";
+  "todos" = dontDistribute super."todos";
+  "tofromxml" = dontDistribute super."tofromxml";
+  "toilet" = dontDistribute super."toilet";
+  "tokenify" = dontDistribute super."tokenify";
+  "tokenize" = dontDistribute super."tokenize";
+  "toktok" = dontDistribute super."toktok";
+  "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell";
+  "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell";
+  "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal";
+  "toml" = dontDistribute super."toml";
+  "toolshed" = dontDistribute super."toolshed";
+  "topkata" = dontDistribute super."topkata";
+  "torch" = dontDistribute super."torch";
+  "total" = dontDistribute super."total";
+  "total-alternative" = dontDistribute super."total-alternative";
+  "total-map" = dontDistribute super."total-map";
+  "total-maps" = dontDistribute super."total-maps";
+  "touched" = dontDistribute super."touched";
+  "toysolver" = dontDistribute super."toysolver";
+  "tpdb" = dontDistribute super."tpdb";
+  "trace" = dontDistribute super."trace";
+  "trace-call" = dontDistribute super."trace-call";
+  "trace-function-call" = dontDistribute super."trace-function-call";
+  "traced" = dontDistribute super."traced";
+  "tracer" = dontDistribute super."tracer";
+  "tracetree" = dontDistribute super."tracetree";
+  "tracker" = dontDistribute super."tracker";
+  "traildb" = dontDistribute super."traildb";
+  "trajectory" = dontDistribute super."trajectory";
+  "transactional-events" = dontDistribute super."transactional-events";
+  "transf" = dontDistribute super."transf";
+  "transformations" = dontDistribute super."transformations";
+  "transformers-abort" = dontDistribute super."transformers-abort";
+  "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4";
+  "transformers-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "transient-universe" = dontDistribute super."transient-universe";
+  "translatable-intset" = dontDistribute super."translatable-intset";
+  "translate" = dontDistribute super."translate";
+  "travis" = dontDistribute super."travis";
+  "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
+  "trawl" = dontDistribute super."trawl";
+  "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-monad" = dontDistribute super."tree-monad";
+  "treemap-html" = dontDistribute super."treemap-html";
+  "treemap-html-tools" = dontDistribute super."treemap-html-tools";
+  "treersec" = dontDistribute super."treersec";
+  "treeviz" = dontDistribute super."treeviz";
+  "tremulous-query" = dontDistribute super."tremulous-query";
+  "trhsx" = dontDistribute super."trhsx";
+  "triangulation" = dontDistribute super."triangulation";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "truelevel" = dontDistribute super."truelevel";
+  "trurl" = dontDistribute super."trurl";
+  "truthful" = dontDistribute super."truthful";
+  "tsession" = dontDistribute super."tsession";
+  "tsession-happstack" = dontDistribute super."tsession-happstack";
+  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "ttask" = dontDistribute super."ttask";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tupleinstances" = dontDistribute super."tupleinstances";
+  "turing" = dontDistribute super."turing";
+  "turing-music" = dontDistribute super."turing-music";
+  "turingMachine" = dontDistribute super."turingMachine";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
+  "twentefp" = dontDistribute super."twentefp";
+  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
+  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
+  "twentefp-graphs" = dontDistribute super."twentefp-graphs";
+  "twentefp-number" = dontDistribute super."twentefp-number";
+  "twentefp-rosetree" = dontDistribute super."twentefp-rosetree";
+  "twentefp-trees" = dontDistribute super."twentefp-trees";
+  "twentefp-websockets" = dontDistribute super."twentefp-websockets";
+  "twentyseven" = dontDistribute super."twentyseven";
+  "twhs" = dontDistribute super."twhs";
+  "twidge" = dontDistribute super."twidge";
+  "twilight-stm" = dontDistribute super."twilight-stm";
+  "twilio" = dontDistribute super."twilio";
+  "twill" = dontDistribute super."twill";
+  "twiml" = dontDistribute super."twiml";
+  "twine" = dontDistribute super."twine";
+  "twisty" = dontDistribute super."twisty";
+  "twitch" = dontDistribute super."twitch";
+  "twitter" = dontDistribute super."twitter";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "tx" = dontDistribute super."tx";
+  "txt-sushi" = dontDistribute super."txt-sushi";
+  "txt2rtf" = dontDistribute super."txt2rtf";
+  "txtblk" = dontDistribute super."txtblk";
+  "ty" = dontDistribute super."ty";
+  "typalyze" = dontDistribute super."typalyze";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
+  "type-cereal" = dontDistribute super."type-cereal";
+  "type-combinators" = dontDistribute super."type-combinators";
+  "type-combinators-quote" = dontDistribute super."type-combinators-quote";
+  "type-digits" = dontDistribute super."type-digits";
+  "type-equality" = dontDistribute super."type-equality";
+  "type-equality-check" = dontDistribute super."type-equality-check";
+  "type-fun" = dontDistribute super."type-fun";
+  "type-functions" = dontDistribute super."type-functions";
+  "type-hint" = dontDistribute super."type-hint";
+  "type-int" = dontDistribute super."type-int";
+  "type-iso" = dontDistribute super."type-iso";
+  "type-level" = dontDistribute super."type-level";
+  "type-level-bst" = dontDistribute super."type-level-bst";
+  "type-level-natural-number" = dontDistribute super."type-level-natural-number";
+  "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction";
+  "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations";
+  "type-level-sets" = dontDistribute super."type-level-sets";
+  "type-level-tf" = dontDistribute super."type-level-tf";
+  "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
+  "type-ord" = dontDistribute super."type-ord";
+  "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
+  "type-prelude" = dontDistribute super."type-prelude";
+  "type-settheory" = dontDistribute super."type-settheory";
+  "type-spine" = dontDistribute super."type-spine";
+  "type-structure" = dontDistribute super."type-structure";
+  "type-sub-th" = dontDistribute super."type-sub-th";
+  "type-unary" = dontDistribute super."type-unary";
+  "typeable-th" = dontDistribute super."typeable-th";
+  "typed-spreadsheet" = dontDistribute super."typed-spreadsheet";
+  "typed-wire" = dontDistribute super."typed-wire";
+  "typed-wire-utils" = dontDistribute super."typed-wire-utils";
+  "typedquery" = dontDistribute super."typedquery";
+  "typehash" = dontDistribute super."typehash";
+  "typelevel" = dontDistribute super."typelevel";
+  "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "uAgda" = dontDistribute super."uAgda";
+  "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
+  "uberlast" = dontDistribute super."uberlast";
+  "uconv" = dontDistribute super."uconv";
+  "udbus" = dontDistribute super."udbus";
+  "udbus-model" = dontDistribute super."udbus-model";
+  "udcode" = dontDistribute super."udcode";
+  "udev" = dontDistribute super."udev";
+  "uhc-light" = dontDistribute super."uhc-light";
+  "uhc-util" = dontDistribute super."uhc-util";
+  "uhexdump" = dontDistribute super."uhexdump";
+  "uhttpc" = dontDistribute super."uhttpc";
+  "ui-command" = dontDistribute super."ui-command";
+  "uid" = dontDistribute super."uid";
+  "una" = dontDistribute super."una";
+  "unagi-chan" = dontDistribute super."unagi-chan";
+  "unagi-streams" = dontDistribute super."unagi-streams";
+  "unamb" = dontDistribute super."unamb";
+  "unamb-custom" = dontDistribute super."unamb-custom";
+  "unbound" = dontDistribute super."unbound";
+  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
+  "unboxed-containers" = dontDistribute super."unboxed-containers";
+  "unbreak" = dontDistribute super."unbreak";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
+  "ungadtagger" = dontDistribute super."ungadtagger";
+  "uni-events" = dontDistribute super."uni-events";
+  "uni-graphs" = dontDistribute super."uni-graphs";
+  "uni-htk" = dontDistribute super."uni-htk";
+  "uni-posixutil" = dontDistribute super."uni-posixutil";
+  "uni-reactor" = dontDistribute super."uni-reactor";
+  "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph";
+  "uni-util" = dontDistribute super."uni-util";
+  "unicode" = dontDistribute super."unicode";
+  "unicode-names" = dontDistribute super."unicode-names";
+  "unicode-normalization" = dontDistribute super."unicode-normalization";
+  "unicode-prelude" = dontDistribute super."unicode-prelude";
+  "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
+  "unicode-symbols" = dontDistribute super."unicode-symbols";
+  "unicoder" = dontDistribute super."unicoder";
+  "uniform-io" = dontDistribute super."uniform-io";
+  "uniform-pair" = dontDistribute super."uniform-pair";
+  "union-find-array" = dontDistribute super."union-find-array";
+  "union-map" = dontDistribute super."union-map";
+  "unique" = dontDistribute super."unique";
+  "unique-logic" = dontDistribute super."unique-logic";
+  "unique-logic-tf" = dontDistribute super."unique-logic-tf";
+  "uniqueid" = dontDistribute super."uniqueid";
+  "unit" = dontDistribute super."unit";
+  "unit-constraint" = dontDistribute super."unit-constraint";
+  "units" = dontDistribute super."units";
+  "units-attoparsec" = dontDistribute super."units-attoparsec";
+  "units-defs" = dontDistribute super."units-defs";
+  "units-parser" = dontDistribute super."units-parser";
+  "unittyped" = dontDistribute super."unittyped";
+  "universal-binary" = dontDistribute super."universal-binary";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-compat" = doDistribute super."unix-compat_0_4_1_4";
+  "unix-fcntl" = dontDistribute super."unix-fcntl";
+  "unix-handle" = dontDistribute super."unix-handle";
+  "unix-io-extra" = dontDistribute super."unix-io-extra";
+  "unix-memory" = dontDistribute super."unix-memory";
+  "unix-process-conduit" = dontDistribute super."unix-process-conduit";
+  "unix-pty-light" = dontDistribute super."unix-pty-light";
+  "unlambda" = dontDistribute super."unlambda";
+  "unlit" = dontDistribute super."unlit";
+  "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
+  "unordered-graphs" = dontDistribute super."unordered-graphs";
+  "unpack-funcs" = dontDistribute super."unpack-funcs";
+  "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin";
+  "unsafe" = dontDistribute super."unsafe";
+  "unsafe-promises" = dontDistribute super."unsafe-promises";
+  "unsafely" = dontDistribute super."unsafely";
+  "unsafeperformst" = dontDistribute super."unsafeperformst";
+  "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
+  "unusable-pkg" = dontDistribute super."unusable-pkg";
+  "uom-plugin" = dontDistribute super."uom-plugin";
+  "up" = dontDistribute super."up";
+  "up-grade" = dontDistribute super."up-grade";
+  "uploadcare" = dontDistribute super."uploadcare";
+  "upskirt" = dontDistribute super."upskirt";
+  "ureader" = dontDistribute super."ureader";
+  "urembed" = dontDistribute super."urembed";
+  "uri" = dontDistribute super."uri";
+  "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-enumerator" = dontDistribute super."uri-enumerator";
+  "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
+  "uri-template" = dontDistribute super."uri-template";
+  "url-generic" = dontDistribute super."url-generic";
+  "urlcheck" = dontDistribute super."urlcheck";
+  "urldecode" = dontDistribute super."urldecode";
+  "urldisp-happstack" = dontDistribute super."urldisp-happstack";
+  "urlencoded" = dontDistribute super."urlencoded";
+  "urn" = dontDistribute super."urn";
+  "urxml" = dontDistribute super."urxml";
+  "usb" = dontDistribute super."usb";
+  "usb-enumerator" = dontDistribute super."usb-enumerator";
+  "usb-hid" = dontDistribute super."usb-hid";
+  "usb-id-database" = dontDistribute super."usb-id-database";
+  "usb-iteratee" = dontDistribute super."usb-iteratee";
+  "usb-safe" = dontDistribute super."usb-safe";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "uu-cco" = dontDistribute super."uu-cco";
+  "uu-cco-examples" = dontDistribute super."uu-cco-examples";
+  "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
+  "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib";
+  "uu-options" = dontDistribute super."uu-options";
+  "uu-tc" = dontDistribute super."uu-tc";
+  "uuagc" = dontDistribute super."uuagc";
+  "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap";
+  "uuagc-cabal" = dontDistribute super."uuagc-cabal";
+  "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
+  "uuagd" = dontDistribute super."uuagd";
+  "uuid-aeson" = dontDistribute super."uuid-aeson";
+  "uuid-le" = dontDistribute super."uuid-le";
+  "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uulib" = dontDistribute super."uulib";
+  "uvector" = dontDistribute super."uvector";
+  "uvector-algorithms" = dontDistribute super."uvector-algorithms";
+  "uxadt" = dontDistribute super."uxadt";
+  "uzbl-with-source" = dontDistribute super."uzbl-with-source";
+  "v4l2" = dontDistribute super."v4l2";
+  "v4l2-examples" = dontDistribute super."v4l2-examples";
+  "vacuum" = dontDistribute super."vacuum";
+  "vacuum-cairo" = dontDistribute super."vacuum-cairo";
+  "vacuum-graphviz" = dontDistribute super."vacuum-graphviz";
+  "vacuum-opengl" = dontDistribute super."vacuum-opengl";
+  "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validations" = dontDistribute super."validations";
+  "value-supply" = dontDistribute super."value-supply";
+  "vampire" = dontDistribute super."vampire";
+  "var" = dontDistribute super."var";
+  "varan" = dontDistribute super."varan";
+  "variable-precision" = dontDistribute super."variable-precision";
+  "variables" = dontDistribute super."variables";
+  "varying" = dontDistribute super."varying";
+  "vaultaire-common" = dontDistribute super."vaultaire-common";
+  "vcache" = dontDistribute super."vcache";
+  "vcache-trie" = dontDistribute super."vcache-trie";
+  "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vect-floating" = dontDistribute super."vect-floating";
+  "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
+  "vect-opengl" = dontDistribute super."vect-opengl";
+  "vector-binary" = dontDistribute super."vector-binary";
+  "vector-bytestring" = dontDistribute super."vector-bytestring";
+  "vector-clock" = dontDistribute super."vector-clock";
+  "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-functorlazy" = dontDistribute super."vector-functorlazy";
+  "vector-heterogenous" = dontDistribute super."vector-heterogenous";
+  "vector-instances-collections" = dontDistribute super."vector-instances-collections";
+  "vector-mmap" = dontDistribute super."vector-mmap";
+  "vector-random" = dontDistribute super."vector-random";
+  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
+  "vector-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "vector-space-points" = dontDistribute super."vector-space-points";
+  "vector-static" = dontDistribute super."vector-static";
+  "vector-strategies" = dontDistribute super."vector-strategies";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = doDistribute super."versions_2_0_0";
+  "vhdl" = dontDistribute super."vhdl";
+  "views" = dontDistribute super."views";
+  "vigilance" = dontDistribute super."vigilance";
+  "vimeta" = dontDistribute super."vimeta";
+  "vimus" = dontDistribute super."vimus";
+  "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-operational" = dontDistribute super."vinyl-operational";
+  "vinyl-plus" = dontDistribute super."vinyl-plus";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
+  "virthualenv" = dontDistribute super."virthualenv";
+  "visibility" = dontDistribute super."visibility";
+  "vision" = dontDistribute super."vision";
+  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
+  "visual-prof" = dontDistribute super."visual-prof";
+  "vk-aws-route53" = dontDistribute super."vk-aws-route53";
+  "vk-posix-pty" = dontDistribute super."vk-posix-pty";
+  "vocabulary-kadma" = dontDistribute super."vocabulary-kadma";
+  "vorbiscomment" = dontDistribute super."vorbiscomment";
+  "vowpal-utils" = dontDistribute super."vowpal-utils";
+  "voyeur" = dontDistribute super."voyeur";
+  "vrpn" = dontDistribute super."vrpn";
+  "vte" = dontDistribute super."vte";
+  "vtegtk3" = dontDistribute super."vtegtk3";
+  "vty-examples" = dontDistribute super."vty-examples";
+  "vty-menu" = dontDistribute super."vty-menu";
+  "vty-ui" = dontDistribute super."vty-ui";
+  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
+  "waddle" = dontDistribute super."waddle";
+  "wai-accept-language" = dontDistribute super."wai-accept-language";
+  "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-devel" = dontDistribute super."wai-devel";
+  "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
+  "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
+  "wai-graceful" = dontDistribute super."wai-graceful";
+  "wai-handler-devel" = dontDistribute super."wai-handler-devel";
+  "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
+  "wai-handler-snap" = dontDistribute super."wai-handler-snap";
+  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
+  "wai-hastache" = dontDistribute super."wai-hastache";
+  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-lens" = dontDistribute super."wai-lens";
+  "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
+  "wai-make-assets" = dontDistribute super."wai-make-assets";
+  "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
+  "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
+  "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
+  "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
+  "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
+  "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac";
+  "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
+  "wai-middleware-verbs" = doDistribute super."wai-middleware-verbs_0_2_0";
+  "wai-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
+  "wai-static-cache" = dontDistribute super."wai-static-cache";
+  "wai-static-pages" = dontDistribute super."wai-static-pages";
+  "wai-test" = dontDistribute super."wai-test";
+  "wai-thrift" = dontDistribute super."wai-thrift";
+  "wai-throttler" = dontDistribute super."wai-throttler";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavesurfer" = dontDistribute super."wavesurfer";
+  "wavy" = dontDistribute super."wavy";
+  "wcwidth" = dontDistribute super."wcwidth";
+  "weather-api" = dontDistribute super."weather-api";
+  "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell";
+  "web-css" = dontDistribute super."web-css";
+  "web-encodings" = dontDistribute super."web-encodings";
+  "web-inv-route" = dontDistribute super."web-inv-route";
+  "web-mongrel2" = dontDistribute super."web-mongrel2";
+  "web-page" = dontDistribute super."web-page";
+  "web-routes-mtl" = dontDistribute super."web-routes-mtl";
+  "web-routes-quasi" = dontDistribute super."web-routes-quasi";
+  "web-routes-regular" = dontDistribute super."web-routes-regular";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "webapi" = dontDistribute super."webapi";
+  "webapp" = dontDistribute super."webapp";
+  "webcloud" = dontDistribute super."webcloud";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-snoy" = dontDistribute super."webdriver-snoy";
+  "webfinger-client" = dontDistribute super."webfinger-client";
+  "webidl" = dontDistribute super."webidl";
+  "webify" = dontDistribute super."webify";
+  "webkit" = dontDistribute super."webkit";
+  "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
+  "webkitgtk3" = doDistribute super."webkitgtk3_0_14_1_1";
+  "webkitgtk3-javascriptcore" = doDistribute super."webkitgtk3-javascriptcore_0_13_1_2";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "webwire" = dontDistribute super."webwire";
+  "wedding-announcement" = dontDistribute super."wedding-announcement";
+  "wedged" = dontDistribute super."wedged";
+  "weighted-regexp" = dontDistribute super."weighted-regexp";
+  "weighted-search" = dontDistribute super."weighted-search";
+  "welshy" = dontDistribute super."welshy";
+  "werewolf" = doDistribute super."werewolf_1_0_2_2";
+  "wheb-mongo" = dontDistribute super."wheb-mongo";
+  "wheb-redis" = dontDistribute super."wheb-redis";
+  "wheb-strapped" = dontDistribute super."wheb-strapped";
+  "while-lang-parser" = dontDistribute super."while-lang-parser";
+  "whim" = dontDistribute super."whim";
+  "whiskers" = dontDistribute super."whiskers";
+  "whitespace" = dontDistribute super."whitespace";
+  "whois" = dontDistribute super."whois";
+  "why3" = dontDistribute super."why3";
+  "wigner-symbols" = dontDistribute super."wigner-symbols";
+  "wikicfp-scraper" = dontDistribute super."wikicfp-scraper";
+  "wikipedia4epub" = dontDistribute super."wikipedia4epub";
+  "win-hp-path" = dontDistribute super."win-hp-path";
+  "windowslive" = dontDistribute super."windowslive";
+  "winerror" = dontDistribute super."winerror";
+  "winio" = dontDistribute super."winio";
+  "wiring" = dontDistribute super."wiring";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word-vector" = dontDistribute super."word-vector";
+  "word24" = dontDistribute super."word24";
+  "wordcloud" = dontDistribute super."wordcloud";
+  "wordexp" = dontDistribute super."wordexp";
+  "words" = dontDistribute super."words";
+  "wordsearch" = dontDistribute super."wordsearch";
+  "wordsetdiff" = dontDistribute super."wordsetdiff";
+  "workflow-osx" = dontDistribute super."workflow-osx";
+  "wp-archivebot" = dontDistribute super."wp-archivebot";
+  "wraparound" = dontDistribute super."wraparound";
+  "wraxml" = dontDistribute super."wraxml";
+  "wreq-sb" = dontDistribute super."wreq-sb";
+  "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
+  "wsedit" = dontDistribute super."wsedit";
+  "wtk" = dontDistribute super."wtk";
+  "wtk-gtk" = dontDistribute super."wtk-gtk";
+  "wumpus-basic" = dontDistribute super."wumpus-basic";
+  "wumpus-core" = dontDistribute super."wumpus-core";
+  "wumpus-drawing" = dontDistribute super."wumpus-drawing";
+  "wumpus-microprint" = dontDistribute super."wumpus-microprint";
+  "wumpus-tree" = dontDistribute super."wumpus-tree";
+  "wx" = dontDistribute super."wx";
+  "wxAsteroids" = dontDistribute super."wxAsteroids";
+  "wxFruit" = dontDistribute super."wxFruit";
+  "wxc" = dontDistribute super."wxc";
+  "wxcore" = dontDistribute super."wxcore";
+  "wxdirect" = dontDistribute super."wxdirect";
+  "wxhnotepad" = dontDistribute super."wxhnotepad";
+  "wxturtle" = dontDistribute super."wxturtle";
+  "wybor" = dontDistribute super."wybor";
+  "wyvern" = dontDistribute super."wyvern";
+  "x-dsp" = dontDistribute super."x-dsp";
+  "x11-xim" = dontDistribute super."x11-xim";
+  "x11-xinput" = dontDistribute super."x11-xinput";
+  "x509-util" = dontDistribute super."x509-util";
+  "xattr" = dontDistribute super."xattr";
+  "xbattbar" = dontDistribute super."xbattbar";
+  "xcb-types" = dontDistribute super."xcb-types";
+  "xcffib" = dontDistribute super."xcffib";
+  "xchat-plugin" = dontDistribute super."xchat-plugin";
+  "xcp" = dontDistribute super."xcp";
+  "xdg-userdirs" = dontDistribute super."xdg-userdirs";
+  "xdot" = dontDistribute super."xdot";
+  "xfconf" = dontDistribute super."xfconf";
+  "xhaskell-library" = dontDistribute super."xhaskell-library";
+  "xhb" = dontDistribute super."xhb";
+  "xhb-atom-cache" = dontDistribute super."xhb-atom-cache";
+  "xhb-ewmh" = dontDistribute super."xhb-ewmh";
+  "xhtml" = doDistribute super."xhtml_3000_2_1";
+  "xhtml-combinators" = dontDistribute super."xhtml-combinators";
+  "xilinx-lava" = dontDistribute super."xilinx-lava";
+  "xine" = dontDistribute super."xine";
+  "xing-api" = dontDistribute super."xing-api";
+  "xinput-conduit" = dontDistribute super."xinput-conduit";
+  "xkbcommon" = dontDistribute super."xkbcommon";
+  "xkcd" = dontDistribute super."xkcd";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit-decode" = dontDistribute super."xml-conduit-decode";
+  "xml-enumerator" = dontDistribute super."xml-enumerator";
+  "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
+  "xml-extractors" = dontDistribute super."xml-extractors";
+  "xml-helpers" = dontDistribute super."xml-helpers";
+  "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens";
+  "xml-monad" = dontDistribute super."xml-monad";
+  "xml-parsec" = dontDistribute super."xml-parsec";
+  "xml-picklers" = dontDistribute super."xml-picklers";
+  "xml-pipe" = dontDistribute super."xml-pipe";
+  "xml-prettify" = dontDistribute super."xml-prettify";
+  "xml-push" = dontDistribute super."xml-push";
+  "xml-query" = dontDistribute super."xml-query";
+  "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit";
+  "xml-query-xml-types" = dontDistribute super."xml-query-xml-types";
+  "xml2html" = dontDistribute super."xml2html";
+  "xml2json" = dontDistribute super."xml2json";
+  "xml2x" = dontDistribute super."xml2x";
+  "xmltv" = dontDistribute super."xmltv";
+  "xmms2-client" = dontDistribute super."xmms2-client";
+  "xmms2-client-glib" = dontDistribute super."xmms2-client-glib";
+  "xmobar" = dontDistribute super."xmobar";
+  "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch";
+  "xmonad-contrib" = dontDistribute super."xmonad-contrib";
+  "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch";
+  "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl";
+  "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper";
+  "xmonad-eval" = dontDistribute super."xmonad-eval";
+  "xmonad-extras" = dontDistribute super."xmonad-extras";
+  "xmonad-screenshot" = dontDistribute super."xmonad-screenshot";
+  "xmonad-utils" = dontDistribute super."xmonad-utils";
+  "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper";
+  "xmonad-windownames" = dontDistribute super."xmonad-windownames";
+  "xmpipe" = dontDistribute super."xmpipe";
+  "xorshift" = dontDistribute super."xorshift";
+  "xosd" = dontDistribute super."xosd";
+  "xournal-builder" = dontDistribute super."xournal-builder";
+  "xournal-convert" = dontDistribute super."xournal-convert";
+  "xournal-parser" = dontDistribute super."xournal-parser";
+  "xournal-render" = dontDistribute super."xournal-render";
+  "xournal-types" = dontDistribute super."xournal-types";
+  "xpathdsv" = dontDistribute super."xpathdsv";
+  "xsact" = dontDistribute super."xsact";
+  "xsd" = dontDistribute super."xsd";
+  "xsha1" = dontDistribute super."xsha1";
+  "xslt" = dontDistribute super."xslt";
+  "xtc" = dontDistribute super."xtc";
+  "xtest" = dontDistribute super."xtest";
+  "xturtle" = dontDistribute super."xturtle";
+  "xxhash" = dontDistribute super."xxhash";
+  "y0l0bot" = dontDistribute super."y0l0bot";
+  "yabi" = dontDistribute super."yabi";
+  "yabi-muno" = dontDistribute super."yabi-muno";
+  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
+  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
+  "yajl" = dontDistribute super."yajl";
+  "yajl-enumerator" = dontDistribute super."yajl-enumerator";
+  "yall" = dontDistribute super."yall";
+  "yamemo" = dontDistribute super."yamemo";
+  "yaml-config" = dontDistribute super."yaml-config";
+  "yaml-light-lens" = dontDistribute super."yaml-light-lens";
+  "yaml-rpc" = dontDistribute super."yaml-rpc";
+  "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
+  "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
+  "yaml2owl" = dontDistribute super."yaml2owl";
+  "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
+  "yampa-canvas" = dontDistribute super."yampa-canvas";
+  "yampa-glfw" = dontDistribute super."yampa-glfw";
+  "yampa-glut" = dontDistribute super."yampa-glut";
+  "yampa2048" = dontDistribute super."yampa2048";
+  "yaop" = dontDistribute super."yaop";
+  "yap" = dontDistribute super."yap";
+  "yarr" = dontDistribute super."yarr";
+  "yarr-image-io" = dontDistribute super."yarr-image-io";
+  "yate" = dontDistribute super."yate";
+  "yavie" = dontDistribute super."yavie";
+  "ycextra" = dontDistribute super."ycextra";
+  "yeganesh" = dontDistribute super."yeganesh";
+  "yeller" = dontDistribute super."yeller";
+  "yeshql" = dontDistribute super."yeshql";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
+  "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
+  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
+  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
+  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
+  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
+  "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
+  "yesod-comments" = dontDistribute super."yesod-comments";
+  "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
+  "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-crud" = dontDistribute super."yesod-crud";
+  "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
+  "yesod-csp" = dontDistribute super."yesod-csp";
+  "yesod-datatables" = dontDistribute super."yesod-datatables";
+  "yesod-dsl" = dontDistribute super."yesod-dsl";
+  "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form-json" = dontDistribute super."yesod-form-json";
+  "yesod-goodies" = dontDistribute super."yesod-goodies";
+  "yesod-ip" = dontDistribute super."yesod-ip";
+  "yesod-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = dontDistribute super."yesod-mangopay";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-paginate" = dontDistribute super."yesod-paginate";
+  "yesod-pagination" = dontDistribute super."yesod-pagination";
+  "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-platform" = dontDistribute super."yesod-platform";
+  "yesod-pnotify" = dontDistribute super."yesod-pnotify";
+  "yesod-pure" = dontDistribute super."yesod-pure";
+  "yesod-purescript" = dontDistribute super."yesod-purescript";
+  "yesod-raml" = dontDistribute super."yesod-raml";
+  "yesod-raml-bin" = dontDistribute super."yesod-raml-bin";
+  "yesod-raml-docs" = dontDistribute super."yesod-raml-docs";
+  "yesod-raml-mock" = dontDistribute super."yesod-raml-mock";
+  "yesod-recaptcha" = dontDistribute super."yesod-recaptcha";
+  "yesod-routes" = dontDistribute super."yesod-routes";
+  "yesod-routes-flow" = dontDistribute super."yesod-routes-flow";
+  "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript";
+  "yesod-rst" = dontDistribute super."yesod-rst";
+  "yesod-s3" = dontDistribute super."yesod-s3";
+  "yesod-sass" = dontDistribute super."yesod-sass";
+  "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test-json" = dontDistribute super."yesod-test-json";
+  "yesod-tls" = dontDistribute super."yesod-tls";
+  "yesod-transloadit" = dontDistribute super."yesod-transloadit";
+  "yesod-vend" = dontDistribute super."yesod-vend";
+  "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra";
+  "yesod-worker" = dontDistribute super."yesod-worker";
+  "yet-another-logger" = dontDistribute super."yet-another-logger";
+  "yhccore" = dontDistribute super."yhccore";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-snippet" = dontDistribute super."yi-snippet";
+  "yi-solarized" = dontDistribute super."yi-solarized";
+  "yi-spolsky" = dontDistribute super."yi-spolsky";
+  "yi-vty" = dontDistribute super."yi-vty";
+  "yices" = dontDistribute super."yices";
+  "yices-easy" = dontDistribute super."yices-easy";
+  "yices-painless" = dontDistribute super."yices-painless";
+  "yjftp" = dontDistribute super."yjftp";
+  "yjftp-libs" = dontDistribute super."yjftp-libs";
+  "yjsvg" = dontDistribute super."yjsvg";
+  "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
+  "yoko" = dontDistribute super."yoko";
+  "york-lava" = dontDistribute super."york-lava";
+  "youtube" = dontDistribute super."youtube";
+  "yql" = dontDistribute super."yql";
+  "yst" = dontDistribute super."yst";
+  "yuiGrid" = dontDistribute super."yuiGrid";
+  "yuuko" = dontDistribute super."yuuko";
+  "yxdb-utils" = dontDistribute super."yxdb-utils";
+  "z3" = dontDistribute super."z3";
+  "zalgo" = dontDistribute super."zalgo";
+  "zampolit" = dontDistribute super."zampolit";
+  "zasni-gerna" = dontDistribute super."zasni-gerna";
+  "zcache" = dontDistribute super."zcache";
+  "zenc" = dontDistribute super."zenc";
+  "zendesk-api" = dontDistribute super."zendesk-api";
+  "zeno" = dontDistribute super."zeno";
+  "zerobin" = dontDistribute super."zerobin";
+  "zeromq-haskell" = dontDistribute super."zeromq-haskell";
+  "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
+  "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeroth" = dontDistribute super."zeroth";
+  "zigbee-znet25" = dontDistribute super."zigbee-znet25";
+  "zip-archive" = doDistribute super."zip-archive_0_2_3_7";
+  "zip-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippo" = dontDistribute super."zippo";
+  "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zmcat" = dontDistribute super."zmcat";
+  "zmidi-core" = dontDistribute super."zmidi-core";
+  "zmidi-score" = dontDistribute super."zmidi-score";
+  "zmqat" = dontDistribute super."zmqat";
+  "zoneinfo" = dontDistribute super."zoneinfo";
+  "zoom" = dontDistribute super."zoom";
+  "zoom-cache" = dontDistribute super."zoom-cache";
+  "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm";
+  "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile";
+  "zoom-refs" = dontDistribute super."zoom-refs";
+  "zsh-battery" = dontDistribute super."zsh-battery";
+  "ztail" = dontDistribute super."ztail";
+
+}
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f353dcbffbbe..1a31e3560704 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -12154,7 +12154,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "IntervalMap" = callPackage
+  "IntervalMap_0_5_1_0" = callPackage
     ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }:
      mkDerivation {
        pname = "IntervalMap";
@@ -12165,6 +12165,20 @@ self: {
        homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
        description = "Containers for intervals, with efficient search";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "IntervalMap" = callPackage
+    ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "IntervalMap";
+       version = "0.5.1.1";
+       sha256 = "5a3324a4a98f2b15f871db98e2b2fe4a0f65d9de776314b955f30d4c1eda32ab";
+       libraryHaskellDepends = [ base containers deepseq ];
+       testHaskellDepends = [ base Cabal containers deepseq QuickCheck ];
+       homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
+       description = "Containers for intervals, with efficient search";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "Irc" = callPackage
@@ -22396,8 +22410,8 @@ self: {
      }:
      mkDerivation {
        pname = "abnf";
-       version = "0.3.1.0";
-       sha256 = "c556b06416b432092f2d6084605a40384b4e91822b49ccc33596badd7fc2ad12";
+       version = "0.3.2.0";
+       sha256 = "f23d3849f6ce8be2fc7c0ba41aff6bd31f97a8dde3000591221e7027298129b1";
        libraryHaskellDepends = [
          attoparsec base containers megaparsec text
        ];
@@ -23794,7 +23808,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ad" = callPackage
+  "ad_4_3_2" = callPackage
     ({ mkDerivation, array, base, comonad, containers, data-reify
      , directory, doctest, erf, filepath, free, nats, reflection
      , transformers
@@ -23813,6 +23827,27 @@ self: {
        homepage = "http://github.com/ekmett/ad";
        description = "Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ad" = callPackage
+    ({ mkDerivation, array, base, comonad, containers, data-reify
+     , directory, doctest, erf, filepath, free, nats, reflection
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ad";
+       version = "4.3.2.1";
+       sha256 = "84de5524f60a088f4a326956434c74f32b9c4961be616fb3f1fbea620413e39d";
+       libraryHaskellDepends = [
+         array base comonad containers data-reify erf free nats reflection
+         transformers
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       doCheck = false;
+       homepage = "http://github.com/ekmett/ad";
+       description = "Automatic Differentiation";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "adaptive-containers" = callPackage
@@ -25587,8 +25622,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
        pname = "aivika";
-       version = "4.3.5";
-       sha256 = "0fc1120a7f3ff97d4200b2149cb61c8a3182d05479fdd338306069236d9e2259";
+       version = "4.5";
+       sha256 = "4a86928ea9d289f82a5e81227dd2f5b29870fa3be608f135e4469e5a8f08c865";
        libraryHaskellDepends = [
          array base containers mtl random vector
        ];
@@ -25603,31 +25638,31 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-branches";
-       version = "0.1.2";
-       sha256 = "6c8a2cd2b840f839881e847af3402f13cb2dc33e6fed19954477c4ae3417a417";
+       version = "0.1.3";
+       sha256 = "d14dac2f3d59a8e51acf4eb078e67910cbf4c52f5acc91f54af6431618f41fb3";
        libraryHaskellDepends = [
          aivika aivika-transformers base containers mtl random
        ];
        homepage = "http://www.aivikasoft.com/en/products/aivika.html";
-       description = "Branching discrete event simulation library";
+       description = "Nested discrete event simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "aivika-distributed" = callPackage
     ({ mkDerivation, aivika, aivika-transformers, base, binary
-     , bytestring, containers, distributed-process, exceptions, mtl
-     , random, stm, time
+     , containers, distributed-process, exceptions, mtl, random, stm
+     , time
      }:
      mkDerivation {
        pname = "aivika-distributed";
-       version = "0.1.3";
-       sha256 = "fbfce34de97c3631dcc067726327c10df1325118685beb89458feb58ce860aae";
+       version = "0.2";
+       sha256 = "19dac37eb6436ce9dbcda7b8a30ee914ec28b6704321512571c27c483ac8b8cc";
        libraryHaskellDepends = [
-         aivika aivika-transformers base binary bytestring containers
+         aivika aivika-transformers base binary containers
          distributed-process exceptions mtl random stm time
        ];
        homepage = "http://www.aivikasoft.com/en/products/aivika.html";
-       description = "Parallel distributed simulation library";
+       description = "Parallel distributed discrete event simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -25701,14 +25736,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aivika-lattice" = callPackage
+    ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl
+     , random
+     }:
+     mkDerivation {
+       pname = "aivika-lattice";
+       version = "0.1.1";
+       sha256 = "6867ddbe564dbf99a5bc4acd942896068f2953de28efe86a02a638dc6450e1d7";
+       libraryHaskellDepends = [
+         aivika aivika-transformers base containers mtl random
+       ];
+       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
+       description = "Nested discrete event simulation module for the Aivika library using lattice";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aivika-transformers" = callPackage
     ({ mkDerivation, aivika, array, base, containers, mtl, random
      , vector
      }:
      mkDerivation {
        pname = "aivika-transformers";
-       version = "4.3.5";
-       sha256 = "8903fc269b790233425684167ed193c2195a33a8134e8351ba98df69058ec6e7";
+       version = "4.5";
+       sha256 = "c86a3db16ffcf528bed4b97cd764ebec3888dc39afa80d9bd7340e178f4b5111";
        libraryHaskellDepends = [
          aivika array base containers mtl random vector
        ];
@@ -37248,7 +37299,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "asn1-encoding" = callPackage
+  "asn1-encoding_0_9_3" = callPackage
     ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl
      , tasty, tasty-quickcheck, text
      }:
@@ -37264,6 +37315,25 @@ self: {
        homepage = "http://github.com/vincenthz/hs-asn1";
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "asn1-encoding" = callPackage
+    ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl
+     , tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "asn1-encoding";
+       version = "0.9.4";
+       sha256 = "a78058f7db08fbd72f2b40c72af324a4d31ea95d70b4bfa372107b980394dde8";
+       libraryHaskellDepends = [ asn1-types base bytestring hourglass ];
+       testHaskellDepends = [
+         asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
+         text
+       ];
+       homepage = "http://github.com/vincenthz/hs-asn1";
+       description = "ASN1 data reader and writer in RAW, BER and DER forms";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "asn1-parse_0_9_0" = callPackage
@@ -42859,7 +42929,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "binary-conduit" = callPackage
+  "binary-conduit_1_2_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, conduit, hspec
      , QuickCheck, quickcheck-assertions, resourcet, vector
      }:
@@ -42867,8 +42937,29 @@ self: {
        pname = "binary-conduit";
        version = "1.2.3";
        sha256 = "d9a18707bfbc583d8ac8bedc2ff5cf89c8e490575b5c75e2bc4192729cefb07a";
-       revision = "1";
-       editedCabalFile = "9cb1c58171575429a65947d1ef7e22c1501b4ca9becc07904c7b4a5066345e29";
+       revision = "2";
+       editedCabalFile = "488839b9dbc62394ccfe9ac772a54f993e4fa4fe20f6631fb67b1fb75daefe29";
+       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-conduit" = callPackage
+    ({ mkDerivation, base, binary, bytestring, conduit, hspec
+     , QuickCheck, quickcheck-assertions, resourcet, vector
+     }:
+     mkDerivation {
+       pname = "binary-conduit";
+       version = "1.2.4.1";
+       sha256 = "445cbb60bcff6da468e27b1db6a8d576b0b43ff284c3dcca4ae4c13f1ca6ca82";
        libraryHaskellDepends = [
          base binary bytestring conduit resourcet vector
        ];
@@ -42876,7 +42967,6 @@ self: {
          base binary bytestring conduit hspec QuickCheck
          quickcheck-assertions resourcet
        ];
-       jailbreak = true;
        homepage = "http://github.com/qnikst/binary-conduit/";
        description = "data serialization/deserialization conduit library";
        license = stdenv.lib.licenses.mit;
@@ -47239,8 +47329,8 @@ self: {
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "break";
-       version = "1.0.0";
-       sha256 = "55083f86c32ca20519605bd37e847e3c6e07aeab622395c18e9fc470146cd895";
+       version = "1.0.1";
+       sha256 = "28e0cff1cc4f96aa19ebaac3caad4ca6851e89cd26bd48c4de4f611cbcf95166";
        libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        description = "Break from a loop";
@@ -48987,7 +49077,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) bzip2;};
 
-  "bzlib-conduit" = callPackage
+  "bzlib-conduit_0_2_1_3" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit
      , conduit-extra, data-default, hspec, mtl, QuickCheck, random
      , resourcet
@@ -49008,6 +49098,30 @@ self: {
        homepage = "https://github.com/snoyberg/bzlib-conduit";
        description = "Streaming compression/decompression via conduits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) bzip2;};
+
+  "bzlib-conduit" = callPackage
+    ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit
+     , conduit-extra, data-default, hspec, mtl, QuickCheck, random
+     , resourcet
+     }:
+     mkDerivation {
+       pname = "bzlib-conduit";
+       version = "0.2.1.4";
+       sha256 = "2d707004ccc83d9aa283805574c7253db5089854abb3a7350587de62f2b2fd1d";
+       libraryHaskellDepends = [
+         base bindings-DSL bytestring conduit conduit-extra data-default mtl
+         resourcet
+       ];
+       librarySystemDepends = [ bzip2 ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-extra hspec QuickCheck random
+         resourcet
+       ];
+       homepage = "https://github.com/snoyberg/bzlib-conduit";
+       description = "Streaming compression/decompression via conduits";
+       license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) bzip2;};
 
   "c-dsl" = callPackage
@@ -57380,22 +57494,22 @@ self: {
      , 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, tagsoup, text, time, time-locale-compat
+     , 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.23.15";
-       sha256 = "ef2959ed07b4123815536ee9eb98a91d93570717a5efb159ac1343b2072e7872";
+       version = "0.23.16";
+       sha256 = "17622913f530b68dcb570603a5223c31f72263a57d5be7342642d18dd41a47b6";
        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 tagsoup text time
+         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
@@ -57612,8 +57726,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-page";
-       version = "0.4.3.2";
-       sha256 = "d3f7584c71e5695ac00f608cb6bb45a71c983f9ed001c841f3b53e631c94fbbf";
+       version = "0.4.3.3";
+       sha256 = "cae111456424fe22eae06a3a0ef1d417d9373b4d09809920a678664b89d7e161";
        libraryHaskellDepends = [
          acid-state aeson attoparsec base clckwrks containers directory
          filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
@@ -68122,15 +68236,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-default_0_7_0" = callPackage
+  "data-default_0_7_1" = callPackage
     ({ mkDerivation, base, data-default-class
      , data-default-instances-base, data-default-instances-containers
      , data-default-instances-dlist, data-default-instances-old-locale
      }:
      mkDerivation {
        pname = "data-default";
-       version = "0.7.0";
-       sha256 = "933b52b2477edbaaf2569a2bc76d4df8cf6fb52dc5e345ce18a76630423cb077";
+       version = "0.7.1";
+       sha256 = "0253f63d1d1c88457f2e644a97b4994f3f7c7a26809afe5e4467a3f75a5bf46d";
        libraryHaskellDepends = [
          base data-default-class data-default-instances-base
          data-default-instances-containers data-default-instances-dlist
@@ -68153,12 +68267,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-default-class_0_1_0" = callPackage
+  "data-default-class_0_1_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "data-default-class";
-       version = "0.1.0";
-       sha256 = "01186c3b0da2d8513c2f93464a253fdc7eaeef06b1c526a5d139300bfcb39790";
+       version = "0.1.1";
+       sha256 = "a351799621279455896479adfe8291c36540911e6bf3a8bda7c2e07082b76c61";
        libraryHaskellDepends = [ base ];
        description = "A class for types with a default value";
        license = stdenv.lib.licenses.bsd3;
@@ -75849,6 +75963,8 @@ self: {
        pname = "distributed-process-client-server";
        version = "0.1.3.2";
        sha256 = "2c905624d5486b7bc8bd1a4763b139e7eb364b20467c9abddd553f9afbd3601f";
+       revision = "1";
+       editedCabalFile = "de3bac2148543dcd00c7cebdaf95a7403d7b0f966683bf9ee23fe4eb8d33fcc6";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-async distributed-process-extras fingertree
@@ -76006,6 +76122,8 @@ self: {
        pname = "distributed-process-extras";
        version = "0.2.1.2";
        sha256 = "c1a4e1a5e3ec30089251db40fd479b19c5fd74c9dd8ca50f8eb32aaf9747a048";
+       revision = "1";
+       editedCabalFile = "5f287b8a5c2d4460cc101fd2b96d116fa74876b894f8ae5ab44b925af5f233d6";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          fingertree hashable mtl stm time transformers unordered-containers
@@ -76266,6 +76384,8 @@ self: {
        pname = "distributed-process-supervisor";
        version = "0.1.3.2";
        sha256 = "3e9b9c940afb67d41bb3ec50229ea972ffd386a2e424007b9cbacc361f053df4";
+       revision = "1";
+       editedCabalFile = "b23308ae5fb7d64215ea9c5a25f92c8ccd7371437e63f4bd9968ab20bfa65e5d";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
@@ -76339,6 +76459,8 @@ self: {
        pname = "distributed-process-task";
        version = "0.1.2.2";
        sha256 = "ec25caf01b9185d166433246210be688a9733e73f54b03f91a910eaf2cd05c23";
+       revision = "1";
+       editedCabalFile = "2881a849616f0f38ece555040465acf23dc273964282be1a3a00521eb0929c26";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-async distributed-process-client-server
@@ -77442,8 +77564,8 @@ self: {
      }:
      mkDerivation {
        pname = "docvim";
-       version = "0.2.0.0";
-       sha256 = "3c9ad07ffa3c6e4d0a5352df82975027ea83206b1066f4026729cf620bc8c71d";
+       version = "0.3.1.0";
+       sha256 = "bb7512fb3c564c3dbe192ab5841cd6ae4a027dbccaf1b963edf487b51cf32fcb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77452,9 +77574,9 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base bytestring containers deepseq dlist filepath hlint lens mtl
-         parsec pretty-show process split tasty tasty-golden tasty-hunit
-         temporary
+         base bytestring containers deepseq directory dlist filepath hlint
+         lens mtl parsec pretty-show process split tasty tasty-golden
+         tasty-hunit temporary
        ];
        jailbreak = true;
        homepage = "https://github.com/wincent/docvim";
@@ -80815,8 +80937,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, split, text, time }:
      mkDerivation {
        pname = "elm-hybrid";
-       version = "0.1.0.0";
-       sha256 = "4b5eea5c6d8c26206da439aa4c3dfc2678f1a91432d15be662c6149b024b5f12";
+       version = "0.1.1.0";
+       sha256 = "fcb5ba585a1398dce8e36fd4677e212b1006f878f51df23af3f746c7a403ca18";
        libraryHaskellDepends = [
          base directory filepath split text time
        ];
@@ -86311,14 +86433,14 @@ self: {
   "fbmessenger-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , filepath, hspec, http-client, http-client-tls, http-media
-     , http-types, mime-types, servant, servant-client, servant-server
-     , stm, string-conversions, text, transformers, unordered-containers
-     , warp
+     , http-types, mime-types, monad-logger, servant, servant-client
+     , servant-server, stm, string-conversions, text, transformers
+     , unordered-containers, wai, wai-logger, warp
      }:
      mkDerivation {
        pname = "fbmessenger-api";
-       version = "0.1.0.2";
-       sha256 = "006c0f782b5e66e0c9198def481730ec6aa70ba3a5005ea409d3febeb8fb98de";
+       version = "0.1.0.3";
+       sha256 = "c746bea409094604698a375cbf08804799e390be1ffee4b0ffe95e2263270879";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86327,8 +86449,8 @@ self: {
          text transformers unordered-containers
        ];
        executableHaskellDepends = [
-         aeson base http-client http-client-tls servant servant-server stm
-         text transformers warp
+         aeson base bytestring http-client http-client-tls monad-logger
+         servant servant-server stm text transformers wai wai-logger warp
        ];
        testHaskellDepends = [ aeson base bytestring filepath hspec text ];
        homepage = "https://github.com/mseri/fbmessenger-api-hs#readme";
@@ -87807,8 +87929,8 @@ self: {
      }:
      mkDerivation {
        pname = "filestore";
-       version = "0.6.1";
-       sha256 = "0009c97f00044d2902209050d3b85a32dbad656ad0bb6276e811d7b0aca5d455";
+       version = "0.6.2";
+       sha256 = "a545e54c70bd12b5a2dfd9a303784d7eccd1db6a074860263f40fd0dd092d3d7";
        libraryHaskellDepends = [
          base bytestring containers Diff directory filepath old-locale
          parsec process split time utf8-string xml
@@ -87816,7 +87938,6 @@ self: {
        testHaskellDepends = [
          base Diff directory filepath HUnit mtl time
        ];
-       jailbreak = true;
        description = "Interface for versioning file stores";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
@@ -88988,6 +89109,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "flow-er" = callPackage
+    ({ mkDerivation, base, doctest, flow, QuickCheck }:
+     mkDerivation {
+       pname = "flow-er";
+       version = "1.0.3";
+       sha256 = "c89d6bb8f11517809b27c5bed59d082c1fbd26c33de6272bbe3a65ddc263dba6";
+       libraryHaskellDepends = [ base flow ];
+       testHaskellDepends = [ base doctest flow QuickCheck ];
+       homepage = "https://github.com/expede/flower#README";
+       description = "More directional operators";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "flow2dot" = callPackage
     ({ mkDerivation, base, containers, mtl, parsec, QuickCheck
      , utf8-string
@@ -95453,17 +95587,18 @@ 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-atk_2_0_4" = callPackage
-    ({ mkDerivation, atk, base, bytestring, containers, gi-glib
+  "gi-atk_2_0_5" = 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.4";
-       sha256 = "0ff8915112f0f0f24e1a80e390e780ec81b4dcb4a41bc155743865dc8f49ffca";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "2.0.5";
+       sha256 = "34691e2961ab2b6a7101ca59165a0bc8da9d18f422a6cf4867fe292e6e32bf9f";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -95495,18 +95630,19 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Cairo bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cairo-gobject = null; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-cairo_1_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, cairo-gobject, containers
+  "gi-cairo_1_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cairo-gobject, containers
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-cairo";
-       version = "1.0.4";
-       sha256 = "6532815f3b225d62c8ed9f865572a6d8ab740fa041adca20ea78b4e9a1735fec";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "1.0.5";
+       sha256 = "cef766729ade64bebcf5452bae4c3786ad262123624c8d61aa4717d3e9e74ba6";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -95537,18 +95673,19 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gdk bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk3 = null;};
 
-  "gi-gdk_3_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gdk3, gi-cairo
-     , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, haskell-gi
-     , haskell-gi-base, text, transformers
+  "gi-gdk_3_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gdk3
+     , gi-cairo, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango
+     , haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "3.0.4";
-       sha256 = "e6a8fc97a124b625a70002aaf0bbe2ae5d33356bd3a733addbbb2eaebee8473f";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "3.0.5";
+       sha256 = "2655a3b1539f9559188fd8464a7359814fcc73c66e7196eae8f6810d81cefb35";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
          gi-gobject gi-pango haskell-gi-base text transformers
@@ -95579,18 +95716,19 @@ 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-gdkpixbuf_2_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gdk_pixbuf, gi-gio
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text
+  "gi-gdkpixbuf_2_0_5" = 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.4";
-       sha256 = "434c75e7e200869c084d661f0fcf7c22526ef59fcbf9c2bab6aaae8611cdb9cf";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "2.0.5";
+       sha256 = "d8541b6b4776a5c8ea859be4c9c524d1ee7decb39e25bbe6d28805cbc5fbbaf5";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -95622,18 +95760,19 @@ 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; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-gio_2_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , glib, gobjectIntrospection, haskell-gi, haskell-gi-base, text
-     , transformers
+  "gi-gio_2_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, glib, gobjectIntrospection, haskell-gi
+     , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gio";
-       version = "2.0.4";
-       sha256 = "197f50d604ccd56dd6610d699657f1926189d5da7685018ef4c1ad33642bcb94";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "2.0.5";
+       sha256 = "56ee835646fecc520d42b44742f7f4c0a58898012f5e804adce8a5ceb57ee0ab";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -95648,15 +95787,15 @@ self: {
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
   "gi-girepository" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-gobject
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-girepository";
-       version = "1.0.4";
-       sha256 = "1c00a09129041157bf1a3a01b3a0167bea4a9ad6b29b84e00583aba269e555ed";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "1.0.5";
+       sha256 = "ad3a48984f54f57a3bf21b8c18c309c7076a48903a9006d31453fb25db110db0";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gobject haskell-gi-base text
          transformers
@@ -95666,6 +95805,7 @@ 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
@@ -95687,18 +95827,19 @@ 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; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-glib_2_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib
+  "gi-glib_2_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-glib";
-       version = "2.0.4";
-       sha256 = "3015352ac2ebc49664c2a1618e16418985b09993f3ad20792e17121c9ab1fce7";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "2.0.5";
+       sha256 = "e3fa60c9707bc44c50468dac3f9135f7e1f7d6a421e4e6b1e9bcc9009afe8f99";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -95730,18 +95871,19 @@ 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; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-gobject_2_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-glib, glib
+  "gi-gobject_2_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-gobject";
-       version = "2.0.4";
-       sha256 = "a177cf48261764f3ae2aaa41a900ef5d08b96eaa8813d112c2b7a64588b3ab0f";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "2.0.5";
+       sha256 = "cce514b2fbf849be02d8b17fab0febe2bc547c26ab24489d728d19c1c1e8fb2a";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib haskell-gi-base text
          transformers
@@ -95756,14 +95898,15 @@ self: {
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
   "gi-gst" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , gstreamer, haskell-gi, haskell-gi-base, text, transformers
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, gstreamer, haskell-gi, haskell-gi-base, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-gst";
-       version = "1.0.4";
-       sha256 = "6bf1d0d2e85e1c999d7e3ed14e9ff53f1f84ecf61555767db4e09499b95b025c";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "1.0.5";
+       sha256 = "67f4eae308ab8e1196b1120dd54ec8affd10c1b9d35bf6e545ff418e9f95ba3e";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -95773,18 +95916,19 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamer bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gstreamer;};
 
   "gi-gstaudio" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , gi-gst, gi-gstbase, gst_plugins_base, haskell-gi, haskell-gi-base
-     , text, transformers
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, gi-gst, gi-gstbase, gst_plugins_base, haskell-gi
+     , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstaudio";
-       version = "1.0.4";
-       sha256 = "63af4a27bbbe5a20d8d4cf0c4c61f051056a52e99635c18105e792c5dc40e0ef";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "1.0.5";
+       sha256 = "ed94858bfab5a9ee9e79fa10cb82dd5949ab4ed6cce75f7dff1a5669d7a03503";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
          haskell-gi-base text transformers
@@ -95794,18 +95938,19 @@ 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_plugins_base;};
 
   "gi-gstbase" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , gi-gst, gst_plugins_base, haskell-gi, haskell-gi-base, text
-     , transformers
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, gi-gst, gst_plugins_base, haskell-gi, haskell-gi-base
+     , text, transformers
      }:
      mkDerivation {
        pname = "gi-gstbase";
-       version = "1.0.4";
-       sha256 = "ca2ed5d1ee65417f65062010d87d4a90525c7cbb76652b685d1de2f063fd96c3";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "1.0.5";
+       sha256 = "ad7520679d6c7ca6ab796021d30af6fa121baf43547d7a3fd5fde562968e0149";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst
          haskell-gi-base text transformers
@@ -95815,18 +95960,19 @@ 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_plugins_base;};
 
   "gi-gstvideo" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , gi-gst, gi-gstbase, gst_plugins_base, haskell-gi, haskell-gi-base
-     , text, transformers
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, gi-gst, gi-gstbase, gst_plugins_base, haskell-gi
+     , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstvideo";
-       version = "1.0.4";
-       sha256 = "cf02df311648bcedeb377ed386237d0f0695365d09d6be9ec6ae4f26ff74f894";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "1.0.5";
+       sha256 = "5a1a165371b6a4cc4423365c7fd5699c16f3bed73491a2711807b0b601af06a6";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
          haskell-gi-base text transformers
@@ -95836,6 +95982,7 @@ 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_plugins_base;};
 
   "gi-gtk_3_0_3" = callPackage
@@ -95861,15 +96008,15 @@ self: {
      }) {gtk3 = pkgs.gnome2.gtk;};
 
   "gi-gtk" = callPackage
-    ({ mkDerivation, base, bytestring, 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, 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.4";
-       sha256 = "a6527c34665a8d395ea529d44d97742f92f2bf1f55d97d9225e727e39e3ad158";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "3.0.5";
+       sha256 = "b509bf99e97ca71da863e17e3b1fea02e662626a94c1acd527159d84bbab8c23";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-pango haskell-gi-base text
@@ -95880,6 +96027,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome2.gtk;};
 
   "gi-gtk-hs" = callPackage
@@ -95898,18 +96046,19 @@ 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
-    ({ mkDerivation, base, bytestring, containers, gi-gdkpixbuf
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
      , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi
      , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gtkosxapplication";
-       version = "2.0.4";
-       sha256 = "6c41278cdc0829ab06d83245250cd8c9192770e03d4916f2084ca2eb0d5c1b79";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "2.0.5";
+       sha256 = "3df3d240f0d2d88e0e08608bc813f7b52927e36c45468616ee07ea6c70305bbd";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk
          haskell-gi-base text transformers
@@ -95919,19 +96068,20 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GtkosxApplication bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk-mac-integration-gtk3 = null;};
 
   "gi-gtksource" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo
-     , gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-gtk
-     , gi-pango, gtksourceview, haskell-gi, haskell-gi-base, text
-     , transformers
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
+     , gi-gtk, gi-pango, gtksourceview, haskell-gi, haskell-gi-base
+     , text, transformers
      }:
      mkDerivation {
        pname = "gi-gtksource";
-       version = "3.0.4";
-       sha256 = "aa360eecff313dc03abe6d352f3ee237af5dd1b4df372fab0617fa84b35cadf9";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "3.0.5";
+       sha256 = "13264ec93d94f3d66e8c86d2edabf270e27ccc27602b75cf2ef3efe779d5ba5f";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi-base text
@@ -95942,17 +96092,18 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GtkSource bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) gtksourceview;};
 
   "gi-javascriptcore" = callPackage
-    ({ mkDerivation, base, bytestring, containers, haskell-gi
+    ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
      , haskell-gi-base, javascriptcoregtk, text, transformers
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "3.0.4";
-       sha256 = "33de003d6ae4a8595f1b509618dcf83048ab0e0837b541d33d0610d7f6f6f641";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "3.0.5";
+       sha256 = "d1844f65c3e64b36eb5107cfcaf38755a7f614b0bd87188aebc19bf6e4f94792";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -95961,17 +96112,18 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "JavaScriptCore bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {javascriptcoregtk = null;};
 
-  "gi-javascriptcore_4_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, containers, haskell-gi
+  "gi-javascriptcore_4_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
      , haskell-gi-base, javascriptcoregtk, text, transformers
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "4.0.4";
-       sha256 = "408c500fea9217ddfe84bdd1ff4dfaabe5113def51f19a9e00da17574753a072";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "4.0.5";
+       sha256 = "91153ca407858eca23be1c2353bbeaf1e27092765f8e3635125818f88eb49fe9";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -95984,15 +96136,15 @@ self: {
      }) {javascriptcoregtk = null;};
 
   "gi-notify" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-gdkpixbuf
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libnotify, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-notify";
-       version = "0.7.4";
-       sha256 = "ff72dd988345b970b5fb0258349cebd0178ddbf523389748e1abaf57651965c3";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "0.7.5";
+       sha256 = "1f2d1d762728e2fdd2c8ea493a0fb3939376bd6b9b84aeed39dbfe9b0311f1bd";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -96002,6 +96154,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Libnotify bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libnotify;};
 
   "gi-pango" = callPackage
@@ -96023,19 +96176,20 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Pango bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gobjectIntrospection; 
          inherit (pkgs.gnome) pango;};
 
-  "gi-pango_1_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , gobjectIntrospection, haskell-gi, haskell-gi-base, pango, text
-     , transformers
+  "gi-pango_1_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base
+     , pango, text, transformers
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "1.0.4";
-       sha256 = "692d8d357d24f76f5d386d66f3f3be877f7cc72968c60d0b3f3309007b27dd22";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "1.0.5";
+       sha256 = "de481c56692e8b67926630f6fee261d9cc3589b58ca3e05c09d854839720d1c5";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -96051,15 +96205,15 @@ self: {
          inherit (pkgs.gnome) pango;};
 
   "gi-pangocairo" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-cairo, gi-glib
-     , gi-gobject, gi-pango, haskell-gi, haskell-gi-base, pango, text
-     , transformers
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
+     , gi-glib, gi-gobject, gi-pango, haskell-gi, haskell-gi-base, pango
+     , text, transformers
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.4";
-       sha256 = "e75d3931e3c58f2be33783ac06aa87b9ada8ca6668c5d78e6c0b6fd638a234e6";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "1.0.5";
+       sha256 = "2dbb331e1e056c4944ade2e26122459e3d106bfaec27c49c12cbbdd27b901be8";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
          haskell-gi-base text transformers
@@ -96069,18 +96223,19 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "PangoCairo bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) pango;};
 
   "gi-poppler" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-cairo, gi-gio
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, poppler, text
-     , transformers
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
+     , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, poppler
+     , text, transformers
      }:
      mkDerivation {
        pname = "gi-poppler";
-       version = "0.18.4";
-       sha256 = "01bc646881b6275d22ef6633fb95dd5fc49c44738e7c1cc27284fceb4c8ca74d";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "0.18.5";
+       sha256 = "13533b108970e9e9e5fc69f16f4c3851c0f89be6ae0cc3cf6cbb0e43fc9ddfad";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -96090,18 +96245,19 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Poppler bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) poppler;};
 
   "gi-soup" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-gio, gi-glib
-     , gi-gobject, haskell-gi, haskell-gi-base, libsoup, text
+    ({ 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.4";
-       sha256 = "8284732ddd001d87221992d47fd980d4629ac62e2460b3710a75926b1de5bce6";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "2.4.5";
+       sha256 = "244310c506fd9483109838077d4a3f4d2a5609a1c4d98996add9f252f2ea6862";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -96111,18 +96267,19 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Libsoup bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) libsoup;};
 
   "gi-vte" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-atk, gi-gdk
-     , gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi
+    ({ 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
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "2.91.4";
-       sha256 = "82fcc4afa1044e3a9fa975f0950a6b46e16fb11934fefed23b9d14935d2f5259";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "2.91.5";
+       sha256 = "292d99543d73c56b4ff5e3bb58ede26e4ca363b79e8eff5030412fe1c4b6a0fc";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
          gi-gtk gi-pango haskell-gi-base text transformers
@@ -96132,19 +96289,20 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Vte bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs.gnome) vte;};
 
   "gi-webkit" = callPackage
-    ({ mkDerivation, 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, webkit
+    ({ 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, webkit
      }:
      mkDerivation {
        pname = "gi-webkit";
-       version = "3.0.4";
-       sha256 = "0a2b689e9f8433d4da321be15f9bf488e57e652cbdb47288d3bfaef2e1a65134";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "3.0.5";
+       sha256 = "09341efe9c6437b8f23f0cc37fa489380acbf2e729a72612ea0a2dff35488064";
+       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
@@ -96155,19 +96313,20 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) webkit;};
 
   "gi-webkit2" = callPackage
-    ({ mkDerivation, 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
-     , webkit2gtk
+    ({ 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, webkit2gtk
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "4.0.4";
-       sha256 = "3748f8b1d30683822b887527668ac7e87b879d72c2b4d1e2576d51c3dedf0d37";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "4.0.5";
+       sha256 = "78331441baaaf622141c27a42ac7d6746355002f13dd0bc36bec37a82485af56";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
          gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi-base text
@@ -96179,18 +96338,19 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit2 bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit2gtk = null;};
 
   "gi-webkit2webextension" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-gobject, gi-gtk
-     , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text
-     , transformers, webkit2gtk-web-extension
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject
+     , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
+     , text, transformers, webkit2gtk-web-extension
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
-       version = "4.0.4";
-       sha256 = "afe4d27191c98d5db379a87953b680d6d8ed508b74a28c5bea0ac37ae5f78493";
-       setupHaskellDepends = [ base haskell-gi ];
+       version = "4.0.5";
+       sha256 = "1edbf17ae79637b09b08ceced08c953194901fe14c2054069a93387acb72ac19";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gobject gi-gtk gi-javascriptcore
          gi-soup haskell-gi-base text transformers
@@ -96201,6 +96361,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit2-WebExtension bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit2gtk-web-extension = null;};
 
   "gimlh" = callPackage
@@ -106722,8 +106883,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-filestore";
-       version = "0.1.1";
-       sha256 = "749551476fc7bbcf10309e6fea7df6660ed44cf1fd0665230882753301cce307";
+       version = "0.1.2";
+       sha256 = "85bda3df5f708d222d0b2d97177809aa95039dbfabd45eb580d65ab58158cf9f";
        libraryHaskellDepends = [
          base filestore hakyll time time-locale-compat
        ];
@@ -136123,10 +136284,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "index-core";
-       version = "1.0.3";
-       sha256 = "7d6d4964a83d04e796286fecc61750c211ec4003484672d43bd6d55c7711919c";
-       revision = "1";
-       editedCabalFile = "a4eb3773e413f2cb2f4963ca921ff295cf3e644dd16681bf5a0aff267ad49883";
+       version = "1.0.4";
+       sha256 = "75d1b87ad536cc0b36cc99d38cbff18b4fdd82d2921a0a81fe81ee0dc4c98e04";
        libraryHaskellDepends = [ base ];
        description = "Indexed Types";
        license = stdenv.lib.licenses.bsd3;
@@ -138330,6 +138489,25 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "irc-client_0_4_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, data-default-class
+     , irc-conduit, irc-ctcp, old-locale, stm, stm-conduit, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "irc-client";
+       version = "0.4.1.0";
+       sha256 = "2661f089733a7473f99662e2e1b97c42a48d399f98b7e076f43c2fadeedcb8f6";
+       libraryHaskellDepends = [
+         base bytestring conduit data-default-class irc-conduit irc-ctcp
+         old-locale stm stm-conduit text time transformers
+       ];
+       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 {
@@ -138341,7 +138519,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "irc-conduit" = callPackage
+  "irc-conduit_0_1_2_0" = callPackage
     ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
      , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls
      , transformers, x509-validation
@@ -138357,9 +138535,10 @@ 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-conduit_0_2_0_0" = callPackage
+  "irc-conduit" = callPackage
     ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
      , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls
      , transformers, x509-validation
@@ -138375,7 +138554,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
@@ -140389,7 +140567,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "js-jquery" = callPackage
+  "js-jquery_1_12_4" = callPackage
     ({ mkDerivation, base, HTTP }:
      mkDerivation {
        pname = "js-jquery";
@@ -140401,9 +140579,10 @@ self: {
        homepage = "https://github.com/ndmitchell/js-jquery#readme";
        description = "Obtain minified jQuery code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "js-jquery_3_0_0" = callPackage
+  "js-jquery" = callPackage
     ({ mkDerivation, base, HTTP }:
      mkDerivation {
        pname = "js-jquery";
@@ -140415,7 +140594,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_0_3_0_3" = callPackage
@@ -142390,6 +142568,7 @@ self: {
          lens-aeson quickcheck-instances scientific stm tasty tasty-hunit
          tasty-quickcheck text time transformers unordered-containers vector
        ];
+       doCheck = false;
        description = "ElasticSearch scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
@@ -146268,13 +146447,12 @@ self: {
      }:
      mkDerivation {
        pname = "language-python";
-       version = "0.5.2";
-       sha256 = "6c8bbde209ca62c32b9b89745f19203007c3dd407acc2f860a737b5a51446437";
+       version = "0.5.3";
+       sha256 = "cbc4cc08d4fa57cd774bed02b4766acb2d8ba0b80796563500e1e69e2ceb8ae2";
        libraryHaskellDepends = [
          array base containers monads-tf pretty transformers utf8-string
        ];
        libraryToolDepends = [ alex happy ];
-       jailbreak = true;
        homepage = "http://github.com/bjpop/language-python";
        description = "Parsing and pretty printing of Python code";
        license = stdenv.lib.licenses.bsd3;
@@ -146301,8 +146479,8 @@ self: {
     ({ mkDerivation, base, language-python }:
      mkDerivation {
        pname = "language-python-test";
-       version = "0.5.2";
-       sha256 = "bf6828c9b940a0b42e7b46f0c75517ac6a50e858525416257fcc45957bb6e1a9";
+       version = "0.5.3";
+       sha256 = "d4501e72569036239037fa06b146aef782dd3c82374cc37fab7b7d56df9f45fa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base language-python ];
@@ -146985,6 +147163,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lazy-search" = callPackage
+    ({ mkDerivation, base, size-based }:
+     mkDerivation {
+       pname = "lazy-search";
+       version = "0.1.0.0";
+       sha256 = "1691e5ec0363fd3aff644ae4daad29c84ea3d3a489546949546e4fb2678b688f";
+       libraryHaskellDepends = [ base size-based ];
+       jailbreak = true;
+       description = "Finds values satisfying a lazy predicate";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lazyarray" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -148897,8 +149087,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, split }:
      mkDerivation {
        pname = "libroman";
-       version = "2.1.1";
-       sha256 = "262bf5d2a22272e17545bc937fee05a4b31db70780c73ba11b46ee02c986a071";
+       version = "2.2.0";
+       sha256 = "a791f77d1a73e0ff7dbe2a2e2941bc9e7b08abb96ff511adcaa2d1a50eac5b8a";
        libraryHaskellDepends = [ base split ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://ahakki.xyz";
@@ -156462,6 +156652,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "means" = callPackage
+    ({ mkDerivation, base, semigroups }:
+     mkDerivation {
+       pname = "means";
+       version = "0.1.0.0";
+       sha256 = "434b91bdf1d01b722d7e038e1b91c7285bb8e61bc889949dbf95aefdb82afd8a";
+       libraryHaskellDepends = [ base semigroups ];
+       description = "calculate varieties of mean/average using semigroup";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mecab" = callPackage
     ({ mkDerivation, base, bytestring, mecab, text }:
      mkDerivation {
@@ -157592,8 +157793,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.4.4.2";
-       sha256 = "d5a6e18813142c1aa9d5cb3196d0e40fe5103d4f52581db519099e44eae74145";
+       version = "0.4.4.3";
+       sha256 = "b76878b66c43b2a2a131bfe99e163f95a736c94b8c48fa7b22c81549c4c07526";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        homepage = "http://github.com/aelve/microlens";
@@ -157601,19 +157802,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "microlens_0_4_4_3" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "microlens";
-       version = "0.4.4.3";
-       sha256 = "b76878b66c43b2a2a131bfe99e163f95a736c94b8c48fa7b22c81549c4c07526";
-       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_2_1_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, directory
      , doctest, filepath, generic-deriving, microlens, scientific
@@ -162503,7 +162691,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "morte" = callPackage
+  "morte_1_6_0" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers, deepseq
      , Earley, http-client, http-client-tls, microlens, microlens-mtl
      , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
@@ -162530,6 +162718,35 @@ self: {
        jailbreak = true;
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "morte" = callPackage
+    ({ mkDerivation, alex, array, base, binary, containers, 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.1";
+       sha256 = "84874884eda53f75ba1b9ab8ed85151839c41de54e9ab999de429f00d319a703";
+       isLibrary = true;
+       isExecutable = 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 optparse-applicative text ];
+       testHaskellDepends = [
+         base mtl QuickCheck system-filepath tasty tasty-hunit
+         tasty-quickcheck text transformers
+       ];
+       description = "A bare-bones calculus of constructions";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -167733,6 +167950,8 @@ self: {
        pname = "neural";
        version = "0.1.1.0";
        sha256 = "222ef9b9feaaf5fcd4577e60c18d9a2cf9feed9dbdbe8f63d997b9b5a7f435c6";
+       revision = "1";
+       editedCabalFile = "db2bcbca3e967c456dfcc752db6bce9a3b69febd01cffa34ea28a7f1f4677088";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169148,8 +169367,8 @@ self: {
      }:
      mkDerivation {
        pname = "nvim-hs";
-       version = "0.0.7";
-       sha256 = "bbd20049812fd481b882443341b17ad4b6b4e4766e7767130beb4f005786dabf";
+       version = "0.0.8";
+       sha256 = "46c126f0930042defbb6177e4ce9213e257876f0c17cd02397a016ff2e5f9606";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169456,8 +169675,8 @@ self: {
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.7.0";
-       sha256 = "3a257d55d375d959ecb8965c0c89a1b9259eba1befd3a0736727f96dcce5657d";
+       version = "0.9.0";
+       sha256 = "d072c5ebc848d0e93222502bdba12a79b5828ddabfa5c6e937893a7678224168";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169473,31 +169692,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "octane_0_8_0" = callPackage
-    ({ mkDerivation, aeson, autoexporter, base, bimap, binary
-     , binary-bits, bytestring, containers, data-binary-ieee754, deepseq
-     , tasty, tasty-hspec, text
-     }:
-     mkDerivation {
-       pname = "octane";
-       version = "0.8.0";
-       sha256 = "da4655af7f357bf7ceeec9285ea4e59f12184bb7529322ea22a329d8796bd831";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson autoexporter base bimap binary binary-bits bytestring
-         containers data-binary-ieee754 deepseq text
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base binary bytestring containers tasty tasty-hspec
-       ];
-       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
@@ -179720,7 +179914,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pipes-bytestring" = callPackage
+  "pipes-bytestring_2_1_2" = callPackage
     ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse
      , transformers
      }:
@@ -179733,6 +179927,22 @@ self: {
        ];
        description = "ByteString support for pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pipes-bytestring" = callPackage
+    ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pipes-bytestring";
+       version = "2.1.3";
+       sha256 = "d2211e068fe28c5e6a5dc0089eec0dd31bedd4b942285965a02f8aa20c4c6f3e";
+       libraryHaskellDepends = [
+         base bytestring pipes pipes-group pipes-parse transformers
+       ];
+       description = "ByteString support for pipes";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "pipes-bzip" = callPackage
@@ -180069,7 +180279,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pipes-extras" = callPackage
+  "pipes-extras_1_0_3" = callPackage
     ({ mkDerivation, base, foldl, HUnit, pipes, test-framework
      , test-framework-hunit, transformers
      }:
@@ -180084,6 +180294,24 @@ self: {
        jailbreak = true;
        description = "Extra utilities for pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pipes-extras" = callPackage
+    ({ mkDerivation, base, foldl, HUnit, pipes, test-framework
+     , test-framework-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-extras";
+       version = "1.0.4";
+       sha256 = "de3ba31f8c6b1d1b1f19bbe1f7bb8486b8687f1489a36e6563b80b64063fd2c2";
+       libraryHaskellDepends = [ base foldl pipes transformers ];
+       testHaskellDepends = [
+         base HUnit pipes test-framework test-framework-hunit transformers
+       ];
+       jailbreak = true;
+       description = "Extra utilities for pipes";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "pipes-fastx" = callPackage
@@ -180165,7 +180393,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pipes-group" = callPackage
+  "pipes-group_1_0_4" = callPackage
     ({ mkDerivation, base, doctest, free, lens-family-core, pipes
      , pipes-parse, transformers
      }:
@@ -180179,6 +180407,39 @@ self: {
        testHaskellDepends = [ base doctest lens-family-core ];
        description = "Group streams into substreams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pipes-group" = callPackage
+    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
+     , pipes-parse, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-group";
+       version = "1.0.5";
+       sha256 = "dbcdfe483c57f337a259635d2fde149e1d2b081092f0b1b30fc7d175b38e2ef5";
+       libraryHaskellDepends = [
+         base free pipes pipes-parse transformers
+       ];
+       testHaskellDepends = [ base doctest lens-family-core ];
+       description = "Group streams into substreams";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "pipes-http_1_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, http-client, http-client-tls
+     , pipes
+     }:
+     mkDerivation {
+       pname = "pipes-http";
+       version = "1.0.2";
+       sha256 = "f32f2962ba04ccb28cef3866d002fbc17a8d818ef637c236c72148f66f580a43";
+       libraryHaskellDepends = [
+         base bytestring http-client http-client-tls pipes
+       ];
+       description = "HTTP client with pipes interface";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-http" = callPackage
@@ -180187,8 +180448,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-http";
-       version = "1.0.2";
-       sha256 = "f32f2962ba04ccb28cef3866d002fbc17a8d818ef637c236c72148f66f580a43";
+       version = "1.0.3";
+       sha256 = "a8a2f0babb5348e6cb6bde375e7af47ebe808d4e333e0dd5c7e0ace3c600d58a";
        libraryHaskellDepends = [
          base bytestring http-client http-client-tls pipes
        ];
@@ -187448,8 +187709,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript-bridge";
-       version = "0.6.0.0";
-       sha256 = "21d7653da75b15adf8d0f253ee4cad5fbc2edd2125d8dc11646c7ff8b82ed542";
+       version = "0.6.0.1";
+       sha256 = "8abbc3ca3df18daac6ba730a39baf71d426555cebc24e73acdbbafb4538bfd8f";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving lens mtl text
          transformers
@@ -197093,7 +197354,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "rose-trees" = callPackage
+  "rose-trees_0_0_3" = callPackage
     ({ mkDerivation, base, containers, deepseq, mtl, QuickCheck
      , quickcheck-instances, semigroupoids, semigroups, sets, tasty
      , tasty-quickcheck, witherable
@@ -197112,29 +197373,31 @@ self: {
        ];
        description = "A collection of rose tree structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rose-trees_0_0_4_1" = callPackage
+  "rose-trees" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, mtl
      , QuickCheck, quickcheck-instances, semigroupoids, semigroups, sets
      , tasty, tasty-quickcheck, unordered-containers, witherable
      }:
      mkDerivation {
        pname = "rose-trees";
-       version = "0.0.4.1";
-       sha256 = "69e4c450588697b5f100a715257aaee8f72ce362c199e3a33cdc43336cf70d29";
+       version = "0.0.4.3";
+       sha256 = "bdd180b27e959316af0825a0de7151ef7cb640fefaa1aecdcfdfab1b94d5e426";
        libraryHaskellDepends = [
          base containers deepseq hashable mtl QuickCheck
          quickcheck-instances semigroupoids semigroups sets
          unordered-containers witherable
        ];
        testHaskellDepends = [
-         base containers deepseq QuickCheck quickcheck-instances
-         semigroupoids semigroups sets tasty tasty-quickcheck witherable
+         base containers deepseq hashable QuickCheck quickcheck-instances
+         semigroupoids semigroups sets tasty tasty-quickcheck
+         unordered-containers witherable
        ];
+       doCheck = false;
        description = "A collection of rose tree structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rose-trie" = callPackage
@@ -199821,7 +200084,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "scientific" = callPackage
+  "scientific_0_3_4_6" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , ghc-prim, hashable, integer-gmp, QuickCheck, smallcheck, tasty
      , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -199842,9 +200105,10 @@ self: {
        homepage = "https://github.com/basvandijk/scientific";
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "scientific_0_3_4_7" = callPackage
+  "scientific" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , ghc-prim, hashable, integer-gmp, QuickCheck, smallcheck, tasty
      , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -199865,7 +200129,6 @@ self: {
        homepage = "https://github.com/basvandijk/scientific";
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scion" = callPackage
@@ -205016,7 +205279,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "shake" = callPackage
+  "shake_0_15_8" = callPackage
     ({ mkDerivation, base, binary, bytestring, deepseq, directory
      , extra, filepath, hashable, js-flot, js-jquery, primitive, process
      , QuickCheck, random, time, transformers, unix
@@ -205047,6 +205310,40 @@ self: {
        homepage = "http://shakebuild.com";
        description = "Build system library, like Make, but more accurate dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "shake" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, directory
+     , extra, filepath, hashable, js-flot, js-jquery, primitive, process
+     , QuickCheck, random, time, transformers, unix
+     , unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "shake";
+       version = "0.15.9";
+       sha256 = "bfb131d3c93879655b5da68fe0137bfafd3f93af09dcc9c79fb4367b97274e8d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery process random time transformers unix
+         unordered-containers utf8-string
+       ];
+       executableHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery primitive process random time transformers unix
+         unordered-containers utf8-string
+       ];
+       testHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery process QuickCheck random time transformers unix
+         unordered-containers utf8-string
+       ];
+       doCheck = false;
+       homepage = "http://shakebuild.com";
+       description = "Build system library, like Make, but more accurate dependencies";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "shake-cabal-build" = callPackage
@@ -205687,6 +205984,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "shakespeare-sass" = callPackage
+    ({ mkDerivation, base, hlibsass, hsass, shakespeare
+     , template-haskell, yesod, yesod-core
+     }:
+     mkDerivation {
+       pname = "shakespeare-sass";
+       version = "0.1.0.2";
+       sha256 = "db1a1a5fa84bd789265af26592fa1e885bd94be3cacb973b96a20a94b5991171";
+       libraryHaskellDepends = [
+         base hlibsass hsass shakespeare template-haskell yesod yesod-core
+       ];
+       homepage = "https://github.com/brcha/shakespeare-sass";
+       description = "SASS support for Shakespeare and Yesod";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "shakespeare-text" = callPackage
     ({ mkDerivation, base, shakespeare }:
      mkDerivation {
@@ -207871,6 +208184,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "size-based" = callPackage
+    ({ mkDerivation, base, dictionary-sharing, template-haskell
+     , testing-type-modifiers
+     }:
+     mkDerivation {
+       pname = "size-based";
+       version = "0.1.0.0";
+       sha256 = "fd59ed893c897b6c44861997d94095897f16eed9243be10a3f05649b860ee9c0";
+       libraryHaskellDepends = [
+         base dictionary-sharing template-haskell testing-type-modifiers
+       ];
+       description = "Sized functors, for size-based enumerations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sized" = callPackage
     ({ mkDerivation, base, constraints, containers, ListLike
      , monomorphic, type-natural, vector
@@ -211841,8 +212169,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparkle";
-       version = "0.1";
-       sha256 = "91e7c8309028201b55d0174b0f6882ada77c41ae4ede94ffc422c48b80c68fb2";
+       version = "0.1.0.1";
+       sha256 = "bb5842365a30d6a32fbcab197ce862c26aea15404b597995baf1573baccebc6f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -216659,35 +216987,36 @@ self: {
      }) {};
 
   "store" = callPackage
-    ({ mkDerivation, array, base, base-orphans, bytestring, conduit
-     , containers, cryptohash, deepseq, fail, ghc-prim, hashable, hspec
-     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
-     , mono-traversable, primitive, resourcet, safe, semigroups
-     , smallcheck, syb, template-haskell, text, th-lift
-     , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
-     , transformers, unordered-containers, vector, void
+    ({ mkDerivation, array, base, base-orphans, bytestring, cereal
+     , cereal-vector, conduit, containers, criterion, cryptohash
+     , deepseq, fail, ghc-prim, hashable, hspec, hspec-smallcheck
+     , integer-gmp, lifted-base, monad-control, mono-traversable
+     , primitive, resourcet, safe, semigroups, smallcheck, store-core
+     , 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.1.0.1";
-       sha256 = "2f7bae795eec86374f1d55edfd9705beb493399a4f85979eec7a366b5ab2bfa2";
-       revision = "2";
-       editedCabalFile = "ffcdc632ec158cac194edfc06955b55ae02ebef6768b645a8b7c5a3d4264f1fa";
+       version = "0.2.0.0";
+       sha256 = "d00fc9a44436e24a14e26a0a838a7639ed3de8fa391d0aeab1374adae011653c";
        libraryHaskellDepends = [
          array base base-orphans bytestring conduit containers cryptohash
          deepseq fail ghc-prim hashable hspec hspec-smallcheck integer-gmp
          lifted-base monad-control mono-traversable primitive resourcet safe
-         semigroups smallcheck syb template-haskell text th-lift
+         semigroups smallcheck store-core syb template-haskell text th-lift
          th-lift-instances th-orphans th-reify-many th-utilities time
          transformers unordered-containers vector void
        ];
        testHaskellDepends = [
-         array base base-orphans bytestring conduit containers cryptohash
-         deepseq fail ghc-prim hashable hspec hspec-smallcheck integer-gmp
-         lifted-base monad-control mono-traversable primitive resourcet safe
-         semigroups smallcheck syb template-haskell text th-lift
-         th-lift-instances th-orphans th-reify-many th-utilities time
-         transformers unordered-containers vector void
+         array base base-orphans bytestring cereal cereal-vector conduit
+         containers criterion cryptohash deepseq fail ghc-prim hashable
+         hspec hspec-smallcheck integer-gmp lifted-base monad-control
+         mono-traversable primitive resourcet safe semigroups smallcheck
+         store-core 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
        ];
        homepage = "https://github.com/fpco/store#readme";
        description = "Fast binary serialization";
@@ -216695,6 +217024,22 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "store-core" = callPackage
+    ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "store-core";
+       version = "0.2.0.0";
+       sha256 = "52ef7fab49c7dbd6c287de92c2f852c78f25cb32a415e56b3f21ca6b9aa5bd0a";
+       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;
+     }) {};
+
   "str" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, Crypto
      , hashable, MissingH, text, utf8-string
@@ -216713,7 +217058,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere" = callPackage
+  "stratosphere_0_1_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , ede, hlint, lens, system-fileio, system-filepath, tasty
      , tasty-hspec, template-haskell, text, unordered-containers
@@ -216740,6 +217085,36 @@ self: {
        homepage = "https://github.com/frontrowed/stratosphere#readme";
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "stratosphere" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+     , ede, hlint, lens, system-fileio, system-filepath, tasty
+     , tasty-hspec, template-haskell, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "stratosphere";
+       version = "0.1.2";
+       sha256 = "80e47c868980bc5b9f84c9512baf8f91f8c6f0da5d676a5f5c10d8e1c4dbae27";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring ede lens system-fileio
+         system-filepath template-haskell text unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring ede lens system-fileio
+         system-filepath template-haskell text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring directory ede hlint lens
+         system-fileio system-filepath tasty tasty-hspec template-haskell
+         text unordered-containers
+       ];
+       homepage = "https://github.com/frontrowed/stratosphere#readme";
+       description = "EDSL for AWS CloudFormation";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "stratum-tool" = callPackage
@@ -216948,7 +217323,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "streaming" = callPackage
+  "streaming_0_1_4_2" = callPackage
     ({ mkDerivation, base, exceptions, ghc-prim, mmorph, monad-control
      , mtl, resourcet, time, transformers, transformers-base
      }:
@@ -216963,6 +217338,24 @@ self: {
        homepage = "https://github.com/michaelt/streaming";
        description = "an elementary streaming prelude and general stream type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "streaming" = callPackage
+    ({ mkDerivation, base, exceptions, ghc-prim, mmorph, monad-control
+     , mtl, resourcet, time, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "streaming";
+       version = "0.1.4.3";
+       sha256 = "c9ea0aa19a91717f0f988d0c2503e68a523b1d104facec841d0182425ec920c9";
+       libraryHaskellDepends = [
+         base exceptions ghc-prim mmorph monad-control mtl resourcet time
+         transformers transformers-base
+       ];
+       homepage = "https://github.com/michaelt/streaming";
+       description = "an elementary streaming prelude and general stream type";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "streaming-bytestring_0_1_4_0" = callPackage
@@ -217414,6 +217807,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "streaming-eversion" = callPackage
+    ({ mkDerivation, base, bifunctors, comonad, doctest, foldl, free
+     , pipes, pipes-text, profunctors, streaming, tasty, tasty-hunit
+     , tasty-quickcheck, transformers
+     }:
+     mkDerivation {
+       pname = "streaming-eversion";
+       version = "0.1.0.0";
+       sha256 = "a75ea3df58d9c5f9e7efd85a43bbccb7c4bef0bb91d6bd92a27cc3b783242517";
+       libraryHaskellDepends = [
+         base bifunctors comonad foldl free pipes profunctors streaming
+         transformers
+       ];
+       testHaskellDepends = [
+         base doctest foldl pipes pipes-text streaming tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       jailbreak = true;
+       description = "Translate pull-based stream folds into push-based iteratees";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "streaming-histogram" = callPackage
     ({ mkDerivation, base, containers, criterion, tasty, tasty-hunit
      , tasty-quickcheck
@@ -224193,7 +224608,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "test-framework-th-prime" = callPackage
+  "test-framework-th-prime_0_0_8" = callPackage
     ({ mkDerivation, base, cpphs, haskell-src-exts, template-haskell
      , test-framework
      }:
@@ -224209,6 +224624,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "test-framework-th-prime" = callPackage
+    ({ mkDerivation, base, cpphs, haskell-src-exts, template-haskell
+     , test-framework
+     }:
+     mkDerivation {
+       pname = "test-framework-th-prime";
+       version = "0.0.9";
+       sha256 = "77e4e33e4207dc6ba9a3c0bb1eda9d6ac6803e1bf20fd7a4aee5c8fe958399bd";
+       libraryHaskellDepends = [
+         base cpphs haskell-src-exts template-haskell test-framework
+       ];
+       description = "Template Haskell for test framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "test-invariant" = callPackage
     ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }:
      mkDerivation {
@@ -225079,8 +225510,8 @@ self: {
     ({ mkDerivation, base, text, text-format, text-show }:
      mkDerivation {
        pname = "text-all";
-       version = "0.2.0.0";
-       sha256 = "15f34c0c6182e635ccde59dd0eeace71fdc031a1468d9a50ea509d7e3aeb7073";
+       version = "0.3.0.0";
+       sha256 = "b982107ded04aa3570f363209477210a3eb82536f3e14d7bbc2a9b6d099d3743";
        libraryHaskellDepends = [ base text text-format text-show ];
        homepage = "http://github.com/aelve/text-all";
        description = "Everything Data.Text related in one package";
@@ -225275,7 +225706,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "text-ldap" = callPackage
+  "text-ldap_0_1_1_6" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
      , containers, dlist, QuickCheck, quickcheck-simple, random
      , semigroups, transformers
@@ -225296,9 +225727,10 @@ self: {
        ];
        description = "Parser and Printer for LDAP text data stream";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text-ldap_0_1_1_7" = callPackage
+  "text-ldap" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
      , containers, dlist, QuickCheck, quickcheck-simple, random
      , semigroups, transformers
@@ -225319,7 +225751,6 @@ self: {
        ];
        description = "Parser and Printer for LDAP text data stream";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-locale-encoding" = callPackage
@@ -227013,6 +227444,7 @@ self: {
        testHaskellDepends = [
          base concurrent-extra HUnit stm test-framework test-framework-hunit
        ];
+       doCheck = false;
        homepage = "https://github.com/basvandijk/threads";
        description = "Fork threads and wait for their result";
        license = stdenv.lib.licenses.bsd3;
@@ -227258,8 +227690,8 @@ self: {
      }:
      mkDerivation {
        pname = "tianbar";
-       version = "1.0.0.0";
-       sha256 = "3acf7d21e2554f7f685f63e8d0c9f54748bdc57f82f08e41336da90db038fa14";
+       version = "1.0.1.0";
+       sha256 = "6f2976bd3d13f33983f0a3fc8b239ba87b3fbf29a9f10ab476bc9936b14e23bb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -227710,7 +228142,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "time-locale-compat" = callPackage
+  "time-locale-compat_0_1_1_1" = callPackage
     ({ mkDerivation, base, old-locale, time }:
      mkDerivation {
        pname = "time-locale-compat";
@@ -227720,9 +228152,10 @@ self: {
        homepage = "https://github.com/khibino/haskell-time-locale-compat";
        description = "Compatibility of TimeLocale between old-locale and time-1.5";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "time-locale-compat_0_1_1_2" = callPackage
+  "time-locale-compat" = callPackage
     ({ mkDerivation, base, old-locale, time }:
      mkDerivation {
        pname = "time-locale-compat";
@@ -227732,7 +228165,6 @@ self: {
        homepage = "https://github.com/khibino/haskell-time-locale-compat";
        description = "Compatibility of TimeLocale between old-locale and time-1.5";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-out" = callPackage
@@ -227978,28 +228410,6 @@ self: {
      }) {};
 
   "timemap" = callPackage
-    ({ mkDerivation, base, containers, focus, hashable, list-t
-     , QuickCheck, quickcheck-instances, stm, stm-containers, tasty
-     , tasty-hunit, tasty-quickcheck, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "timemap";
-       version = "0.0.3";
-       sha256 = "4a88aa0f9c7f13390bf842fd93d0d22cbf92aed0f7a7c6cec06eca38a45ed89f";
-       libraryHaskellDepends = [
-         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
-         tasty-quickcheck time unordered-containers
-       ];
-       description = "A mutable hashmap, implicitly indexed by UTCTime";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "timemap_0_0_4" = callPackage
     ({ mkDerivation, base, containers, focus, hashable, list-t
      , QuickCheck, quickcheck-instances, stm, stm-containers, tasty
      , tasty-hunit, tasty-quickcheck, time, unordered-containers
@@ -228019,7 +228429,6 @@ self: {
        ];
        description = "A mutable hashmap, implicitly indexed by UTCTime";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeout" = callPackage
@@ -229400,8 +229809,8 @@ self: {
      }:
      mkDerivation {
        pname = "tpdb";
-       version = "1.3.2";
-       sha256 = "eb54039be2a2bc45f1018e7f2531118d69b96abdfeb91e61ced4e597e3730409";
+       version = "1.3.3";
+       sha256 = "faa53ced8a5756fef610618b96d4dad7518f66a56108ad0300a3866259237af6";
        libraryHaskellDepends = [
          base bytestring containers filepath hashable HaXml hxt mtl parsec
          text time wl-pprint-text
@@ -239825,6 +240234,7 @@ self: {
          process tasty tasty-hunit text wai wai-extra wai-websockets warp
          websockets
        ];
+       doCheck = false;
        homepage = "https://github.com/larskuhtz/wai-cors";
        description = "CORS for WAI";
        license = stdenv.lib.licenses.mit;
@@ -244956,8 +245366,8 @@ self: {
     ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }:
      mkDerivation {
        pname = "webkit-javascriptcore";
-       version = "0.14.1.0";
-       sha256 = "d3049d1ea5f9a8a7bc9b0d5e85507acfe8af9fa6344bab82443299c17f18ee72";
+       version = "0.14.2.0";
+       sha256 = "e0add063357a0798d6b40b9f8bab83395094199de3432570e4632a8d71a624e2";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkit ];
@@ -245024,8 +245434,8 @@ self: {
     ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }:
      mkDerivation {
        pname = "webkitgtk3-javascriptcore";
-       version = "0.14.1.0";
-       sha256 = "8d75032979d34ac811a06a5d3c7596b0cc176e24304a3834067896b4df0e5d6d";
+       version = "0.14.2.0";
+       sha256 = "0eba3872499ca6fc54b24a8205297f01498eca2c7622e76c92458bc018ee1edc";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkit ];
@@ -245569,8 +245979,8 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf";
-       version = "1.2.0.2";
-       sha256 = "606c1561b96511bedbcfc363447bd524c767b1f67cb45c8f904d121c13fcb852";
+       version = "1.3.0.0";
+       sha256 = "101a12cbd6d9437ff1382629b5d185e64214f16fd08a2569b8ebda21da2b6662";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -245581,13 +245991,12 @@ self: {
          aeson base containers directory extra filepath lens MonadRandom mtl
          optparse-applicative random-shuffle text transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/hjwylde/werewolf";
        description = "A game engine for playing werewolf within an arbitrary chat client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "werewolf-slack" = callPackage
+  "werewolf-slack_1_0_1_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, extra, http-client
      , http-client-tls, http-types, mtl, optparse-applicative, process
      , text, wai, warp, werewolf
@@ -245606,6 +246015,27 @@ self: {
        homepage = "https://github.com/hjwylde/werewolf-slack";
        description = "A chat interface for playing werewolf in Slack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "werewolf-slack" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, extra, http-client
+     , http-client-tls, http-types, mtl, optparse-applicative, process
+     , text, wai, warp, werewolf
+     }:
+     mkDerivation {
+       pname = "werewolf-slack";
+       version = "1.0.1.3";
+       sha256 = "0643b9c5762e1406946f21746df0a693f58505ba4a38873fd42d0a025f1dafa5";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring extra http-client http-client-tls http-types
+         mtl optparse-applicative process text wai warp werewolf
+       ];
+       homepage = "https://github.com/hjwylde/werewolf-slack";
+       description = "A chat interface for playing werewolf in Slack";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "wheb-mongo" = callPackage
@@ -248928,6 +249358,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "xml-conduit-decode" = callPackage
+    ({ mkDerivation, base, bifunctors, data-default, lens, semigroups
+     , tasty, tasty-hunit, text, time, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit-decode";
+       version = "1.0.0.0";
+       sha256 = "1a914d60ea5cc05a2164467cf49b1ad5543e849182d734c3cab19662fbe5eb7b";
+       libraryHaskellDepends = [
+         base bifunctors lens semigroups text time xml-conduit
+       ];
+       testHaskellDepends = [
+         base data-default lens tasty tasty-hunit text time xml-conduit
+         xml-types
+       ];
+       homepage = "https://github.com/benkolera/xml-conduit-decode";
+       description = "Historical cursors & decoding on top of xml-conduit";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "xml-conduit-parse" = callPackage
     ({ mkDerivation, base, conduit, conduit-parse, containers
      , data-default, exceptions, hlint, parsers, resourcet, tasty

From bef99f11cb422c646db6c24b0dc0f1d0998dabee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 13 Jun 2016 23:05:04 +0200
Subject: [PATCH 296/436] Add LTS Haskell 6.3.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7a5a2bfccc79..1125b8b9d9f5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -412,7 +412,10 @@ rec {
     lts-6_2 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-6.2.nix { };
     };
-    lts-6 = packages.lts-6_2;
+    lts-6_3 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-6.3.nix { };
+    };
+    lts-6 = packages.lts-6_3;
 
     lts = packages.lts-6;
   };

From 322fe543b65f0e3cf8697b56880d14dc936f8abe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 13 Jun 2016 18:25:07 +0200
Subject: [PATCH 297/436] cabal2nix: bump to version 20160613

---
 pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix        | 4 ++--
 .../tools/haskell/cabal2nix/distribution-nixpkgs.nix          | 4 ++--
 pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
index 58471d9b9601..0586652ac410 100644
--- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
@@ -6,12 +6,12 @@
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20160611";
+  version = "20160613";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1zmrqs09zfnwy9cclp78p5nfpg5520p0lnz1myg5q4p6i2251mp3";
+    sha256 = "0cnc037qsmwwddws138z7w1aww0l9z5bg89dgh4vfxck29z84is9";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;
diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
index caa3db746fda..32dc8e38788d 100644
--- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
@@ -11,8 +11,8 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
-    rev = "v20160611";
-    sha256 = "1zmrqs09zfnwy9cclp78p5nfpg5520p0lnz1myg5q4p6i2251mp3";
+    rev = "v20160613";
+    sha256 = "0cnc037qsmwwddws138z7w1aww0l9z5bg89dgh4vfxck29z84is9";
   };
   postUnpack = "sourceRoot+=/${pname}";
   libraryHaskellDepends = [
diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
index 68165b5926cd..95c5309d0369 100644
--- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
@@ -7,12 +7,12 @@
 
 mkDerivation rec {
   pname = "hackage2nix";
-  version = "20160611";
+  version = "20160613";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1zmrqs09zfnwy9cclp78p5nfpg5520p0lnz1myg5q4p6i2251mp3";
+    sha256 = "0cnc037qsmwwddws138z7w1aww0l9z5bg89dgh4vfxck29z84is9";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;

From 8d86c8274f8cf31d096763839346388c20ce29a2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 13 Jun 2016 18:32:44 +0200
Subject: [PATCH 298/436] callHackage: generate expressions for the appropriate
 target system and compiler

---
 pkgs/development/haskell-modules/default.nix | 23 ++++++++++++++++++--
 pkgs/development/haskell-modules/lib.nix     | 21 ------------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 7a51a1de1471..b03293ecfc5c 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -6,9 +6,14 @@
 
 let
 
-  inherit (stdenv.lib) fix' extends;
+  allCabalFiles = pkgs.fetchFromGitHub {
+     owner = "commercialhaskell";
+     repo = "all-cabal-hashes";
+     rev = "461610ab6f0cf581e186643c037f1981755792d9";
+     sha256 = "0x2577lfd5cbbaivl72273kw93gcmxvbjybk7w4h2ic3zvs1fnvm";
+   };
 
-  inherit (import ./lib.nix { inherit pkgs; }) hackage2nix;
+  inherit (stdenv.lib) fix' extends;
 
   haskellPackages = self:
     let
@@ -54,6 +59,20 @@ let
         inherit packages;
       };
 
+      hackage2nix = name: version: pkgs.stdenv.mkDerivation {
+        name = "cabal2nix-${name}-${version}";
+        buildInputs = [ pkgs.cabal2nix ];
+        phases = ["installPhase"];
+        LANG = "en_US.UTF-8";
+        LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive";
+        installPhase = ''
+          export HOME="$TMP"
+          mkdir $out
+          hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${allCabalFiles}/${name}/${version}/${name}.json)
+          cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} --sha256=$hash ${allCabalFiles}/${name}/${version}/${name}.cabal >$out/default.nix
+        '';
+      };
+
     in
       import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // {
 
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index b92bf304723b..e96200578de5 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -85,25 +85,4 @@ rec {
 
   triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
 
-  allCabalFiles = pkgs.fetchFromGitHub {
-     owner = "commercialhaskell";
-     repo = "all-cabal-hashes";
-     rev = "461610ab6f0cf581e186643c037f1981755792d9";
-     sha256 = "0x2577lfd5cbbaivl72273kw93gcmxvbjybk7w4h2ic3zvs1fnvm";
-   };
-
-   hackage2nix = name: version: pkgs.stdenv.mkDerivation {
-     name = "cabal2nix-${name}-${version}";
-     buildInputs = [ pkgs.cabal2nix ];
-     phases = ["installPhase"];
-     LANG = "en_US.UTF-8";
-     LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive";
-     installPhase = ''
-       export HOME="$TMP"
-       mkdir $out
-       hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${allCabalFiles}/${name}/${version}/${name}.json)
-       cabal2nix --sha256=$hash ${allCabalFiles}/${name}/${version}/${name}.cabal >$out/default.nix
-     '';
-   };
-
 }

From 437ea9fd370f85451801ae5904a364175ce4eef8 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 13 Jun 2016 23:32:16 +0200
Subject: [PATCH 299/436] Fixes #16181 - using bin output for Go services

---
 nixos/modules/services/misc/confd.nix            | 2 +-
 nixos/modules/services/misc/etcd.nix             | 2 +-
 nixos/modules/services/monitoring/bosun.nix      | 2 +-
 nixos/modules/services/monitoring/grafana.nix    | 2 +-
 nixos/modules/services/monitoring/scollector.nix | 2 +-
 nixos/modules/services/networking/consul.nix     | 8 ++++----
 nixos/modules/services/networking/skydns.nix     | 2 +-
 nixos/modules/services/security/hologram.nix     | 2 +-
 nixos/modules/services/security/oauth2_proxy.nix | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix
index c0fbf06e6c4c..72ec68dee6b3 100644
--- a/nixos/modules/services/misc/confd.nix
+++ b/nixos/modules/services/misc/confd.nix
@@ -75,7 +75,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/confd";
+        ExecStart = "${cfg.package.bin}/bin/confd";
       };
     };
 
diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix
index bc8064e3c879..0d6ed8eb9043 100644
--- a/nixos/modules/services/misc/etcd.nix
+++ b/nixos/modules/services/misc/etcd.nix
@@ -115,7 +115,7 @@ in {
 
       serviceConfig = {
         Type = "notify";
-        ExecStart = "${pkgs.etcd}/bin/etcd";
+        ExecStart = "${pkgs.etcd.bin}/bin/etcd";
         User = "etcd";
         PermissionsStartOnly = true;
       };
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 51d38e8db4de..9a1e790d3ab6 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -148,7 +148,7 @@ in {
         User = cfg.user;
         Group = cfg.group;
         ExecStart = ''
-          ${cfg.package}/bin/bosun -c ${configFile}
+          ${cfg.package.bin}/bin/bosun -c ${configFile}
         '';
       };
     };
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index defbd9289dcd..0b7f3ce0a29b 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -228,7 +228,7 @@ in {
       after = ["networking.target"];
       environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/grafana-server -homepath ${cfg.dataDir}";
+        ExecStart = "${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}";
         WorkingDirectory = cfg.dataDir;
         User = "grafana";
       };
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index 1e397435e600..2684482c6184 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -119,7 +119,7 @@ in {
         PermissionsStartOnly = true;
         User = cfg.user;
         Group = cfg.group;
-        ExecStart = "${cfg.package}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";
+        ExecStart = "${cfg.package.bin}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";
       };
     };
 
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 2aa101f980da..166ee7732375 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -178,14 +178,14 @@ in
             (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);
 
         serviceConfig = {
-          ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d"
+          ExecStart = "@${cfg.package.bin}/bin/consul consul agent -config-dir /etc/consul.d"
             + concatMapStrings (n: " -config-file ${n}") configFiles;
-          ExecReload = "${cfg.package}/bin/consul reload";
+          ExecReload = "${cfg.package.bin}/bin/consul reload";
           PermissionsStartOnly = true;
           User = if cfg.dropPrivileges then "consul" else null;
           TimeoutStartSec = "0";
         } // (optionalAttrs (cfg.leaveOnStop) {
-          ExecStop = "${cfg.package}/bin/consul leave";
+          ExecStop = "${cfg.package.bin}/bin/consul leave";
         });
 
         path = with pkgs; [ iproute gnugrep gawk consul ];
@@ -236,7 +236,7 @@ in
 
         serviceConfig = {
           ExecStart = ''
-            ${cfg.alerts.package}/bin/consul-alerts start \
+            ${cfg.alerts.package.bin}/bin/consul-alerts start \
               --alert-addr=${cfg.alerts.listenAddr} \
               --consul-addr=${cfg.alerts.consulAddr} \
               ${optionalString cfg.alerts.watchChecks "--watch-checks"} \
diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix
index 39ebaa45a794..ba913482e3cb 100644
--- a/nixos/modules/services/networking/skydns.nix
+++ b/nixos/modules/services/networking/skydns.nix
@@ -83,7 +83,7 @@ in {
         SKYDNS_NAMESERVERS = concatStringsSep "," cfg.nameservers;
       };
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/skydns";
+        ExecStart = "${cfg.package.bin}/bin/skydns";
       };
     };
 
diff --git a/nixos/modules/services/security/hologram.nix b/nixos/modules/services/security/hologram.nix
index 58f308df7a21..e267fed27955 100644
--- a/nixos/modules/services/security/hologram.nix
+++ b/nixos/modules/services/security/hologram.nix
@@ -95,7 +95,7 @@ in {
       wantedBy    = [ "multi-user.target" ];
 
       serviceConfig = {
-        ExecStart = "${pkgs.hologram}/bin/hologram-server --debug --conf ${cfgFile}";
+        ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";
       };
     };
   };
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index b149373076a6..4c20392214fc 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -515,7 +515,7 @@ in
       serviceConfig = {
         User = "oauth2_proxy";
         Restart = "always";
-        ExecStart = "${cfg.package}/bin/oauth2_proxy ${mkCommandLine cfg}";
+        ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${mkCommandLine cfg}";
       };
     };
 

From 75b9a7beac4529fcff9e452e5e88f6ddfb4567f6 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 14 Jun 2016 00:04:56 +0200
Subject: [PATCH 300/436] grsecurity: implement a single NixOS kernel

This patch replaces the old grsecurity kernels with a single NixOS
specific grsecurity kernel.  This kernel is intended as a general
purpose kernel, tuned for casual desktop use.

Providing only a single kernel may seem like a regression compared to
offering a multitude of flavors.  It is impossible, however, to
effectively test and support that many options.  This is amplified by
the reality that very few seem to actually use grsecurity on NixOS,
meaning that bugs go unnoticed for long periods of time, simply because
those code paths end up never being exercised.  More generally, it is
hopeless to anticipate imagined needs.  It is better to start from a
solid foundation and possibly add more flavours on demand.

While the generic kernel is intended to cover a wide range of use cases,
it cannot cover everything.  For some, the configuration will be either
too restrictive or too lenient.  In those cases, the recommended
solution is to build a custom kernel --- this is *strongly* recommended
for security sensitive deployments.

Building a custom grsec kernel should be as simple as
```nix
linux_grsec_nixos.override {
  extraConfig = ''
    GRKERNSEC y
    PAX y
    # and so on ...
  '';
}
```

The generic kernel should be usable both as a KVM guest and host.  When
running as a host, the kernel assumes hardware virtualisation support.
Virtualisation systems other than KVM are *unsupported*: users of
non-KVM systems are better served by compiling a custom kernel.

Unlike previous Grsecurity kernels, this configuration disables `/proc`
restrictions in favor of `security.hideProcessInformation`.

Known incompatibilities:
- ZFS: can't load spl and zfs kernel modules; claims incompatibility
  with KERNEXEC method `or` and RAP; changing to `bts` does not fix the
  problem, which implies we'd have to disable RAP as well for ZFS to
  work
- `kexec()`: likely incompatible with KERNEXEC (unverified)
- Xen: likely incompatible with KERNEXEC and UDEREF (unverified)
- Virtualbox: likely incompatible with UDEREF (unverified)
---
 pkgs/build-support/grsecurity/default.nix     | 179 +++---------------
 pkgs/build-support/grsecurity/flavors.nix     |  17 --
 .../linux/kernel/grsecurity-nixos-config.nix  |  43 +++++
 ...-4.5.patch => grsecurity-nixos-kmod.patch} |   0
 ...rsecurity-4.5.nix => linux-grsecurity.nix} |   0
 pkgs/os-specific/linux/kernel/patches.nix     |  41 ++--
 pkgs/top-level/all-packages.nix               |  97 ++++------
 7 files changed, 132 insertions(+), 245 deletions(-)
 delete mode 100644 pkgs/build-support/grsecurity/flavors.nix
 create mode 100644 pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
 rename pkgs/os-specific/linux/kernel/{grsecurity-path-4.5.patch => grsecurity-nixos-kmod.patch} (100%)
 rename pkgs/os-specific/linux/kernel/{linux-grsecurity-4.5.nix => linux-grsecurity.nix} (100%)

diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index 7777b6000628..8713f2d22c45 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -1,158 +1,33 @@
-{ grsecOptions, lib, pkgs }:
+{ stdenv
+, overrideDerivation
 
-with lib;
+# required for gcc plugins
+, gmp, libmpc, mpfr
 
-let
-  cfg = {
-    kernelPatch = grsecOptions.kernelPatch;
-    config = {
-      mode = "auto";
-      sysctl = false;
-      denyChrootCaps = false;
-      denyChrootChmod = false;
-      denyUSB = false;
-      restrictProc = false;
-      restrictProcWithGroup = true;
-      unrestrictProcGid = 121; # Ugh, an awful hack. See grsecurity NixOS gid
-      disableRBAC = false;
-      disableSimultConnect = false;
-      redistKernel = true;
-      verboseVersion = false;
-      kernelExtraConfig = "";
-    } // grsecOptions.config;
-  };
+# the base kernel
+, kernel
 
-  vals = rec {
+, grsecPatch
+, kernelPatches ? []
 
-    mkKernel = patch:
-        {
-          inherit patch;
-          inherit (patch) kernel patches grversion revision;
-        };
+, localver ? "-grsec"
+, modDirVersion ? "${kernel.version}${localver}"
+, extraConfig ? ""
+, ...
+} @ args:
 
-    grKernel = mkKernel cfg.kernelPatch;
+assert (kernel.version == grsecPatch.kver);
 
-    ## -- grsecurity configuration ---------------------------------------------
-
-    grsecPrioCfg =
-      if cfg.config.priority == "security" then
-        "GRKERNSEC_CONFIG_PRIORITY_SECURITY y"
-      else
-        "GRKERNSEC_CONFIG_PRIORITY_PERF y";
-
-    grsecSystemCfg =
-      if cfg.config.system == "desktop" then
-        "GRKERNSEC_CONFIG_DESKTOP y"
-      else
-        "GRKERNSEC_CONFIG_SERVER y";
-
-    grsecVirtCfg =
-      if cfg.config.virtualisationConfig == null then
-        "GRKERNSEC_CONFIG_VIRT_NONE y"
-      else if cfg.config.virtualisationConfig == "host" then
-        "GRKERNSEC_CONFIG_VIRT_HOST y"
-      else
-        "GRKERNSEC_CONFIG_VIRT_GUEST y";
-
-    grsecHwvirtCfg = if cfg.config.virtualisationConfig == null then "" else
-      if cfg.config.hardwareVirtualisation == true then
-        "GRKERNSEC_CONFIG_VIRT_EPT y"
-      else
-        "GRKERNSEC_CONFIG_VIRT_SOFT y";
-
-    grsecVirtswCfg =
-      let virtCfg = opt: "GRKERNSEC_CONFIG_VIRT_"+opt+" y";
-      in
-        if cfg.config.virtualisationConfig == null then ""
-        else if cfg.config.virtualisationSoftware == "xen"    then virtCfg "XEN"
-        else if cfg.config.virtualisationSoftware == "kvm"    then virtCfg "KVM"
-        else if cfg.config.virtualisationSoftware == "vmware" then virtCfg "VMWARE"
-        else                                                       virtCfg "VIRTUALBOX";
-
-    grsecMainConfig = if cfg.config.mode == "custom" then "" else ''
-      GRKERNSEC_CONFIG_AUTO y
-      ${grsecPrioCfg}
-      ${grsecSystemCfg}
-      ${grsecVirtCfg}
-      ${grsecHwvirtCfg}
-      ${grsecVirtswCfg}
-    '';
-
-    grsecConfig =
-      let boolToKernOpt = b: if b then "y" else "n";
-          # Disable RANDSTRUCT under virtualbox, as it has some kind of
-          # breakage with the vbox guest drivers
-          #randstruct = optionalString config.virtualisation.virtualbox.guest.enable
-          #  "GRKERNSEC_RANDSTRUCT n";
-
-          # Disable restricting links under the testing kernel, as something
-          # has changed causing it to fail miserably during boot.
-          #restrictLinks = optionalString cfg.testing
-          #  "GRKERNSEC_LINK n";
-      in ''
-        GRKERNSEC y
-        ${grsecMainConfig}
-
-        # Disable features rendered useless by redistributing the kernel
-        ${optionalString cfg.config.redistKernel ''
-          GRKERNSEC_RANDSTRUCT n
-          GRKERNSEC_HIDESYM n
-          ''}
-
-        # The paxmarks mechanism relies on ELF header markings, but the default
-        # grsecurity configuration only enables xattr markings
-        PAX_PT_PAX_FLAGS y
-
-        ${if cfg.config.restrictProc then
-            "GRKERNSEC_PROC_USER y"
-          else
-            optionalString cfg.config.restrictProcWithGroup ''
-              GRKERNSEC_PROC_USERGROUP y
-              GRKERNSEC_PROC_GID ${toString cfg.config.unrestrictProcGid}
-            ''
-        }
-
-        GRKERNSEC_SYSCTL ${boolToKernOpt cfg.config.sysctl}
-        GRKERNSEC_CHROOT_CAPS ${boolToKernOpt cfg.config.denyChrootCaps}
-        GRKERNSEC_CHROOT_CHMOD ${boolToKernOpt cfg.config.denyChrootChmod}
-        GRKERNSEC_DENYUSB ${boolToKernOpt cfg.config.denyUSB}
-        GRKERNSEC_NO_RBAC ${boolToKernOpt cfg.config.disableRBAC}
-        GRKERNSEC_NO_SIMULT_CONNECT ${boolToKernOpt cfg.config.disableSimultConnect}
-
-        ${cfg.config.kernelExtraConfig}
-      '';
-
-    ## -- grsecurity kernel packages -------------------------------------------
-
-    localver = grkern:
-      "-grsec" + optionalString cfg.config.verboseVersion
-         "-${grkern.grversion}-${grkern.revision}";
-
-    grsecurityOverrider = args: grkern: {
-      # additional build inputs for gcc plugins, required by some PaX/grsec features
-      nativeBuildInputs = args.nativeBuildInputs ++ (with pkgs; [ gmp libmpc mpfr ]);
-
-      preConfigure = (args.preConfigure or "") + ''
-        echo ${localver grkern} > localversion-grsec
-      '';
-    };
-
-    mkGrsecKern = grkern:
-      lowPrio (overrideDerivation (grkern.kernel.override (args: {
-        kernelPatches = args.kernelPatches ++ [ grkern.patch  ] ++ grkern.patches;
-        argsOverride = {
-          modDirVersion = "${grkern.kernel.modDirVersion}${localver grkern}";
-        };
-        extraConfig = grsecConfig;
-        features.grsecurity = true;
-        ignoreConfigErrors = true; # Too lazy to model the config options that work with grsecurity and don't for now
-      })) (args: grsecurityOverrider args grkern));
-
-    mkGrsecPkg = grkern: pkgs.linuxPackagesFor grkern (mkGrsecPkg grkern);
-
-    ## -- Kernel packages ------------------------------------------------------
-
-    grsecKernel  = mkGrsecKern grKernel;
-    grsecPackage = mkGrsecPkg grsecKernel;
-  };
-in vals
+overrideDerivation (kernel.override {
+  inherit modDirVersion;
+  kernelPatches = [ { inherit (grsecPatch) name patch; } ] ++ kernelPatches ++ (kernel.kernelPatches or []);
+  features = (kernel.features or {}) // { grsecurity = true; };
+  inherit extraConfig;
+  ignoreConfigErrors = true;
+}) (attrs: {
+  nativeBuildInputs = [ gmp libmpc mpfr ] ++ (attrs.nativeBuildInputs or []);
+  preConfigure = ''
+    echo ${localver} >localversion-grsec
+    ${attrs.preConfigure or ""}
+  '';
+})
diff --git a/pkgs/build-support/grsecurity/flavors.nix b/pkgs/build-support/grsecurity/flavors.nix
deleted file mode 100644
index 1281d60aa328..000000000000
--- a/pkgs/build-support/grsecurity/flavors.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-let
-  mkOpts = prio: sys: virt: swvirt: hwvirt:
-    { config.priority               = prio;
-      config.system                 = sys;
-      config.virtualisationConfig   = virt;
-      config.hardwareVirtualisation = hwvirt;
-      config.virtualisationSoftware = swvirt;
-    };
-in
-{
-  desktop =
-    mkOpts "performance" "desktop" "host" "kvm" true;
-  server  =
-    mkOpts "security" "server" "host" "kvm" true;
-  server_xen =
-    mkOpts "security" "server" "guest" "xen" true;
-}
diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
new file mode 100644
index 000000000000..894f2d8e3641
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
@@ -0,0 +1,43 @@
+{ stdenv }:
+
+with stdenv.lib;
+
+''
+GRKERNSEC y
+PAX y
+
+GRKERNSEC_CONFIG_AUTO y
+GRKERNSEC_CONFIG_DESKTOP y
+GRKERNSEC_CONFIG_VIRT_HOST y
+GRKERNSEC_CONFIG_VIRT_EPT y
+GRKERNSEC_CONFIG_VIRT_KVM y
+GRKERNSEC_CONFIG_PRIORITY_SECURITY y
+
+PAX_PT_PAX_FLAGS y
+PAX_XATTR_PAX_FLAGS n
+PAX_EI_PAX n
+
+GRKERNSEC_PROC_GID 0
+
+PAX_LATENT_ENTROPY n
+PAX_SIZE_OVERFLOW n
+GRKERNSEC_HIDESYM n
+GRKERNSEC_RANDSTRUCT n
+GRKERNSEC_PROC n
+GRKERNSEC_SYSFS_RESTRICT n
+GRKERNSEC_KMEM n
+GRKERNSEC_MODHARDEN n
+GRKERNSEC_NO_SIMULT_CONNECT n
+
+PAX_KERNEXEC_PLUGIN_METHOD_BTS y
+
+GRKERNSEC_ACL_HIDEKERN y
+GRKERNSEC_IO y
+
+GRKERNSEC_AUDIT_PTRACE y
+GRKERNSEC_FORKFAIL y
+
+GRKERNSEC_SYSCTL y
+GRKERNSEC_SYSCTL_DISTRO y
+GRKERNSEC_SYSCTL_ON y
+''
diff --git a/pkgs/os-specific/linux/kernel/grsecurity-path-4.5.patch b/pkgs/os-specific/linux/kernel/grsecurity-nixos-kmod.patch
similarity index 100%
rename from pkgs/os-specific/linux/kernel/grsecurity-path-4.5.patch
rename to pkgs/os-specific/linux/kernel/grsecurity-nixos-kmod.patch
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
similarity index 100%
rename from pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix
rename to pkgs/os-specific/linux/kernel/linux-grsecurity.nix
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 877e51565ac2..0fa9708efe52 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -18,20 +18,20 @@ let
       };
     };
 
-  grsecPatch = { grversion ? "3.1", kernel, patches, kversion, revision, branch ? "test", sha256 }:
-    assert kversion == kernel.version;
-    { name = "grsecurity-${grversion}-${kversion}";
-      inherit grversion kernel patches kversion revision;
+  grsecPatch = { grbranch ? "test", grver ? "3.1", kver, grrev, sha256 }: rec {
+    name = "grsecurity-${grver}-${kver}-${grrev}";
+
+    # Pass these along to allow the caller to determine compatibility
+    inherit grver kver grrev;
+
+    patch = fetchurl {
       # When updating versions/hashes, ALWAYS use the official version; we use
       # this mirror only because upstream removes sources files immediately upon
       # releasing a new version ...
-      patch = fetchurl {
-        url = "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/test/grsecurity-${grversion}-${kversion}-${revision}.patch";
-        inherit sha256;
-      };
-      features.grsecurity = true;
+      url = "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${name}.patch";
+      inherit sha256;
     };
-
+  };
 in
 
 rec {
@@ -92,19 +92,18 @@ rec {
 
   grsecurity_4_4 = throw "grsecurity stable is no longer supported";
 
-  grsecurity_4_5 = grsecPatch
-    { kernel    = pkgs.grsecurity_base_linux_4_5;
-      patches   = [ grsecurity_fix_path_4_5 ];
-      kversion  = "4.5.7";
-      revision  = "201606080852";
-      sha256    = "1vgc314nh6bd7zw9r927lnbjq29z32g0s02jgvf635y9zz550nsh";
+  grsecurity_testing = grsecPatch
+    { kver   = "4.5.7";
+      grrev  = "201606080852";
+      sha256 = "1vgc314nh6bd7zw9r927lnbjq29z32g0s02jgvf635y9zz550nsh";
     };
 
-  grsecurity_latest = grsecurity_4_5;
-
-  grsecurity_fix_path_4_5 =
-    { name = "grsecurity-fix-path-4.5";
-      patch = ./grsecurity-path-4.5.patch;
+  # This patch relaxes grsec constraints on the location of usermode helpers,
+  # e.g., modprobe, to allow calling into the Nix store.
+  grsecurity_nixos_kmod =
+    {
+      name  = "grsecurity-nixos-kmod";
+      patch = ./grsecurity-nixos-kmod.patch;
     };
 
   crc_regression =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bd8ca6a01df..093fcc5fb891 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10822,32 +10822,6 @@ in
 
   linux_chromiumos_latest = self.linux_chromiumos_3_18;
 
-  # grsecurity configuration
-
-  grsecurity_base_linux_4_5 = callPackage ../os-specific/linux/kernel/linux-grsecurity-4.5.nix {
-    inherit (linux_4_5) kernelPatches;
-  };
-
-  grFlavors = import ../build-support/grsecurity/flavors.nix;
-
-  mkGrsecurity = patch: opts:
-    (callPackage ../build-support/grsecurity {
-      grsecOptions = { kernelPatch = patch; } // opts;
-    });
-
-  grKernel  = patch: opts: (self.mkGrsecurity patch opts).grsecKernel;
-  grPackage = patch: opts: recurseIntoAttrs (self.mkGrsecurity patch opts).grsecPackage;
-
-  # grsecurity kernels (see also linuxPackages_grsec_*)
-
-  linux_grsec_desktop_4_5    = self.grKernel kernelPatches.grsecurity_4_5 self.grFlavors.desktop;
-  linux_grsec_server_4_5     = self.grKernel kernelPatches.grsecurity_4_5 self.grFlavors.server;
-  linux_grsec_server_xen_4_5 = self.grKernel kernelPatches.grsecurity_4_5 self.grFlavors.server_xen;
-
-  linux_grsec_desktop_latest    = self.grKernel kernelPatches.grsecurity_latest self.grFlavors.desktop;
-  linux_grsec_server_latest     = self.grKernel kernelPatches.grsecurity_latest self.grFlavors.server;
-  linux_grsec_server_xen_latest = self.grKernel kernelPatches.grsecurity_latest self.grFlavors.server_xen;
-
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
      specific kernel, we have a function that builds those packages
@@ -10997,52 +10971,65 @@ in
   # Build a kernel for Xen dom0
   linuxPackages_latest_xen_dom0 = recurseIntoAttrs (self.linuxPackagesFor (self.linux_latest.override { features.xen_dom0=true; }) linuxPackages_latest);
 
-  # grsecurity packages
+  # Grsecurity packages
 
-  linuxPackages_grsec_desktop_4_5    = self.grPackage kernelPatches.grsecurity_4_5 self.grFlavors.desktop;
-  linuxPackages_grsec_server_4_5     = self.grPackage kernelPatches.grsecurity_4_5 self.grFlavors.server;
-  linuxPackages_grsec_server_xen_4_5 = self.grPackage kernelPatches.grsecurity_4_5 self.grFlavors.server_xen;
+  linux_grsec_nixos = callPackage ../build-support/grsecurity {
+    inherit (lib) overrideDerivation;
+    kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix {
+      inherit (self.linux_4_5) kernelPatches;
+    };
+    grsecPatch = self.kernelPatches.grsecurity_testing;
+    kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ];
+    extraConfig = callPackage ../os-specific/linux/kernel/grsecurity-nixos-config.nix { };
+  };
 
-  linuxPackages_grsec_desktop_latest    = self.grPackage kernelPatches.grsecurity_latest self.grFlavors.desktop;
-  linuxPackages_grsec_server_latest     = self.grPackage kernelPatches.grsecurity_latest self.grFlavors.server;
-  linuxPackages_grsec_server_xen_latest = self.grPackage kernelPatches.grsecurity_latest self.grFlavors.server_xen;
+  linuxPackages_grsec_nixos =
+    let self = linuxPackagesFor linux_grsec_nixos self;
+    in recurseIntoAttrs self;
 
   # grsecurity: legacy
 
   grsecurity_base_linux_3_14 = throw "grsecurity stable is no longer supported";
   grsecurity_base_linux_4_4  = throw "grsecurity stable is no longer supported";
 
+  linuxPackages_grsec_desktop_3_14    = throw "linuxPackages_grsec_desktop has been removed";
+  linuxPackages_grsec_desktop_4_4    = throw "linuxPackages_grsec_desktop has been removed";
+  linuxPackages_grsec_desktop_4_5    = throw "linuxPackages_grsec_desktop has been removed";
+  linuxPackages_grsec_desktop_latest    = throw "linuxPackages_grsec_desktop has been removed";
+
+  linuxPackages_grsec_server_3_14     = throw "linuxPackages_grsec_server has been removed";
+  linuxPackages_grsec_server_4_4     = throw "linuxPackages_grsec_server has been removed";
+  linuxPackages_grsec_server_4_5     = throw "linuxPackages_grsec_server has been removed";
+  linuxPackages_grsec_server_latest     = throw "linuxPackages_grsec_server has been removed";
+
+  linuxPackages_grsec_server_xen_3_14 = throw "linuxPackages_grsec_server_xen has been removed";
+  linuxPackages_grsec_server_xen_4_4 = throw "linuxPackages_grsec_server_xen has been removed";
+  linuxPackages_grsec_server_xen_4_5 = throw "linuxPackages_grsec_server_xen has been removed";
+  linuxPackages_grsec_server_xen_latest = throw "linuxPackages_grsec_server_xen has been removed";
+
   linux_grsec_desktop_3_14    = throw "grsecurity stable is no longer supported";
-  linux_grsec_server_3_14     = throw "grsecurity stable is no longer supported";
-  linux_grsec_server_xen_3_14 = throw "grsecurity stable is no longer supported";
-
   linux_grsec_desktop_4_4    = throw "grsecurity stable is no longer supported";
-  linux_grsec_server_4_4     = throw "grsecurity stable is no longer supported";
-  linux_grsec_server_xen_4_4 = throw "grsecurity stable is no longer supported";
+  linux_grsec_desktop_4_5    = throw "linux_grsec_desktop has been removed";
+  linux_grsec_desktop_latest    = throw "linux_grsec_desktop has been removed";
 
-  linux_grsec_testing_desktop    = self.linux_grsec_desktop_latest;
-  linux_grsec_testing_server     = self.linux_grsec_server_latest;
-  linux_grsec_testing_server_xen = self.linux_grsec_server_xen_latest;
+  linux_grsec_server_3_14     = throw "grsecurity stable is no longer supported";
+  linux_grsec_server_4_4     = throw "grsecurity stable is no longer supported";
+  linux_grsec_server_4_5     = throw "linux_grsec_server has been removed";
+  linux_grsec_server_latest     = throw "linux_grsec_server_latest has been removed";
+
+  linux_grsec_server_xen_3_14 = throw "grsecurity stable is no longer supported";
+  linux_grsec_server_xen_4_4 = throw "grsecurity stable is no longer supported";
+  linux_grsec_server_xen_4_5 = throw "linux_grsec_server_xen has been removed";
+  linux_grsec_server_xen_latest = throw "linux_grsec_server_xen has been removed";
 
   linux_grsec_stable_desktop    = self.linux_grsec_desktop_3_14;
   linux_grsec_stable_server     = self.linux_grsec_server_3_14;
   linux_grsec_stable_server_xen = self.linux_grsec_server_xen_3_14;
 
-  linuxPackages_grsec_desktop_3_14    = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.desktop;
-  linuxPackages_grsec_server_3_14     = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server;
-  linuxPackages_grsec_server_xen_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server_xen;
+  linux_grsec_testing_desktop    = self.linux_grsec_desktop_latest;
+  linux_grsec_testing_server     = self.linux_grsec_server_latest;
+  linux_grsec_testing_server_xen = self.linux_grsec_server_xen_latest;
 
-  linuxPackages_grsec_desktop_4_4    = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.desktop;
-  linuxPackages_grsec_server_4_4     = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server;
-  linuxPackages_grsec_server_xen_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server_xen;
-
-  linuxPackages_grsec_testing_desktop    = self.linuxPackages_grsec_desktop_latest;
-  linuxPackages_grsec_testing_server     = self.linuxPackages_grsec_server_latest;
-  linuxPackages_grsec_testing_server_xen = self.linuxPackages_grsec_server_xen_latest;
-
-  linuxPackages_grsec_stable_desktop    = self.linuxPackages_grsec_desktop_3_14;
-  linuxPackages_grsec_stable_server     = self.linuxPackages_grsec_server_3_14;
-  linuxPackages_grsec_stable_server_xen = self.linuxPackages_grsec_server_xen_3_14;
 
   # ChromiumOS kernels
   linuxPackages_chromiumos_3_14 = recurseIntoAttrs (self.linuxPackagesFor self.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14);

From 7ae1e9bb6ddf914b660e8c18102d3373d5fdc975 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 6 Jun 2016 18:20:15 +0300
Subject: [PATCH 301/436] multi_v7_defconfig: Enable AHCI_IMX

---
 pkgs/top-level/platforms.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 805fe4f3825c..8ffe1a60af5a 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -397,9 +397,11 @@ rec {
     kernelArch = "arm";
     kernelDTB = true;
     kernelAutoModules = false;
-    kernelExtraConfig = "";
     uboot = null;
     kernelTarget = "zImage";
+    kernelExtraConfig = ''
+      AHCI_IMX y
+    '';
     gcc = {
       # Some table about fpu flags:
       # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png

From 0677cc61c8fae0b699a9be837c897b8d7b6d837c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 9 Jun 2016 20:12:31 +0200
Subject: [PATCH 302/436] nixos: rewrite the grsecurity module

The new module is specifically adapted to the NixOS Grsecurity/PaX
kernel.  The module declares the required kernel configurations and
so *should* be somewhat compatible with custom Grsecurity kernels.

The module exposes only a limited number of options, minimising the need
for user intervention beyond enabling the module. For experts,
Grsecurity/PaX behavior may be configured via `boot.kernelParams` and
`boot.kernel.sysctl`.

The module assumes the user knows what she's doing (esp. if she decides
to modify configuration values not directly exposed by the module).

Administration of Grsecurity's role based access control system is yet
to be implemented.
---
 nixos/modules/rename.nix              |  20 ++
 nixos/modules/security/grsecurity.nix | 400 +++++++-------------------
 2 files changed, 125 insertions(+), 295 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 3440261c3965..634f91a275d3 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -114,6 +114,26 @@ 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" ])
+
     # Options that are obsolete and have no replacement.
     (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ])
     (mkRemovedOptionModule [ "programs" "bash" "enable" ])
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 3f24118ea1cb..9d0249820d5d 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -1,312 +1,122 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
 let
   cfg = config.security.grsecurity;
+  grsecLockPath = "/proc/sys/kernel/grsecurity/grsec_lock";
 
-  customGrsecPkg =
-    (import ../../../pkgs/build-support/grsecurity {
-      grsecOptions = cfg;
-      inherit pkgs lib;
-    }).grsecPackage;
+  # Ascertain whether ZFS is required for booting the system; grsecurity is
+  # currently incompatible with ZFS, rendering the system unbootable.
+  zfsNeededForBoot = filter
+    (fs: (fs.neededForBoot
+          || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ])
+          && fs.fsType == "zfs")
+    (attrValues config.fileSystems) != [];
 in
+
 {
-  options = {
-    security.grsecurity = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enable grsecurity support. This enables advanced exploit
-          hardening for the Linux kernel, and adds support for
-          administrative Role-Based Acess Control (RBAC) via
-          <literal>gradm</literal>. It also includes traditional
-          utilities for PaX.
-        '';
-      };
+  options.security.grsecurity = {
 
-      kernelPatch = mkOption {
-        type = types.attrs;
-        example = lib.literalExample "pkgs.kernelPatches.grsecurity_4_1";
-        description = ''
-          Grsecurity patch to use.
-        '';
-      };
+    enable = mkEnableOption "Grsecurity/PaX";
 
-      config = {
-        mode = mkOption {
-          type = types.enum [ "auto" "custom" ];
-          default = "auto";
-          description = ''
-            grsecurity configuration mode. This specifies whether
-            grsecurity is auto-configured or otherwise completely
-            manually configured.
-          '';
-        };
-
-        priority = mkOption {
-          type = types.enum [ "security" "performance" ];
-          default = "security";
-          description = ''
-            grsecurity configuration priority. This specifies whether
-            the kernel configuration should emphasize speed or
-            security.
-          '';
-        };
-
-        system = mkOption {
-          type = types.enum [ "desktop" "server" ];
-          default = "desktop";
-          description = ''
-            grsecurity system configuration.
-          '';
-        };
-
-        virtualisationConfig = mkOption {
-          type = types.nullOr (types.enum [ "host" "guest" ]);
-          default = null;
-          description = ''
-            grsecurity virtualisation configuration. This specifies
-            the virtualisation role of the machine - that is, whether
-            it will be a virtual machine guest, a virtual machine
-            host, or neither.
-          '';
-        };
-
-        hardwareVirtualisation = mkOption {
-          type = types.nullOr types.bool;
-          default = null;
-          example = true;
-          description = ''
-            grsecurity hardware virtualisation configuration. Set to
-            <literal>true</literal> if your machine supports hardware
-            accelerated virtualisation.
-          '';
-        };
-
-        virtualisationSoftware = mkOption {
-          type = types.nullOr (types.enum [ "kvm" "xen" "vmware" "virtualbox" ]);
-          default = null;
-          description = ''
-            Configure grsecurity for use with this virtualisation software.
-          '';
-        };
-
-        sysctl = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            If true, then set <literal>GRKERN_SYSCTL y</literal>. If
-            enabled then grsecurity can be controlled using sysctl
-            (and turned off). You are advised to *never* enable this,
-            but if you do, make sure to always set the sysctl
-            <literal>kernel.grsecurity.grsec_lock</literal> to
-            non-zero as soon as all sysctl options are set. *THIS IS
-            EXTREMELY IMPORTANT*!
-          '';
-        };
-
-        denyChrootChmod = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            If true, then set <literal>GRKERN_CHROOT_CHMOD
-            y</literal>. If enabled, this denies processes inside a
-            chroot from setting the suid or sgid bits using
-            <literal>chmod</literal> or <literal>fchmod</literal>.
-
-            By default this protection is disabled - it makes it
-            impossible to use Nix to build software on your system,
-            which is what most users want.
-
-            If you are using NixOps to deploy your software to a
-            remote machine, you're encouraged to enable this as you
-            won't need to compile code.
-          '';
-        };
-
-        denyChrootCaps = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            Whether to lower capabilities of all processes within a chroot,
-            preventing commands that require <literal>CAP_SYS_ADMIN</literal>.
-
-            This protection is disabled by default because it breaks
-            <literal>nixos-rebuild</literal>. Whenever possible, it is
-            highly recommended to enable this protection.
-          '';
-        };
-
-        denyUSB = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            If true, then set <literal>GRKERNSEC_DENYUSB y</literal>.
-
-            This enables a sysctl with name
-            <literal>kernel.grsecurity.deny_new_usb</literal>. Setting
-            its value to <literal>1</literal> will prevent any new USB
-            devices from being recognized by the OS.  Any attempted
-            USB device insertion will be logged.
-
-            This option is intended to be used against custom USB
-            devices designed to exploit vulnerabilities in various USB
-            device drivers.
-          '';
-        };
-
-        restrictProc = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            If true, then set <literal>GRKERN_PROC_USER
-            y</literal>. This restricts non-root users to only viewing
-            their own processes and restricts network-related
-            information, kernel symbols, and module information.
-          '';
-        };
-
-        restrictProcWithGroup = mkOption {
-          type = types.bool;
-          default = true;
-          description = ''
-            If true, then set <literal>GRKERN_PROC_USERGROUP
-            y</literal>. This is similar to
-            <literal>restrictProc</literal> except it allows a special
-            group (specified by <literal>unrestrictProcGid</literal>)
-            to still access otherwise classified information in
-            <literal>/proc</literal>.
-          '';
-        };
-
-        unrestrictProcGid = mkOption {
-          type = types.int;
-          default = config.ids.gids.grsecurity;
-          description = ''
-            If set, specifies a GID which is exempt from
-            <literal>/proc</literal> restrictions (set by
-            <literal>GRKERN_PROC_USERGROUP</literal>). By default,
-            this is set to the GID for <literal>grsecurity</literal>,
-            a predefined NixOS group, which the
-            <literal>root</literal> account is a member of. You may
-            conveniently add other users to this group if you need
-            access to <literal>/proc</literal>
-          '';
-        };
-
-        disableRBAC = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            If true, then set <literal>GRKERN_NO_RBAC
-            y</literal>. This disables the
-            <literal>/dev/grsec</literal> device, which in turn
-            disables the RBAC system (and <literal>gradm</literal>).
-          '';
-        };
-
-        disableSimultConnect = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            Disable TCP simultaneous connect.  The TCP simultaneous connect
-            feature allows two clients to connect without either of them
-            entering the listening state.  This feature of the TCP specification
-            is claimed to enable an attacker to deny the target access to a given
-            server by guessing the source port the target would use to make the
-            connection.
-
-            This option is OFF by default because TCP simultaneous connect has
-            some legitimate uses.  Enable this option if you know what this TCP
-            feature is for and know that you do not need it.
-          '';
-        };
-
-        verboseVersion = mkOption {
-          type = types.bool;
-          default = false;
-          description = "Use verbose version in kernel localversion.";
-        };
-
-        kernelExtraConfig = mkOption {
-          type = types.str;
-          default = "";
-          description = "Extra kernel configuration parameters.";
-        };
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    assertions =
-      [
-        { assertion = (cfg.config.restrictProc -> !cfg.config.restrictProcWithGroup) ||
-                      (cfg.config.restrictProcWithGroup -> !cfg.config.restrictProc);
-          message   = "You cannot enable both restrictProc and restrictProcWithGroup";
-        }
-        { assertion = config.boot.kernelPackages.kernel.features ? grsecurity
-                   && config.boot.kernelPackages.kernel.features.grsecurity;
-          message = "grsecurity enabled, but kernel doesn't have grsec support";
-        }
-        { assertion = (cfg.config.mode == "auto" && (cfg.config.virtualisationConfig != null)) ->
-              cfg.config.hardwareVirtualisation != null;
-          message   = "when using auto grsec mode with virtualisation, you must specify if your hardware has virtualisation extensions";
-        }
-        { assertion = (cfg.config.mode == "auto" && (cfg.config.virtualisationConfig != null)) ->
-              cfg.config.virtualisationSoftware != null;
-         message   = "grsecurity configured for virtualisation but no virtualisation software specified";
-        }
-      ];
-
-    security.grsecurity.kernelPatch = lib.mkDefault pkgs.kernelPatches.grsecurity_latest;
-
-    systemd.services.grsec-lock = mkIf cfg.config.sysctl {
-      description     = "grsecurity sysctl-lock Service";
-      wants           = [ "systemd-sysctl.service" ];
-      after           = [ "systemd-sysctl.service" ];
-      wantedBy        = [ "multi-user.target" ];
-      serviceConfig.Type = "oneshot";
-      serviceConfig.RemainAfterExit = "yes";
-      unitConfig.ConditionPathIsReadWrite = "/proc/sys/kernel/grsecurity/grsec_lock";
-      script = ''
-        locked=`cat /proc/sys/kernel/grsecurity/grsec_lock`
-        if [ "$locked" == "0" ]; then
-            echo 1 > /proc/sys/kernel/grsecurity/grsec_lock
-            echo grsecurity sysctl lock - enabled
-        else
-            echo grsecurity sysctl lock already enabled - doing nothing
-        fi
+    lockTunables = mkOption {
+      type = types.bool;
+      example = false;
+      default = true;
+      description = ''
+        Whether to automatically lock grsecurity tunables
+        (<option>boot.kernel.sysctl."kernel.grsecurity.*"</option>).  Disable
+        this to allow configuration of grsecurity features while the system is
+        running.  The lock can be manually engaged by activating the
+        <literal>grsec-lock</literal> service unit.
       '';
     };
 
-#   systemd.services.grsec-learn = {
-#     description     = "grsecurity learning Service";
-#     wantedBy        = [ "local-fs.target" ];
-#     serviceConfig   = {
-#       Type = "oneshot";
-#       RemainAfterExit = "yes";
-#       ExecStart = "${pkgs.gradm}/sbin/gradm -VFL /etc/grsec/learning.logs";
-#       ExecStop  = "${pkgs.gradm}/sbin/gradm -D";
-#     };
-#   };
+  };
 
-    system.activationScripts = lib.optionalAttrs (!cfg.config.disableRBAC) { grsec = ''
-      mkdir -p /etc/grsec
-      if [ ! -f /etc/grsec/learn_config ]; then
-        cp ${pkgs.gradm}/etc/grsec/learn_config /etc/grsec
-      fi
-      if [ ! -f /etc/grsec/policy ]; then
-        cp ${pkgs.gradm}/etc/grsec/policy /etc/grsec
-      fi
-      chmod -R 0600 /etc/grsec
-    ''; };
+  config = mkIf cfg.enable {
+
+    # Allow the user to select a different package set, subject to the stated
+    # required kernel config
+    boot.kernelPackages = mkDefault pkgs.linuxPackages_grsec_nixos;
+
+    system.requiredKernelConfig = with config.lib.kernelConfig;
+      [ (isEnabled "GRKERNSEC")
+        (isEnabled "PAX")
+        (isYES "GRKERNSEC_SYSCTL")
+        (isYES "GRKERNSEC_SYSCTL_DISTRO")
+      ];
+
+    # Crashing on an overflow in kernel land is user unfriendly and may prevent
+    # the system from booting, which is too severe for our use case.
+    boot.kernelParams = [ "pax_size_overflow_report_only" ];
+
+    # Install PaX related utillities into the system profile.  Eventually, we
+    # also want to include gradm here.
+    environment.systemPackages = with pkgs; [ 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 = {
+      # Removed under grsecurity
+      "kernel.kptr_restrict" = mkForce null;
+    } // optionalAttrs config.nix.useSandbox {
+      # chroot(2) restrictions that conflict with sandboxed Nix builds
+      "kernel.grsecurity.chroot_caps" = mkForce 0;
+      "kernel.grsecurity.chroot_deny_chroot" = mkForce 0;
+      "kernel.grsecurity.chroot_deny_mount" = mkForce 0;
+      "kernel.grsecurity.chroot_deny_pivot" = mkForce 0;
+    } // optionalAttrs config.boot.enableContainers {
+      # chroot(2) restrictions that conflict with NixOS lightweight containers
+      "kernel.grsecurity.chroot_deny_chmod" = mkForce 0;
+      "kernel.grsecurity.chroot_deny_mount" = mkForce 0;
+      "kernel.grsecurity.chroot_restrict_nice" = mkForce 0;
+    };
+
+    assertions = [
+      { assertion = !zfsNeededForBoot;
+        message = "grsecurity is currently incompatible with ZFS";
+      }
+    ];
 
-    # Enable AppArmor, gradm udev rules, and utilities
-    security.apparmor.enable   = true;
-    boot.kernelPackages        = customGrsecPkg;
-    services.udev.packages     = lib.optional (!cfg.config.disableRBAC) pkgs.gradm;
-    environment.systemPackages = [ pkgs.paxctl pkgs.pax-utils ] ++ lib.optional (!cfg.config.disableRBAC) pkgs.gradm;
   };
 }

From a53452f3e12f4feb76a5169149d93c3bd5359363 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 9 Jun 2016 20:29:11 +0200
Subject: [PATCH 303/436] nixos: remove the grsecurity GID

This GID was used to exempt users from Grsecurity's
`/proc` restrictions; we now prefer to rely on
`security.hideProcessInformation`, which uses the `proc` group
for this purpose.  That leaves no use for the grsecurity GID.

More generally, having only a single GID to, presumably, serve as the
default for all of grsecurity's GID based exemption/resriction schemes
would be problematic in any event, so if we decide to enable those
grsecurity features in the future, more specific GIDs should be added.
---
 nixos/modules/config/users-groups.nix | 2 --
 nixos/modules/misc/ids.nix            | 2 --
 2 files changed, 4 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index e643b2d059b5..8231907d7999 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -468,7 +468,6 @@ in {
         home = "/root";
         shell = mkDefault cfg.defaultUserShell;
         group = "root";
-        extraGroups = [ "grsecurity" ];
         initialHashedPassword = mkDefault config.security.initialRootPassword;
       };
       nobody = {
@@ -497,7 +496,6 @@ in {
       nixbld.gid = ids.gids.nixbld;
       utmp.gid = ids.gids.utmp;
       adm.gid = ids.gids.adm;
-      grsecurity.gid = ids.gids.grsecurity;
       input.gid = ids.gids.input;
     };
 
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index d421167c859c..61c49f07abbb 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -147,7 +147,6 @@
       foundationdb = 118;
       newrelic = 119;
       starbound = 120;
-      #grsecurity = 121; # unused
       hydra = 122;
       spiped = 123;
       teamspeak = 124;
@@ -396,7 +395,6 @@
       foundationdb = 118;
       newrelic = 119;
       starbound = 120;
-      grsecurity = 121;
       hydra = 122;
       spiped = 123;
       teamspeak = 124;

From 09cf92ccee755bb67ecbf1b5928ef58eb43016f7 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 9 Jun 2016 20:14:42 +0200
Subject: [PATCH 304/436] nixos: flesh out the grsecurity test suite

I've failed to figure out what why `paxtest blackhat` hangs the vm, and
have resigned to running individual `paxtest` programs.  This provides
limited coverage, but at least verifies that some important features are
in fact working.

Ideas for future work includes a subtest for basic desktop
functionality.
---
 nixos/tests/grsecurity.nix | 40 +++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/nixos/tests/grsecurity.nix b/nixos/tests/grsecurity.nix
index 14f1aa9ff885..aadbfd8371ff 100644
--- a/nixos/tests/grsecurity.nix
+++ b/nixos/tests/grsecurity.nix
@@ -3,17 +3,39 @@
 import ./make-test.nix ({ pkgs, ...} : {
   name = "grsecurity";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ copumpkin ];
+    maintainers = [ copumpkin joachifm ];
   };
 
   machine = { config, pkgs, ... }:
-    { boot.kernelPackages = pkgs.linuxPackages_grsec_testing_server; };
+    { security.grsecurity.enable = true;
+      boot.kernel.sysctl."kernel.grsecurity.deter_bruteforce" = 0;
+      security.apparmor.enable = true;
+    };
 
-  testScript =
-    ''
-      $machine->succeed("uname -a") =~ /grsec/;
-      # FIXME: this seems to hang the whole test. Unclear why, but let's fix it
-      # $machine->succeed("${pkgs.paxtest}/bin/paxtest blackhat");
-    '';
+  testScript = ''
+    subtest "grsec-lock", sub {
+      $machine->succeed("systemctl is-active grsec-lock");
+      $machine->succeed("grep -Fq 1 /proc/sys/kernel/grsecurity/grsec_lock");
+      $machine->fail("echo -n 0 >/proc/sys/kernel/grsecurity/grsec_lock");
+    };
+
+    subtest "paxtest", sub {
+      # TODO: running paxtest blackhat hangs the vm
+      $machine->succeed("${pkgs.paxtest}/lib/paxtest/anonmap") =~ /Killed/ or die;
+      $machine->succeed("${pkgs.paxtest}/lib/paxtest/execbss") =~ /Killed/ or die;
+      $machine->succeed("${pkgs.paxtest}/lib/paxtest/execdata") =~ /Killed/ or die;
+      $machine->succeed("${pkgs.paxtest}/lib/paxtest/execheap") =~ /Killed/ or die;
+      $machine->succeed("${pkgs.paxtest}/lib/paxtest/execstack") =~ /Killed/ or die;
+      $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotanon") =~ /Killed/ or die;
+      $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotbss") =~ /Killed/ or die;
+      $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotdata") =~ /Killed/ or die;
+      $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotheap") =~ /Killed/ or die;
+      $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotstack") =~ /Killed/ or die;
+    };
+
+    subtest "tcc", sub {
+      $machine->execute("echo -e '#include <stdio.h>\nint main(void) { puts(\"hello\"); return 0; }' >main.c");
+      $machine->succeed("${pkgs.tinycc.bin}/bin/tcc -run main.c");
+    };
+  '';
 })
-

From dae5f53d257817a33d6f59a2abf1f75634af1ab0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 8 Apr 2016 01:45:53 +0200
Subject: [PATCH 305/436] qemu: apply PaX markings

---
 pkgs/applications/virtualization/qemu/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index ed59f5eb5108..4cdb2f7ec7d8 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -60,6 +60,13 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.isDarwin "--enable-cocoa"
     ++ optional stdenv.isLinux "--enable-linux-aio";
 
+  postFixup =
+    ''
+      for exe in $out/bin/qemu-system-* ; do
+        paxmark m $exe
+      done
+    '';
+
   postInstall =
     ''
       # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.

From 544b42f8f567ad573b04131f0bc5f5bee0f60c66 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 11 Jun 2016 22:36:49 +0200
Subject: [PATCH 306/436] top-level/release.nix: remove obsolete grsec jobs

---
 pkgs/top-level/release.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5870f7abe78c..b596075a2ed0 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -332,11 +332,6 @@ let
         xfwm4 = linux;
       };
 
-      linuxPackages_testing = { };
-      linuxPackages_grsec_testing_desktop = { };
-      linuxPackages_grsec_testing_server = { };
-      linuxPackages_grsec_testing_server_xen = { };
-
     } ));
 
 in jobs

From 7bda8f0a8fc38e3cccd565521342ec9aaeffb297 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 14 Jun 2016 00:09:55 +0200
Subject: [PATCH 307/436] grsecurity: add a xen guest kernel

This is for the benefit of users who want to quickly get up and running
on a Xen host, for which the stock NixOS kernel is likely unsuitable.
---
 pkgs/top-level/all-packages.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 093fcc5fb891..75e577b16ab9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10987,6 +10987,19 @@ in
     let self = linuxPackagesFor linux_grsec_nixos self;
     in recurseIntoAttrs self;
 
+  # An unsupported grsec xen guest kernel
+  linux_grsec_server_xen = linux_grsec_nixos.override {
+    extraConfig = ''
+      GRKERNSEC y
+      PAX y
+      GRKERNSEC_CONFIG_AUTO y
+      GRKERNSEC_CONFIG_PRIORITY_SECURITY y
+      GRKERNSEC_CONFIG_SERVER y
+      GRKERNSEC_CONFIG_VIRT_GUEST y
+      GRKERNSEC_CONFIG_VIRT_XEN y
+    '';
+  };
+
   # grsecurity: legacy
 
   grsecurity_base_linux_3_14 = throw "grsecurity stable is no longer supported";

From 4e59526bf4f4b69524a520f443ddf048342103fb Mon Sep 17 00:00:00 2001
From: Christian Lask <christian@hiberno.net>
Date: Tue, 14 Jun 2016 09:54:19 +0200
Subject: [PATCH 308/436] rofi-pass: 1.3.1 -> 1.3.2

Note: You'll need to add the `_rofi` command to your config of rofi-pass
to make this release work. Refer to config.example for an example of
how this might look like. For more information on this change, see
https://github.com/carnager/rofi-pass/commit/75cf7151588927122d696dc1daa95fee1ba43644.
---
 pkgs/tools/security/pass/rofi-pass.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
index 45cd0f0e20b0..51f44c3c7df7 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/pkgs/tools/security/pass/rofi-pass.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchgit
-, pass, rofi, coreutils, utillinux, xdotool, gnugrep, pwgen, findutils
+, pass, rofi, coreutils, utillinux, xdotool, gnugrep, pwgen, findutils, gawk
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "rofi-pass-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchgit {
     url = "https://github.com/carnager/rofi-pass";
     rev = "refs/tags/${version}";
-    sha256 = "1r206fq96avhlgkf2fzf8j2a25dav0s945qv66hwvqwhxq74frrv";
+    sha256 = "1xqp8s0yyjs2ca9mf8lbz8viwl9xzxf5kk1v68v9hqdgxj26wgls";
   };
 
   buildInputs = [ makeWrapper ];
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
     rofi
     utillinux
     xdotool
+    gawk
   ];
 
   fixupPhase = ''

From 61431e239b164b92a16d282dfe0e87147ef4122d Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Tue, 14 Jun 2016 10:46:56 +0200
Subject: [PATCH 309/436] lsyncd: removed support for Darwin

---
 pkgs/applications/networking/sync/lsyncd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
index b190b05e2891..a7cf26ea7aea 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/axkibe/lsyncd;
     description = "A utility that synchronizes local directories with remote targets";
     license = licenses.gpl2;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ bobvanderlinden ];
   };
 }

From efb519d2f497d693f88dc0f45b75f560446d5243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 14 Jun 2016 12:27:09 +0200
Subject: [PATCH 310/436] i2pd: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 3fd4e37c9080..c92403a1af51 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "0siqg2gf1w85c3j7w6bzjyyjzlxr8z57jk0675gn8yz0xvpkrdys";
+    sha256 = "02jqkwihp4im58qdnyd7d6m37ym9168gy35cql8gviq2w03yznpk";
   };
 
   buildInputs = [ boost zlib openssl ];

From 1f77d3cd09cf1fdc8d06e7616477bf1922fccb66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 14 Jun 2016 06:56:33 -0300
Subject: [PATCH 311/436] idea.idea-{community,ultimate}: 2016.1.2 -> 2016.1.3

(cherry picked from commit a6fd3e8680ff3da7ddc55c8d8dfd38e17f9fcd1f)
---
 pkgs/applications/editors/idea/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index e09c29b9dc47..5abbcb37042f 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -188,13 +188,13 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2016.1.2";
-    build = "IC-145.971.21";
+    version = "2016.1.3";
+    build = "IC-145.1617.8";
     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 = "15c92wsfw16j48k12x4vw78886yf9yjx7hwwjamgf28lmzvc37iz";
+      sha256 = "0yd1jqz4arywyjsiakszrr48w2xqnik6vnl1a6l0ph2hssgkzkfi";
     };
     wmClass = "jetbrains-idea-ce";
   };
@@ -227,13 +227,13 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2016.1.2";
-    build = "IU-145.971.21";
+    version = "2016.1.3";
+    build = "IU-145.1617.8";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "0dxpx4nx845vgqxl5qz029d3w3kn3hi98wgzympidplxrphgalgy";
+      sha256 = "1zzxwdnw2bbnl86kj7fjk5p8c99d0hdn1ki2alw5xm8wp4k0w7rv";
     };
     wmClass = "jetbrains-idea";
   };

From 130b06eb0b3c2ce9fdcc4b9be36ce77f48a1778d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 14 Jun 2016 14:18:01 +0200
Subject: [PATCH 312/436] grsecurity: 4.5.7-201606080852 -> 4.5.7-201606110914

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 0fa9708efe52..a5a78845d8ae 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -94,8 +94,8 @@ rec {
 
   grsecurity_testing = grsecPatch
     { kver   = "4.5.7";
-      grrev  = "201606080852";
-      sha256 = "1vgc314nh6bd7zw9r927lnbjq29z32g0s02jgvf635y9zz550nsh";
+      grrev  = "201606110914";
+      sha256 = "17gvqp5dqqw190wvprbq1x7i8g6b0l2gsdp4l61v2p3by9n5wsk6";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From d27006b82b11261b4ee11064cb324b8fd6b42fad Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 14 Jun 2016 14:22:18 +0200
Subject: [PATCH 313/436] dnscrypt-wrapper: 0.2 -> 0.2.1

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

diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
index 03204d6ccf31..491bf3157579 100644
--- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix
+++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "dnscrypt-wrapper-${version}";
-  version = "0.2";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "Cofyc";
     repo = "dnscrypt-wrapper";
     rev = "v${version}";
-    sha256 = "06m6p79y0p6f1knk40fbi7dnc5hnq066kafvrq74fxrl51nywjbg";
+    sha256 = "0gysylchvmxvqd4ims2cf2610vmxl80wlk62jhsv13p94yvrl53b";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From 370cc4f44ff65dc0b58a19f523cabd9b6c1a5e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 14 Jun 2016 11:51:04 -0300
Subject: [PATCH 314/436] libxfce4ui: use nativeBuildInputs for dependencies
 not needed at runtime

---
 pkgs/desktops/xfce/core/libxfce4ui.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix
index 6bdeb50f8399..9cd6f99f4469 100644
--- a/pkgs/desktops/xfce/core/libxfce4ui.nix
+++ b/pkgs/desktops/xfce/core/libxfce4ui.nix
@@ -18,8 +18,10 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" "docdev" ];
 
+  nativeBuildInputs = [ pkgconfig intltool ];
+
   buildInputs =
-    [ pkgconfig intltool gtk libxfce4util xfconf libglade
+    [ gtk libxfce4util xfconf libglade
       libstartup_notification hicolor_icon_theme
     ] ++ optional withGtk3 gtk3;
 

From e72d29020c37a8630cd70073eac4d687631d0791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 14 Jun 2016 11:53:11 -0300
Subject: [PATCH 315/436] libxfce4ui: add libICE and libSM as propagated build
 inputs

---
 pkgs/desktops/xfce/core/libxfce4ui.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix
index 9cd6f99f4469..09b400cfceb8 100644
--- a/pkgs/desktops/xfce/core/libxfce4ui.nix
+++ b/pkgs/desktops/xfce/core/libxfce4ui.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf
+{ stdenv, fetchurl, pkgconfig, intltool, xorg, gtk, libxfce4util, xfconf
 , libglade, libstartup_notification, hicolor_icon_theme
 , withGtk3 ? false, gtk3
 }:
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
       libstartup_notification hicolor_icon_theme
     ] ++ optional withGtk3 gtk3;
 
+  propagatedBuildInputs = [ xorg.libICE xorg.libSM ];
+
   #TODO: glade?
   configureFlags = optional withGtk3 "--enable-gtk3";
 

From f79930849a2cfda9af2a1b949544e3ebb19b48e4 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sat, 21 May 2016 19:49:14 +0800
Subject: [PATCH 316/436] openldap: add -h urlList in service so LDAP TLS could
 be enabled

---
 nixos/modules/services/databases/openldap.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 9e86559dda04..4d205d07ec61 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -40,6 +40,13 @@ in
         description = "Group account under which slapd runs.";
       };
 
+      urlList = mkOption {
+        type = types.listOf types.string;
+        default = [ "ldap:///" ];
+        description = "URL list slapd should listen on.";
+        example = [ "ldaps:///" ];
+      };
+
       dataDir = mkOption {
         type = types.string;
         default = "/var/db/openldap";
@@ -50,7 +57,7 @@ in
         type = types.lines;
         default = "";
         description = "
-          sldapd.conf configuration
+          slapd.conf configuration
         ";
         example = ''
             include ''${pkgs.openldap}/etc/openldap/schema/core.schema
@@ -87,7 +94,7 @@ in
         mkdir -p ${cfg.dataDir}
         chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
       '';
-      serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -f ${configFile}";
+      serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" -f ${configFile}";
     };
 
     users.extraUsers.openldap =

From 93912d99d23fa964d4dadcda9a90c8fbe7bb1faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 14 Jun 2016 17:50:53 +0200
Subject: [PATCH 317/436] Adding nvenc support to ffmpeg (default off)

I add the nvidia-video-sdk header files, required to make it work.

You have to set nvenct=true to ffmpeg-full and nonfreeLicensing=true to
ffmpeg-full to use this.
---
 .../libraries/ffmpeg-full/default.nix         |  6 +++--
 .../libraries/nvidia-video-sdk/default.nix    | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/nvidia-video-sdk/default.nix

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 0f6ffe51d854..26bc727dfdea 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -99,7 +99,7 @@
 , libxcbshapeExtlib ? true # X11 grabbing shape rendering
 , libXv ? null # Xlib support
 , lzma ? null # xz-utils
-#, nvenc ? null # NVIDIA NVENC support
+, 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
@@ -232,6 +232,7 @@ assert libxcbshapeExtlib -> libxcb != null;
 assert openglExtlib -> mesa != null;
 assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
 assert x11grabExtlib -> libX11 != null && libXv != null;
+assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-full-${version}";
@@ -356,7 +357,7 @@ stdenv.mkDerivation rec {
     (enableFeature libxcbxfixesExtlib "libxcb-xfixes")
     (enableFeature libxcbshapeExtlib "libxcb-shape")
     (enableFeature (lzma != null) "lzma")
-    #(enableFeature nvenc "nvenc")
+    (enableFeature nvenc "nvenc")
     (enableFeature (openal != null) "openal")
     #(enableFeature opencl "opencl")
     #(enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb")
@@ -410,6 +411,7 @@ stdenv.mkDerivation rec {
     ++ optionals nonfreeLicensing [ faac fdk_aac openssl ]
     ++ optional ((isLinux || isFreeBSD) && libva != null) libva
     ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
+    ++ optionals nvenc [ nvidia-video-sdk ]
     ++ optionals stdenv.isDarwin [ Cocoa CoreServices AVFoundation MediaToolbox
                                    VideoDecodeAcceleration ];
 
diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix
new file mode 100644
index 000000000000..798f9d3a3965
--- /dev/null
+++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "nvidia-video-sdk-6.0.1";
+
+  src = fetchurl {
+    url = "https://developer.nvidia.com/video-sdk-601";
+    name = "nvidia_video_sdk_6.0.1.zip";
+    sha256 = "08h1vnqsv22js9v3pyim5yb80z87baxb7s2g5gsvvjax07j7w8h5";
+  };
+
+  buildInputs = [ unzip ];
+
+  # We only need the header files. The library files are
+  # in the nvidia_x11 driver.
+  installPhase = ''
+    mkdir -p $out/include
+    cp -R Samples/common/inc/* $out/include
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The NVIDIA Video Codec SDK";
+    homepage = https://developer.nvidia.com/nvidia-video-codec-sdk;
+    license = licenses.unfree;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1402c4b7b9c8..6007aa1afb00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8586,6 +8586,8 @@ in
 
   nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { };
 
+  nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { };
+
   ocl-icd = callPackage ../development/libraries/ocl-icd { };
 
   ode = callPackage ../development/libraries/ode { };

From 156a14d15370eebc64f886a1c2bef4a45ad795c6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 13 Jun 2016 23:08:17 +0200
Subject: [PATCH 318/436] geolite-legacy: 2016-06-08 -> 2016-06-13

---
 pkgs/data/misc/geolite-legacy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 33a38f609b6a..724a88ce8e46 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
-  version = "2016-06-08";
+  version = "2016-06-13";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     "0dq5rh08xgwsrmkniww001b2dpd1d7db4sd385p70hkbbry496l3";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "0isimfb0as6hblsbi0zlpj0zyyr6g3y7n1q7sic748hdf7a1zphn";
+    "156mkrizbnjs90lg2gqdlx1zzvpn81c83jiyprv12638zfgvqc7z";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1klh5s7z0z1mipi92q1kf5k9zznvxs9ma69q704vpblfah3km3cc";
+    "1wd838achh7wayl6bxmj0yywp5m2zbqk4xghng4mwmmnda6pa0f5";
 
   meta = with stdenv.lib; {
     description = "GeoLite Legacy IP geolocation databases";

From 9f996d6406d7be49208c136da74e748290ae9c93 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 14 Jun 2016 18:23:23 +0200
Subject: [PATCH 319/436] tzdata: 2016d -> 2016e

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

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 9adbbcb7d7f8..a633b9abe830 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
-  version = "2016d";
+  version = "2016e";
 
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "1d51y1cmp2mhfmk51pagw7p15vrnf269xn1bb19n1mzgl3xlsmfr";
+        sha256 = "10dxnv6mwpm1rbv0dp7fhih4jd7lvqgmw7x2gy6h9i4dy6czh05s";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1jp06jd3vpsh38549xnx0wnxadrnwvvcg7vnwh4y3xxfhxpkvwx8";
+        sha256 = "17j5z894cfnid3dhh8y934hn86pvxz2ym672s1bhdag8spyc9n2p";
       })
     ];
 

From d1f38e2adcc78cfb17f2d60c0c63dd597b3e5c90 Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Tue, 14 Jun 2016 20:01:51 +0200
Subject: [PATCH 320/436] make clblas-cuda and libgpuarray-cuda more functorial

---
 .../python-modules/libgpuarray/cuda/default.nix        | 10 ++++++++--
 pkgs/top-level/all-packages.nix                        |  6 ------
 pkgs/top-level/python-packages.nix                     |  9 +--------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/libgpuarray/cuda/default.nix b/pkgs/development/python-modules/libgpuarray/cuda/default.nix
index 70a79b76ec1a..6934d9bfe6f4 100644
--- a/pkgs/development/python-modules/libgpuarray/cuda/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/cuda/default.nix
@@ -18,8 +18,14 @@
 , python
 , cudatoolkit
 , nvidia_x11
+, setuptools
 }: 
-
+let
+  scipy_numpy = scipy.override (let inherit numpy; in {
+    passthru = { blas = numpy.blas; };
+    propagatedBuildInputs = [ numpy.blas numpy ] ++ [ python setuptools ];
+  });
+in
 buildPythonPackage rec {
   name = "libgpuarray-cuda-${version}";
   version = "-9998.0"; 
@@ -98,7 +104,7 @@ EOF
 
   propagatedBuildInputs = [
     numpy
-    scipy
+    scipy_numpy
     nose
     six
     Mako
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca53a536a46b..f9090bf2ba52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1550,8 +1550,6 @@ in
 
   libbladeRF = callPackage ../development/libraries/libbladeRF { };
 
-  libgpuarray-cuda = python34Packages.libgpuarray-cuda;
-
   lp_solve = callPackage ../applications/science/math/lp_solve { };
 
   lprof = callPackage ../tools/graphics/lprof { };
@@ -15950,10 +15948,6 @@ in
   clblas-cuda = callPackage ../development/libraries/science/math/clblas/cuda {
     cudatoolkit = pkgs.cudatoolkit75;
     inherit (linuxPackages) nvidia_x11;
-    python = pkgs.python34Packages.python;
-    boost = pkgs.boost159.override {
-      inherit python;
-    };
   };
 
   jags = callPackage ../applications/science/math/jags { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6956800c2d07..13154ea57e3c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11892,14 +11892,7 @@ in modules // {
 
   libgpuarray-cuda = callPackage ../development/python-modules/libgpuarray/cuda/default.nix rec {
     numpy = self.numpy_1_10;
-    scipy = self.buildScipyPackage rec {
-      version = "0.17.1";
-      src = pkgs.fetchurl {
-        url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
-        sha256 = "1b1qpfz2j2rvmlplsjbnznnxnqr9ckbmis506110ii1w07wd4k4w";
-      };
-      inherit numpy;
-    };
+    inherit (self) scipy;
     inherit (pkgs.linuxPackages) nvidia_x11;
     cudatoolkit = pkgs.cudatoolkit75;
     clblas = pkgs.clblas-cuda;

From ee0684fa1e3ab78b4c91e0b7240eae329ee26efb Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 14 Jun 2016 20:41:21 +0200
Subject: [PATCH 321/436] perl-Math-BigInt: 1.999722 -> 1.999723

---
 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 0a06ccf8f855..43b583c60818 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7605,10 +7605,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MathBigInt = buildPerlPackage rec {
-    name = "Math-BigInt-1.999722";
+    name = "Math-BigInt-1.999723";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
-      sha256 = "c76a2d5e6a996186a42a7e516b8d82217fb0cd18c7e1e55241322c4a859ccf40";
+      sha256 = "c67da3fdc18f6f6127b13d10f0b2d482c431b0c10d9239ace8481cdf7136f0c9";
     };
     meta = {
       description = "Arbitrary size integer/float math package";

From 3d1eea2225485576a4b6fe5e514ac5bf3c6b7d99 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 14 Jun 2016 20:42:43 +0200
Subject: [PATCH 322/436] perl-CryptX: 0.035 -> 0.036

---
 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 43b583c60818..bf3d2258ca6f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2698,10 +2698,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptX = buildPerlPackage rec {
-    name = "CryptX-0.035";
+    name = "CryptX-0.036";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
-      sha256 = "1ec6c000862d60d3d12eda5d0eed3f08e759d4140775b6c76da538a8be3857fe";
+      sha256 = "9b740a592843c48a437f5e2b434cee38382e93a9112d2331a76ed7b865d0d520";
     };
     propagatedBuildInputs = [ JSONMaybeXS ];
     meta = {

From 2968db5b7b4deca5d8ce7b543ec160c9843c3fc1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 14 Jun 2016 20:43:04 +0200
Subject: [PATCH 323/436] perl-Crypt-JWT: 0.011 -> 0.017

---
 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 bf3d2258ca6f..1f888f3a2d6b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2500,11 +2500,11 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ClassMix];
   };
 
-  CryptJWT = buildPerlPackage {
-    name = "Crypt-JWT-0.011";
+  CryptJWT = buildPerlPackage rec {
+    name = "Crypt-JWT-0.017";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.011.tar.gz;
-      sha256 = "0eb02328aa2949adbf91c760bcdc9a5f6e206db8533023847fd7f76783f71e09";
+      url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
+      sha256 = "811857ca0be3155ebb2f5ce006772f7463165678f6aa2c959f3009aa54d2f4f7";
     };
     propagatedBuildInputs = [ CryptX JSONMaybeXS ];
     meta = {

From a221ff5569cea8b0f8e7a9f7222ccc760034074e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmai.com>
Date: Tue, 14 Jun 2016 19:17:29 +0000
Subject: [PATCH 324/436] makeself: header wasn't being patched correctly

---
 pkgs/applications/misc/makeself/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index b1b4e66cfe49..361ced02b7ed 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -2,19 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "makeself-2.2.0";
+
   src = fetchgit {
     url = "https://github.com/megastep/makeself.git";
     rev = "b836b9281ae99abe1865608b065551da56c80719";
     sha256 = "f7c97f0f8ad8128f2f1b54383319f2cc44cbb05b60ced222784debdf326f23ad";
   };
+
+  patchPhase = ''
+    sed -e "s|^HEADER=.*|HEADER=$out/share/${name}/makeself-header.sh|" -i makeself.sh
+  '';
+
   installPhase = ''
     mkdir -p $out/{bin,share/{${name},man/man1}}
-    mv makeself.lsm README.md $out/share/${name}
-    mv makeself.sh $out/bin/makeself
-    mv makeself.1  $out/share/man/man1/
-    mv makeself-header.sh $out/share/${name}
-    sed -e 's|HEADER=`dirname "$0"`/makeself-header.sh|HEADER=`dirname $0`/../share/${name}/makeself-header.sh|' -i $out/bin/makeself
+    cp makeself.lsm README.md $out/share/${name}
+    cp makeself.sh $out/bin/makeself
+    cp makeself.1  $out/share/man/man1/
+    cp makeself-header.sh $out/share/${name}
   '';
+
   meta = with stdenv.lib; {
     homepage = http://megastep.org/makeself;
     description = "Utility to create self-extracting packages";

From b422df0e990ac85ca34c19aabc1f6bf2e45dc600 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Thu, 9 Jun 2016 14:16:24 +0200
Subject: [PATCH 325/436] crrcsim: 0.9.12 -> 0.9.13

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

diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix
index b50aa7040484..68dfefad8d2e 100644
--- a/pkgs/games/crrcsim/default.nix
+++ b/pkgs/games/crrcsim/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, mesa, SDL, SDL_mixer, plib, libjpeg }:
 let
-  version = "0.9.12";
+  version = "0.9.13";
 in
 stdenv.mkDerivation rec {
   name = "crrcsim-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/crrcsim/${name}.tar.gz";
-    sha256 = "1yx3cn7ilwj92v6rk3zm565ap92vmky4r39na814lfglkzn6l5id";
+    sha256 = "abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698";
   };
 
   buildInputs = [

From 4a69b81213dbe407a36eb402b91368adeb77bf6e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 14 Jun 2016 22:13:07 +0200
Subject: [PATCH 326/436] perl-Readonly: 2.04 -> 2.05

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1f888f3a2d6b..ef00739b11d4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10559,18 +10559,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   Readonly = buildPerlModule rec {
-    name = "Readonly-2.04";
+    name = "Readonly-2.05";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SA/SANKO/${name}.tar.gz";
-      sha256 = "2221243758afde3b3238d1325b9c32bf1b4d0b4d11065920c03408b2645c93b6";
+      sha256 = "4b23542491af010d44a5c7c861244738acc74ababae6b8838d354dfb19462b5e";
     };
     buildInputs = [ ModuleBuildTiny ];
     meta = {
       homepage = https://github.com/sanko/readonly;
       description = "Facility for creating read-only scalars, arrays, hashes";
-      platforms = stdenv.lib.platforms.unix;
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ rycee ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 

From b0e02cecb676204ef07ed1da6f693726a94bcd98 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 14 Jun 2016 22:13:21 +0200
Subject: [PATCH 327/436] perl-PDF-API2: 2.027 -> 2.028

---
 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 ef00739b11d4..d5c1f2fc825f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9850,10 +9850,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PDFAPI2 = buildPerlPackage rec {
-    name = "PDF-API2-2.027";
+    name = "PDF-API2-2.028";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SS/SSIMMS/${name}.tar.gz";
-      sha256 = "d24db02d902198406270551857830633b289ad39f5a9ba5431246f8cd60e7599";
+      sha256 = "a642b41362884b7005e421ec93c7d3a54f7adef7657540331e0d4ca89d106b04";
     };
     propagatedBuildInputs = [ FontTTF ];
     meta = {

From 34ebc3c0858f9473630f0f134a542e55f97667ae Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 14 Jun 2016 22:13:38 +0200
Subject: [PATCH 328/436] perl-CGI: 4.28 -> 4.31

---
 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 d5c1f2fc825f..1fcdf8d4e09a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1499,13 +1499,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   CGI = buildPerlPackage rec {
-    name = "CGI-4.28";
+    name = "CGI-4.31";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
-      sha256 = "1297d3ed6616cacb4eb57860e3e743f3890111e7a63ca08849930f42f1360532";
+      sha256 = "dee34f45525efb698d02c56ba2458a72acc34c4dcb05344706b587840b4e8c99";
     };
     buildInputs = [ TestDeep TestWarn ];
-    propagatedBuildInputs = [ HTMLParser ];
+    propagatedBuildInputs = [ HTMLParser self."if" ];
     meta = {
       homepage = https://metacpan.org/module/CGI;
       description = "Handle Common Gateway Interface requests and responses";

From 06027595fcf802f2b8a8fc5bf29111d1ffac5c48 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 15 Jun 2016 00:03:59 +0300
Subject: [PATCH 329/436] vimPlugins: update 2016-06-15

---
 pkgs/misc/vim-plugins/default.nix | 324 +++++++++++++++---------------
 1 file changed, 162 insertions(+), 162 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 1ac2e82b4b0c..f6f6f68d89a0 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -173,11 +173,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2016-05-23";
+    name = "Syntastic-2016-06-12";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "95879f19a9f8a72282717e07d0d4e006d8561580";
-      sha256 = "19wr3bll9n7y3rh26r4aklk682jqxrh5j8c9wkpg6m9v60yqj053";
+      rev = "d6b96c079be137c83009827b543a83aa113cc011";
+      sha256 = "1hb1vs0sqzpjbh4l2q1rfhh4mxvhn08pin3glba26p37639w9qqc";
     };
     dependencies = [];
 
@@ -206,22 +206,22 @@ rec {
   };
 
   The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2016-05-24";
+    name = "The_NERD_Commenter-2016-06-10";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "2b3714bff67ca57cb9e416bd737a24f71181859b";
-      sha256 = "1va0d4vxk53lgy2cs1hgxcha6fsc6c2y6m7jwmzfpj2gdha2v52y";
+      rev = "e2d47bec2662d5fcd324d17e22dc37f38c97bf2d";
+      sha256 = "099i7jksdp4c4m7imv96xji4lbjscdns37fsr2qgn7zw5pjgjbw4";
     };
     dependencies = [];
 
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2016-05-11";
+    name = "The_NERD_tree-2016-06-10";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "15445be5fb2559829ac7a1f05af5d713586e8ec9";
-      sha256 = "1x85k2h2qm1z67ywg0867w483w1rb7zmq9r2rkjj2kkk5wi6hfvq";
+      rev = "d280b15ba9388ab93f3401b26877a13fdb8ed816";
+      sha256 = "19mlvmlg1lccr2kkigbggv3jfl0bdc5r6lpa2jds1j20gxp9zhwi";
     };
     dependencies = [];
 
@@ -343,44 +343,44 @@ rec {
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2016-05-23";
+    name = "vim-autoformat-2016-06-10";
     src = fetchgit {
       url = "git://github.com/Chiel92/vim-autoformat";
-      rev = "0dcc7b318939dab7c34c4aa31ce93678800034c6";
-      sha256 = "1ahrpjnkyqslmiii8c81mayl299imd1jmgjplh0g575bipy4f7sa";
+      rev = "9742ae2dfb46b26b9aed39491afe3d3ecb5eafd0";
+      sha256 = "0lagj6977vbjvzk01sf43hhmj1jh7d2sa478igjmkw8j3gwvxcmq";
     };
     dependencies = [];
 
   };
 
   vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nix-2015-12-10";
+    name = "vim-nix-2016-05-31";
     src = fetchgit {
       url = "git://github.com/LnL7/vim-nix";
-      rev = "f0b7bd4bce5ed0f12fb4d26115c84fb3edcd1e12";
-      sha256 = "0x12a191xafn7918xa8r4sjiw79005lcr0yv5kjc4p1izwddfgdv";
+      rev = "9ac8876e5beb824018b9a09d4640f7efc2fbc8ae";
+      sha256 = "0whdf56c63vp4c3b2jfl1x5c0dxxrzwvxkfm5951qzpfy6xwg27x";
     };
     dependencies = [];
 
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2016-05-24";
+    name = "deoplete-nvim-2016-06-11";
     src = fetchgit {
       url = "git://github.com/Shougo/deoplete.nvim";
-      rev = "b254ca56f768b72b3ba136ccd81abd919523036a";
-      sha256 = "1dg5ids354f5c9ixfy9b6526yhr9w9968g0rghm0w8mlvgbx6bj8";
+      rev = "eac8020ef6f740df9109fa557b46a488f98103f1";
+      sha256 = "0fsg9mr23qsqhvzjmj626nd873zqwyxzvr5b1i97l0g6zwq3q8i8";
     };
     dependencies = [];
 
   };
 
   Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Spacegray-vim-2016-05-21";
+    name = "Spacegray-vim-2016-06-04";
     src = fetchgit {
       url = "git://github.com/ajh17/Spacegray.vim";
-      rev = "82551620059b055d7ed866cf7af3e8b6f1b891a4";
-      sha256 = "0xprszpva3via83zbs3x74jbc9zfrnxryilqvgpnrircgxm9cbx7";
+      rev = "adb621e3d1df5f55d60383717bbae4533fda9c62";
+      sha256 = "15n92rllri11ckdy1dykllx7xpgscvhfqa55z5sl66zicnrv89c9";
     };
     dependencies = [];
 
@@ -398,22 +398,22 @@ rec {
   };
 
   vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-css-color-2016-04-14";
+    name = "vim-css-color-2016-06-12";
     src = fetchgit {
       url = "git://github.com/ap/vim-css-color";
-      rev = "4421dbac36bedcdd4fc345fd95785cfed518847c";
-      sha256 = "0z4d9q7irid4wianh94wqc2nr8hx54pci0p87ibhkbi7ibpl1qmp";
+      rev = "ba98bd138ee15dbf6b6dc3b7080c0e65e0657c76";
+      sha256 = "0l76yqd3cvdm41dx720skbphwqsza51xaf7vi8jlknsqnrb6z1kf";
     };
     dependencies = [];
 
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2016-05-22";
+    name = "neomake-2016-06-08";
     src = fetchgit {
       url = "git://github.com/benekastah/neomake";
-      rev = "b33d77d4b0543e9444ca5e79daa5109bbab4a31c";
-      sha256 = "00r7fpsd4cc3f69jar7v39ffj0xndlvgbkmlmhlcfgk1h1bzic5h";
+      rev = "0de96a8a906d254ee3b5e6cd1e9838f1c1cc59c5";
+      sha256 = "1adq47ra0vf5kak7m65gyaxi1jkbdi7647bb73785j3sx5q41v0f";
     };
     dependencies = [];
 
@@ -431,33 +431,33 @@ rec {
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2016-05-09";
+    name = "vim-tmux-navigator-2016-06-03";
     src = fetchgit {
       url = "git://github.com/christoomey/vim-tmux-navigator";
-      rev = "e13914d89e9413cfa449f0c3daff18691356f2d1";
-      sha256 = "1hs61lgkf4bsy8891zqklh9jfzkwmm7r0lmr228k5wn97778bc83";
+      rev = "57701ac650990010ea97b1b4d64779d0b60c769b";
+      sha256 = "0kl9as63h8bfkmqhq9myma6z7xvp30hiqcnxham4cvd6vhph3b7j";
     };
     dependencies = [];
 
   };
 
   spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "spacevim-2016-05-23";
+    name = "spacevim-2016-06-08";
     src = fetchgit {
       url = "git://github.com/ctjhoa/spacevim";
-      rev = "c6d1cae4a72c957279707256f6c91a390f83aa9c";
-      sha256 = "1ipm8csk6a7wcpqi1c9nmhb3jfm7ikfrw207yp1b9vklsznnqm53";
+      rev = "c8811a397249508432199786abbbd41429b6c90b";
+      sha256 = "0a41pjc6qd378y8sg2sp65k0s32ssn9pkk6yyss92k97rlx2bsjp";
     };
     dependencies = [];
 
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2016-05-01";
+    name = "ctrlp-vim-2016-06-08";
     src = fetchgit {
       url = "git://github.com/ctrlpvim/ctrlp.vim";
-      rev = "28fce0fb860fe8df0915da1de1fb6e90d6ab2edc";
-      sha256 = "1amxly825vdp7s1znnzz7ysjks26j37lhpm8hvgfxpxks2clyhhs";
+      rev = "cd99e43613202d56b2adfc8f9bd216734a9601fd";
+      sha256 = "0inlwdl27rsjq9jaa37w21kgbvf6v8351xzqz6y2f6s5ciwbhfm3";
     };
     dependencies = [];
 
@@ -485,6 +485,17 @@ rec {
 
   };
 
+  vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-localvimrc-2016-06-06";
+    src = fetchgit {
+      url = "git://github.com/embear/vim-localvimrc";
+      rev = "f104384cd9127b5a75ed889b551fd7f46faeb74a";
+      sha256 = "0k1ava8nhshkm7llhmagpsmvgwy8xcc0mn3chdk6hz8gzz9755py";
+    };
+    dependencies = [];
+
+  };
+
   vim-haskellConcealPlus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-haskellConcealPlus-2016-05-13";
     src = fetchgit {
@@ -508,11 +519,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2016-05-23";
+    name = "vim-go-2016-06-11";
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
-      rev = "e9f44d933e38bf3193ac5cce15f08fdc7e54814b";
-      sha256 = "18hxnb6rn6gxixcqqwpqi4q9adz23jgrz8as2rl90y77m8f5inr5";
+      rev = "6efcfb275c8f7779bfc0738da730dfab19f157fe";
+      sha256 = "14n7phv3b4s7fhz94ziafakd0wl6n4z3a12i5qq2hdavi98kd640";
     };
     dependencies = [];
 
@@ -529,6 +540,17 @@ rec {
 
   };
 
+  psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "psc-ide-vim-2016-04-26";
+    src = fetchgit {
+      url = "git://github.com/frigoeu/psc-ide-vim";
+      rev = "27c000f0f27c7a4d05f001320ddcf1ae15b22eb7";
+      sha256 = "1vgxf5kziv00mi346zw3b2dnxygxk0jyxg41y6w1j22yrp9id1k2";
+    };
+    dependencies = [];
+
+  };
+
   vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jsonnet-2016-05-10";
     src = fetchgit {
@@ -574,11 +596,11 @@ rec {
   };
 
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2016-05-16";
+    name = "lightline-vim-2016-06-12";
     src = fetchgit {
       url = "git://github.com/itchyny/lightline.vim";
-      rev = "ac5e6df5cac0f3ff3078c51f715978288a5c351d";
-      sha256 = "1q3zkfg8dq7760jlm207f6d85c46q8x2hfdqmdxkbagvhb9c0f4y";
+      rev = "430ce2cb063b39a0c7950cafd617e333acb6759a";
+      sha256 = "0336c17vkfh60cvj86y35lqz1xcd80csrlb985k1hyd5s7cayp42";
     };
     dependencies = [];
 
@@ -638,24 +660,13 @@ rec {
     dependencies = [];
 
   };
-  
-  vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2016-06-06";
-    src = fetchgit {
-      url = "git://github.com/embear/vim-localvimrc";
-      rev = "f104384cd9127b5a75ed889b551fd7f46faeb74a";
-      sha256 = "0k1ava8nhshkm7llhmagpsmvgwy8xcc0mn3chdk6hz8gzz9755py";
-    };
-    dependencies = [];
-
-  };
 
   tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tslime-vim-2015-08-14";
+    name = "tslime-vim-2016-06-14";
     src = fetchgit {
       url = "git://github.com/jgdavey/tslime.vim";
-      rev = "4a8091956e331d7b1d4187a2883b720dfec7e9dd";
-      sha256 = "09csafrigp1ak566zxvhj71cdr6b6i3fplgncb288r051kw16cg6";
+      rev = "c980c76bbfc9a523fcf1edf08580d0d3a486e8f2";
+      sha256 = "0gifyxwlspfnkni886adwn9kc0dckanjk0097y8pwxh7qbwfydf1";
     };
     dependencies = [];
 
@@ -706,11 +717,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2016-05-24";
+    name = "fzf-vim-2016-06-14";
     src = fetchgit {
       url = "git://github.com/junegunn/fzf.vim";
-      rev = "c786d516375c5fe404febec39282fc1d63069a37";
-      sha256 = "0dk5bs4f2lfs96npgid5ayapsqf9xhf9ii0gaa0rq4dz93i76hzg";
+      rev = "0867178d9963e9f971c7799b0820aab985676c3c";
+      sha256 = "09d9v4anraxp6bk54mkx4w7j256b21m7ik77l647j3bnyn0z3wf8";
     };
     dependencies = [];
 
@@ -728,11 +739,11 @@ rec {
   };
 
   vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-peekaboo-2016-02-29";
+    name = "vim-peekaboo-2016-05-31";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-peekaboo";
-      rev = "111c4bacbe5216022d56489c366bf4ce985506e9";
-      sha256 = "0pblcxb467n4nxkvmb8sl8765nmz17h74hs5dy5dnmaxiy55v0d9";
+      rev = "35ee385d451d06c93177d6bb268dcefd19b091da";
+      sha256 = "1ix03w0rcn5l8ljszhsn53gsqmpsk12qv1s6imd5nhdf66njhlks";
     };
     dependencies = [];
 
@@ -772,11 +783,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2016-05-23";
+    name = "vimtex-2016-06-14";
     src = fetchgit {
       url = "git://github.com/lervag/vimtex";
-      rev = "257d2f91de35716d09f08fbbcb384cdc20ac7659";
-      sha256 = "1cq7dvv4hsrm8khhlj1411rp9q5f0xp7q1m61khdr1icgjfasaxp";
+      rev = "1211d5725331a221329f8cd98756c8ef68556fd9";
+      sha256 = "0hjajg8ls2gl0jjrcb7m5qrvvzlm86jac8786fi56iql3r1yvlil";
     };
     dependencies = [];
 
@@ -809,11 +820,11 @@ rec {
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2016-03-24";
+    name = "vim-startify-2016-06-08";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-startify";
-      rev = "e74cc71b1b7b33f6df6e8b48ff4b0f587f6bfed9";
-      sha256 = "1s7kys6kj7jrs1z3i8fgb9y1f45halwgpkgw34518ljmjx8n42sa";
+      rev = "dbaa0254249a5d9685ffc9513557bb811fad65b4";
+      sha256 = "1l65ah2k437rhp3rr81fgrwwr7vvipfrj5vlixx49zxgzy489wr4";
     };
     dependencies = [];
 
@@ -875,88 +886,99 @@ rec {
   };
 
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-watchdogs-2016-01-13";
+    name = "vim-watchdogs-2016-05-29";
     src = fetchgit {
       url = "git://github.com/osyo-manga/vim-watchdogs";
-      rev = "ebcf3df39007aa5d65910f44eb20c9caea9007df";
-      sha256 = "09wajb6kxvxnqaysj5hhp1g79hzz3bazmbpnj7nn5fdaf83rd8jl";
+      rev = "a1136db1d8806a03fc8ea81aa60e82d4cba57fb5";
+      sha256 = "1qk0wg11x6xwakqqbnx47ma5arsam55jqag0hxsf6is2yjqxb825";
     };
     dependencies = [];
 
   };
 
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-racer-2016-05-24";
+    name = "vim-racer-2016-05-31";
     src = fetchgit {
       url = "git://github.com/racer-rust/vim-racer";
-      rev = "031a4e4131450758ade9073025cf4f75e8c2d85c";
-      sha256 = "1hq67hi8069h4yp8l6nb0afnkgidrk4c3hagp6saiihlh3541m11";
+      rev = "392e5818039a13f0cc3f819afcbb31291b1635a4";
+      sha256 = "0fs3zlsc1h4a58m0xlv11g5vzfvhjrinnmxh7xmgjnnd4njx8iax";
+    };
+    dependencies = [];
+
+  };
+
+  purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "purescript-vim-2016-01-04";
+    src = fetchgit {
+      url = "git://github.com/raichoo/purescript-vim";
+      rev = "92dd6bc647b45444e9d5e0550bdc3c56928f9762";
+      sha256 = "090vpff58lzzhqp28p27am5s8s6ngjxw6j4y46zaixcxxx7wqzha";
     };
     dependencies = [];
 
   };
 
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2016-04-12";
+    name = "rust-vim-2016-06-05";
     src = fetchgit {
       url = "git://github.com/rust-lang/rust.vim";
-      rev = "115d321d383eb96d438466c56cc871fcc1bd0faa";
-      sha256 = "0j9vp3kb9kiza3h6jr8csqmdcsdp4g2qix70lvyh6ybrbkz84ghw";
+      rev = "e064f270e85e0cbb7bd643aeda3e7088378341f7";
+      sha256 = "04s3c1hwxcprvzn8wx39f9mg3rmgwvqvinqwbfm591pjpialvmpk";
     };
     dependencies = [];
 
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2016-04-30";
+    name = "neocomplete-vim-2016-06-07";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "81d39635625730ca43f08762e2908b96e7b7f077";
-      sha256 = "0lqvklg2vm8vcgj0786wi103wzr71v2l9i3f215kg9did2nnmky9";
+      rev = "14698b37d10b8ae18a4850aa784fdd3130e4ba3e";
+      sha256 = "08bg6yafp68gh82afzzn9msb7adydihdvxyzigvjzr94bzv4n4ab";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2016-05-15";
+    name = "neosnippet-snippets-2016-05-26";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet-snippets";
-      rev = "b068cc47707ecc7d023d75359687b21545bfc341";
-      sha256 = "1gy7dn2h1w8bpqr681nqm1kyb9ggxakw25mlhlb3vvb2p8nm553r";
+      rev = "dbce664a473e2344d2cc4e494fb5e408452646e2";
+      sha256 = "008brypf2jc9kl1gqyl1x2b1qx0bzvvfc0qqg0aniva2hwsda38k";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2016-05-17";
+    name = "neosnippet-vim-2016-06-11";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "9eac227835317d2fad9ae9b816590ce33a3ab7c4";
-      sha256 = "0hbj03rhrlga9fszd3ryyrfl93fmxsc3892swdaa3zhl18zfn0m2";
+      rev = "23eac4b080bb9788fbe61a0b93c7cf39e533f490";
+      sha256 = "01hbglhvgkfq78hxyh32afi4q47y6l3lm7yn4cz532cqd7ac78ij";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2016-05-22";
+    name = "unite-vim-2016-06-11";
     src = fetchgit {
       url = "git://github.com/shougo/unite.vim";
-      rev = "5fd81feec7ff3f94173ecb10e3dee98aaef26e5d";
-      sha256 = "0lnmys9g99m7fzcxgc9xl2n7am14wyvqmffaqhdlpqjj3lv2l4dz";
+      rev = "27a97d3eacd209c4f6e15c98e9217a4f6c438ac5";
+      sha256 = "14d87skqrsdb61nqpdch584hi0hpb5a0nqf35q5727pz6ckch32f";
     };
     dependencies = [];
 
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2016-04-27";
+    name = "vimproc-vim-2016-06-11";
     src = fetchgit {
       url = "git://github.com/shougo/vimproc.vim";
-      rev = "0ff17bc0725cd0323df87664fa02b1436349f667";
-      sha256 = "14j8ypn54cidh4bk3nqsc0ablwvgydlsbmb256rq512gpwkm2mil";
+      rev = "c2f6b82af60a4e7acde0e8dc4e6b6f5dc1cc8e1d";
+      sha256 = "1h79c0fskvalasji290qz89y1s9c1mic7h1p82p1im036jvmkf22";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -971,11 +993,11 @@ rec {
   };
 
   vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimshell-vim-2016-04-04";
+    name = "vimshell-vim-2016-06-11";
     src = fetchgit {
       url = "git://github.com/shougo/vimshell.vim";
-      rev = "bdcd197b701734a743903c7547e9f56842701614";
-      sha256 = "1cv2mdkhq3kvs91cd7d703b6567glb3snvg27vmj1p8amzxjf97d";
+      rev = "d36fde6da558d4cad7a1d03a07fd5e1fcf299141";
+      sha256 = "0xx84552k7ziymp81slgxsym1nvzkyyyf1d31y7k8cqbvq87nbn1";
     };
     dependencies = [ "vimproc-vim" ];
   };
@@ -1025,11 +1047,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2016-05-18";
+    name = "vim-quickrun-2016-06-09";
     src = fetchgit {
       url = "git://github.com/thinca/vim-quickrun";
-      rev = "3bdd13cc577b58a90d7964f2fe4446b2e65ea77a";
-      sha256 = "0lpnq1pkv8zjj99gfsa21bvz2g1bspxkqjbs3m4h49g1695bf5w9";
+      rev = "bb4daff0342ce3311b7f6c2fd3e2160f2be9e374";
+      sha256 = "11baxdcqr8854ijp0gkwwjl9navv8x1dv53p2isiq5vpqiq4n3mw";
     };
     dependencies = [];
 
@@ -1080,11 +1102,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2016-05-17";
+    name = "youcompleteme-2016-06-13";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "fa583935476776ef274adf1d516d1497d5bb573d";
-      sha256 = "0i6zr4x28j5lfqsbaq9mdpzxyppkrj2hlh4w1inx94f2sfijf1m5";
+      rev = "871387bd2a2ed9270ccc17ed63dde99c840deab5";
+      sha256 = "19ll1nh6nxl31zdajz9kdgw18mvsy4d630435z604rxik2rgbh3d";
     };
     dependencies = [];
     buildInputs = [
@@ -1120,11 +1142,11 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2016-05-16";
+    name = "vim-airline-themes-2016-06-06";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline-themes";
-      rev = "97a042a57af7f04e25fddb6e694d75be1d55be02";
-      sha256 = "1sgkwjrh8g01kykzbz6dm5giycrq3vqi0f3m5ppvijhj8yind69s";
+      rev = "796478723c01a275269b96f63ee5cd5b44a342f4";
+      sha256 = "1irvzv1sq12y2q6yjb26b89j5pxs5cia35dax093q6h88ywq709g";
     };
     dependencies = [];
 
@@ -1153,11 +1175,11 @@ rec {
   };
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-syntax-2016-03-20";
+    name = "vim-pandoc-syntax-2016-06-14";
     src = fetchgit {
       url = "git://github.com/vim-pandoc/vim-pandoc-syntax";
-      rev = "a35e9ce28bae85b1ce5d4f817882a8d78efcd6be";
-      sha256 = "08l6sjzvl6bigh4d9rvqadvz8bpq25c1ima4la2i3pg8xgdc9xf3";
+      rev = "eaf2507e0bd51ec06bc111777376b21da7340d5d";
+      sha256 = "0xxsjvzv98wnfzw0j590am8za75y7gr8r480izb3db2z437micw7";
     };
     dependencies = [];
 
@@ -1241,22 +1263,22 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2016-05-21";
+    name = "vim-wakatime-2016-06-13";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "d46c3e96d5e489d45c2910898212f58c646518c9";
-      sha256 = "1qpsasiqin9wlavivfd9925pzsfh04hhdww92iah66a2vvaxjnhw";
+      rev = "cd074dcff51f12d1658902d4fe0d9f311ac94a2d";
+      sha256 = "0sq7n9w4nadc0psr74g7bmgv87bqlzsmyrr4iyalz108bdgxahav";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2016-05-21";
+    name = "command-t-2016-06-14";
     src = fetchgit {
       url = "git://github.com/wincent/command-t";
-      rev = "39b75707640493795afb4fb90b2d74cade84cee8";
-      sha256 = "1n46dq4fsqq7nsl7nivl3xk23k54sarflrr6b30v1vvg22mw64yq";
+      rev = "354c429dad34f7d163663943c948f819588b53d3";
+      sha256 = "1vkvc6ckza5b4ck52hv4rjclqi7x4f06dxkbqcqnia490m685v9q";
     };
     dependencies = [];
     buildInputs = [ perl ruby ];
@@ -1312,28 +1334,6 @@ rec {
 
   };
 
-  psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2016-06-04";
-    src = fetchgit {
-      url = "git://github.com/frigoeu/psc-ide-vim";
-      rev = "27c000f0f27c7a4d05f001320ddcf1ae15b22eb7";
-      sha256 = "1vgxf5kziv00mi346zw3b2dnxygxk0jyxg41y6w1j22yrp9id1k2";
-    };
-    dependencies = [ ];
-
-  };
-
-  purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "purescript-vim-2016-06-04";
-    src = fetchgit {
-      url = "git://github.com/raichoo/purescript-vim";
-      rev = "92dd6bc647b45444e9d5e0550bdc3c56928f9762";
-      sha256 = "090vpff58lzzhqp28p27am5s8s6ngjxw6j4y46zaixcxxx7wqzha";
-    };
-    dependencies = [ ];
-
-  };
-
   quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "quickfixstatus-2011-09-02";
     src = fetchgit {
@@ -1379,11 +1379,11 @@ rec {
   };
 
   snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "snipmate-2016-04-04";
+    name = "snipmate-2016-06-08";
     src = fetchgit {
       url = "git://github.com/garbas/vim-snipmate";
-      rev = "66555c2a86ba2136459190c06aa2c0f25ad38bb3";
-      sha256 = "1156g0iwy4fdfvb9922jvbxyn5k6z094m0y11igamb5d4kv7v72y";
+      rev = "0c20e4136a298a73e21047d12cc5049595fb8445";
+      sha256 = "1x9skkywr5shrvb9bm3mjww6kmjmck7y8g0mn9yq8psqag9j3l21";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -1401,11 +1401,11 @@ rec {
   };
 
   surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "surround-2015-08-07";
+    name = "surround-2016-06-01";
     src = fetchgit {
       url = "git://github.com/tpope/vim-surround";
-      rev = "2d05440ad23f97a7874ebd9b5de3a0e65d25d85c";
-      sha256 = "1b74l52a2yi9r5j6w3mcyhacdxajs3ndab1viw632nprqqsh8qb4";
+      rev = "e49d6c2459e0f5569ff2d533b4df995dd7f98313";
+      sha256 = "1v0q2f1n8ngbja3wpjvqp2jh89pb5ij731qmm18k41nhgz6hhm46";
     };
     dependencies = [];
 
@@ -1675,11 +1675,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2016-05-22";
+    name = "vim-airline-2016-06-07";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "4d39cb6f2078326dd07f2ab680a0365299a2589e";
-      sha256 = "0jwk1ly9sbj3warq92haw3alq7q639375c9bl28j3rzg7x008blz";
+      rev = "7b9b68f15dc50ef3c6382bd9df3a5e70c9ddcee9";
+      sha256 = "0k6imrfgp62qminwd7ilsq106dy49nwn2fsm88v546mwc9a2bccd";
     };
     dependencies = [];
 
@@ -1719,11 +1719,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2016-05-23";
+    name = "vim-gitgutter-2016-06-09";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "f8da1fd6dbd558ebcc743bd7f91d35d6ca8db56a";
-      sha256 = "0rbvkd8pc2wpfavbkb088rp6fmsww1m29zphcw8r8x1vwk2bz1p2";
+      rev = "09b9144002e938844df74f48ac72c1e3118e7d39";
+      sha256 = "10yyzib9znhqz298h3f67n9hz1fvm5yk6958bisimf9bg9w9rn1v";
     };
     dependencies = [];
 
@@ -1752,55 +1752,55 @@ rec {
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2016-04-11";
+    name = "vim-multiple-cursors-2016-06-03";
     src = fetchgit {
       url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "25b567baf712a7e9bc8f3c9ca816bd579363109b";
-      sha256 = "0y4gmk4m43ia94dkir2i3qs5z8i00r7yk22hrdws6nqrpnf7dp13";
+      rev = "51d0717f63cc231f11b4b63ee5b611f589dce1b3";
+      sha256 = "1s06wp4cjdmfvljzd9gz0wawkfcpkj8l2scjdx626ml740pnhmx8";
     };
     dependencies = [];
 
   };
 
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2016-05-19";
+    name = "vim-signature-2016-06-09";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
-      rev = "2a2915685f78c60e6c95d936e8881d9336c3b03a";
-      sha256 = "1sd4502bixs8311dj1w20jdwf1lgrbkz696ay9r0ywhxp7ri0qs4";
+      rev = "782ed5284ddf6ef3695f8b3314facd8c6113c725";
+      sha256 = "1s6n6qdn3f89h4gi8nflz84y9l59rrfn43rgn257kxsq0df0kmx2";
     };
     dependencies = [];
 
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2016-04-08";
+    name = "vim-signify-2016-06-08";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "37376d9970294063b2ba9594204d50cfa181ebb6";
-      sha256 = "0ih09i0smn768fkbzbjpfzsjfsm4w653ghaykzcn4hbail67nx84";
+      rev = "cb975a8c6fbf08385eba8d0bbc1168ae53be460a";
+      sha256 = "00vi90zfkx94i0n0x4fjiz6bxfl2whxsclp8zxd4mivcqsw500jy";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2016-05-24";
+    name = "vim-snippets-2016-06-09";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "477ede1985a92f3ae1a5ff806a7507823abcc203";
-      sha256 = "1ncs7bk2pqz4dy3h206s0c9f14h5kgfanipbiiis24z2zvq9mw18";
+      rev = "e840b91a4e86cda657519eba00766a29a614e1e2";
+      sha256 = "11pns71zpg9nh3mf2g24k194371jhkkv7b3in8r9av107ijky3sb";
     };
     dependencies = [];
 
   };
 
   vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-webdevicons-2016-04-17";
+    name = "vim-webdevicons-2016-06-03";
     src = fetchgit {
       url = "git://github.com/ryanoasis/vim-devicons";
-      rev = "ad5d6d7f9fdf741a1e0d45b2bebab1d0116e1158";
-      sha256 = "0i3frd23zwbxypj8xgv4hc44wzc2803p15852iqz3k0xr8y8rjxd";
+      rev = "0bf80d78cba8603dd4f594f1807cc5bee706db84";
+      sha256 = "17r98gh4pk0xdfprjmqzp617szwq4j6yrn6pbx0l1n7k7q5crv89";
     };
     dependencies = [];
 

From 0720373dfc8ebb8962cdab9ba816c348fa7e6692 Mon Sep 17 00:00:00 2001
From: David Craven <david@craven.ch>
Date: Tue, 7 Jun 2016 20:42:51 +0200
Subject: [PATCH 330/436] cargo: Use stable releases instead of snapshots

---
 .../rustc/{stable.nix => default.nix}         |  8 ++-
 pkgs/development/compilers/rustc/generic.nix  |  6 +-
 .../tools/build-managers/cargo/bootstrap.nix  | 50 +++++++++++++++
 .../tools/build-managers/cargo/common.nix     | 38 -----------
 .../tools/build-managers/cargo/default.nix    | 55 +++-------------
 .../tools/build-managers/cargo/generic.nix    | 64 +++++++++++++++++++
 .../tools/build-managers/cargo/head.nix       | 43 ++-----------
 .../build-managers/cargo/print-hashes.sh      | 17 +++++
 .../tools/build-managers/cargo/snapshot.nix   | 55 ----------------
 pkgs/top-level/all-packages.nix               | 34 +++-------
 10 files changed, 164 insertions(+), 206 deletions(-)
 rename pkgs/development/compilers/rustc/{stable.nix => default.nix} (60%)
 create mode 100644 pkgs/development/tools/build-managers/cargo/bootstrap.nix
 delete mode 100644 pkgs/development/tools/build-managers/cargo/common.nix
 create mode 100644 pkgs/development/tools/build-managers/cargo/generic.nix
 create mode 100755 pkgs/development/tools/build-managers/cargo/print-hashes.sh
 delete mode 100644 pkgs/development/tools/build-managers/cargo/snapshot.nix

diff --git a/pkgs/development/compilers/rustc/stable.nix b/pkgs/development/compilers/rustc/default.nix
similarity index 60%
rename from pkgs/development/compilers/rustc/stable.nix
rename to pkgs/development/compilers/rustc/default.nix
index 596ef2d0cb7a..dd7fd8a88dab 100644
--- a/pkgs/development/compilers/rustc/stable.nix
+++ b/pkgs/development/compilers/rustc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage }:
+{ stdenv, callPackage, targets ? [], targetToolchains ? [] }:
 
 callPackage ./generic.nix {
   shortVersion = "1.9.0";
@@ -6,8 +6,10 @@ callPackage ./generic.nix {
   forceBundledLLVM = false;
   configureFlags = [ "--release-channel=stable" ];
   srcRev = "e4e8b666850a763fdf1c3c2c142856ab51e32779";
-  srcSha = "1pz4qx70mqv78fxm4w1mq7csk5pssq4qmr2vwwb5v8hyx03caff8";
+  srcSha = "167rh7hs77grn895h54s7np7f0k7b6i8z4wdfinncg4chy08hxq1";
   patches = [ ./patches/remove-uneeded-git.patch ]
     ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-  rustc = callPackage ./bootstrap.nix {};
+  rustc = callPackage ./snapshot.nix {};
+  inherit targets;
+  inherit targetToolchains;
 }
diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index 09d8ad8bf00f..42deddd9e1d2 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
-, llvm, jemalloc, ncurses, darwin, binutils, rustc
+, llvm, jemalloc, ncurses, darwin, binutils, rustc, git
 
 , isRelease ? false
 , shortVersion
@@ -112,8 +112,8 @@ stdenv.mkDerivation {
   '';
 
   # ps is needed for one of the test cases
-  nativeBuildInputs = [ file python2 procps rustc ];
-  buildInputs = [ ncurses ]
+  nativeBuildInputs = [ file python2 procps rustc git ];
+  buildInputs = [ ncurses ] ++ targetToolchains
     ++ stdenv.lib.optional (!forceBundledLLVM) llvmShared;
 
   # https://github.com/rust-lang/rust/issues/30181
diff --git a/pkgs/development/tools/build-managers/cargo/bootstrap.nix b/pkgs/development/tools/build-managers/cargo/bootstrap.nix
new file mode 100644
index 000000000000..c4052232a8bb
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cargo/bootstrap.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, makeWrapper, cacert, zlib, rustc }:
+
+let
+  platform =
+    if stdenv.system == "i686-linux"
+    then "i686-unknown-linux-gnu"
+    else if stdenv.system == "x86_64-linux"
+    then "x86_64-unknown-linux-gnu"
+    else if stdenv.system == "i686-darwin"
+    then "i686-apple-darwin"
+    else if stdenv.system == "x86_64-darwin"
+    then "x86_64-apple-darwin"
+    else abort "missing boostrap url for platform ${stdenv.system}";
+
+  # fetch hashes by running `print-hashes.sh 1.9.0`
+  bootstrapHash =
+    if stdenv.system == "i686-linux"
+    then "dd4d9bf1b9393867eb18d00431e8fb733894984f2c7b5154bc1b64d045077b45"
+    else if stdenv.system == "x86_64-linux"
+    then "288ff13efa2577e81c77fc2cb6e2b49b1ed0ceab51b4fa12f7efb87039ac49b7"
+    else if stdenv.system == "i686-darwin"
+    then "4d4d4b256d6bd6ae2527cf61007b2553de200f0a1910b7ad41e4f51d2b21e536"
+    else if stdenv.system == "x86_64-darwin"
+    then "d59b5509e69c1cace20a57072e3b3ecefdbfd8c7e95657b0ff2ac10aa1dfebe6"
+    else throw "missing boostrap hash for platform ${stdenv.system}";
+in
+stdenv.mkDerivation rec {
+  name = "cargo-bootstrap-${version}";
+  version = "1.9.0";
+
+  src = fetchurl {
+     url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz";
+     sha256 = bootstrapHash;
+  };
+
+  passthru.rustc = rustc;
+  buildInputs = [makeWrapper zlib];
+  phases = ["unpackPhase" "installPhase"];
+
+  installPhase = ''
+    cp -r cargo "$out"
+
+    patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      "$out/bin/cargo"
+
+    wrapProgram "$out/bin/cargo" \
+      --suffix PATH : "${rustc}/bin"
+  '';
+}
diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix
deleted file mode 100644
index 649664793192..000000000000
--- a/pkgs/development/tools/build-managers/cargo/common.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{stdenv, version, rustc}:
-
-{
-  inherit version;
-
-  name = "cargo-${version}";
-
-  postInstall = ''
-    rm "$out/lib/rustlib/components" \
-       "$out/lib/rustlib/install.log" \
-       "$out/lib/rustlib/rust-installer-version" \
-       "$out/lib/rustlib/uninstall.sh" \
-       "$out/lib/rustlib/manifest-cargo"
-
-     wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin" \
-       ${stdenv.lib.optionalString stdenv.isDarwin ''--suffix DYLD_LIBRARY_PATH : "${rustc}/lib"''}
-  '';
-
-  platform = if stdenv.system == "i686-linux"
-    then "i686-unknown-linux-gnu"
-    else if stdenv.system == "x86_64-linux"
-    then "x86_64-unknown-linux-gnu"
-    else if stdenv.system == "i686-darwin"
-    then "i686-apple-darwin"
-    else if stdenv.system == "x86_64-darwin"
-    then "x86_64-apple-darwin"
-    else throw "no snapshot to bootstrap for this platform (missing platform url suffix)";
-
-  passthru.rustc = rustc;
-
-  meta = with stdenv.lib; {
-    homepage = http://crates.io;
-    description = "Downloads your Rust project's dependencies and builds your project";
-    maintainers = with maintainers; [ wizeman retrry ];
-    license = [ licenses.mit licenses.asl20 ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index 54909ce3b704..253a62e7bbe2 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -1,49 +1,14 @@
-{ stdenv, lib, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
-, cmake, zlib, makeWrapper
-# Darwin dependencies
-, libiconv }:
+{ stdenv, callPackage, rustc, makeRustPlatform, recurseIntoAttrs }:
 
-with rustPlatform;
-
-with ((import ./common.nix) {
-  inherit stdenv rustc;
+let
+  cargoBootstrap = callPackage ./bootstrap.nix {};
+  rustPlatformBootstrap = recurseIntoAttrs (makeRustPlatform cargoBootstrap rustPlatformBootstrap);
+in
+callPackage ./generic.nix rec {
   version = "0.10.0";
-});
-
-buildRustPackage rec {
-  inherit name version meta passthru;
-
-  # Needs to use fetchgit instead of fetchFromGitHub to fetch submodules
-  src = fetchgit {
-    url = "git://github.com/rust-lang/cargo";
-    rev = "refs/tags/${version}";
-    sha256 = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2";
-  };
-
+  srcRev = "refs/tags/${version}";
+  srcSha = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2";
   depsSha256 = "0js4697n7v93wnqnpvamhp446w58llj66za5hkd6wannmc0gsy3b";
-
-  buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]
-    ++ lib.optional stdenv.isDarwin libiconv;
-
-  configurePhase = ''
-    ./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo
-  '';
-
-  buildPhase = "make";
-
-  checkPhase = ''
-    # Export SSL_CERT_FILE as without it one test fails with SSL verification error
-    export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
-    # Disable cross compilation tests
-    export CFG_DISABLE_CROSS_TESTS=1
-    cargo test
-  '';
-
-  # Disable check phase as there are failures (author_prefers_cargo test fails)
-  doCheck = false;
-
-  installPhase = ''
-    make install
-    ${postInstall}
-  '';
+  inherit rustc;
+  rustPlatform = rustPlatformBootstrap;
 }
diff --git a/pkgs/development/tools/build-managers/cargo/generic.nix b/pkgs/development/tools/build-managers/cargo/generic.nix
new file mode 100644
index 000000000000..4f74166bf625
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cargo/generic.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchgit, file, curl, pkgconfig, python, openssl, cmake, zlib
+, makeWrapper, libiconv, cacert, rustPlatform, rustc
+, version, srcRev, srcSha, depsSha256 }:
+
+rustPlatform.buildRustPackage rec {
+  name = "cargo-${version}";
+  inherit version;
+
+  src = fetchgit {
+    url = "https://github.com/rust-lang/cargo";
+    rev = srcRev;
+    sha256 = srcSha;
+  };
+
+  inherit depsSha256;
+
+  passthru.rustc = rustc;
+
+  buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]
+    ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+
+  configurePhase = ''
+    ./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.cargo}/bin/cargo
+  '';
+
+  buildPhase = "make";
+
+  installPhase = ''
+    make install
+    ${postInstall}
+  '';
+
+  postInstall = ''
+    rm "$out/lib/rustlib/components" \
+       "$out/lib/rustlib/install.log" \
+       "$out/lib/rustlib/rust-installer-version" \
+       "$out/lib/rustlib/uninstall.sh" \
+       "$out/lib/rustlib/manifest-cargo"
+
+    wrapProgram "$out/bin/cargo" \
+      --suffix PATH : "${rustc}/bin" \
+      --run "export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt" \
+      ${stdenv.lib.optionalString stdenv.isDarwin ''--suffix DYLD_LIBRARY_PATH : "${rustc}/lib"''}
+  '';
+
+  checkPhase = ''
+    # Export SSL_CERT_FILE as without it one test fails with SSL verification error
+    export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
+    # Disable cross compilation tests
+    export CFG_DISABLE_CROSS_TESTS=1
+    cargo test
+  '';
+
+  # Disable check phase as there are failures (author_prefers_cargo test fails)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://crates.io;
+    description = "Downloads your Rust project's dependencies and builds your project";
+    maintainers = with maintainers; [ wizeman retrry ];
+    license = [ licenses.mit licenses.asl20 ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/tools/build-managers/cargo/head.nix b/pkgs/development/tools/build-managers/cargo/head.nix
index 475e2ab962c8..0faaf5e9a719 100644
--- a/pkgs/development/tools/build-managers/cargo/head.nix
+++ b/pkgs/development/tools/build-managers/cargo/head.nix
@@ -1,39 +1,10 @@
-{ stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
-, cmake, zlib, makeWrapper }:
-
-with rustPlatform;
-
-with ((import ./common.nix) {
-  inherit stdenv rustc;
-  version = "2016-03-20";
-});
-
-buildRustPackage rec {
-  inherit name version meta passthru;
-
-  # Needs to use fetchgit instead of fetchFromGitHub to fetch submodules
-  src = fetchgit {
-    url = "git://github.com/rust-lang/cargo";
-    rev = "7d79da08238e3d47e0bc4406155bdcc45ccb8c82";
-    sha256 = "190qdii53s4vk940yzs2iizhfs22y2v8bzw051bl6bk9bs3y4fdd";
-  };
+{ stdenv, callPackage, rustc, rustPlatform }:
 
+callPackage ./generic.nix rec {
+  version = "2016.06.07";
+  srcRev = "3e70312a2a4ebedace131fc63bb8f27463c5db28";
+  srcSha = "0nibzyfjkiqfnq0c00hhqvs856l5qls8wds252p97q5q92yvp40f";
   depsSha256 = "1xbb33aqnf5yyws6gjys9w8kznbh9rh6hw8mpg1hhq1ahipc2j1f";
-
-  buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ];
-
-  configurePhase = ''
-    ./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo
-  '';
-
-  buildPhase = "make";
-
-  # Disable check phase as there are lots of failures (some probably due to
-  # trying to access the network).
-  doCheck = false;
-
-  installPhase = ''
-    make install
-    ${postInstall}
-  '';
+  inherit rustc;
+  inherit rustPlatform;
 }
diff --git a/pkgs/development/tools/build-managers/cargo/print-hashes.sh b/pkgs/development/tools/build-managers/cargo/print-hashes.sh
new file mode 100755
index 000000000000..4d1d20066b85
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cargo/print-hashes.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+PLATFORMS="i686-unknown-linux-gnu x86_64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin"
+BASEURL="https://static.rust-lang.org/dist"
+VERSION=$1
+
+if [[ -z  $VERSION ]]
+then
+    echo "No version supplied"
+    exit -1
+fi
+
+for PLATFORM in $PLATFORMS
+do
+    URL="$BASEURL/rust-$VERSION-$PLATFORM.tar.gz.sha256"
+    curl $URL
+done
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
deleted file mode 100644
index 62539c2c7328..000000000000
--- a/pkgs/development/tools/build-managers/cargo/snapshot.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, fetchurl, zlib, makeWrapper, rustc }:
-
-/* Cargo binary snapshot */
-
-let snapshotDate = "2016-01-31";
-in
-
-with ((import ./common.nix) {
-  inherit stdenv rustc;
-  version = "snapshot-${snapshotDate}";
-});
-
-let snapshotHash = if stdenv.system == "i686-linux"
-      then "7e2f9c82e1af5aa43ef3ee2692b985a5f2398f0a"
-      else if stdenv.system == "x86_64-linux"
-      then "4c03a3fd2474133c7ad6d8bb5f6af9915ca5292a"
-      else if stdenv.system == "i686-darwin"
-      then "4d84d31449a5926f9e7ceb344540d6e5ea530b88"
-      else if stdenv.system == "x86_64-darwin"
-      then "f8baef5b0b3e6f9825be1f1709594695ac0f0abc"
-      else throw "no snapshot for platform ${stdenv.system}";
-    snapshotName = "cargo-nightly-${platform}.tar.gz";
-in
-
-stdenv.mkDerivation {
-  inherit name version meta passthru;
-
-  src = fetchurl {
-    url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${snapshotDate}/${snapshotName}";
-    sha1 = snapshotHash;
-  };
-
-  buildInputs = [ makeWrapper ];
-
-  dontStrip = true;
-
-  __propagatedImpureHostDeps = [
-    "/usr/lib/libiconv.2.dylib"
-    "/usr/lib/libssl.0.9.8.dylib"
-    "/usr/lib/libcurl.4.dylib"
-    "/System/Library/Frameworks/GSS.framework/GSS"
-    "/System/Library/Frameworks/GSS.framework/Versions/Current"
-    "/System/Library/PrivateFrameworks/Heimdal.framework/Heimdal"
-    "/System/Library/PrivateFrameworks/Heimdal.framework/Versions/Current"
-  ];
-
-  installPhase = ''
-    mkdir -p "$out"
-    ./install.sh "--prefix=$out"
-  '' + (if stdenv.isLinux then ''
-    patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
-             --set-rpath "${stdenv.cc.cc.lib}/lib/:${stdenv.cc.cc.lib}/lib64/:${zlib.out}/lib" \
-             "$out/bin/cargo"
-  '' else "") + postInstall;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6007aa1afb00..b4653fcbb1d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2527,7 +2527,7 @@ in
   netatalk = callPackage ../tools/filesystems/netatalk { };
 
   netcdf = callPackage ../development/libraries/netcdf { };
- 
+
   netcdf-mpi = appendToName "mpi" (netcdf.override {
     hdf5 = hdf5-mpi;
   });
@@ -4491,7 +4491,7 @@ in
   inherit (self.haskellPackages) ghc;
 
   cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install;
-   
+
   stack = haskell.lib.overrideCabal haskellPackages.stack (drv: {
     enableSharedExecutables = false;
     isLibrary = false;
@@ -5262,18 +5262,14 @@ in
   rtags = callPackage ../development/tools/rtags/default.nix {};
 
   rustc = rustcStable;
-  rustcStable = callPackage ../development/compilers/rustc/stable.nix {};
+  rustcStable = callPackage ../development/compilers/rustc {};
   rustcBeta = lowPrio (callPackage ../development/compilers/rustc/beta.nix {});
   rustcUnstable = lowPrio (callPackage ../development/compilers/rustc/head.nix {});
 
-  rustPlatform = rustStable;
-  rustStable = recurseIntoAttrs (makeRustPlatform cargo rustStable);
-  rustBeta = lowPrio (recurseIntoAttrs (makeRustPlatform cargoUnstable rustBeta));
-  rustUnstable = lowPrio (recurseIntoAttrs (makeRustPlatform cargoUnstable rustUnstable));
+  cargo = callPackage ../development/tools/build-managers/cargo {};
+  cargoUnstable = lowPrio (callPackage ../development/tools/build-managers/cargo/head.nix {});
 
-  # rust platform to build cargo itself (with cargoSnapshot)
-  rustCargoPlatform = makeRustPlatform (cargoSnapshot rustcStable) rustCargoPlatform;
-  rustUnstableCargoPlatform = makeRustPlatform (cargoSnapshot rustcUnstable) rustUnstableCargoPlatform;
+  rustPlatform = recurseIntoAttrs (makeRustPlatform cargo rustPlatform);
 
   makeRustPlatform = cargo: self:
     let
@@ -5955,20 +5951,6 @@ in
 
   byacc = callPackage ../development/tools/parsing/byacc { };
 
-  cargo = callPackage ../development/tools/build-managers/cargo {
-    # cargo needs to be built with rustCargoPlatform, which uses cargoSnapshot
-    rustPlatform = rustCargoPlatform;
-  };
-
-  cargoUnstable = lowPrio (callPackage ../development/tools/build-managers/cargo/head.nix {
-    rustPlatform = rustUnstableCargoPlatform;
-  });
-
-  cargoSnapshot = rustc:
-    callPackage ../development/tools/build-managers/cargo/snapshot.nix {
-      inherit rustc;
-    };
-
   casperjs = callPackage ../development/tools/casperjs {
     inherit (texFunctions) fontsConf;
   };
@@ -10840,7 +10822,7 @@ in
     batman_adv = callPackage ../os-specific/linux/batman-adv {};
 
     bcc = callPackage ../os-specific/linux/bcc { };
-    
+
     bbswitch = callPackage ../os-specific/linux/bbswitch {};
 
     ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
@@ -16015,7 +15997,7 @@ in
 
   openspecfun = callPackage ../development/libraries/science/math/openspecfun {};
 
-  magma = callPackage ../development/libraries/science/math/magma { };  
+  magma = callPackage ../development/libraries/science/math/magma { };
 
   mathematica = callPackage ../applications/science/math/mathematica { };
   mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { };

From 447dce99da1a92c0efa2810ae9e9d592152a7586 Mon Sep 17 00:00:00 2001
From: David Craven <david@craven.ch>
Date: Tue, 7 Jun 2016 20:53:25 +0200
Subject: [PATCH 331/436] rustc: Enable crosscompiling std crates

---
 pkgs/development/compilers/rustc/beta.nix    |  4 ++-
 pkgs/development/compilers/rustc/generic.nix | 29 ++++----------------
 pkgs/development/compilers/rustc/head.nix    |  4 ++-
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/compilers/rustc/beta.nix b/pkgs/development/compilers/rustc/beta.nix
index 7dbd8ae7a695..363dc71c02da 100644
--- a/pkgs/development/compilers/rustc/beta.nix
+++ b/pkgs/development/compilers/rustc/beta.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, rustcStable }:
+{ stdenv, callPackage, rustcStable, targets ? [], targetToolchains ? [] }:
 
 callPackage ./generic.nix {
   shortVersion = "beta-1.10.0";
@@ -9,4 +9,6 @@ callPackage ./generic.nix {
   patches = [ ./patches/disable-lockfile-check.patch ] ++
     stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
   rustc = rustcStable;
+  inherit targets;
+  inherit targetToolchains;
 }
diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index 42deddd9e1d2..a08843f494e9 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -7,22 +7,10 @@
 , srcSha, srcRev
 , configureFlags ? []
 , patches
+, targets
+, targetToolchains
 } @ args:
 
-/* Rust's build process has a few quirks :
-
-- The Rust compiler is written is Rust, so it requires a bootstrap
-  compiler, which is downloaded during the build. To make the build
-  pure, we download it ourself before and put it where it is
-  expected. Once the language is stable (1.0) , we might want to
-  switch it to use nix's packaged rust compiler. This might not be possible
-  as the compiler is highly coupled to the bootstrap.
-
-NOTE : some derivation depend on rust. When updating this, please make
-sure those derivations still compile. (racer, for example).
-
-*/
-
 let
     version = if isRelease then
         "${shortVersion}"
@@ -35,15 +23,7 @@ let
 
     llvmShared = llvm.override { enableSharedLibraries = true; };
 
-    target = if stdenv.system == "i686-linux"
-      then "i686-unknown-linux-gnu"
-      else if stdenv.system == "x86_64-linux"
-      then "x86_64-unknown-linux-gnu"
-      else if stdenv.system == "i686-darwin"
-      then "i686-apple-darwin"
-      else if stdenv.system == "x86_64-darwin"
-      then "x86_64-apple-darwin"
-      else abort "no snapshot to bootstrap for this platform (missing target triple)";
+    target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
 
     meta = with stdenv.lib; {
       homepage = http://www.rust-lang.org/;
@@ -75,9 +55,11 @@ stdenv.mkDerivation {
                 # ++ [ "--jemalloc-root=${jemalloc}/lib"
                 ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
                 ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang"
+                ++ stdenv.lib.optional (targets != []) "--target=${target}"
                 ++ stdenv.lib.optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
 
   inherit patches;
+  passthru.target = target;
 
   postPatch = ''
     substituteInPlace src/rust-installer/gen-install-script.sh \
@@ -125,4 +107,5 @@ stdenv.mkDerivation {
   preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
 
   doCheck = true;
+  dontSetConfigureCross = true;
 }
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 8d9373eb3c3d..aa32416c6495 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -1,5 +1,5 @@
 # Please make sure to check if rustfmt still builds when updating nightly
-{ stdenv, callPackage, rustcStable }:
+{ stdenv, callPackage, rustcStable, targets ? [], targetToolchains ? [] }:
 
 callPackage ./generic.nix {
   shortVersion = "master-1.11.0";
@@ -10,4 +10,6 @@ callPackage ./generic.nix {
               ./patches/use-rustc-1.9.0.patch ] ++
     stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
   rustc = rustcStable;
+  inherit targets;
+  inherit targetToolchains;
 }

From d8a7aaf179cfad732720b996c76c55488b8d6d20 Mon Sep 17 00:00:00 2001
From: David Craven <david@craven.ch>
Date: Tue, 7 Jun 2016 20:55:14 +0200
Subject: [PATCH 332/436] rustc: Prepare for 1.10.0 release

---
 .../development/compilers/rustc/bootstrap.nix | 73 ++++++++-----------
 .../compilers/rustc/print-hashes.sh           | 17 +++++
 pkgs/development/compilers/rustc/snapshot.nix | 61 ++++++++++++++++
 3 files changed, 109 insertions(+), 42 deletions(-)
 create mode 100755 pkgs/development/compilers/rustc/print-hashes.sh
 create mode 100644 pkgs/development/compilers/rustc/snapshot.nix

diff --git a/pkgs/development/compilers/rustc/bootstrap.nix b/pkgs/development/compilers/rustc/bootstrap.nix
index 8bff511459dc..0361bb78a9ce 100644
--- a/pkgs/development/compilers/rustc/bootstrap.nix
+++ b/pkgs/development/compilers/rustc/bootstrap.nix
@@ -1,58 +1,47 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper }:
 
 let
-  platform = if stdenv.system == "i686-linux"
-    then "linux-i386"
+  platform =
+    if stdenv.system == "i686-linux"
+    then "i686-unknown-linux-gnu"
     else if stdenv.system == "x86_64-linux"
-    then "linux-x86_64"
+    then "x86_64-unknown-linux-gnu"
     else if stdenv.system == "i686-darwin"
-    then "macos-i386"
+    then "i686-apple-darwin"
     else if stdenv.system == "x86_64-darwin"
-    then "macos-x86_64"
-    else abort "no snapshot to bootstrap for this platform (missing platform url suffix)";
+    then "x86_64-apple-darwin"
+    else abort "missing boostrap url for platform ${stdenv.system}";
 
-  /* Rust is bootstrapped from an earlier built version. We need
-    to fetch these earlier versions, which vary per platform.
-    The shapshot info you want can be found at
-    https://github.com/rust-lang/rust/blob/{$shortVersion}/src/snapshots.txt
-    with the set you want at the top. Make sure this is the latest snapshot
-    for the tagged release and not a snapshot in the current HEAD.
-    NOTE: Rust 1.9.0 is the last version that uses snapshots
-  */
-
-  snapshotHashLinux686 = "0e0e4448b80d0a12b75485795244bb3857a0a7ef";
-  snapshotHashLinux64 = "1273b6b6aed421c9e40c59f366d0df6092ec0397";
-  snapshotHashDarwin686 = "9f9c0b4a2db09acbce54b792fb8839a735585565";
-  snapshotHashDarwin64 = "52570f6fd915b0210a9be98cfc933148e16a75f8";
-  snapshotDate = "2016-03-18";
-  snapshotRev = "235d774";
-
-  snapshotHash = if stdenv.system == "i686-linux"
-    then snapshotHashLinux686
+  # fetch hashes by running `print-hashes.sh 1.9.0`
+  bootstrapHash =
+    if stdenv.system == "i686-linux"
+    then "2951dec835827974d03c7aafbf2c969f39bb530e1c200fd46f90bc01772fae39"
     else if stdenv.system == "x86_64-linux"
-    then snapshotHashLinux64
+    then "d0704d10237c66c3efafa6f7e5570c59a1d3fe5c6d99487540f90ebb37cd84c4"
     else if stdenv.system == "i686-darwin"
-    then snapshotHashDarwin686
+    then "c7aa93e2475aa8e65259f606ca70e98da41cf5d2b20f91703b98f9572a84f7e6"
     else if stdenv.system == "x86_64-darwin"
-    then snapshotHashDarwin64
-    else abort "no snapshot for platform ${stdenv.system}";
-
-  snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2";
+    then "7204226b42e9c380d44e722efd4a886178a1867a064c90f12e0553a21a4184c6"
+    else throw "missing boostrap hash for platform ${stdenv.system}";
 in
-
-stdenv.mkDerivation {
-  name = "rust-bootstrap";
+stdenv.mkDerivation rec {
+  name = "rustc-bootstrap-${version}";
+  version = "1.9.0";
   src = fetchurl {
-    url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
-    sha1 = snapshotHash;
+     url = "https://static.rust-lang.org/dist/rustc-${version}-${platform}.tar.gz";
+     sha256 = bootstrapHash;
   };
-  dontStrip = true;
+  buildInputs = [makeWrapper];
+  phases = ["unpackPhase" "installPhase"];
+
   installPhase = ''
     mkdir -p "$out"
-    cp -r bin "$out/bin"
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
-    patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
-             --set-rpath "${stdenv.cc.cc.lib}/lib/:${stdenv.cc.cc.lib}/lib64/" \
-             "$out/bin/rustc"
+    ./install.sh "--prefix=$out"
+
+    patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      "$out/bin/rustc"
+
+    wrapProgram "$out/bin/rustc"
   '';
 }
diff --git a/pkgs/development/compilers/rustc/print-hashes.sh b/pkgs/development/compilers/rustc/print-hashes.sh
new file mode 100755
index 000000000000..710d4c0b585c
--- /dev/null
+++ b/pkgs/development/compilers/rustc/print-hashes.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+PLATFORMS="i686-unknown-linux-gnu x86_64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin"
+BASEURL="https://static.rust-lang.org/dist"
+VERSION=$1
+
+if [[ -z  $VERSION ]]
+then
+    echo "No version supplied"
+    exit -1
+fi
+
+for PLATFORM in $PLATFORMS
+do
+    URL="$BASEURL/rustc-$VERSION-$PLATFORM.tar.gz.sha256"
+    curl $URL
+done
diff --git a/pkgs/development/compilers/rustc/snapshot.nix b/pkgs/development/compilers/rustc/snapshot.nix
new file mode 100644
index 000000000000..8f7005dc0d76
--- /dev/null
+++ b/pkgs/development/compilers/rustc/snapshot.nix
@@ -0,0 +1,61 @@
+/* NOTE: Rust 1.9.0 is the last version that uses snapshots
+         This file can be deleted after the 1.10.0 release and bootstrap.nix
+         can be used instead
+*/
+{ stdenv, fetchurl }:
+
+let
+  platform = if stdenv.system == "i686-linux"
+    then "linux-i386"
+    else if stdenv.system == "x86_64-linux"
+    then "linux-x86_64"
+    else if stdenv.system == "i686-darwin"
+    then "macos-i386"
+    else if stdenv.system == "x86_64-darwin"
+    then "macos-x86_64"
+    else abort "no snapshot to bootstrap for this platform (missing platform url suffix)";
+
+  /* Rust is bootstrapped from an earlier built version. We need
+    to fetch these earlier versions, which vary per platform.
+    The shapshot info you want can be found at
+    https://github.com/rust-lang/rust/blob/{$shortVersion}/src/snapshots.txt
+    with the set you want at the top. Make sure this is the latest snapshot
+    for the tagged release and not a snapshot in the current HEAD.
+  */
+
+  snapshotHashLinux686 = "0e0e4448b80d0a12b75485795244bb3857a0a7ef";
+  snapshotHashLinux64 = "1273b6b6aed421c9e40c59f366d0df6092ec0397";
+  snapshotHashDarwin686 = "9f9c0b4a2db09acbce54b792fb8839a735585565";
+  snapshotHashDarwin64 = "52570f6fd915b0210a9be98cfc933148e16a75f8";
+  snapshotDate = "2016-03-18";
+  snapshotRev = "235d774";
+
+  snapshotHash = if stdenv.system == "i686-linux"
+    then snapshotHashLinux686
+    else if stdenv.system == "x86_64-linux"
+    then snapshotHashLinux64
+    else if stdenv.system == "i686-darwin"
+    then snapshotHashDarwin686
+    else if stdenv.system == "x86_64-darwin"
+    then snapshotHashDarwin64
+    else abort "no snapshot for platform ${stdenv.system}";
+
+  snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2";
+in
+
+stdenv.mkDerivation {
+  name = "rust-bootstrap";
+  src = fetchurl {
+    url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
+    sha1 = snapshotHash;
+  };
+  dontStrip = true;
+  installPhase = ''
+    mkdir -p "$out"
+    cp -r bin "$out/bin"
+  '' + stdenv.lib.optionalString stdenv.isLinux ''
+    patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
+             --set-rpath "${stdenv.cc.cc.lib}/lib/:${stdenv.cc.cc.lib}/lib64/" \
+             "$out/bin/rustc"
+  '';
+}

From dd5a46f85d811f8b62dcd87d6f2a23a57b4f9c9c Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Wed, 15 Jun 2016 00:15:38 +0200
Subject: [PATCH 333/436] pytools: init at 2016.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7d7c4bc58aaa..098a133ea71c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7779,6 +7779,33 @@ in modules // {
     };
   };
 
+  pytools = buildPythonPackage rec { 
+    name = "pytools-${version}"; 
+    version = "2016.2.1"; 
+
+    src = pkgs.fetchFromGitHub {
+      owner = "inducer";
+      repo = "pytools";
+      rev = "e357a9de14d0ff5131284f369d220d8b439a7906";
+      sha256 = "0g5w1cira1bl9f2ji11cbr9daj947nrfydydymjp4bbxbpl2jnaq";
+    };
+
+    buildInputs = with self; [
+      decorator
+      appdirs
+      six
+      numpy
+    ];
+
+    meta = {
+      homepage = https://github.com/inducer/pytools/; 
+      description = "Miscellaneous Python lifesavers.";
+      license = licenses.mit;
+      maintainers = with maintainers; [ artuuge ];
+    };
+
+  };
+
   radicale = buildPythonPackage rec {
     name = "radicale-${version}";
     namePrefix = "";

From be0ade9d0343905ae3ca439eae8d3b179592eb2e Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Wed, 15 Jun 2016 00:47:55 +0200
Subject: [PATCH 334/436] pycuda: init at 2016.1

---
 .../python-modules/pycuda/compyte.nix         | 21 ++++++
 .../python-modules/pycuda/default.nix         | 66 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  5 ++
 3 files changed, 92 insertions(+)
 create mode 100644 pkgs/development/python-modules/pycuda/compyte.nix
 create mode 100644 pkgs/development/python-modules/pycuda/default.nix

diff --git a/pkgs/development/python-modules/pycuda/compyte.nix b/pkgs/development/python-modules/pycuda/compyte.nix
new file mode 100644
index 000000000000..50bd81ac462c
--- /dev/null
+++ b/pkgs/development/python-modules/pycuda/compyte.nix
@@ -0,0 +1,21 @@
+{ mkDerivation 
+, fetchFromGitHub
+}:
+
+mkDerivation rec {
+  name = "compyte-${version}";
+  version = "git-20150817"; 
+
+  src = fetchFromGitHub {
+    owner = "inducer";
+    repo = "compyte";
+    rev = "ac1c71d46428c14aa1bd1c09d7da19cd0298d5cc";
+    sha256 = "1980h017qi52b7fqwm75m481xs2napgdd3fbrzkfc29k085cbign";
+  };
+
+  installPhase = '' 
+    mkdir -p $out
+    cp -r * $out
+  '';
+
+}
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
new file mode 100644
index 000000000000..df507f9b6ad0
--- /dev/null
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -0,0 +1,66 @@
+{ buildPythonPackage 
+, fetchFromGitHub
+, boost
+, numpy
+, pytools
+, pytest
+, decorator
+, appdirs
+, six
+, cudatoolkit
+, python
+, mkDerivation
+, stdenv
+}:
+let
+  compyte = import ./compyte.nix {
+    inherit mkDerivation fetchFromGitHub;
+  };
+in
+buildPythonPackage rec {
+  name = "pycuda-${version}"; 
+  version = "2016.1"; 
+
+  src = fetchFromGitHub {
+    owner = "inducer"; 
+    repo = "pycuda";
+    rev = "609817e22c038249f5e9ddd720b3ca5a9d58ca11"; 
+    sha256 = "0kg6ayxsw2gja9rqspy6z8ihacf9jnxr8hzywjwmj1izkv24cff7"; 
+  }; 
+
+  preConfigure = ''
+    findInputs ${boost} 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
+  '';
+
+  postInstall = ''
+    ln -s ${compyte} $out/${python.sitePackages}/pycuda/compyte 
+  '';
+
+  propagatedBuildInputs = [
+    numpy
+    pytools
+    pytest
+    decorator
+    appdirs
+    six
+    cudatoolkit
+    compyte
+    python
+  ]; 
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/inducer/pycuda/;
+    description = "CUDA integration for Python.";
+    license = licenses.mit;
+    maintainers = with maintainers; [ artuuge ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 098a133ea71c..2411dcd105e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7508,6 +7508,11 @@ in modules // {
     };
   };
 
+  pycuda = callPackage ../development/python-modules/pycuda rec {
+    cudatoolkit = pkgs.cudatoolkit75;
+    inherit (pkgs.stdenv) mkDerivation;
+  };
+
   python-axolotl = buildPythonPackage rec {
     name = "python-axolotl-${version}";
     version = "0.1.7";

From c4435493aa203e9053fbd83a7690fcda70647250 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Tue, 14 Jun 2016 20:29:50 +0200
Subject: [PATCH 335/436] lizardfs: init at 3.9.4

LizardFS is a highly reliable, scalable and efficient distributed file
system.
---
 .../filesystems/lizardfs/check-includes.patch | 30 ++++++++++++
 pkgs/tools/filesystems/lizardfs/default.nix   | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 80 insertions(+)
 create mode 100644 pkgs/tools/filesystems/lizardfs/check-includes.patch
 create mode 100644 pkgs/tools/filesystems/lizardfs/default.nix

diff --git a/pkgs/tools/filesystems/lizardfs/check-includes.patch b/pkgs/tools/filesystems/lizardfs/check-includes.patch
new file mode 100644
index 000000000000..49aa0375762a
--- /dev/null
+++ b/pkgs/tools/filesystems/lizardfs/check-includes.patch
@@ -0,0 +1,30 @@
+From 60f64d7077ebd2b29b18faa3b25ee593e126e347 Mon Sep 17 00:00:00 2001
+From: Dmitry Smirnov <onlyjob@member.fsf.org>
+Date: Sun, 20 Dec 2015 14:03:20 +1100
+Subject: [PATCH] build: Fix FTBFS with CMake-3.4
+
+Closes: #363
+
+~~~~
+ CMake Error at CheckIncludes.cmake:4 (check_include_files):
+   Unknown CMake command "check_include_files".
+ Call Stack (most recent call first):
+   CMakeLists.txt:113 (check_includes)
+~~~~
+
+Change-Id: I70f03d829c40ae560083a98c2bcf6344dbac3ad6
+Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
+---
+ CheckIncludes.cmake | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CheckIncludes.cmake b/CheckIncludes.cmake
+index 19ed485..f51075a 100644
+--- a/CheckIncludes.cmake
++++ b/CheckIncludes.cmake
+@@ -1,3 +1,5 @@
++include(CheckIncludeFiles)
++
+ function(check_includes INCLUDES)
+   set(INCLUDE_MISSING FALSE)
+   foreach(INCLUDE_FILE ${INCLUDES})
diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix
new file mode 100644
index 000000000000..7b6f2e17dcf5
--- /dev/null
+++ b/pkgs/tools/filesystems/lizardfs/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, makeWrapper
+, python
+, fuse
+# The following are required for manpages
+#, asciidoc, libxml2
+, boost
+, pkgconfig
+, judy
+, pam
+, zlib # optional
+}:
+
+stdenv.mkDerivation rec {
+  name = "lizardfs-${version}";
+  version = "3.9.4";
+
+  src = fetchFromGitHub {
+    owner = "lizardfs";
+    repo = "lizardfs";
+    rev = "v.${version}";
+    sha256 = "1vg33jy280apm4lp5dn3x51pkf7035ijqjm8wbmyha2g35gfjrlx";
+  };
+
+  # Manpages don't build in the current release
+  buildInputs = [ cmake fuse /* asciidoc libxml2.bin */ zlib boost pkgconfig judy pam makeWrapper ];
+
+  # Fixed in upcoming 3.10.0
+  patches = [ ./check-includes.patch ];
+
+  postInstall = ''
+    wrapProgram $out/sbin/lizardfs-cgiserver \
+        --prefix PATH ":" "${python}/bin"
+
+    # mfssnapshot and mfscgiserv are deprecated
+    rm -f $out/bin/mfssnapshot $out/sbin/mfscgiserv
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://lizardfs.com;
+    description = "A highly reliable, scalable and efficient distributed file system";
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.rushmorem ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6007aa1afb00..ab4f3d099d54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4672,6 +4672,8 @@ in
 
   liquibase = callPackage ../development/tools/database/liquibase { };
 
+  lizardfs = callPackage ../tools/filesystems/lizardfs { };
+
   llvm = self.llvmPackages.llvm;
 
   llvm_38 = self.llvmPackages_38.llvm;

From 54e806e690bb3e124dff45ef31560cfac8f5501e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 15 Jun 2016 12:59:41 +0800
Subject: [PATCH 336/436] syncthing: 0.13.4 -> 0.13.7

---
 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 83e5f2bd3289..40b3cb6fcce5 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchgit, go }:
 
 stdenv.mkDerivation rec {
-  version = "0.13.4";
+  version = "0.13.7";
   name = "syncthing-${version}";
 
   src = fetchgit {
     url = https://github.com/syncthing/syncthing;
     rev = "refs/tags/v${version}";
-    sha256 = "0aa0nqi0gmka5r5dzph4g51jlsy7w5q4ri8f4gy3qnma4pgp7pg2";
+    sha256 = "0n1yqaaag4l30i6zqb74z6f800xjvj9zvprb12nl9xlm5swrwrkz";
   };
 
   buildInputs = [ go ];

From f3d202150cd0ac594be6c2b0ba962cb871eabcef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Pacana?= <pawel.pacana@gmail.com>
Date: Tue, 31 May 2016 16:22:15 +0200
Subject: [PATCH 337/436] buildkite-agent: 2.1.8 ~> 2.1.13

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

diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index 166c57a9529d..302026e59cc9 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }:
 
 stdenv.mkDerivation rec {
-  version = "2.1.8";
+  version = "2.1.13";
   name = "buildkite-agent-${version}";
   dontBuild = true;
 
   src = fetchurl {
     url = "https://github.com/buildkite/agent/releases/download/v${version}/buildkite-agent-linux-386-${version}.tar.gz";
-    sha256 = "f54ca7da4379180700f5038779a7cbb1cef31d49f4a06c42702d68c34387c242";
+    sha256 = "bd40c2ba37b3b54b875241a32b62190a4cf4c15e2513c573f1626a3ca35c8657";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 54f80775cb58b3aa784b323b1eddb14e45d86fc4 Mon Sep 17 00:00:00 2001
From: David Craven <david@craven.ch>
Date: Tue, 14 Jun 2016 12:49:48 +0200
Subject: [PATCH 338/436] rust: Refactoring of rust and cargo packages

---
 pkgs/build-support/rust/default.nix           |  6 +-
 pkgs/build-support/rust/fetchcargo.nix        |  4 +-
 pkgs/development/compilers/rust/beta.nix      | 27 +++++++++
 .../cargo => compilers/rust}/bootstrap.nix    | 60 ++++++++++++++-----
 .../generic.nix => compilers/rust/cargo.nix}  |  2 +-
 pkgs/development/compilers/rust/default.nix   | 33 ++++++++++
 pkgs/development/compilers/rust/head.nix      | 27 +++++++++
 .../patches/disable-lockfile-check.patch      |  0
 .../{rustc => rust}/patches/grsec.patch       |  0
 .../patches/remove-uneeded-git.patch          |  0
 .../patches/use-rustc-1.9.0.patch             |  0
 .../cargo => compilers/rust}/print-hashes.sh  |  0
 .../{rustc/generic.nix => rust/rustc.nix}     |  9 +--
 .../compilers/{rustc => rust}/snapshot.nix    | 34 ++++++-----
 pkgs/development/compilers/rustc/beta.nix     | 14 -----
 .../development/compilers/rustc/bootstrap.nix | 47 ---------------
 pkgs/development/compilers/rustc/default.nix  | 15 -----
 pkgs/development/compilers/rustc/head.nix     | 15 -----
 .../compilers/rustc/print-hashes.sh           | 17 ------
 .../tools/build-managers/cargo/default.nix    | 14 -----
 .../tools/build-managers/cargo/head.nix       | 10 ----
 pkgs/development/tools/rust/racer/default.nix |  4 +-
 .../development/tools/rust/racerd/default.nix |  2 +-
 pkgs/misc/vim-plugins/default.nix             |  4 +-
 .../vim2nix/additional-nix-code/youcompleteme |  2 +-
 pkgs/tools/misc/exa/default.nix               |  2 +-
 pkgs/top-level/all-packages.nix               | 31 ++++------
 27 files changed, 181 insertions(+), 198 deletions(-)
 create mode 100644 pkgs/development/compilers/rust/beta.nix
 rename pkgs/development/{tools/build-managers/cargo => compilers/rust}/bootstrap.nix (53%)
 rename pkgs/development/{tools/build-managers/cargo/generic.nix => compilers/rust/cargo.nix} (98%)
 create mode 100644 pkgs/development/compilers/rust/default.nix
 create mode 100644 pkgs/development/compilers/rust/head.nix
 rename pkgs/development/compilers/{rustc => rust}/patches/disable-lockfile-check.patch (100%)
 rename pkgs/development/compilers/{rustc => rust}/patches/grsec.patch (100%)
 rename pkgs/development/compilers/{rustc => rust}/patches/remove-uneeded-git.patch (100%)
 rename pkgs/development/compilers/{rustc => rust}/patches/use-rustc-1.9.0.patch (100%)
 rename pkgs/development/{tools/build-managers/cargo => compilers/rust}/print-hashes.sh (100%)
 rename pkgs/development/compilers/{rustc/generic.nix => rust/rustc.nix} (93%)
 rename pkgs/development/compilers/{rustc => rust}/snapshot.nix (74%)
 delete mode 100644 pkgs/development/compilers/rustc/beta.nix
 delete mode 100644 pkgs/development/compilers/rustc/bootstrap.nix
 delete mode 100644 pkgs/development/compilers/rustc/default.nix
 delete mode 100644 pkgs/development/compilers/rustc/head.nix
 delete mode 100755 pkgs/development/compilers/rustc/print-hashes.sh
 delete mode 100644 pkgs/development/tools/build-managers/cargo/default.nix
 delete mode 100644 pkgs/development/tools/build-managers/cargo/head.nix

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index b889c4f24583..bbea045f6371 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cacert, git, cargo, rustRegistry }:
+{ stdenv, cacert, git, rust, rustRegistry }:
 { name, depsSha256
 , src ? null
 , srcs ? null
@@ -10,7 +10,7 @@
 
 let
   fetchDeps = import ./fetchcargo.nix {
-    inherit stdenv cacert git cargo rustRegistry;
+    inherit stdenv cacert git rust rustRegistry;
   };
 
   cargoDeps = fetchDeps {
@@ -23,7 +23,7 @@ in stdenv.mkDerivation (args // {
 
   patchRegistryDeps = ./patch-registry-deps;
 
-  buildInputs = [ git cargo cargo.rustc ] ++ buildInputs;
+  buildInputs = [ git rust.cargo rust.rustc ] ++ buildInputs;
 
   configurePhase = args.configurePhase or "true";
 
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 518420002622..1b4983e32597 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -1,9 +1,9 @@
-{ stdenv, cacert, git, cargo, rustRegistry }:
+{ stdenv, cacert, git, rust, rustRegistry }:
 { name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }:
 
 stdenv.mkDerivation {
   name = "${name}-fetch";
-  buildInputs = [ cargo git ];
+  buildInputs = [ rust.cargo rust.rustc git ];
   inherit src srcs sourceRoot rustRegistry cargoUpdateHook;
 
   phases = "unpackPhase installPhase";
diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix
new file mode 100644
index 000000000000..4b4ee89f981b
--- /dev/null
+++ b/pkgs/development/compilers/rust/beta.nix
@@ -0,0 +1,27 @@
+{ stdenv, callPackage, rustPlatform,
+  targets ? [], targetToolchains ? [], targetPatches ? [] }:
+
+rec {
+  rustc = callPackage ./rustc.nix {
+    shortVersion = "beta-1.10.0";
+    forceBundledLLVM = false;
+    configureFlags = [ "--release-channel=beta" ];
+    srcRev = "d18e321abeecc69e4d1bf9cafba4fba53ddf267d";
+    srcSha = "1ck8mbjrq0bzq5xzwgaqdilakwm2ab0xpzqibjycds62ad4yw774";
+    patches = [ ./patches/disable-lockfile-check.patch ]
+      ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+    inherit targets;
+    inherit targetPatches;
+    inherit targetToolchains;
+    inherit rustPlatform;
+  };
+
+  cargo = callPackage ./cargo.nix rec {
+    version = "0.10.0";
+    srcRev = "refs/tags/${version}";
+    srcSha = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2";
+    depsSha256 = "0js4697n7v93wnqnpvamhp446w58llj66za5hkd6wannmc0gsy3b";
+    inherit rustc; # the rustc that will be wrapped by cargo
+    inherit rustPlatform; # used to build cargo
+  };
+}
diff --git a/pkgs/development/tools/build-managers/cargo/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
similarity index 53%
rename from pkgs/development/tools/build-managers/cargo/bootstrap.nix
rename to pkgs/development/compilers/rust/bootstrap.nix
index c4052232a8bb..300f69294532 100644
--- a/pkgs/development/tools/build-managers/cargo/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, cacert, zlib, rustc }:
+{ stdenv, fetchurl, makeWrapper, cacert, zlib }:
 
 let
   platform =
@@ -23,28 +23,56 @@ let
     else if stdenv.system == "x86_64-darwin"
     then "d59b5509e69c1cace20a57072e3b3ecefdbfd8c7e95657b0ff2ac10aa1dfebe6"
     else throw "missing boostrap hash for platform ${stdenv.system}";
-in
-stdenv.mkDerivation rec {
-  name = "cargo-bootstrap-${version}";
-  version = "1.9.0";
 
   src = fetchurl {
      url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz";
      sha256 = bootstrapHash;
   };
 
-  passthru.rustc = rustc;
-  buildInputs = [makeWrapper zlib];
-  phases = ["unpackPhase" "installPhase"];
+  version = "1.9.0";
+in
 
-  installPhase = ''
-    cp -r cargo "$out"
+rec {
+  rustc = stdenv.mkDerivation rec {
+    name = "rustc-bootstrap-${version}";
 
-    patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      "$out/bin/cargo"
+    inherit version;
+    inherit src;
 
-    wrapProgram "$out/bin/cargo" \
-      --suffix PATH : "${rustc}/bin"
-  '';
+    buildInputs = [ makeWrapper ];
+    phases = ["unpackPhase" "installPhase"];
+
+    installPhase = ''
+      ./install.sh --prefix=$out \
+        --components=rustc,rust-std-${platform},rust-docs
+
+      patchelf \
+        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+        "$out/bin/rustc"
+
+      wrapProgram "$out/bin/rustc"
+    '';
+  };
+
+  cargo = stdenv.mkDerivation rec {
+    name = "cargo-bootstrap-${version}";
+
+    inherit version;
+    inherit src;
+
+    buildInputs = [ makeWrapper zlib rustc ];
+    phases = ["unpackPhase" "installPhase"];
+
+    installPhase = ''
+      ./install.sh --prefix=$out \
+        --components=cargo
+
+      patchelf \
+        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+        "$out/bin/cargo"
+
+      wrapProgram "$out/bin/cargo" \
+        --suffix PATH : "${rustc}/bin"
+    '';
+  };
 }
diff --git a/pkgs/development/tools/build-managers/cargo/generic.nix b/pkgs/development/compilers/rust/cargo.nix
similarity index 98%
rename from pkgs/development/tools/build-managers/cargo/generic.nix
rename to pkgs/development/compilers/rust/cargo.nix
index 4f74166bf625..fc4bf732cf6b 100644
--- a/pkgs/development/tools/build-managers/cargo/generic.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     ++ stdenv.lib.optional stdenv.isDarwin libiconv;
 
   configurePhase = ''
-    ./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.cargo}/bin/cargo
+    ./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.rust.cargo}/bin/cargo
   '';
 
   buildPhase = "make";
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
new file mode 100644
index 000000000000..d1e7460fa54c
--- /dev/null
+++ b/pkgs/development/compilers/rust/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform,
+  targets ? [], targetToolchains ? [], targetPatches ? [] }:
+
+let
+  rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}) rustPlatform);
+  rustSnapshotPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./snapshot.nix {}) rustPlatform);
+in
+
+rec {
+  rustc = callPackage ./rustc.nix {
+    shortVersion = "1.9.0";
+    isRelease = true;
+    forceBundledLLVM = false;
+    configureFlags = [ "--release-channel=stable" ];
+    srcRev = "e4e8b666850a763fdf1c3c2c142856ab51e32779";
+    srcSha = "1pz4qx70mqv78fxm4w1mq7csk5pssq4qmr2vwwb5v8hyx03caff8";
+    patches = [ ./patches/remove-uneeded-git.patch ]
+      ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+    inherit targets;
+    inherit targetPatches;
+    inherit targetToolchains;
+    rustPlatform = rustSnapshotPlatform;
+  };
+
+  cargo = callPackage ./cargo.nix rec {
+    version = "0.10.0";
+    srcRev = "refs/tags/${version}";
+    srcSha = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2";
+    depsSha256 = "0js4697n7v93wnqnpvamhp446w58llj66za5hkd6wannmc0gsy3b";
+    inherit rustc; # the rustc that will be wrapped by cargo
+    inherit rustPlatform; # used to build cargo
+  };
+}
diff --git a/pkgs/development/compilers/rust/head.nix b/pkgs/development/compilers/rust/head.nix
new file mode 100644
index 000000000000..bbfe5c9a1529
--- /dev/null
+++ b/pkgs/development/compilers/rust/head.nix
@@ -0,0 +1,27 @@
+{ stdenv, callPackage, rustPlatform,
+  targets ? [], targetToolchains ? [], targetPatches ? [] }:
+
+rec {
+  rustc = callPackage ./rustc.nix {
+    shortVersion = "master-1.11.0";
+    forceBundledLLVM = false;
+    srcRev = "298730e7032cd55809423773da397cd5c7d827d4";
+    srcSha = "0hyz5j1z75sjkgsifzgxviv3b1lhgaz8wqwvmq80xx5vd78yd0c1";
+    patches = [ ./patches/disable-lockfile-check.patch
+                ./patches/use-rustc-1.9.0.patch ]
+      ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+    inherit targets;
+    inherit targetPatches;
+    inherit targetToolchains;
+    inherit rustPlatform;
+  };
+
+  cargo = callPackage ./cargo.nix rec {
+    version = "2016.06.07";
+    srcRev = "3e70312a2a4ebedace131fc63bb8f27463c5db28";
+    srcSha = "0nibzyfjkiqfnq0c00hhqvs856l5qls8wds252p97q5q92yvp40f";
+    depsSha256 = "1xbb33aqnf5yyws6gjys9w8kznbh9rh6hw8mpg1hhq1ahipc2j1f";
+    inherit rustc; # the rustc that will be wrapped by cargo
+    inherit rustPlatform; # used to build cargo
+  };
+}
diff --git a/pkgs/development/compilers/rustc/patches/disable-lockfile-check.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check.patch
similarity index 100%
rename from pkgs/development/compilers/rustc/patches/disable-lockfile-check.patch
rename to pkgs/development/compilers/rust/patches/disable-lockfile-check.patch
diff --git a/pkgs/development/compilers/rustc/patches/grsec.patch b/pkgs/development/compilers/rust/patches/grsec.patch
similarity index 100%
rename from pkgs/development/compilers/rustc/patches/grsec.patch
rename to pkgs/development/compilers/rust/patches/grsec.patch
diff --git a/pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch b/pkgs/development/compilers/rust/patches/remove-uneeded-git.patch
similarity index 100%
rename from pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch
rename to pkgs/development/compilers/rust/patches/remove-uneeded-git.patch
diff --git a/pkgs/development/compilers/rustc/patches/use-rustc-1.9.0.patch b/pkgs/development/compilers/rust/patches/use-rustc-1.9.0.patch
similarity index 100%
rename from pkgs/development/compilers/rustc/patches/use-rustc-1.9.0.patch
rename to pkgs/development/compilers/rust/patches/use-rustc-1.9.0.patch
diff --git a/pkgs/development/tools/build-managers/cargo/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh
similarity index 100%
rename from pkgs/development/tools/build-managers/cargo/print-hashes.sh
rename to pkgs/development/compilers/rust/print-hashes.sh
diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rust/rustc.nix
similarity index 93%
rename from pkgs/development/compilers/rustc/generic.nix
rename to pkgs/development/compilers/rust/rustc.nix
index a08843f494e9..b1b33d57bb25 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
-, llvm, jemalloc, ncurses, darwin, binutils, rustc, git
+, llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git
 
 , isRelease ? false
 , shortVersion
@@ -8,6 +8,7 @@
 , configureFlags ? []
 , patches
 , targets
+, targetPatches
 , targetToolchains
 } @ args:
 
@@ -51,14 +52,14 @@ stdenv.mkDerivation {
 
   # We need rust to build rust. If we don't provide it, configure will try to download it.
   configureFlags = configureFlags
-                ++ [ "--enable-local-rust" "--local-rust-root=${rustc}" "--enable-rpath" ]
+                ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
                 # ++ [ "--jemalloc-root=${jemalloc}/lib"
                 ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
                 ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang"
                 ++ stdenv.lib.optional (targets != []) "--target=${target}"
                 ++ stdenv.lib.optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
 
-  inherit patches;
+  patches = patches ++ targetPatches;
   passthru.target = target;
 
   postPatch = ''
@@ -94,7 +95,7 @@ stdenv.mkDerivation {
   '';
 
   # ps is needed for one of the test cases
-  nativeBuildInputs = [ file python2 procps rustc git ];
+  nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git ];
   buildInputs = [ ncurses ] ++ targetToolchains
     ++ stdenv.lib.optional (!forceBundledLLVM) llvmShared;
 
diff --git a/pkgs/development/compilers/rustc/snapshot.nix b/pkgs/development/compilers/rust/snapshot.nix
similarity index 74%
rename from pkgs/development/compilers/rustc/snapshot.nix
rename to pkgs/development/compilers/rust/snapshot.nix
index 8f7005dc0d76..47f271b18e06 100644
--- a/pkgs/development/compilers/rustc/snapshot.nix
+++ b/pkgs/development/compilers/rust/snapshot.nix
@@ -2,7 +2,7 @@
          This file can be deleted after the 1.10.0 release and bootstrap.nix
          can be used instead
 */
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, callPackage }:
 
 let
   platform = if stdenv.system == "i686-linux"
@@ -43,19 +43,23 @@ let
   snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2";
 in
 
-stdenv.mkDerivation {
-  name = "rust-bootstrap";
-  src = fetchurl {
-    url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
-    sha1 = snapshotHash;
+rec {
+  rustc = stdenv.mkDerivation {
+    name = "rustc-snapshot";
+    src = fetchurl {
+      url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
+      sha1 = snapshotHash;
+    };
+    dontStrip = true;
+    installPhase = ''
+      mkdir -p "$out"
+      cp -r bin "$out/bin"
+    '' + stdenv.lib.optionalString stdenv.isLinux ''
+      patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
+               --set-rpath "${stdenv.cc.cc.lib}/lib/:${stdenv.cc.cc.lib}/lib64/" \
+               "$out/bin/rustc"
+    '';
   };
-  dontStrip = true;
-  installPhase = ''
-    mkdir -p "$out"
-    cp -r bin "$out/bin"
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
-    patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
-             --set-rpath "${stdenv.cc.cc.lib}/lib/:${stdenv.cc.cc.lib}/lib64/" \
-             "$out/bin/rustc"
-  '';
+
+  cargo = null;
 }
diff --git a/pkgs/development/compilers/rustc/beta.nix b/pkgs/development/compilers/rustc/beta.nix
deleted file mode 100644
index 363dc71c02da..000000000000
--- a/pkgs/development/compilers/rustc/beta.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, callPackage, rustcStable, targets ? [], targetToolchains ? [] }:
-
-callPackage ./generic.nix {
-  shortVersion = "beta-1.10.0";
-  forceBundledLLVM = false;
-  configureFlags = [ "--release-channel=beta" ];
-  srcRev = "39f3c16cca889ef3f1719d9177e3315258222a65";
-  srcSha = "01bx6616lslp2mbj4h8bb6m042fs0y1z8g0jgpxvbk3fbhzwafrx";
-  patches = [ ./patches/disable-lockfile-check.patch ] ++
-    stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-  rustc = rustcStable;
-  inherit targets;
-  inherit targetToolchains;
-}
diff --git a/pkgs/development/compilers/rustc/bootstrap.nix b/pkgs/development/compilers/rustc/bootstrap.nix
deleted file mode 100644
index 0361bb78a9ce..000000000000
--- a/pkgs/development/compilers/rustc/bootstrap.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, makeWrapper }:
-
-let
-  platform =
-    if stdenv.system == "i686-linux"
-    then "i686-unknown-linux-gnu"
-    else if stdenv.system == "x86_64-linux"
-    then "x86_64-unknown-linux-gnu"
-    else if stdenv.system == "i686-darwin"
-    then "i686-apple-darwin"
-    else if stdenv.system == "x86_64-darwin"
-    then "x86_64-apple-darwin"
-    else abort "missing boostrap url for platform ${stdenv.system}";
-
-  # fetch hashes by running `print-hashes.sh 1.9.0`
-  bootstrapHash =
-    if stdenv.system == "i686-linux"
-    then "2951dec835827974d03c7aafbf2c969f39bb530e1c200fd46f90bc01772fae39"
-    else if stdenv.system == "x86_64-linux"
-    then "d0704d10237c66c3efafa6f7e5570c59a1d3fe5c6d99487540f90ebb37cd84c4"
-    else if stdenv.system == "i686-darwin"
-    then "c7aa93e2475aa8e65259f606ca70e98da41cf5d2b20f91703b98f9572a84f7e6"
-    else if stdenv.system == "x86_64-darwin"
-    then "7204226b42e9c380d44e722efd4a886178a1867a064c90f12e0553a21a4184c6"
-    else throw "missing boostrap hash for platform ${stdenv.system}";
-in
-stdenv.mkDerivation rec {
-  name = "rustc-bootstrap-${version}";
-  version = "1.9.0";
-  src = fetchurl {
-     url = "https://static.rust-lang.org/dist/rustc-${version}-${platform}.tar.gz";
-     sha256 = bootstrapHash;
-  };
-  buildInputs = [makeWrapper];
-  phases = ["unpackPhase" "installPhase"];
-
-  installPhase = ''
-    mkdir -p "$out"
-    ./install.sh "--prefix=$out"
-
-    patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      "$out/bin/rustc"
-
-    wrapProgram "$out/bin/rustc"
-  '';
-}
diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix
deleted file mode 100644
index dd7fd8a88dab..000000000000
--- a/pkgs/development/compilers/rustc/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ stdenv, callPackage, targets ? [], targetToolchains ? [] }:
-
-callPackage ./generic.nix {
-  shortVersion = "1.9.0";
-  isRelease = true;
-  forceBundledLLVM = false;
-  configureFlags = [ "--release-channel=stable" ];
-  srcRev = "e4e8b666850a763fdf1c3c2c142856ab51e32779";
-  srcSha = "167rh7hs77grn895h54s7np7f0k7b6i8z4wdfinncg4chy08hxq1";
-  patches = [ ./patches/remove-uneeded-git.patch ]
-    ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-  rustc = callPackage ./snapshot.nix {};
-  inherit targets;
-  inherit targetToolchains;
-}
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
deleted file mode 100644
index aa32416c6495..000000000000
--- a/pkgs/development/compilers/rustc/head.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# Please make sure to check if rustfmt still builds when updating nightly
-{ stdenv, callPackage, rustcStable, targets ? [], targetToolchains ? [] }:
-
-callPackage ./generic.nix {
-  shortVersion = "master-1.11.0";
-  forceBundledLLVM = false;
-  srcRev = "298730e7032cd55809423773da397cd5c7d827d4";
-  srcSha = "0hyz5j1z75sjkgsifzgxviv3b1lhgaz8wqwvmq80xx5vd78yd0c1";
-  patches = [ ./patches/disable-lockfile-check.patch
-              ./patches/use-rustc-1.9.0.patch ] ++
-    stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-  rustc = rustcStable;
-  inherit targets;
-  inherit targetToolchains;
-}
diff --git a/pkgs/development/compilers/rustc/print-hashes.sh b/pkgs/development/compilers/rustc/print-hashes.sh
deleted file mode 100755
index 710d4c0b585c..000000000000
--- a/pkgs/development/compilers/rustc/print-hashes.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-PLATFORMS="i686-unknown-linux-gnu x86_64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin"
-BASEURL="https://static.rust-lang.org/dist"
-VERSION=$1
-
-if [[ -z  $VERSION ]]
-then
-    echo "No version supplied"
-    exit -1
-fi
-
-for PLATFORM in $PLATFORMS
-do
-    URL="$BASEURL/rustc-$VERSION-$PLATFORM.tar.gz.sha256"
-    curl $URL
-done
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
deleted file mode 100644
index 253a62e7bbe2..000000000000
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, callPackage, rustc, makeRustPlatform, recurseIntoAttrs }:
-
-let
-  cargoBootstrap = callPackage ./bootstrap.nix {};
-  rustPlatformBootstrap = recurseIntoAttrs (makeRustPlatform cargoBootstrap rustPlatformBootstrap);
-in
-callPackage ./generic.nix rec {
-  version = "0.10.0";
-  srcRev = "refs/tags/${version}";
-  srcSha = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2";
-  depsSha256 = "0js4697n7v93wnqnpvamhp446w58llj66za5hkd6wannmc0gsy3b";
-  inherit rustc;
-  rustPlatform = rustPlatformBootstrap;
-}
diff --git a/pkgs/development/tools/build-managers/cargo/head.nix b/pkgs/development/tools/build-managers/cargo/head.nix
deleted file mode 100644
index 0faaf5e9a719..000000000000
--- a/pkgs/development/tools/build-managers/cargo/head.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, callPackage, rustc, rustPlatform }:
-
-callPackage ./generic.nix rec {
-  version = "2016.06.07";
-  srcRev = "3e70312a2a4ebedace131fc63bb8f27463c5db28";
-  srcSha = "0nibzyfjkiqfnq0c00hhqvs856l5qls8wds252p97q5q92yvp40f";
-  depsSha256 = "1xbb33aqnf5yyws6gjys9w8kznbh9rh6hw8mpg1hhq1ahipc2j1f";
-  inherit rustc;
-  inherit rustPlatform;
-}
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 76f5354d596d..0f4477c9b3ff 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -17,13 +17,13 @@ buildRustPackage rec {
   buildInputs = [ makeWrapper ];
 
   preCheck = ''
-    export RUST_SRC;_PATH="${rustc.src}/src"
+    export RUST_SRC;_PATH="${rustPlatform.rust.rustc.src}/src"
   '';
 
   installPhase = ''
     mkdir -p $out/bin
     cp -p target/release/racer $out/bin/
-    wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustc.src}/src"
+    wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustPlatform.rust.rustc.src}/src"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index a5a3418388d6..d1e3ba8b0cb7 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -17,7 +17,7 @@ buildRustPackage rec {
 
   buildInputs = [ makeWrapper ];
 
-  RUST_SRC_PATH = ''${rustc.src}/src'';
+  RUST_SRC_PATH = ''${rustPlatform.rust.rustc.src}/src'';
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index f6f6f68d89a0..8a36263ebb6a 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,7 +1,7 @@
 # TODO check that no license information gets lost
 { fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
 , which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip
-, vim_configurable, vimPlugins, xkb_switch, git, racerdRust, fzf
+, vim_configurable, vimPlugins, xkb_switch, git, rustracerd, fzf
 , Cocoa ? null
 }:
 
@@ -1116,7 +1116,7 @@ rec {
     ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
     propogatedBuildInputs = [
-      racerdRust
+      rustracerd
     ];
 
     buildPhase = ''
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
index 12bcf53f1e04..a27b1f053a29 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
@@ -5,7 +5,7 @@
     ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
     propogatedBuildInputs = [
-      racerdRust
+      rustracerd
     ];
 
     buildPhase = ''
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index 39ba9bb2e509..14d1417e5a42 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -6,7 +6,7 @@ buildRustPackage rec {
   name = "exa-${version}";
   version = "2016-04-20";
 
-  depsSha256 = "1rpynsni2r3gim10xc1qkj51wpbzafwsr99y61zh41v4vh047g1k";
+  depsSha256 = "0dm8zaxy29pfbq68ysssab9i06sj4azgi3vib9617rklg7w3hdmk";
 
   src = fetchFromGitHub {
     owner = "ogham";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4653fcbb1d5..298c7f1c07ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5261,32 +5261,31 @@ in
 
   rtags = callPackage ../development/tools/rtags/default.nix {};
 
-  rustc = rustcStable;
-  rustcStable = callPackage ../development/compilers/rustc {};
-  rustcBeta = lowPrio (callPackage ../development/compilers/rustc/beta.nix {});
-  rustcUnstable = lowPrio (callPackage ../development/compilers/rustc/head.nix {});
+  rust = rustStable;
+  rustStable = callPackage ../development/compilers/rust {};
+  rustBeta = lowPrio (callPackage ../development/compilers/rust/beta.nix {});
+  rustUnstable = lowPrio (callPackage ../development/compilers/rust/head.nix {});
 
-  cargo = callPackage ../development/tools/build-managers/cargo {};
-  cargoUnstable = lowPrio (callPackage ../development/tools/build-managers/cargo/head.nix {});
+  cargo = rust.cargo;
+  rustc = rust.rustc;
+  rustPlatform = recurseIntoAttrs (makeRustPlatform rust rustPlatform);
 
-  rustPlatform = recurseIntoAttrs (makeRustPlatform cargo rustPlatform);
-
-  makeRustPlatform = cargo: self:
+  makeRustPlatform = rust: self:
     let
       callPackage = newScope self;
     in {
-      inherit cargo;
-
-      rustc = cargo.rustc;
+      inherit rust;
 
       rustRegistry = callPackage ./rust-packages.nix { };
 
       buildRustPackage = callPackage ../build-support/rust {
-        inherit cargo;
+        inherit rust;
       };
     };
 
   rustfmt = callPackage ../development/tools/rust/rustfmt { };
+  rustracer = callPackage ../development/tools/rust/racer { };
+  rustracerd = callPackage ../development/tools/rust/racerd { };
 
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
   sbcl = callPackage ../development/compilers/sbcl {};
@@ -6363,10 +6362,6 @@ in
     withDocumentation = false; # 'true' is currently broken with qt>=5.5
   };
 
-  racerRust = callPackage ../development/tools/rust/racer { };
-
-  racerdRust = callPackage ../development/tools/rust/racerd { };
-
   radare = callPackage ../development/tools/analysis/radare {
     inherit (gnome) vte;
     lua = lua5;
@@ -7494,7 +7489,7 @@ in
   };
   libkrb5 = self.krb5Full.override { type = "lib"; };
 
-  lasso = callPackage ../development/libraries/lasso { };  
+  lasso = callPackage ../development/libraries/lasso { };
 
   LASzip = callPackage ../development/libraries/LASzip { };
 

From 7102c3c0c4eea385f5f2d7b52dab37ba46216356 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Wed, 15 Jun 2016 14:42:32 +0200
Subject: [PATCH 339/436] cura: Fix breakage due to numpy change. (#16234)

Upstream bug report: https://github.com/daid/Cura/issues/1461
---
 pkgs/applications/misc/cura/default.nix      |  2 ++
 pkgs/applications/misc/cura/numpy-cast.patch | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/applications/misc/cura/numpy-cast.patch

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index a711cc1db87c..a53b001b0e98 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
 
   configurePhase = "";
   buildPhase = "";
+  
+  patches = [ ./numpy-cast.patch ];
 
   installPhase = ''
     # Install Python code.
diff --git a/pkgs/applications/misc/cura/numpy-cast.patch b/pkgs/applications/misc/cura/numpy-cast.patch
new file mode 100644
index 000000000000..efb14182b3e6
--- /dev/null
+++ b/pkgs/applications/misc/cura/numpy-cast.patch
@@ -0,0 +1,12 @@
+diff -urN Cura-15.04.old/Cura/util/sliceEngine.py Cura-15.04/Cura/util/sliceEngine.py
+--- Cura-15.04.old/Cura/util/sliceEngine.py	2016-05-07 20:34:17.305020334 +0200
++++ Cura-15.04/Cura/util/sliceEngine.py	2016-05-07 20:40:02.993286467 +0200
+@@ -343,7 +343,7 @@
+ 						objMax[1] = max(oMax[1], objMax[1])
+ 			if objMin is None:
+ 				return
+-			pos += (objMin + objMax) / 2.0 * 1000
++			pos = numpy.add( pos, (objMin + objMax) / 2.0 * 1000, out=pos, casting='unsafe')
+ 			commandList += ['-s', 'posx=%d' % int(pos[0]), '-s', 'posy=%d' % int(pos[1])]
+ 
+ 			vertexTotal = [0] * 4

From 285aee3c1212a9b47d20644f846d0be6e3f16163 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 15 Jun 2016 14:39:29 +0100
Subject: [PATCH 340/436] protobuf3_0: 3.0.0-beta-2 -> 3.0.0-beta-3.1

---
 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 a06d4cef968a..a547dff14cc2 100644
--- a/pkgs/development/libraries/protobuf/3.0.nix
+++ b/pkgs/development/libraries/protobuf/3.0.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "protobuf-${version}";
 
-  version = "3.0.0-beta-2";
+  version = "3.0.0-beta-3.1";
   # make sure you test also -A pythonPackages.protobuf
   src = fetchFromGitHub {
     owner = "google";
     repo = "protobuf";
     rev = "v${version}";
-    sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1";
+    sha256 = "1lj3q1wq821q9h2y2hhbnvyy4nw3gl0x2g0kplyvd6ivrissfcqx";
   };
 
   postPatch = ''

From 2e61bd72a161d2f739049d407d6f8d8e0f933f92 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Wed, 15 Jun 2016 07:19:44 -0700
Subject: [PATCH 341/436] beamPackages: add the ability to override phases

---
 .../beam-modules/build-erlang-mk.nix          | 20 ++++++++++++-----
 pkgs/development/beam-modules/build-mix.nix   | 22 ++++++++++++++-----
 .../development/beam-modules/build-rebar3.nix | 14 ++++++++----
 3 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix
index 8c2b72aa43cf..ef966ebd04f7 100644
--- a/pkgs/development/beam-modules/build-erlang-mk.nix
+++ b/pkgs/development/beam-modules/build-erlang-mk.nix
@@ -8,6 +8,8 @@
 , postPatch ? ""
 , compilePorts ? false
 , installPhase ? null
+, buildPhase ? null
+, configurePhase ? null
 , meta ? {}
 , ... }@attrs:
 
@@ -37,7 +39,8 @@ let
     buildInputs = [ erlang perl which gitMinimal wget ];
     propagatedBuildInputs = beamDeps;
 
-    configurePhase = ''
+    configurePhase = if configurePhase == null
+    then ''
       runHook preConfigure
 
       # We shouldnt need to do this, but it seems at times there is a *.app in
@@ -45,17 +48,21 @@ let
       make SKIP_DEPS=1 clean
 
       runHook postConfigure
-    '';
+    ''
+    else configurePhase;
 
-    buildPhase = ''
+    buildPhase = if buildPhase == null
+    then ''
         runHook preBuild
 
         make SKIP_DEPS=1
 
         runHook postBuild
-    '';
+    ''
+    else buildPhase;
 
-    installPhase = ''
+    installPhase =  if installPhase == null
+    then ''
         runHook preInstall
 
         mkdir -p $out/lib/erlang/lib/${name}
@@ -75,7 +82,8 @@ let
         fi
 
         runHook postInstall
-    '';
+    ''
+    else installPhase;
 
     passthru = {
       packageName = name;
diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix
index 70c186df8a06..3af7ff6f92c7 100644
--- a/pkgs/development/beam-modules/build-mix.nix
+++ b/pkgs/development/beam-modules/build-mix.nix
@@ -8,6 +8,9 @@
 , beamDeps ? []
 , postPatch ? ""
 , compilePorts ? false
+, installPhase ? null
+, buildPhase ? null
+, configurePhase ? null
 , meta ? {}
 , ... }@attrs:
 
@@ -38,13 +41,17 @@ let
     inherit buildInputs;
     propagatedBuildInputs = [ hexRegistrySnapshot hex elixir ] ++ beamDeps;
 
-    configurePhase = ''
+    configurePhase = if configurePhase == null
+    then ''
       runHook preConfigure
       ${erlang}/bin/escript ${bootstrapper}
       runHook postConfigure
-    '';
+    ''
+    else configurePhase ;
 
-    buildPhase = ''
+
+    buildPhase = if buildPhase == null
+    then ''
         runHook preBuild
 
         export HEX_OFFLINE=1
@@ -54,9 +61,11 @@ let
         MIX_ENV=prod mix compile --debug-info --no-deps-check
 
         runHook postBuild
-    '';
+    ''
+    else buildPhase;
 
-    installPhase = ''
+    installPhase = if installPhase == null
+    then ''
         runHook preInstall
 
         MIXENV=prod
@@ -74,7 +83,8 @@ let
         done
 
         runHook postInstall
-    '';
+    ''
+    else installPhase;
 
     passthru = {
       packageName = name;
diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix
index f13322519fd8..abf2d1188ddc 100644
--- a/pkgs/development/beam-modules/build-rebar3.nix
+++ b/pkgs/development/beam-modules/build-rebar3.nix
@@ -8,6 +8,8 @@
 , postPatch ? ""
 , compilePorts ? false
 , installPhase ? null
+, buildPhase ? null
+, configurePhase ? null
 , meta ? {}
 , ... }@attrs:
 
@@ -46,20 +48,24 @@ let
       rm -f rebar rebar3
     '';
 
-    configurePhase = ''
+    configurePhase = if configurePhase == null
+    then ''
       runHook preConfigure
       ${erlang}/bin/escript ${rebar3.bootstrapper}
       runHook postConfigure
-    '';
+    ''
+    else configurePhase;
 
-    buildPhase = ''
+    buildPhase = if buildPhase == null
+    then ''
       runHook preBuild
       HOME=. rebar3 compile
       ${if compilePorts then ''
         HOME=. rebar3 pc compile
       '' else ''''}
       runHook postBuild
-    '';
+    ''
+    else installPhase;
 
     installPhase = if installPhase == null
     then ''

From de4013367349b38ca44ea59805640b76a2f01102 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@sunlightpayments.com>
Date: Wed, 15 Jun 2016 07:14:59 -0700
Subject: [PATCH 342/436] beamPackages: point to new cdn for tarballs

---
 pkgs/development/beam-modules/fetch-hex.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix
index 1b1378c10cbd..c55a7a80ff39 100644
--- a/pkgs/development/beam-modules/fetch-hex.nix
+++ b/pkgs/development/beam-modules/fetch-hex.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation ({
   name = "hex-source-${pkg}-${version}";
 
   src = fetchurl {
-    url = "https://s3.amazonaws.com/s3.hex.pm/tarballs/${pkg}-${version}.tar";
+    url = "https://repo.hex.pm/tarballs/${pkg}-${version}.tar";
     inherit sha256;
   };
 

From b1cd08246fa51d3b018ae92f1e58a79844e44859 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@sunlightpayments.com>
Date: Wed, 15 Jun 2016 07:15:06 -0700
Subject: [PATCH 343/436] beamPackages: turn on debug_info for beam packages

This allows you to turn on debug infor for all the beam packages in the
system with a single change at the top level. This is required for
debugging and dialyzer work. It also allows you to switch it on on a
package by package basis.
---
 .../beam-modules/build-erlang-mk.nix          |  7 ++-
 pkgs/development/beam-modules/build-mix.nix   |  8 ++-
 .../development/beam-modules/build-rebar3.nix |  7 ++-
 .../interpreters/elixir/default.nix           |  2 +
 pkgs/development/interpreters/erlang/R16.nix  |  5 +-
 pkgs/development/interpreters/erlang/R17.nix  |  3 +
 pkgs/development/interpreters/erlang/R18.nix  |  3 +
 .../rebar3/rebar3-nix-bootstrap               | 56 +++++++++++++++----
 8 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix
index ef966ebd04f7..110c06e6f8ad 100644
--- a/pkgs/development/beam-modules/build-erlang-mk.nix
+++ b/pkgs/development/beam-modules/build-erlang-mk.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, erlang, perl, which, gitMinimal, wget }:
+{ stdenv, writeText, erlang, perl, which, gitMinimal, wget, lib }:
 
 { name, version
 , src
@@ -11,11 +11,14 @@
 , buildPhase ? null
 , configurePhase ? null
 , meta ? {}
+, enableDebugInfo ? false
 , ... }@attrs:
 
 with stdenv.lib;
 
 let
+  debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info";
+
   shell = drv: stdenv.mkDerivation {
           name = "interactive-shell-${drv.name}";
           buildInputs = [ drv ];
@@ -55,7 +58,7 @@ let
     then ''
         runHook preBuild
 
-        make SKIP_DEPS=1
+        make SKIP_DEPS=1 ERL_OPTS="$ERL_OPTS ${debugInfoFlag}"
 
         runHook postBuild
     ''
diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix
index 3af7ff6f92c7..9e160acf2d40 100644
--- a/pkgs/development/beam-modules/build-mix.nix
+++ b/pkgs/development/beam-modules/build-mix.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, elixir, erlang, hexRegistrySnapshot, hex }:
+{ stdenv, writeText, elixir, erlang, hexRegistrySnapshot, hex, lib }:
 
 { name
 , version
@@ -12,11 +12,15 @@
 , buildPhase ? null
 , configurePhase ? null
 , meta ? {}
+, enableDebugInfo ? false
 , ... }@attrs:
 
 with stdenv.lib;
 
 let
+
+  debugInfoFlag = lib.optionalString (enableDebugInfo || elixir.debugInfo) "--debug-info";
+
   shell = drv: stdenv.mkDerivation {
           name = "interactive-shell-${drv.name}";
           buildInputs = [ drv ];
@@ -58,7 +62,7 @@ let
         export HEX_HOME=`pwd`
         export MIX_ENV=prod
 
-        MIX_ENV=prod mix compile --debug-info --no-deps-check
+        MIX_ENV=prod mix compile ${debugInfoFlag} --no-deps-check
 
         runHook postBuild
     ''
diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix
index abf2d1188ddc..ac40b76a78af 100644
--- a/pkgs/development/beam-modules/build-rebar3.nix
+++ b/pkgs/development/beam-modules/build-rebar3.nix
@@ -1,5 +1,5 @@
 { stdenv, writeText, erlang, rebar3, openssl, libyaml,
-  pc, buildEnv }:
+  pc, buildEnv, lib }:
 
 { name, version
 , src
@@ -11,11 +11,14 @@
 , buildPhase ? null
 , configurePhase ? null
 , meta ? {}
+, enableDebugInfo ? false
 , ... }@attrs:
 
 with stdenv.lib;
 
 let
+  debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info";
+
   ownPlugins = buildPlugins ++ (if compilePorts then [pc] else []);
 
   shell = drv: stdenv.mkDerivation {
@@ -51,7 +54,7 @@ let
     configurePhase = if configurePhase == null
     then ''
       runHook preConfigure
-      ${erlang}/bin/escript ${rebar3.bootstrapper}
+      ${erlang}/bin/escript ${rebar3.bootstrapper} ${debugInfoFlag}
       runHook postConfigure
     ''
     else configurePhase;
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index b72b6e360197..5d977ea799ac 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
+  inherit debugInfo;
+
   buildFlags = if debugInfo
    then "ERL_COMPILER_OPTIONS=debug_info"
    else "";
diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix
index 6eb89bbf89be..7323fafaf97a 100644
--- a/pkgs/development/interpreters/erlang/R16.nix
+++ b/pkgs/development/interpreters/erlang/R16.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, perl, gnum4, ncurses, openssl
 , gnused, gawk, makeWrapper
 , odbcSupport ? false, unixODBC ? null
-, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null }:
+, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null
+, enableDebugInfo ? false }:
 
 assert wxSupport -> mesa != null && wxGTK != null && xorg != null;
 assert odbcSupport -> unixODBC != null;
@@ -17,6 +18,8 @@ stdenv.mkDerivation rec {
     sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp";
   };
 
+  debugInfo = enableDebugInfo;
+
   buildInputs =
     [ perl gnum4 ncurses openssl makeWrapper
     ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ]
diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix
index c597a44a890e..cb29341689de 100644
--- a/pkgs/development/interpreters/erlang/R17.nix
+++ b/pkgs/development/interpreters/erlang/R17.nix
@@ -5,6 +5,7 @@
 , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null
 , javacSupport ? false, openjdk ? null
 , enableHipe ? true
+, enableDebugInfo ? false
 }:
 
 assert wxSupport -> (if stdenv.isDarwin
@@ -35,6 +36,8 @@ stdenv.mkDerivation rec {
 
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
 
+  debugInfo = enableDebugInfo;
+
   preConfigure = ''
     export HOME=$PWD/../
     sed -e s@/bin/pwd@pwd@g -i otp_build
diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix
index 42289d2467b1..0929495ee1be 100644
--- a/pkgs/development/interpreters/erlang/R18.nix
+++ b/pkgs/development/interpreters/erlang/R18.nix
@@ -5,6 +5,7 @@
 , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null
 , javacSupport ? false, openjdk ? null
 , enableHipe ? true
+, enableDebugInfo ? false
 }:
 
 assert wxSupport -> (if stdenv.isDarwin
@@ -33,6 +34,8 @@ stdenv.mkDerivation rec {
       ++ optional javacSupport openjdk
       ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
 
+  debugInfo = enableDebugInfo;
+
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
 
   preConfigure = ''
diff --git a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
index 4784f2224cc9..30ff235d12cf 100755
--- a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
+++ b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
@@ -26,6 +26,7 @@
 
 -record(data, {version
               , registry_only = false
+              , debug_info = false
               , compile_ports
               , erl_libs
               , plugins
@@ -54,21 +55,29 @@ do_the_bootstrap(RequiredData) ->
 %% @doc
 %% Argument parsing is super simple only because we want to keep the
 %% dependencies minimal. For now there can be two entries on the
-%% command line, "registery-only"
+%% command line, "registery-only" and "debug-info"
 -spec parse_args([string()]) -> #data{}.
-parse_args(["registry-only"]) ->
-    {ok, #data{registry_only = true}};
-parse_args([]) ->
-    {ok, #data{registry_only = false}};
-parse_args(Args) ->
-    io:format("Unexpected command line arguments passed in: ~p~n", [Args]),
-    erlang:halt(120).
+parse_args(Args0) ->
+    PossibleArgs = sets:from_list(["registry-only", "debug-info"]),
+    Args1 = sets:from_list(Args0),
+    Result = sets:subtract(Args1, PossibleArgs),
+    case sets:to_list(Result) of
+        [] ->
+            {ok, #data{registry_only = sets:is_element("registry-only", Args1),
+                       debug_info = sets:is_element("debug-info", Args1)}};
+        UnknownArgs ->
+            io:format("Unexpected command line arguments passed in: ~p~n",
+                      [UnknownArgs]),
+            erlang:halt(120)
+    end.
+
 
 -spec bootstrap_configs(#data{}) -> ok.
 bootstrap_configs(RequiredData)->
     io:format("Boostrapping app and rebar configurations~n"),
     ok = if_single_app_project_update_app_src_version(RequiredData),
-    ok = if_compile_ports_add_pc_plugin(RequiredData).
+    ok = if_compile_ports_add_pc_plugin(RequiredData),
+    ok = if_debug_info_add(RequiredData).
 
 -spec bootstrap_plugins(#data{}) -> ok.
 bootstrap_plugins(#data{plugins = Plugins}) ->
@@ -198,6 +207,33 @@ guard_env(Name) ->
             Variable
     end.
 
+%% @doc
+%% If debug info is set we need to add debug info to the list of compile options
+%%
+-spec if_debug_info_add(#data{}) -> ok.
+if_debug_info_add(#data{debug_info = true}) ->
+    ConfigTerms = add_debug_info(read_rebar_config()),
+    Text = lists:map(fun(Term) -> io_lib:format("~tp.~n", [Term]) end,
+                     ConfigTerms),
+    file:write_file("rebar.config", Text);
+if_debug_info_add(_) ->
+    ok.
+
+-spec add_debug_info([term()]) -> [term()].
+add_debug_info(Config) ->
+    ExistingOpts = case lists:keysearch(erl_opts, 1, Config) of
+                       {value, {erl_opts, ExistingOptsList}} -> ExistingOptsList;
+                       _ -> []
+                   end,
+    case lists:member(debug_info, ExistingOpts) of
+        true ->
+            Config;
+        false ->
+            lists:keystore(erl_opts, 1, Config,
+                           {erl_opts, [debug_info | ExistingOpts]})
+    end.
+
+
 %% @doc
 %% If the compile ports flag is set, rewrite the rebar config to
 %% include the 'pc' plugin.
@@ -213,7 +249,7 @@ if_compile_ports_add_pc_plugin(_) ->
 -spec add_pc_to_plugins([term()]) -> [term()].
 add_pc_to_plugins(Config) ->
     PluginList = case lists:keysearch(plugins, 1, Config) of
-                     {ok, {plugins, ExistingPluginList}} -> ExistingPluginList;
+                     {value, {plugins, ExistingPluginList}} -> ExistingPluginList;
                      _ -> []
                  end,
     lists:keystore(plugins, 1, Config, {plugins, [pc | PluginList]}).

From 346fb6c3baa08542093d6f66027f2cb5c8d967b9 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@sunlightpayments.com>
Date: Wed, 15 Jun 2016 07:15:13 -0700
Subject: [PATCH 344/436] beamPackages: update registry snapshot to d58a937

---
 pkgs/development/beam-modules/hex-registry-snapshot.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/hex-registry-snapshot.nix b/pkgs/development/beam-modules/hex-registry-snapshot.nix
index 3c2690c01036..b4f02a127c00 100644
--- a/pkgs/development/beam-modules/hex-registry-snapshot.nix
+++ b/pkgs/development/beam-modules/hex-registry-snapshot.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
     name = "hex-registry";
-    rev = "59b836d";
+    rev = "d58a937";
     version = "0.0.0+build.${rev}";
 
     src = fetchFromGitHub {
         owner = "erlang-nix";
         repo = "hex-pm-registry-snapshots";
         inherit rev;
-        sha256 = "1l8m6ckn5ivhfiv3k4dymi6b7wg511fwymnpxd6ymfd39dq0n5b0";
+        sha256 = "11ymmn75qjlhzf7aaza708gq0hqg55dzd3q13npgq43wg90rgpxy";
     };
 
     installPhase = ''

From 864a0816c468a9de91377dea7bfd6b5115669a9d Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@sunlightpayments.com>
Date: Wed, 15 Jun 2016 07:15:16 -0700
Subject: [PATCH 345/436] rebar3: remove no longer needed registrySnapshot.nix

---
 .../rebar3/registrySnapshot.nix               | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix

diff --git a/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix b/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix
deleted file mode 100644
index 378fb382f952..000000000000
--- a/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{stdenv, writeText, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-    name = "hex-registry";
-    rev = "329ae2b";
-    version = "0.0.0+build.${rev}";
-
-    src = fetchFromGitHub {
-        owner = "erlang-nix";
-        repo = "hex-pm-registry-snapshots";
-        inherit rev;
-        sha256 = "1rs3z8psfvy10mzlfvkdzbflgikcnq08r38kfi0f8p5wvi8f8hmh";
-    };
-
-    installPhase = ''
-       mkdir -p "$out/var/hex"
-       zcat "registry.ets.gz" > "$out/var/hex/registry.ets"
-    '';
-
-    setupHook = writeText "setupHook.sh" ''
-        export HEX_REGISTRY_SNAPSHOT="$1/var/hex/registry.ets"
-   '';
-}

From eeed6411ce6f1b9a6028dc1f521f35643bfd5901 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Wed, 15 Jun 2016 07:21:18 -0700
Subject: [PATCH 346/436] beamPackages: update packages from Hex.pm

Pull in the latest package set from hex
---
 .../development/beam-modules/hex-packages.nix | 21539 +++++++++++-----
 1 file changed, 15543 insertions(+), 5996 deletions(-)

diff --git a/pkgs/development/beam-modules/hex-packages.nix b/pkgs/development/beam-modules/hex-packages.nix
index 1fcbb6f3e510..b77d5e6c589a 100644
--- a/pkgs/development/beam-modules/hex-packages.nix
+++ b/pkgs/development/beam-modules/hex-packages.nix
@@ -2,109 +2,95 @@
 
 /* Unbuildable packages:
 
+ * absinthe_relay_0_9_3
  * active_0_9_0
+ * addict_0_2_5
  * address_us_0_1_1
- * aeacus_0_3_0
  * airbrake_0_1_0
  * airbrake_plug_0_1_1
- * airbrakex_0_0_6
- * airbrakify_0_0_1
- * algolia_0_3_1
- * alice_0_3_3
- * alice_against_humanity_0_1_2
- * alice_google_images_0_1_3
- * alice_karma_0_1_1
- * alice_shizzle_0_1_2
- * alice_xkcd_0_0_3
- * amazon_product_advertising_client_0_1_1
+ * airbrakex_0_0_8
+ * alembic_2_1_0
+ * algolia_0_3_2
+ * alphonse_0_1_0
  * amqp_0_1_1
  * amqp_0_1_4
  * amqp_client_3_5_6
  * amrita_0_4_0
- * anilixir_1_0_0
+ * angellist_0_0_0
  * anubis_0_1_0
  * anubis_0_3_0
  * apache_passwd_md5_1_0_0
  * apostle_0_0_3
- * arc_0_5_1
- * arc_ecto_0_3_2
+ * arc_0_5_2
+ * arc_ecto_0_4_1
+ * as_nested_set_0_1_0
  * asanaficator_0_0_1
- * assembla_api_0_1_0
  * atlas_0_2_0
- * aws_0_0_10
+ * authable_0_3_1
  * aws_erlang_0_1_1
  * aws_http_0_2_4
- * b2_0_0_6
+ * b2_client_0_0_1
  * backoff_1_1_3
  * balanced_3_1_0
- * bamboo_0_3_2
- * bamboo_0_4_0
  * bamboo_sendgrid_0_1_0
  * bandwidth_1_2_1
  * barrel_jiffy_0_14_4
  * barrel_jiffy_0_14_5
- * basehangul_0_2_0
- * basho_stats_1_0_3
+ * basehangul_0_2_1
+ * basho_exometer_core_1_0_0
  * basic_auth_1_0_0
- * battlenet_0_0_2
- * bbsmq_0_0_4
+ * bbmustache_1_0_1
+ * bbsmq_0_0_6
  * beaker_1_2_0
  * benchwarmer_0_0_2
  * bencoder_0_0_7
  * bertex_1_2_0
  * bgg_0_1_0
- * big_query_0_0_2
- * bing_translator_0_2_6
  * bitbucket_api_0_0_2
  * bitpay_0_2_5
  * blackbook_0_3_1
- * blaze_cloud_0_0_1
  * block_timer_0_0_1
- * blockchain_info_0_0_1
- * bloodhound_0_1_1
  * bno055_0_0_1
  * booter_0_1_0
- * botan_0_1_2
  * bottler_0_5_0
  * bouncer_0_1_5
  * brady_0_0_2
- * braintree_0_3_2
+ * brod_2_1_4
  * bson_0_4_4
- * bugsnag_1_2_0
- * bugsnag_erl_0_1_3
+ * bugsnag_erl_0_1_4
+ * bugsnex_0_0_1
  * bump_0_1_0
- * bureaucrat_0_1_2
- * butler_0_7_0
+ * bureaucrat_0_1_4
+ * butler_0_6_2
  * butler_0_7_1
  * butler_cage_0_0_2
  * butler_cowsay_0_2_1
  * butler_new_0_4_3
  * butler_tableflip_0_0_3
  * cache_tab_1_0_2
- * calecto_0_5_2
+ * calecto_0_6_0
+ * calendar_0_16_0
+ * calendar_0_6_8
+ * calendar_translations_0_0_3
+ * can_0_0_4
  * canada_1_0_0
  * canary_0_14_1
  * carrier_1_0_4
- * cassette_1_0_0
- * cassette_plug_1_0_1
  * cassius_0_0_1
  * cauldron_0_1_5
- * caylir_0_2_0
  * ccc_0_0_2
- * cep_0_0_1
+ * certifi_0_1_1
  * cesso_0_1_3
  * cet_0_2_3
- * chaos_spawn_0_7_0
+ * channels_0_0_2
  * charlotte_0_4_0
  * charm_0_0_1
- * chatter_0_0_14
- * chinese_translation_0_1_0
- * cipher_1_0_0
+ * chatter_0_0_15
+ * cipher_1_0_5
  * cldr_0_0_1
  * cleverbot_0_0_1
- * clicksign_0_0_2
- * cloak_0_2_0
- * cloudex_0_0_2
+ * cloak_0_2_2
+ * cloudi_core_1_4_0_rc_4
  * cloudi_core_1_5_1
  * cloudi_service_api_requests_1_5_1
  * cloudi_service_db_1_5_1
@@ -132,723 +118,859 @@
  * cloudi_service_udp_1_5_1
  * cloudi_service_validate_1_5_1
  * cloudi_service_zeromq_1_5_1
- * cloudinary_0_0_2
- * cloudinaryex_0_0_2
  * clox_0_1_3
- * cmark_0_6_8
  * coinbase_0_0_1
- * coincap_io_0_0_1
- * comeonin_1_6_0
- * comeonin_2_0_3
- * comeonin_2_1_1
- * comeonin_2_3_0
- * comeonin_ecto_password_0_0_3
+ * comeonin_ecto_password_2_0_0_rc_0
  * commerce_billing_0_0_2
- * comredis_1_0_0
+ * concierge_0_0_1
  * conferl_0_0_1
- * conform_0_10_5
- * conform_0_11_0
+ * conform_0_16_0
+ * conform_1_0_0_rc8
+ * conform_2_0_0
+ * conform_exrm_1_0_0
  * console_0_0_1
  * consul_1_0_3
  * core_0_14_1
- * core_data_0_1_0
- * couchbeam_1_3_0
  * couchdb_client_0_2_5
- * couchdb_connector_0_2_0
+ * couchdb_connector_0_3_0
  * countries_1_1_2
+ * countries_erlang_0_2_0
  * courier_web_0_0_8
- * coverex_1_4_8
+ * coverex_1_4_9
  * cowboy_oauth_0_2_14
+ * cowboy_routes_tree_0_2_0
+ * cpg_1_4_0
  * cpg_1_5_1
+ * cqrex_0_0_1
  * craterl_0_2_3
- * crc_0_4_0
  * crudex_0_0_2
  * crypto_ext_0_1_3
  * cure_0_4_1
- * current_streak_ex_0_1_1
  * currently_0_0_3
  * datomex_0_0_5
  * datomic_gen_server_2_0_1
+ * dayron_0_1_1
  * db_0_9_0
  * dbschema_0_2_0
  * dbus_0_5_0
  * ddb_client_0_1_17
- * dealer_0_8_0
+ * ddb_client_0_1_21
+ * ddb_connection_0_1_3
  * decimal_0_2_5
+ * decorators_0_1_0
  * denrei_0_2_3
  * descriptive_statistics_0_0_1
- * deviant_elixir_0_0_4
  * dexts_0_2_1
- * di_0_1_0
  * dialyze_0_1_4
  * diane_0_0_1
  * dicer_0_8_0
  * dicks_0_1_0
- * digoc_0_3_3
- * diplomat_0_0_1
+ * difficult_0_0_2
+ * diplomat_0_0_3
  * discount_0_7_0
  * discovery_0_5_7
- * distance_api_matrix_2_0_0
+ * distance_api_matrix_2_0_1
  * dns_0_0_3
- * dnsimple_0_0_1
  * docker_0_3_0
  * dotenv_0_0_4
  * dotenv_elixir_0_0_2
- * dovetail_0_0_3
  * dpd_client_0_0_6
  * dproto_0_1_12
- * dqe_0_1_33
+ * dproto_0_1_16
+ * dqe_0_2_2
+ * dqe_fun_0_1_1
+ * dqe_idx_ddb_0_1_13
+ * dqe_idx_pg_0_1_29
+ * drawille_0_0_1
  * dropbox_0_0_7
- * dublin_bus_api_0_1_6
- * e_quip_0_0_1
+ * earmark_0_1_0
  * ecc_0_1_3
- * echonest_ex_0_0_2
+ * ecdo_0_1_4
+ * ecrontab_0_2_0
  * ecto_0_2_4
- * ecto_0_2_7
- * ecto_0_5_1
- * ecto_2_0_0_beta_2
- * ecto_enum_0_3_0
+ * ecto_2_0_0_beta_0
+ * ecto_2_0_0_rc_5
+ * ecto_enum_0_3_1
+ * ecto_factory_0_0_1
  * ecto_fixtures_0_0_2
+ * ecto_gettext_0_1_6
  * ecto_hstore_0_0_1
  * ecto_it_0_2_0
  * ecto_lazy_float_0_1_2
- * ecto_ldap_0_2_4
+ * ecto_ldap_0_2_8
  * ecto_migrate_0_6_3
  * ecto_ordered_0_0_2
+ * ecto_state_machine_0_0_4
  * ecto_validation_case_0_1_1
+ * ectograph_0_0_8
  * ectoo_0_0_4
  * ectophile_0_3_0
  * eden_0_1_3
  * edgarex_0_0_2
- * edown_0_7_0
  * efrisby_0_2_0
- * ejabberd_16_2_0
+ * egithub_0_2_6
+ * eini_1_2_1
+ * ejabberd_16_4_1
  * ekstat_0_2_2
- * elastex_0_1_2
- * elastix_0_1_0
- * elaxtic_0_0_1
+ * elastix_0_2_0
  * eleveldb_2_1_3
  * elibphonenumber_0_1_1
  * elistrix_0_0_5
  * elixilorem_0_0_1
  * elixir_ale_0_4_1
+ * elixir_ale_0_5_3
+ * elixir_drawille_0_0_3
  * elixir_ipfs_api_0_1_0
  * elixir_locker_0_1_4
- * elixir_nsq_1_0_3
- * elixir_talk_1_0_1
- * elixtagram_0_2_5
+ * elixometer_1_2_1
+ * elixtagram_0_2_7
+ * elixush_0_0_4
+ * elli_xpblfe_0_1_1
  * elmit_0_0_1
- * email_checker_0_0_3
+ * emodel_1_3_1
  * enotify_0_1_0
  * ensq_0_1_6
  * env_conf_0_3_0
- * epgpool_1_0_0
  * eplugin_0_1_4
  * epubnub_0_1_0
- * eredis_cluster_0_5_4
+ * eql_0_1_2
+ * eredis_cluster_0_5_7
  * erlang_dbus_0_2_0
  * erlang_lua_0_1_0
- * erlastic_search_1_1_1
- * erlcloud_0_9_2
+ * erlang_osc_1_0_1
+ * erlang_tls_1_0_3
+ * erlastic_search_1_2_0
+ * erlcloud_0_13_4
  * erldn_1_0_5
- * erlexec_1_1_1
+ * erldyn_0_7_2
+ * erlogger_0_1_0
  * erltrace_0_1_4
- * erlzk_0_6_1
  * erocksdb_0_4_1
  * erwatch_0_3_0
  * es_0_0_1
  * escalus_2_6_4
- * esip_1_0_2
- * espec_0_8_16
- * espec_phoenix_0_2_0
- * esqlite_0_2_2
+ * esip_1_0_4
+ * espec_phoenix_0_2_1
  * etcd_0_0_2
- * etherchain_org_0_0_3
+ * etude_request_0_1_0
  * euler_0_0_1
  * event_source_encoder_0_0_3
- * eventstore_client_0_1_4
  * everex_0_1_1
  * everyoneapi_0_0_1
+ * everything_location_0_0_1
+ * ex_admin_0_7_6
  * ex_aerospike_0_0_1
- * ex_aws_0_4_18
+ * ex_aws_0_4_19
  * ex_bitcask_0_1_0
- * ex_chimp_0_0_1
- * ex_closeio_0_0_12
- * ex_cloudinary_0_1_2
+ * ex_chimp_0_0_2
+ * ex_cloudinary_0_2_2
  * ex_conf_0_1_2
  * ex_conf_0_1_3
- * ex_crypto_0_0_1
+ * ex_doc_0_10_0
+ * ex_doc_0_11_5
+ * ex_doc_0_8_4
+ * ex_doc_dash_0_3_0
+ * ex_doc_epub_0_0_2
  * ex_dockerapi_0_0_1
  * ex_edn_0_1_2
- * ex_iss_1_0_0
- * ex_omegle_0_1_1
- * ex_orient_1_1_1
+ * ex_hubic_0_1_0
+ * ex_orient_1_3_0
+ * ex_ovh_0_1_2
  * ex_parsec_0_2_1
+ * ex_queb_0_1_2
+ * ex_sharp_0_0_6
+ * ex_slp_0_1_0
  * ex_unit_emacs_0_1_2
- * exalice_0_0_5_alpha
  * exauth_0_0_1
  * excheck_0_3_3
  * excountries_0_0_3
- * excoveralls_0_5_1
- * exddb_0_1_3
- * exdesk_0_2_0
+ * excoveralls_0_5_4
  * exdjango_0_3_1
+ * exdm_0_0_4
  * exdn_2_1_2
+ * exdns_0_0_1
  * exdweet_0_0_1
  * exeque_0_1_0
- * exfavicon_0_3_2
  * exfile_0_1_5
- * exfile_0_2_0
- * exfile_b2_0_1_3
- * exfile_imagemagick_0_1_1
+ * exfile_0_3_3
+ * exfile_b2_0_2_2
+ * exfile_encryption_0_0_2
+ * exfile_imagemagick_0_1_2
  * exfile_memory_0_1_0
- * exfoaas_0_0_2
- * exgenius_0_0_5
+ * exfile_s3_0_0_1
  * exgpg_0_0_3
  * exgrid_0_3_0
- * exhal_4_2_1
+ * exhal_4_12_3
  * exintercom_0_1_6
  * exjira_0_0_1
  * exjprop_0_0_5
  * exkad_0_0_2
- * exkismet_0_0_2
+ * exmagick_0_0_1
  * exometer_core_1_0_0
+ * exometer_core_1_4_0
+ * exometer_datadog_0_4_3
+ * exometer_zabbix_0_0_3
  * exos_1_0_0
- * exparticle_0_0_2
  * expcap_0_1_0
  * exprotobuf_0_10_2
  * exprotobuf_0_13_0
  * exprotobuf_1_0_0
+ * exquery_0_0_11
  * exrabbit_0_0_2
  * exrecaptcha_0_0_3
+ * exrm_0_14_10
  * exrm_0_14_17
- * exrm_0_14_2
  * exrm_0_18_8
- * exrm_rpm_0_3_0
+ * exrm_0_19_9
  * exseed_0_0_3
- * exsentry_0_3_0
+ * exsentry_0_5_0
  * exsyslog_1_0_1
- * extreme_0_5_0
- * extripe_0_3_2
- * exts_0_2_2
+ * extreme_0_5_1
  * exurban_0_0_1
- * exvcr_0_3_9
- * exvcr_0_7_2
- * exyelp_0_0_2
  * ezlib_1_0_1
  * ezmq_0_2_0
- * facebook_0_4_2
- * fast_tls_1_0_1
+ * facebook_0_10_0
+ * fast_tls_1_0_3
  * fast_xml_1_1_11
  * fast_yaml_1_0_3
  * favicon_0_0_7
  * feedistiller_2_0_2
  * feedlex_0_0_1
- * feedme_0_0_1
- * fifo_db_0_2_1
+ * fernet_ecto_0_2_0
+ * ffi_0_0_1_alpha
+ * fifo_db_0_2_2
  * fifo_dt_0_1_66
- * fifo_dt_0_1_68
+ * fifo_dt_0_1_69
+ * fifo_lager_0_1_4
  * fifo_spec_0_1_27
  * fifo_utils_0_1_20
  * fifo_utils_0_1_22
  * figaro_0_1_0
  * filepreviews_1_0_1
- * filtrex_0_1_0
+ * filtrex_0_2_0
  * finch_0_0_3
+ * fintex_0_3_0
  * fireworks_0_5_1
  * fitbit_0_0_1
  * fitex_0_0_1
+ * flames_0_1_0
  * fleet_api_0_0_15
- * floki_0_1_1
- * floki_0_7_2
+ * floorplan_0_1_1
  * flower_power_0_3_2
  * fluent_client_0_1_0
  * folsom_ddb_0_1_22
  * font_awesome_phoenix_0_3_2
- * forcex_0_2_0
- * forecast_io_0_2_1
  * form_data_0_1_1
- * fox_0_1_12
+ * forms_0_0_1
  * fqc_0_1_7
  * frank_0_0_3
- * freegeoip_0_0_4
- * fulcrum_0_0_6
+ * fuentes_0_0_3
  * funnel_0_4_1
- * gateway_0_0_6
- * gcm_1_2_0
+ * gcloudex_0_4_4
+ * gcm_1_3_1
  * gcmex_0_0_1
+ * gen_leader_0_1_0
  * gen_rpc_1_0_2
- * geo_1_0_1
- * geocoder_0_4_0
+ * gen_state_machine_0_0_2
+ * geo_1_0_4
+ * geocoder_0_4_2
  * gil_0_0_3
  * gimei_0_0_2
  * gimei_ex_1_0_0
- * github_oauth_0_1_1
- * github_trend_ex_0_1_2
- * gizoogle_0_0_2
- * gmail_0_1_8
- * gold_0_12_0
- * google_sheets_2_0_5
- * goth_0_0_3
  * gpb_3_18_10
  * gpb_3_18_8
- * gpb_3_20_0
+ * gpb_3_21_2
+ * gpb_3_22_2
  * graphql_parser_0_0_3
- * graphql_relay_0_0_16
+ * graphql_relay_0_3_0
  * group_manager_0_0_8
  * guardian_0_10_1
+ * guardian_0_12_0
  * guardian_0_9_1
  * guardian_db_0_4_0
- * guri_0_2_1
- * gutenex_0_1_0
+ * guardian_db_0_7_0
  * hackney_1_1_0
  * hackney_1_3_1
  * hackney_1_3_2
  * hackney_1_4_10
  * hackney_1_4_4
  * hackney_1_4_8
- * hackney_1_5_7
- * hackney_1_6_0
  * hamcrest_0_1_1
- * harvest_0_0_3
  * hash_ring_ex_1_1_2
  * hdr_histogram_0_2_0
+ * hedwig_flowdock_0_1_1
  * hedwig_hipchat_0_9_4
- * hedwig_irc_0_1_1
+ * hedwig_irc_0_1_3
+ * hedwig_slack_0_1_0
+ * hedwig_sms_0_1_0
  * hedwig_xmpp_1_0_0_rc2
- * hello_0_0_0
- * hello_world_0_0_0
  * hello_world_header_0_0_1
- * hex_searcher_1_0_0
  * hexoku_0_1_0
  * hmc5883l_0_5_0
- * honeybadger_0_4_0
- * honeydew_0_0_8
- * hound_0_8_2
+ * honeydew_0_0_9
  * hr_0_2_2
  * hstore_0_0_2
- * html_sanitize_ex_0_1_2
- * html_sanitize_ex_0_3_1
  * htpasswd_1_0_2
  * http_0_0_1
- * http_proxy_1_0_1
- * httpehaviour_0_9_0
+ * httpc_aws_0_1_3
  * httpoison_0_7_1
  * httpoison_0_7_5
  * httpoison_0_8_0
- * httpoison_0_8_2
  * httprot_0_1_7
- * huex_0_5_0
- * hydra_0_0_1
- * hypermock_0_0_2
  * iconv_1_0_0
  * ielixir_0_9_5
  * ifttt_oauth_0_0_1
- * inaka_aleppo_0_9_9
- * inaka_mixer_0_1_5
- * inch_ex_0_5_1
+ * inch_ex_0_5_3
  * inch_test_0_0_1
+ * inflex_0_2_0
  * inquisitor_0_1_0
- * insight_0_1_3
- * instream_0_10_0
+ * instream_0_12_0
  * intellij_elixir_0_1_2
  * iona_0_2_1
- * isbndbex_0_0_1
+ * ipgeobase_0_0_1
  * isn_1_0_0
- * ja_serializer_0_8_1
- * janrain_0_0_1
+ * ja_serializer_0_9_0
  * japanese_holiday_0_0_2
- * jazz_0_1_2
+ * jazz_0_1_1
  * jazz_0_2_1
- * jc_1_0_4
- * jira_0_0_8
- * joken_1_1_0
+ * jiffy_0_14_7
+ * joken_0_13_1
+ * joken_1_2_1
  * jsxn_0_2_1
- * kane_0_0_5
- * katipo_0_3_2
+ * kafka_protocol_0_3_2
+ * kalecto_0_3_3
+ * kalends_0_6_5
+ * kane_0_1_1
+ * katipo_0_3_4
  * keccakf1600_2_0_0
  * keelless_0_1_0
+ * keenex_0_3_0
  * kerosene_0_0_1
  * kindred_0_0_1
  * kovacs_0_9_2
- * kubex_0_1_1
  * kvs_2_1_0
  * lager_2_1_1
+ * lager_graylog_0_1_1
+ * lager_logstash_backend_0_1_1
  * lager_watchdog_0_1_10
  * lasp_0_0_5
  * lazymaru_0_2_5
  * ledx_0_0_1
- * libchunter_0_1_46
+ * letsencrypt_0_5_0
+ * lfe_1_0_2
+ * libchunter_0_1_48
  * libdecaf_0_0_2
  * libex_config_0_2_0
- * libhowl_0_1_34
+ * libhowl_0_1_36
  * libleofs_0_1_2
  * libsnarl_0_3_40
- * libsnarl_0_3_44
- * libsniffle_0_3_45
- * libsodium_0_0_4
+ * libsnarl_0_3_46
+ * libsniffle_0_3_47
+ * libsodium_0_0_7
  * link_shrinkex_1_0_0
  * locker_1_0_8
  * logger_json_file_backend_0_1_2
  * logger_logentries_backend_0_0_1
- * logger_loggly_backend_0_2_0
+ * logster_0_2_0
  * lyn_0_0_16
- * m2x_2_0_0
- * m2x_erlang_1_3_1
  * mad_0_9_0
  * mailchimp_0_0_5
  * mailgun_webhook_auth_1_0_0
  * mailibex_0_1_0
- * mandrill_0_4_1
+ * mailman_0_2_2
  * mandrillex_0_2_0
- * markit_0_1_2
- * markit_skill_0_0_2
- * maru_0_9_5
- * maru_swagger_0_7_3
+ * maru_0_10_1
+ * maru_swagger_0_8_0
  * marvel_1_0_0
  * marvin_0_3_0
- * mcrypt_0_1_0
+ * mc_protocol_0_0_2
+ * mcrypt_0_1_1
  * mdns_client_0_1_7
  * mdns_client_lib_0_1_33
- * mdns_client_lib_0_1_38
- * meck_0_8_4
+ * mdns_client_lib_0_1_39
  * medex_0_1_2
  * message_pack_0_2_0
- * microformats2_0_0_5
- * mixpanel_api_ex_0_8_3
- * mixpanel_data_client_0_0_2
+ * meta_0_0_1
+ * migratrex_0_0_1
+ * mimerl_1_0_0
  * mixstar_0_0_1
  * mmath_0_1_15
- * mmath_0_1_16
  * mobiledoc_0_0_1
- * mochiweb_2_12_2
- * mock_0_1_3
- * moebius_1_0_8
- * mondo_0_1_0
+ * monetized_0_4_0
+ * money_1_0_0
  * mongo_0_5_4
+ * mongodb_ecto_0_1_4
  * motor_hat_0_6_1
- * mstore_0_1_9
- * mt940_0_4_0
- * murdoch_0_0_1
+ * mstore_0_1_11
+ * mt940_1_0_0
  * mustachex_0_0_1
  * mynumber_1_0_0
  * nacl_0_3_0
- * nadia_0_4_0
  * naughtygram_0_2_0
  * neo4j_0_3_0
- * neo4j_sips_0_1_25
+ * neo4j_sips_0_1_26
  * neo4j_sips_models_0_1_1
+ * neotoma_1_7_3
  * neotomex_0_1_4
- * nerves_io_neopixel_0_2_0
+ * nerves_0_3_2
+ * nerves_interim_wifi_0_0_1
+ * nerves_network_interface_0_3_1
+ * nerves_system_ag150_0_5_1
+ * nerves_system_alix_0_5_1
+ * nerves_system_bbb_0_6_2
+ * nerves_system_ev3_0_5_1
+ * nerves_system_galileo_0_5_1
+ * nerves_system_qemu_arm_0_5_1
+ * nerves_system_rpi_0_5_2
+ * nerves_system_rpi2_0_5_2
+ * nerves_system_rpi3_0_5_2
+ * nerves_toolchain_arm_unknown_linux_gnueabi_0_6_2
+ * nerves_toolchain_arm_unknown_linux_gnueabihf_0_6_1
+ * nerves_toolchain_armv6_rpi_linux_gnueabi_0_6_1
+ * nerves_toolchain_i586_unknown_linux_gnu_0_6_1
+ * nerves_wpa_supplicant_0_2_1
+ * nested_set_0_0_2
+ * new_relixir_0_1_0
+ * newrelic_0_1_0
  * nice_nickname_0_0_1
  * nifty_0_0_3
- * ninjaproxies_0_2_0
  * nio_google_authenticator_1_0_1
  * nio_google_geocoder_0_7_0
- * njord_0_1_1
+ * nodefinder_1_4_0
  * nodefinder_1_5_1
- * normalixr_0_3_0
- * oauth2_0_3_0
+ * nomad_0_6_0
+ * normalixr_0_4_0
  * oauth2_0_6_0
+ * oauth2_server_0_1_1
  * oauth2cli_0_0_4
  * oauth2ex_0_0_9
  * obelisk_0_10_0
- * observer_cli_1_0_3
- * octokit_0_1_0
+ * observer_cli_1_0_5
  * okta_0_0_1
- * omise_0_1_4
- * one_signal_0_0_6
- * opbeat_0_3_0
- * open_graphx_0_0_2
- * openmaize_0_17_2
- * openstack_0_0_4
+ * omise_0_2_2
+ * openmaize_0_18_1
  * overpass_0_1_1
  * oxr_0_3_1
  * p1_mysql_1_0_1
+ * p1_oauth2_0_6_1
  * p1_pgsql_1_1_0
  * p1_stringprep_1_0_1
+ * p1_utils_1_0_0
  * p1_utils_1_0_3
+ * p1_utils_1_0_4
  * p1_xml_1_1_1
  * p1_xmlrpc_1_15_1
- * pagexduty_0_1_0
  * params_2_0_0_beta_0
  * parse_client_0_2_3
  * parse_trans_2_9_0
  * parsex_0_0_2
  * passport_0_0_4
- * pavlov_0_2_3
  * peatio_client_1_5_0
  * pet_0_1_1
  * pgpool_1_0_0
- * phoenix_0_2_11
+ * phoenix_0_2_6
  * phoenix_0_4_1
- * phoenix_1_1_4
+ * phoenix_1_2_0_rc_1
+ * phoenix_active_link_0_0_1
  * phoenix_calendar_0_1_2
  * phoenix_dtl_0_0_1
- * phoenix_ecto_3_0_0_beta_2
+ * phoenix_ecto_3_0_0_rc_0
  * phoenix_ember_0_0_1
+ * phoenix_facebook_messenger_0_3_0
  * phoenix_gen_gulp_jspm_1_0_0
- * phoenix_haml_0_2_0
- * phoenix_html_2_0_0_dev
+ * phoenix_haml_0_2_1
+ * phoenix_html_2_4_0_dev
  * phoenix_html_2_5_1
- * phoenix_html_sanitizer_0_2_0
- * phoenix_html_simplified_helpers_0_3_2
+ * phoenix_html_sanitizer_1_0_2
+ * phoenix_html_simplified_helpers_0_3_3
  * phoenix_linguist_0_0_1
- * phoenix_live_reload_1_0_3
+ * phoenix_live_reload_1_0_5
+ * phoenix_microsoftbot_0_1_0
  * phoenix_pubsub_rabbitmq_0_0_1
  * phoenix_pubsub_redis_2_0_0
+ * phoenix_ratchet_0_2_0
+ * phoenix_reactor_0_0_3
  * phoenix_simple_form_0_0_2
  * phoenix_slim_0_4_1
- * phoenix_slime_0_5_1
- * phoenix_swoosh_0_1_0
- * phoenix_timex_0_0_3
+ * phoenix_slime_0_6_0
+ * phoenix_swoosh_0_1_2
+ * phoenix_timex_1_0_1
  * phoenix_token_auth_0_4_0
  * picosat_0_1_0
- * pigeon_0_4_1
  * pin_elixir_0_0_1
- * pinglix_1_1_1
- * pipette_0_0_4
- * pixie_0_3_3
+ * pixie_0_3_5
  * placid_0_1_3
- * plasm_0_1_0
- * plug_0_5_1
- * plug_0_5_2
+ * plain_sitemap_0_0_1
+ * plasm_0_3_0
+ * plug_0_4_4
  * plug_0_5_3
  * plug_0_7_0
  * plug_abort_2_1_1
- * plug_accesslog_0_11_0
  * plug_auth_0_3_0
  * plug_basic_auth_1_1_0
  * plug_byte_serve_0_3_2
  * plug_cors_0_8_2
  * plug_exception_handler_0_0_4
- * plug_graphql_0_2_0
+ * plug_graphql_0_3_1
  * plug_json_parser_0_0_6
  * plug_jwt_0_7_1
+ * plug_newrelic_0_0_5
  * plug_secure_headers_0_0_1
- * plugsnag_1_1_0
- * pocketex_0_1_0
+ * plug_session_memcached_0_3_3
+ * png_0_1_1
  * poison_1_0_3
  * poison_1_1_1
  * poison_1_2_1
- * poloniex_0_0_3
  * pool_0_0_2
- * poolboy_1_2_1
  * pooler_1_4_0
- * pooler_1_5_0
  * portal_0_0_1
  * porterstemmer_0_0_1
- * portmidi_3_2_0
+ * portmidi_5_0_0
  * postgrex_0_6_0
+ * pqueue_1_4_0
  * proper_1_1_1_beta
+ * protego_0_1_0
  * protobuffs_0_8_2
- * proxy_0_0_1
- * pubnub_ex_0_0_2
- * pulse_0_1_3
+ * provider_asn1_0_2_1
  * pulse_libs_1_0_0
- * pusher_0_1_3
- * pushex_0_0_2
- * qiita_ex_0_0_2
- * qiniu_0_2_2
+ * pushex_0_0_5
+ * pynchon_0_1_1
+ * quick_chex_0_2_1
  * quinn_0_0_4
  * rackla_1_0_0
  * radpath_0_0_5
  * random_0_2_2
- * rapidax_0_0_3
+ * ratchet_0_3_1
  * raven_0_0_5
- * raygun_0_2_0
+ * raygun_0_3_0
  * reactive_0_0_1
- * reagent_0_1_5
+ * readme_md_doc_0_1_2
  * reaxt_0_3_2
  * rebar3_abnfc_plugin_0_1_0
  * rebar3_auto_0_3_0
+ * rebar3_auto_applications_1_0_0
  * rebar3_autotest_0_1_1
+ * rebar3_cuttlefish_0_11_0
+ * rebar3_diameter_compiler_0_4_0
+ * rebar3_elixir_0_0_5
+ * rebar3_elixirc_0_1_0
  * rebar3_eqc_0_0_10
  * rebar3_exunit_0_1_1
- * rebar3_gpb_plugin_1_3_0
+ * rebar3_git_vsn_1_1_0
+ * rebar3_gpb_plugin_1_3_3
+ * rebar3_hex_2_5_1
+ * rebar3_idl_compiler_0_4_0
+ * rebar3_lfe_compile_0_4_1
  * rebar3_live_0_1_3
+ * rebar3_neotoma_plugin_0_2_0
  * rebar3_proper_0_6_0
  * rebar3_proper_plugin_0_1_0
  * rebar3_protobuffs_0_2_0
+ * rebar3_raw_deps_2_0_0
  * rebar3_run_0_2_0
+ * rebar3_shellrpc_0_1_0
+ * rebar3_tsung_0_1_4
+ * rebar3_vendor_0_3_0
  * rebar3_yang_plugin_0_2_1
+ * rebar_alias_0_1_0
+ * rebar_cmd_0_2_3
+ * rebar_erl_vsn_0_1_0
  * rebar_protobuffs_0_1_0
+ * rebind_0_1_3
  * recaptcha_1_1_1
- * recon_ex_0_9_0
+ * receipt_verifier_0_0_1
+ * recon_2_2_1
+ * recon_2_3_1
+ * recon_ex_0_9_1
  * record_translator_0_0_3
+ * red_0_0_5
+ * red_black_tree_1_2_0
  * reddhl_0_0_1
+ * redis_pool_0_2_3
+ * redis_poolex_0_0_5
+ * redix_0_3_6
+ * redo_2_0_1
  * redtube_1_0_0
+ * ref_inspector_0_9_0
+ * regdom_0_0_1
  * relax_0_3_0
+ * relflow_1_0_5
+ * relief_0_0_1
  * relisa_0_1_0
+ * relocker_0_0_8
+ * reltool_util_1_4_0
+ * reltool_util_1_5_1
+ * relx_3_1_0
+ * relx_3_19_0
+ * relx_3_5_0
+ * remix_0_0_2
+ * remodel_0_0_1
+ * remote_ip_rewriter_0_0_2
  * rendezvous_0_0_1
- * reporter_0_4_1
+ * repg2_0_0_4
+ * repo_0_4_1
+ * repoquery_0_0_2
+ * reporter_0_5_1
+ * reprise_0_5_0
+ * resin_0_4_1
+ * rest_1_5_0
  * rest_client_0_0_1
  * rethinkdb_0_4_0
  * rethinkdb_changefeed_0_0_1
+ * retrieval_0_9_1
+ * retry_0_1_0
+ * reup_0_1_0
  * reverse_proxy_0_1_0
+ * revision_plate_ex_0_1_0
+ * rfc3339_0_9_0
  * riak_1_0_0
- * riak_core_ng_2_2_3
+ * riak_core_ng_2_2_5
+ * riak_dt_2_1_1
  * riak_ensemble_2_1_3
  * riak_pb_2_1_0
+ * riak_sysmon_2_1_2
  * riakc_2_1_1
  * riboflavin_0_0_2
- * riemann_0_0_14
+ * riemann_0_0_15
+ * rlist_0_0_1
  * robotex_0_0_1
  * rogger_0_1_0
- * rollbax_0_5_4
+ * rollbax_0_6_0
+ * rollex_0_4_0
+ * roman_numerals_1_0_1
+ * romanex_0_1_0
+ * romeo_0_5_0
  * roombex_0_0_4
+ * rop_0_5_3
+ * rotor_0_2_2
+ * rquote_0_0_1
+ * rsa_0_0_1
  * rss_0_2_1
+ * rstats_1_0_2
+ * rubix_0_0_2
  * rulex_0_2_0
+ * russian_0_1_0
+ * rustler_0_0_7
+ * safetybox_0_1_2
+ * sage_0_0_1
+ * salsa20_0_3_0
  * saltie_0_3_2
+ * saltpack_1_0_1
+ * sap_0_0_2
+ * sasl_ex_0_1_0
  * sass_elixir_0_0_1
  * savory_0_0_2
+ * sbroker_0_6_2
+ * sbroker_0_7_0
+ * sbroker_1_0_0_beta_2
+ * scaffold_0_0_5
+ * scarab_0_1_0
+ * schedule_0_1_0
+ * schizo_0_0_1
+ * scientist_0_2_0
+ * scientist_ex_0_1_0
  * scrape_1_0_4
- * scrivener_1_1_2
+ * scrivener_1_1_4
+ * scrivener_1_2_1
  * scrivener_headers_1_0_1
- * scrivener_html_1_0_9
+ * scrivener_html_1_1_1
+ * seasonal_0_3_0
+ * seat_json_0_0_18
+ * sec_cik_ticker_mapper_0_0_2
  * sec_company_filings_rss_feed_parser_0_0_2
- * sec_recent_filings_rss_feed_parser_0_0_3
+ * sec_recent_filings_rss_feed_parser_0_0_6
+ * secure_0_1_0
+ * secure_compare_0_0_1
  * secure_headers_0_0_1
- * secure_password_0_4_0
+ * secure_password_0_4_3
+ * secure_random_0_1_1
+ * secure_random_0_3_0
+ * seedex_0_1_2
+ * seg_seg_0_0_1
+ * seg_seg_0_1_0
+ * segment_0_1_0
  * select_0_0_1
- * sendgrid_0_0_2
+ * selenium_0_0_2
+ * semver_0_1_2
+ * sendgrid_0_1_0
+ * sentient_0_0_2
  * sentinel_0_1_0
  * sentry_0_3_2
  * sequences_1_1_0
  * serial_0_1_2
+ * serve_this_1_0_0
  * service_1_5_1
+ * setup_1_7_0
+ * setup_tag_0_1_2
+ * sfmt_0_12_7
+ * sfmt_0_13_0
+ * sfsobject_0_0_3
+ * sh_1_1_2
+ * sha3_1_0_0
+ * shameless_plug_1_0_0
+ * shape_0_0_2
+ * shell_stream_0_0_1
+ * short_maps_0_1_1
+ * shorter_maps_1_0_0
+ * shotgun_0_3_0
+ * shouldi_0_3_0
+ * shove_0_0_1
+ * shrivel_0_0_3
+ * sidejob_2_0_0
+ * sideshow_0_0_2
+ * sidetask_1_1_0
+ * signaturex_1_0_1
+ * simetric_0_1_0
+ * simple_agent_0_0_7
+ * simple_bar_0_0_7
  * simple_format_0_1_0
- * simplify_0_2_0
- * siphash_3_0_0
+ * simple_markdown_0_0_1
+ * simple_secrets_1_0_0
+ * simple_statistics_0_0_1
+ * simplex_0_4_0
+ * simplify_0_2_1
+ * simpre_0_1_0
+ * siphash_3_1_0
  * sips_downloader_0_2_2
+ * sitemap_0_7_0
+ * skills_0_0_1
  * skroutz_0_1_0
  * slack_0_3_0
  * slack_0_4_2
- * slack_logger_backend_0_1_3
+ * slack_0_5_0
+ * slack_logger_backend_0_1_4
  * slack_webhook_0_0_2
  * slacker_0_0_2
  * slackex_0_0_1
+ * slim_fast_0_10_0
+ * slime_0_13_0
  * slp_0_0_2
+ * slugerl_1_0_0
+ * slugger_0_1_0
  * smex_0_0_1
+ * sms506_0_2_0
+ * sms_blitz_0_0_1
+ * smurf_0_1_3
  * snappy_1_1_1
  * snowflake_client_0_1_1
  * socket_0_2_8
- * socket_0_3_1
+ * socket_0_3_4
+ * solage_0_0_1
  * sonic_0_1_3
+ * sorted_set_1_1_0
+ * soundcloud_ex_0_0_1
+ * spaceapi_0_1_2
  * spaced_repetitions_0_0_1
+ * spacesaving_0_0_3
+ * spaghetti_pool_0_1_0
+ * sparkpost_0_1_0
+ * spartan_0_0_1
  * spawndir_0_1_1
  * spirit_0_0_1
- * spotify_ex_0_0_4
- * spreedly_0_1_1
- * sql_dust_0_3_2
+ * sql_dust_0_3_4
  * sqlite3_1_1_5
  * sqlite_ecto_0_5_0
+ * sqlite_ecto_1_0_2
  * sqlite_ecto_1_1_0
- * sqlitex_0_8_3
- * sqlitex_1_0_0
  * ssdb_0_3_0
  * ssdb_elixir_0_2_2
  * sshex_1_1_0
- * ssl_verify_fun_1_1_0
+ * ssl_verify_hostname_1_0_0
  * ssl_verify_hostname_1_0_5
  * ssl_verify_hostname_1_0_6
- * statistics_0_4_0
- * steamex_0_0_5
+ * statman_0_5_0
  * stmd_0_0_2
- * stockastic_0_0_2
- * stockfighter_0_0_1
  * strava_0_0_1
  * stringprep_1_0_3
  * stripe_0_0_1
- * stripex_0_1_0
+ * stripe_client_0_0_3
+ * stripe_eventex_1_0_0
  * stripity_stripe_1_4_0
  * structurez_0_0_1
- * stun_1_0_1
- * sugar_0_4_10
+ * stun_1_0_3
+ * sugar_0_4_11
  * supermemo_1_0_0
  * supervisord_0_1_0
  * swaggerdoc_0_0_1
- * swapi_1_0_0
  * sweet_xml_0_4_0
- * swoosh_0_1_0
+ * switchboard_0_3_2
+ * swoosh_0_3_0
  * syslog_1_0_2
  * tagplay_0_1_0
- * tanegashima_0_0_9
- * tanuki_0_2_0
+ * tarantool_0_0_2
+ * tcs34725_0_0_1
  * tds_ecto_1_0_2
  * telebot_0_1_2
  * templates_0_0_5
- * tentabucket_0_0_1
- * tentacat_0_4_0
+ * texas_0_0_2
  * theriac_0_0_1
- * thesis_0_0_8
+ * thesis_0_0_14
+ * thing_0_0_1
  * timex_0_12_9
  * timex_0_13_5
  * timex_0_16_2
- * timex_0_19_5
+ * timex_1_0_0_rc4
  * timex_ecto_1_0_4
- * tmdb_0_0_6
- * togglex_0_2_0
+ * timex_ecto_1_1_3
+ * timex_interval_0_6_0
+ * tirerl_1_0_1
  * tomlex_0_0_4
+ * topo_0_1_1
  * tracker_request_0_0_4
  * tractor_0_1_0
  * traitify_elixir_0_1_1
- * travis_ex_0_0_2
+ * trans_0_1_0
+ * translator_0_0_1
  * tributary_0_0_2
- * tubex_0_0_7
  * tuco_tuco_0_8_1
  * twittertex_0_1_0
  * twittex_0_0_4
- * typeformx_0_0_1
- * tzdata_0_5_7
  * u2f_0_1_3
+ * u_token_0_0_2
  * ucol_2_0_0
  * ucol_nif_1_1_5
  * ueberauth_facebook_0_3_2
  * ueberauth_fitbit_0_2_1
  * ueberauth_github_0_2_0
  * ueberauth_google_0_2_0
+ * ueberauth_linkedin_0_2_0
+ * ueberauth_paypal_0_1_0
  * ueberauth_slack_0_2_0
- * ueberauth_twitter_0_2_2
- * unsplash_0_3_0
- * untappd_0_0_1
+ * ueberauth_spotify_0_0_1
+ * ueberauth_strava_0_1_1
+ * ueberauth_vk_0_1_1
+ * ueberauth_vkontakte_0_1_0
+ * ueberauth_weibo_0_0_3
+ * ui_0_1_1
+ * ulitos_0_3_0
+ * unsplash_0_4_0
  * upyun_0_0_1
  * uri_template_1_2_0
- * url_unroller_0_0_3
  * urna_0_1_4
+ * uuid_erl_1_4_0
  * uuid_erl_1_5_1
  * valid_field_0_3_0
- * velkoz_0_0_1
- * verk_web_0_9_4
- * viktor_0_0_9
+ * velkoz_1_2_0
+ * verk_0_12_0
+ * verk_web_0_11_0
  * vimeo_0_0_2
- * virus_total_0_0_1
- * wallaby_0_1_0
+ * voorhees_0_1_1
  * wayback_archiver_0_0_1
  * webdriver_0_8_1
  * weber_0_1_0
- * webmentions_0_0_5
- * webpay_0_0_4
  * weebo_0_1_2
  * wifi_0_2_0
+ * win_notify_0_0_4
  * wire_0_2_0
- * wizardry_0_0_1
- * wpa_supplicant_0_1_0
- * wykop_api_0_0_4
- * xe_0_0_1
- * xfighter_0_2_1
- * xkcd_0_0_1
- * xoauth2_0_0_3
- * yahoo_fx_0_2_0
+ * xlsx_parser_0_0_7
+ * xref_runner_1_0_0
  * yar_0_1_0
- * yggdrasil_1_1_1
- * yocingo_0_0_2
+ * yggdrasil_1_2_3
  * yodlee_0_1_4
  * yomel_0_5_0
- * ytx_0_0_5
  * zanox_0_0_1
  * zencoder_1_0_1
- * zipcloudx_0_0_2
+ * zipper_1_0_0
  * zuppler_users_client_0_0_5
 
 */
@@ -895,33 +1017,33 @@ let
             meta = {
               description = ''GraphQL for Elixir'';
               license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/CargoSense/absinthe";
+              homepage = "https://github.com/absinthe-graphql/absinthe";
             };
           } // packageOverrides)
       ) {};
 
-    absinthe_1_1_2 = callPackage
+    absinthe_1_1_6 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "absinthe";
-            version = "1.1.2";
+            version = "1.1.6";
             src = fetchHex {
               pkg = "absinthe";
-              version = "1.1.2";
+              version = "1.1.6";
               sha256 =
-                "e15a387d865922df70506a4cdb63520de8ae9473358deefaffa3f70195193b07";
+                "3e83ea139967975a025850c0efc5aba7a864aded6b10d6483a60264a3523411f";
             };
 
             meta = {
               description = ''GraphQL for Elixir'';
               license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/CargoSense/absinthe";
+              homepage = "https://github.com/absinthe-graphql/absinthe";
             };
           } // packageOverrides)
       ) {};
 
-    absinthe = absinthe_1_1_2;
+    absinthe = absinthe_1_1_6;
 
     absinthe_plug_1_0_0 = callPackage
       (
@@ -929,7 +1051,7 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           absinthe_1_0_0
         }:
           buildMix ({
@@ -941,7 +1063,7 @@ let
               sha256 =
                 "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
             };
-            beamDeps  = [ plug_1_1_3 absinthe_1_0_0 ];
+            beamDeps  = [ plug_1_1_5 absinthe_1_0_0 ];
 
             meta = {
               description = ''A plug for Absinthe, an experimental GraphQL
@@ -952,31 +1074,36 @@ let
           } // packageOverrides)
       ) {};
 
-    absinthe_plug = absinthe_plug_1_0_0;
-
-    absinthe_relay_0_8_0 = callPackage
+    absinthe_plug_1_1_3 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, absinthe_1_1_2 }:
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_5,
+          absinthe_1_1_6
+        }:
           buildMix ({
-            name = "absinthe_relay";
-            version = "0.8.0";
+            name = "absinthe_plug";
+            version = "1.1.3";
             src = fetchHex {
-              pkg = "absinthe_relay";
-              version = "0.8.0";
+              pkg = "absinthe_plug";
+              version = "1.1.3";
               sha256 =
-                "a54ba3775d06db5d7cf3eaa7165bfa3eeaf26f7ee1d5021e0b4db3d74a3ecdd9";
+                "9fa66d56b4ddbd42fc11510780ed6c9758d539b9c8e538930ff8b383ae71814e";
             };
-            beamDeps  = [ absinthe_1_1_2 ];
+            beamDeps  = [ plug_1_1_5 absinthe_1_1_6 ];
 
             meta = {
-              description = ''Relay framework support for Absinthe'';
+              description = ''A plug for Absinthe, an experimental GraphQL
+                            toolkit'';
               license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/absinthe-graphql/absinthe_relay";
+              homepage = "https://github.com/CargoSense/absinthe_plug";
             };
           } // packageOverrides)
       ) {};
 
-    absinthe_relay = absinthe_relay_0_8_0;
+    absinthe_plug = absinthe_plug_1_1_3;
 
     access_token_extractor_0_1_1 = callPackage
       (
@@ -984,7 +1111,7 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -996,7 +1123,7 @@ let
               sha256 =
                 "40f76799f8fbb5b03230b31d4d55c5a169e7c3ad82d776a9d87fe0c65c85396d";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''Simple Plug to extract access_token from
@@ -1062,6 +1189,55 @@ let
 
     adap = adap_0_0_1;
 
+    adt_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "adt";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "adt";
+              version = "0.0.2";
+              sha256 =
+                "a5b310b1ed8093b0f786ca4facdd0c9ff073acf3e47db6a9771005b77e0d7259";
+            };
+
+            meta = {
+              description = ''A light ADT module for Elixir.'';
+
+            };
+          } // packageOverrides)
+      ) {};
+
+    adt = adt_0_0_2;
+
+    aeacus_0_3_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, comeonin_1_6_0 }:
+          buildMix ({
+            name = "aeacus";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "aeacus";
+              version = "0.3.0";
+              sha256 =
+                "3cc138cfc7c508cfd85afddd0881632dde2e663d222c9e3749fae8c80ebb2c0b";
+            };
+            beamDeps  = [ comeonin_1_6_0 ];
+
+            meta = {
+              longDescription = ''A simple, secure, and highly configurable
+                                Elixir identity [username | email | id |
+                                etc.]/password authentication module; Compatible
+                                with Ecto.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/zmoshansky/aeacus";
+            };
+          } // packageOverrides)
+      ) {};
+
+    aeacus = aeacus_0_3_0;
+
     ahab_0_1_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -1086,6 +1262,39 @@ let
 
     ahab = ahab_0_1_1;
 
+    airbrakify_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          plug_1_1_5,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "airbrakify";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "airbrakify";
+              version = "0.0.1";
+              sha256 =
+                "973f895ba83e6dd71cf87182419e144db5c3ac23e43b7a1247e51559bf2737b6";
+            };
+            beamDeps  = [ poison_2_1_0 plug_1_1_5 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''A simple Airbrake/Errbit library for
+                                Elixir/Phoenix projects. Currently only supports
+                                error/exception notifications via a Plug.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Diamond/airbrakify";
+            };
+          } // packageOverrides)
+      ) {};
+
+    airbrakify = airbrakify_0_0_1;
+
     alambic_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -1112,17 +1321,41 @@ let
 
     alambic = alambic_0_1_0;
 
-    alchemic_pinyin_0_1_0 = callPackage
+    alchemic_avatar_0_1_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "alchemic_avatar";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "alchemic_avatar";
+              version = "0.1.2";
+              sha256 =
+                "329ae15eb6a304d6d425f86e6890f1d5c3901475b3fbc9eb07ad03f1394144b4";
+            };
+
+            meta = {
+              description = ''Creating letter avatar from user`s name(or any
+                            other strong / character).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zhangsoledad/alchemic_avatar";
+            };
+          } // packageOverrides)
+      ) {};
+
+    alchemic_avatar = alchemic_avatar_0_1_2;
+
+    alchemic_pinyin_0_1_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "alchemic_pinyin";
-            version = "0.1.0";
+            version = "0.1.2";
             src = fetchHex {
               pkg = "alchemic_pinyin";
-              version = "0.1.0";
+              version = "0.1.2";
               sha256 =
-                "b1488866a9501557d9a5089726675bb34affd513316e167baccc155d7abfefd2";
+                "1fbd8300984699370b4a97ab10b64023494d2f9755eddf0abe1dcd9a5f2498c6";
             };
 
             meta = {
@@ -1133,7 +1366,7 @@ let
           } // packageOverrides)
       ) {};
 
-    alchemic_pinyin = alchemic_pinyin_0_1_0;
+    alchemic_pinyin = alchemic_pinyin_0_1_2;
 
     alchemist_0_0_2 = callPackage
       (
@@ -1160,7 +1393,7 @@ let
 
     alchemy_0_0_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_4 }:
           buildMix ({
             name = "alchemy";
             version = "0.0.1";
@@ -1170,7 +1403,7 @@ let
               sha256 =
                 "109ce3f83d596a6ab9a947f472516f87da7b0df823fe2d91e27bc6594a305c3d";
             };
-            beamDeps  = [ uuid_1_1_3 ];
+            beamDeps  = [ uuid_1_1_4 ];
 
             meta = {
               description = ''Perform experiments in production'';
@@ -1205,17 +1438,17 @@ let
 
     aleppo = aleppo_0_9_0;
 
-    alexa_0_1_12 = callPackage
+    alexa_0_1_14 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
           buildMix ({
             name = "alexa";
-            version = "0.1.12";
+            version = "0.1.14";
             src = fetchHex {
               pkg = "alexa";
-              version = "0.1.12";
+              version = "0.1.14";
               sha256 =
-                "dbc1da3081766570635abc31a799164a1afb34fce437b1d5ef14bfcc5f8ace3d";
+                "a15cc63ef736f45326a3065ff59e1211365929387957f246e7b8cee76a31bbe8";
             };
             beamDeps  = [ poison_2_1_0 ];
 
@@ -1228,11 +1461,11 @@ let
           } // packageOverrides)
       ) {};
 
-    alexa = alexa_0_1_12;
+    alexa = alexa_0_1_14;
 
     alexa_plug_0_2_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "alexa_plug";
             version = "0.2.0";
@@ -1242,7 +1475,7 @@ let
               sha256 =
                 "a78f6fa5e3ba33ce0943f4cb96d6cfcc9b36637a4575314469c8a0d45fff40d0";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               longDescription = ''A simple set of plugs and utilities for
@@ -1262,9 +1495,9 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4,
-          alexa_0_1_12
+          alexa_0_1_14
         }:
           buildMix ({
             name = "alexa_web";
@@ -1275,7 +1508,7 @@ let
               sha256 =
                 "e60a7fa60eb52bbb91e445cf0ee3781e0e2a148855befa638b274e6720421126";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 alexa_0_1_12 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 alexa_0_1_14 ];
 
             meta = {
               description = ''A web endpoint for deploying one or a collection
@@ -1312,42 +1545,312 @@ let
 
     algae = algae_0_10_0;
 
-    alphonse_0_1_0 = callPackage
+    alice_0_3_6 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, cipher_0_1_0 }:
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          redix_0_3_6,
+          poolboy_1_5_1,
+          slack_0_4_2
+        }:
           buildMix ({
-            name = "alphonse";
-            version = "0.1.0";
+            name = "alice";
+            version = "0.3.6";
             src = fetchHex {
-              pkg = "alphonse";
-              version = "0.1.0";
+              pkg = "alice";
+              version = "0.3.6";
               sha256 =
-                "01666afde723be7d84fcd2e55741c90fd8bc78a407001677deb0717f685b8d21";
+                "f5c549f6983a5cc5f13320728315d101c8117f939df29e51c10ed3ff26809d54";
             };
-            beamDeps  = [ cipher_0_1_0 ];
+            beamDeps  = [ poison_2_1_0 redix_0_3_6 poolboy_1_5_1 slack_0_4_2
+                      ];
 
             meta = {
-              description = ''A module wrapper to encrypt and decrypt files
-                            with aes-128-cbc'';
+              description = ''A Slack bot'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/chrisenytc/alphonse";
+              homepage = "https://github.com/adamzaninovich/alice";
             };
           } // packageOverrides)
       ) {};
 
-    alphonse = alphonse_0_1_0;
+    alice = alice_0_3_6;
 
-    amnesia_0_2_1 = callPackage
+    alice_against_humanity_0_1_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, alice_0_3_6 }:
+          buildMix ({
+            name = "alice_against_humanity";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "alice_against_humanity";
+              version = "0.1.2";
+              sha256 =
+                "aac5f049b59d0eaaea2383e1fc8fec28125b9a29ffda7fbe214d829738ad3935";
+            };
+            beamDeps  = [ alice_0_3_6 ];
+
+            meta = {
+              description = ''A handler for the Alice Slack bot. Play Cards
+                            Against Humanity with Alice.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/adamzaninovich/alice_against_humanity";
+            };
+          } // packageOverrides)
+      ) {};
+
+    alice_against_humanity = alice_against_humanity_0_1_2;
+
+    alice_google_images_0_1_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, alice_0_3_6 }:
+          buildMix ({
+            name = "alice_google_images";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "alice_google_images";
+              version = "0.1.3";
+              sha256 =
+                "04b4e23c44a67c032c1ac8e2da4ca0fca03ec20cf207b4cb40eba0cb17e975e8";
+            };
+            beamDeps  = [ alice_0_3_6 ];
+
+            meta = {
+              description = ''A handler for the Alice Slack bot. Get random
+                            images from Google'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/adamzaninovich/alice_google_images";
+            };
+          } // packageOverrides)
+      ) {};
+
+    alice_google_images = alice_google_images_0_1_3;
+
+    alice_karma_0_2_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, alice_0_3_6 }:
+          buildMix ({
+            name = "alice_karma";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "alice_karma";
+              version = "0.2.0";
+              sha256 =
+                "8b1a6da30511fbc9c6df4035994407813af5ff194768ad64ebc1379cd923591d";
+            };
+            beamDeps  = [ alice_0_3_6 ];
+
+            meta = {
+              longDescription = ''A handler for the Alice Slack bot. Allows
+                                Alice to keep track of karma points for
+                                arbitrary terms.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adamzaninovich/alice_karma";
+            };
+          } // packageOverrides)
+      ) {};
+
+    alice_karma = alice_karma_0_2_0;
+
+    alice_personable_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, alice_0_3_6 }:
+          buildMix ({
+            name = "alice_personable";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "alice_personable";
+              version = "0.0.2";
+              sha256 =
+                "fb80938b27c3ae374b3d0bf284de9902d65e85dd8da2d4c80238a03b819b8aad";
+            };
+            beamDeps  = [ alice_0_3_6 ];
+
+            meta = {
+              description = ''A plugin for the Alice chat bot to make her seem
+                            a bit more human.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mattr-/alice_personable";
+            };
+          } // packageOverrides)
+      ) {};
+
+    alice_personable = alice_personable_0_0_2;
+
+    alice_reddit_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          readit_0_0_3,
+          alice_0_3_6
+        }:
+          buildMix ({
+            name = "alice_reddit";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "alice_reddit";
+              version = "0.0.3";
+              sha256 =
+                "bd1d16dde4cb066b4ae7486da425148fab23ae5bece0d283e1c27352b7707dbc";
+            };
+            beamDeps  = [ readit_0_0_3 alice_0_3_6 ];
+
+            meta = {
+              description = ''Alice does Reddit'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adamzaninovich/alice_reddit";
+            };
+          } // packageOverrides)
+      ) {};
+
+    alice_reddit = alice_reddit_0_0_3;
+
+    alice_shizzle_0_1_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          gizoogle_0_0_2,
+          alice_0_3_6
+        }:
+          buildMix ({
+            name = "alice_shizzle";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "alice_shizzle";
+              version = "0.1.2";
+              sha256 =
+                "c98481d59c004f905958b9412bff1d288a649cf373afb4fea307222af2597c19";
+            };
+            beamDeps  = [ gizoogle_0_0_2 alice_0_3_6 ];
+
+            meta = {
+              longDescription = ''A handlez fo` tha Alice Slack bot fo` realz.
+                                Uses Gizoogle ta allow you ta drop a rhyme like
+                                a thug n` retrieve links fo` translated sitez'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/notdevinclark/alice_shizzle";
+            };
+          } // packageOverrides)
+      ) {};
+
+    alice_shizzle = alice_shizzle_0_1_2;
+
+    alice_tielurs_heart_rate_0_0_5 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          alice_0_3_6,
+          timex_2_1_6,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "alice_tielurs_heart_rate";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "alice_tielurs_heart_rate";
+              version = "0.0.5";
+              sha256 =
+                "691b49b417029034d5b1905e06fa266c114d41fc9066047aa65212224e0bb5cc";
+            };
+            beamDeps  = [ alice_0_3_6 timex_2_1_6 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A handler for the Alice Slack bot. Allows Alice
+                            to check Tielur`s heart rate'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tielur/alice_tielurs_heart_rate";
+            };
+          } // packageOverrides)
+      ) {};
+
+    alice_tielurs_heart_rate = alice_tielurs_heart_rate_0_0_5;
+
+    alice_xkcd_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          xkcd_0_0_1,
+          alice_0_3_6
+        }:
+          buildMix ({
+            name = "alice_xkcd";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "alice_xkcd";
+              version = "0.0.3";
+              sha256 =
+                "13562b43fd99c7d9cdc568d7511c154842b9a59a19eca9df019069193bd94842";
+            };
+            beamDeps  = [ xkcd_0_0_1 alice_0_3_6 ];
+
+            meta = {
+              longDescription = ''A handler for the Alice Slack bot. Retrieves
+                                latest, specific and random XKCD comics.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/notdevinclark/alice_xkcd";
+            };
+          } // packageOverrides)
+      ) {};
+
+    alice_xkcd = alice_xkcd_0_0_3;
+
+    amazon_product_advertising_client_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_1_0_2,
+          sweet_xml_0_6_1,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "amazon_product_advertising_client";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "amazon_product_advertising_client";
+              version = "0.1.1";
+              sha256 =
+                "406111cedbd475cab29bdcc69f48ddc3670e57d2e3294e8d948c117ae492951c";
+            };
+            beamDeps  = [ timex_1_0_2 sweet_xml_0_6_1 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An Amazon Product Advertising API client for
+                            Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/zachgarwood/elixir-amazon-product-advertising-client";
+            };
+          } // packageOverrides)
+      ) {};
+
+    amazon_product_advertising_client =
+      amazon_product_advertising_client_0_1_1;
+
+    amnesia_0_2_4 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, exquisite_0_1_6 }:
           buildMix ({
             name = "amnesia";
-            version = "0.2.1";
+            version = "0.2.4";
             src = fetchHex {
               pkg = "amnesia";
-              version = "0.2.1";
+              version = "0.2.4";
               sha256 =
-                "2d8b0dc6d2da2dcce7339cb2173dc3dad5a2f0865ce770f5f3ded796cd1d6e61";
+                "fba1e39f5c51d860b22618046a25525170530bc595d0f2dbb45f070c3b40da8f";
             };
             beamDeps  = [ exquisite_0_1_6 ];
 
@@ -1359,7 +1862,32 @@ let
           } // packageOverrides)
       ) {};
 
-    amnesia = amnesia_0_2_1;
+    amnesia = amnesia_0_2_4;
+
+    anagram_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "anagram";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "anagram";
+              version = "1.0.0";
+              sha256 =
+                "8c41013b8b586728adbf821fe809c277e30f99323138b8e8ccff2311317c8fac";
+            };
+
+            meta = {
+              longDescription = ''Find anagrams of words and \"words that can
+                                be made with a set of letters\" (sort of a sub
+                                anagram)'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ewildgoose/elixir-anagram";
+            };
+          } // packageOverrides)
+      ) {};
+
+    anagram = anagram_1_0_0;
 
     anaphora_0_1_2 = callPackage
       (
@@ -1384,6 +1912,36 @@ let
 
     anaphora = anaphora_0_1_2;
 
+    anilixir_1_0_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "anilixir";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "anilixir";
+              version = "1.0.0";
+              sha256 =
+                "ee5c6dfa7e5250d8ec5c9b04910e3202788ceeba231cb3ff8b22e479cc64f1c3";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Anilist API client for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sotojuan/anilixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    anilixir = anilixir_1_0_0;
+
     apex_0_3_7 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -1405,17 +1963,17 @@ let
           } // packageOverrides)
       ) {};
 
-    apex_0_4_0 = callPackage
+    apex_0_5_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "apex";
-            version = "0.4.0";
+            version = "0.5.0";
             src = fetchHex {
               pkg = "apex";
-              version = "0.4.0";
+              version = "0.5.0";
               sha256 =
-                "0a566f042e9be5e220ed7ca2869770c0c2c0ca4560c416dee317df86f238eccf";
+                "dd8863ebef2a42be331eece2d3a2f721c4ec3c8495bc0e198703aea7927f156a";
             };
 
             meta = {
@@ -1426,12 +1984,12 @@ let
           } // packageOverrides)
       ) {};
 
-    apex = apex_0_4_0;
+    apex = apex_0_5_0;
 
     apix_0_1_0 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "apix";
             version = "0.1.0";
             src = fetchHex {
@@ -1453,25 +2011,26 @@ let
 
     apix = apix_0_1_0;
 
-    apns_0_0_12 = callPackage
+    apns_0_9_2 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
           poolboy_1_5_1,
-          poison_1_5_2
+          poison_2_1_0,
+          connection_1_0_2
         }:
           buildMix ({
             name = "apns";
-            version = "0.0.12";
+            version = "0.9.2";
             src = fetchHex {
               pkg = "apns";
-              version = "0.0.12";
+              version = "0.9.2";
               sha256 =
-                "3eb40b6ef9e73a5082593f6ac1e8ba8548bbfd4bff1f3a5c5d5707ac114fc172";
+                "7d63bd108572fadac777006957e45db5da1a8adf2e94e76f83c89942adf54f68";
             };
-            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 ];
+            beamDeps  = [ poolboy_1_5_1 poison_2_1_0 connection_1_0_2 ];
 
             meta = {
               description = ''APNS (Apple Push Notification Service) library
@@ -1482,7 +2041,7 @@ let
           } // packageOverrides)
       ) {};
 
-    apns = apns_0_0_12;
+    apns = apns_0_9_2;
 
     ar2ecto_0_1_2 = callPackage
       (
@@ -1585,7 +2144,7 @@ let
           fetchHex,
           porcelain_2_0_1,
           poolboy_1_5_1,
-          plug_1_1_3
+          plug_1_1_5
         }:
           buildMix ({
             name = "artifact";
@@ -1596,7 +2155,7 @@ let
               sha256 =
                 "6c66a3c745418e1f1207940c3815828d1a0f022d8186e5da593599d1f460197f";
             };
-            beamDeps  = [ porcelain_2_0_1 poolboy_1_5_1 plug_1_1_3 ];
+            beamDeps  = [ porcelain_2_0_1 poolboy_1_5_1 plug_1_1_5 ];
 
             meta = {
               description = ''File upload and on-the-fly processing for
@@ -1664,6 +2223,60 @@ let
 
     ashes = ashes_0_0_3;
 
+    assembla_api_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "assembla_api";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "assembla_api";
+              version = "0.1.0";
+              sha256 =
+                "b4a3898de536e4820702c0f119993fd2804e91e2525d1e7eba57d8744983ef24";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Assembla API client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Assembla/ex_assembla_api";
+            };
+          } // packageOverrides)
+      ) {};
+
+    assembla_api = assembla_api_0_1_0;
+
+    assembly_line_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, gproc_0_5_0 }:
+          buildMix ({
+            name = "assembly_line";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "assembly_line";
+              version = "1.0.0";
+              sha256 =
+                "3b687890bf750cd893e8a73c261710c1014ba4d5b2247f695f7730b2a84a5473";
+            };
+            beamDeps  = [ gproc_0_5_0 ];
+
+            meta = {
+              description = ''A light-weight job queue (think DAG) manager.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/LeakyBucket/assembly_line";
+            };
+          } // packageOverrides)
+      ) {};
+
+    assembly_line = assembly_line_1_0_0;
+
     assert_diff_0_0_5 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -1687,9 +2300,34 @@ let
 
     assert_diff = assert_diff_0_0_5;
 
+    atomic_map_0_9_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "atomic_map";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "atomic_map";
+              version = "0.9.0";
+              sha256 =
+                "f95d5fd4e0f5e4a8ecfead77fa1957cfbcee52307692bcd632159e01326cbf78";
+            };
+
+            meta = {
+              longDescription = ''A small utility to convert deep Elixir maps
+                                with mixed string/atom keys to atom-only keyed
+                                maps'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ruby2elixir/atomic_map";
+            };
+          } // packageOverrides)
+      ) {};
+
+    atomic_map = atomic_map_0_9_0;
+
     auth_test_support_0_0_6 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "auth_test_support";
             version = "0.0.6";
@@ -1699,7 +2337,7 @@ let
               sha256 =
                 "930596c61d237fbf74b86d87819f0a7df8da8ef79051294a1982ded403cb2401";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               description = ''Authentication and authorization test support
@@ -1741,7 +2379,7 @@ let
           packageOverrides ? {},
           fetchHex,
           poison_1_5_2,
-          plug_1_1_3
+          plug_1_1_5
         }:
           buildMix ({
             name = "auto_doc";
@@ -1752,7 +2390,7 @@ let
               sha256 =
                 "9c4b30c526e59f63173fe2f0d0c360ac678f1e7a11adcf209dfc843a3e63e6f7";
             };
-            beamDeps  = [ poison_1_5_2 plug_1_1_3 ];
+            beamDeps  = [ poison_1_5_2 plug_1_1_5 ];
 
             meta = {
               description = ''A package that will create REST API docs based on
@@ -1771,7 +2409,7 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -1783,7 +2421,7 @@ let
               sha256 =
                 "7cfa258ce5eff01018dfd6faf509b430d03770fb733c1b10217b9e52770014b3";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {    };
           } // packageOverrides)
@@ -1814,19 +2452,50 @@ let
 
     avex = avex_0_2_0;
 
-    aws_auth_0_2_5 = callPackage
+    aws_0_0_11 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_2_1_6,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "aws";
+            version = "0.0.11";
+            src = fetchHex {
+              pkg = "aws";
+              version = "0.0.11";
+              sha256 =
+                "f9f3f9b0e02bb6aa29268a746b2110deaebe34f205d689e9d57ccb90f0caf072";
+            };
+            beamDeps  = [ timex_2_1_6 poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''AWS clients for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jkakar/aws-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    aws = aws_0_0_11;
+
+    aws_auth_0_4_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_2_1_6 }:
           buildMix ({
             name = "aws_auth";
-            version = "0.2.5";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "aws_auth";
-              version = "0.2.5";
+              version = "0.4.0";
               sha256 =
-                "646f1f42652adfb329b5eedde28ddda516c6d02dce45932108b85e2d8bd91b0a";
+                "67f28f8e4ffdd3f3155e124f20ef325ff32ea3f525cf85e2df96f2f09d245976";
             };
-            beamDeps  = [ timex_1_0_2 ];
+            beamDeps  = [ timex_2_1_6 ];
 
             meta = {
               description = ''AWS Signature Version 4 Signing Library'';
@@ -1836,7 +2505,7 @@ let
           } // packageOverrides)
       ) {};
 
-    aws_auth = aws_auth_0_2_5;
+    aws_auth = aws_auth_0_4_0;
 
     aws_cli_0_1_0 = callPackage
       (
@@ -1863,17 +2532,260 @@ let
 
     aws_cli = aws_cli_0_1_0;
 
-    bankster_0_1_0 = callPackage
+    azure_push_client_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "azure_push_client";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "azure_push_client";
+              version = "0.0.2";
+              sha256 =
+                "d58bbac5e5260d92ef62916e74dbb8743e413a9f69afa2d8e1940071407a2f06";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Azure Push Client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/chaione/azure_push_client";
+            };
+          } // packageOverrides)
+      ) {};
+
+    azure_push_client = azure_push_client_0_0_2;
+
+    b2_0_0_6 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "b2";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "b2";
+              version = "0.0.6";
+              sha256 =
+                "f8b33d1ec36576dfbca3f2f4c5fad1a9a227207d1ef63b3a388778e8fad3333a";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir B2 cloud API wrapper'';
+
+            };
+          } // packageOverrides)
+      ) {};
+
+    b2 = b2_0_0_6;
+
+    backy_0_0_5 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          postgrex_0_11_1
+        }:
+          buildMix ({
+            name = "backy";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "backy";
+              version = "0.0.5";
+              sha256 =
+                "e581cc209ec08e61f0ba2205b39b7154f9fb3d12f6636e76ebd3ddce5e85a0e6";
+            };
+            beamDeps  = [ poison_2_1_0 postgrex_0_11_1 ];
+
+            meta = {
+              description = ''A simple background job queue backed by
+                            postgresql.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kuon/backy";
+            };
+          } // packageOverrides)
+      ) {};
+
+    backy = backy_0_0_5;
+
+    bamboo_0_3_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "bamboo";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "bamboo";
+              version = "0.3.2";
+              sha256 =
+                "1b4bfdddae49f6fc66616c63b4d2d9a0e99d40a08619004f5c4f4e4aebfa20ed";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''Straightforward, powerful, and adapter based
+                                Elixir email library. Works with Mandrill,
+                                Mailgun, SendGrid, SparkPost, in-memory, and
+                                test.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/paulcsmith/bamboo";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bamboo_0_5_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          plug_1_1_5,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "bamboo";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "bamboo";
+              version = "0.5.0";
+              sha256 =
+                "29e46e8c9e861e93103cde6fab9712bb077317e517af75a05e118763f7c5fc35";
+            };
+            beamDeps  = [ poison_2_1_0 plug_1_1_5 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''Straightforward, powerful, and adapter based
+                                Elixir email library. Works with Mandrill,
+                                Mailgun, SendGrid, SparkPost, in-memory, and
+                                test.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/paulcsmith/bamboo";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bamboo_0_6_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          plug_1_1_5,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "bamboo";
+            version = "0.6.0";
+            src = fetchHex {
+              pkg = "bamboo";
+              version = "0.6.0";
+              sha256 =
+                "81a48add86d8b08da8a4ca8249caa0d42cb51d0cb654bf8ed921f3055995441d";
+            };
+            beamDeps  = [ poison_2_1_0 plug_1_1_5 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''Straightforward, powerful, and adapter based
+                                Elixir email library. Works with Mandrill,
+                                Mailgun, SendGrid, SparkPost, in-memory, and
+                                test.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/paulcsmith/bamboo";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bamboo = bamboo_0_6_0;
+
+    bamboo_smtp_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          gen_smtp_0_10_0,
+          bamboo_0_5_0
+        }:
+          buildMix ({
+            name = "bamboo_smtp";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "bamboo_smtp";
+              version = "0.0.2";
+              sha256 =
+                "34c621806c8f9a2e316d5bc5f63bf85f5387418ff60222a383189611a367de4d";
+            };
+            beamDeps  = [ gen_smtp_0_10_0 bamboo_0_5_0 ];
+
+            meta = {
+              description = ''A Bamboo adapter for SMTP'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/fewlinesco/bamboo_smtp";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bamboo_smtp = bamboo_smtp_0_0_2;
+
+    bamboo_sparkpost_0_5_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, bamboo_0_6_0 }:
+          buildMix ({
+            name = "bamboo_sparkpost";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "bamboo_sparkpost";
+              version = "0.5.1";
+              sha256 =
+                "dc4165282d13fe431b78dbf04db5e280bc4fef9f87d3b0e20e78e008c8c6b3de";
+            };
+            beamDeps  = [ bamboo_0_6_0 ];
+
+            meta = {
+              description = ''A Bamboo adapter for the SparkPost email
+                            service'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/andrewtimberlake/bamboo_sparkpost";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bamboo_sparkpost = bamboo_sparkpost_0_5_1;
+
+    bankster_0_2_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "bankster";
-            version = "0.1.0";
+            version = "0.2.2";
             src = fetchHex {
               pkg = "bankster";
-              version = "0.1.0";
+              version = "0.2.2";
               sha256 =
-                "c56909377e5246b37043b4b19a940a4eac8ef57d8e8006d10e201928fd2bbcb7";
+                "000df06a7701e11f1b9cba4595873f8c7d8e55afde22153fd3d6d19e55bc29f7";
             };
 
             meta = {
@@ -1885,7 +2797,7 @@ let
           } // packageOverrides)
       ) {};
 
-    bankster = bankster_0_1_0;
+    bankster = bankster_0_2_2;
 
     banner_0_1_0 = callPackage
       (
@@ -1980,6 +2892,32 @@ let
 
     base16 = base16_1_0_0;
 
+    base36_1_0_0 = callPackage
+      (
+        {
+          buildMix, packageOverrides ? {}, fetchHex, custom_base_0_2_0
+        }:
+          buildMix ({
+            name = "base36";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "base36";
+              version = "1.0.0";
+              sha256 =
+                "6022d73272ebd0a6f600248da05b47576b94f064c6444dd0401df67e717c189e";
+            };
+            beamDeps  = [ custom_base_0_2_0 ];
+
+            meta = {
+              description = ''Base36 encoder/decoder.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nscyclone/base36";
+            };
+          } // packageOverrides)
+      ) {};
+
+    base36 = base36_1_0_0;
+
     base58_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -2076,6 +3014,29 @@ let
 
     base64url = base64url_0_0_1;
 
+    basex_0_2_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "basex";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "basex";
+              version = "0.2.1";
+              sha256 =
+                "190fcbb9d03fe325aee3bc1eea67e663ace1209d4515518c25098e307070f551";
+            };
+
+            meta = {
+              description = ''BaseX - arbitrary alphabet encoding'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/basex_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    basex = basex_0_2_1;
+
     basho_poolboy_0_8_1_p3 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -2099,6 +3060,29 @@ let
 
     basho_poolboy = basho_poolboy_0_8_1_p3;
 
+    basho_stats_1_0_3 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "basho_stats";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "basho_stats";
+              version = "1.0.3";
+              sha256 =
+                "d739e733b1c8afcaa467289fca50221753fc8cde6e7b53a79b67f98a2a261f5a";
+            };
+
+            meta = {
+              description = ''Basic Erlang statistics library'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/basho/basho_stats";
+            };
+          } // packageOverrides)
+      ) {};
+
+    basho_stats = basho_stats_1_0_3;
+
     batcher_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -2124,6 +3108,36 @@ let
 
     batcher = batcher_0_0_1;
 
+    battlenet_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "battlenet";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "battlenet";
+              version = "0.0.2";
+              sha256 =
+                "cdd4e182da5a2db478e0da9ac1a467fc8f2b8ec638e3e38dd7962ff3fe8c9342";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir library for the Battle.net API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cazrin/battlenet";
+            };
+          } // packageOverrides)
+      ) {};
+
+    battlenet = battlenet_0_0_2;
+
     bbmustache_1_0_3 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -2266,6 +3280,70 @@ let
 
     bear = bear_0_8_3;
 
+    beersearch_0_0_6 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpotion_2_2_2,
+          floki_0_8_1
+        }:
+          buildMix ({
+            name = "beersearch";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "beersearch";
+              version = "0.0.6";
+              sha256 =
+                "d830a7e1a6384d62b1dca430b6ab7dd99467f4ca1555a2ce7fed9422c3c86c6a";
+            };
+            beamDeps  = [ httpotion_2_2_2 floki_0_8_1 ];
+
+            meta = {
+              description = ''A simple Elixir module that searches for beers on
+                            Untappd.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nicksergeant/elixir-beersearch";
+            };
+          } // packageOverrides)
+      ) {};
+
+    beersearch = beersearch_0_0_6;
+
+    bees_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          plug_1_1_5,
+          jsx_2_8_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "bees";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "bees";
+              version = "0.0.2";
+              sha256 =
+                "3b6c0eee9359a87aff7b7e625a571a646d1932f8b4835fc18cc14f07cf0810fc";
+            };
+            beamDeps  = [ poison_2_1_0 plug_1_1_5 jsx_2_8_0 httpoison_0_8_3
+                      ];
+
+            meta = {
+              description = ''Foursquare API client for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/danieltomlinson/bees";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bees = bees_0_0_2;
+
     belixir_0_2_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -2315,6 +3393,63 @@ let
 
     belvedere = belvedere_0_0_1;
 
+    benchee_0_2_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "benchee";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "benchee";
+              version = "0.2.0";
+              sha256 =
+                "892b4463b3add8cb0a1c68fc45e03c6297895979bd0c77283460bad90d029dc3";
+            };
+
+            meta = {
+              longDescription = ''Versatile (micro) benchmarking that is
+                                extensible. Get statistics such as: average,
+                                iterations per second, standard deviation and
+                                the median.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/PragTob/benchee";
+            };
+          } // packageOverrides)
+      ) {};
+
+    benchee = benchee_0_2_0;
+
+    benchee_csv_0_2_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          csv_1_4_1,
+          benchee_0_2_0
+        }:
+          buildMix ({
+            name = "benchee_csv";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "benchee_csv";
+              version = "0.2.0";
+              sha256 =
+                "43a864f1be2e9755a7cfed9e7a26aec466887773a76d1a9ef04f8737fe5b3968";
+            };
+            beamDeps  = [ csv_1_4_1 benchee_0_2_0 ];
+
+            meta = {
+              description = ''Get CSV from your benchee benchmarks to them into
+                            graphs or whatever!'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/PragTob/benchee_csv";
+            };
+          } // packageOverrides)
+      ) {};
+
+    benchee_csv = benchee_csv_0_2_0;
+
     benchfella_0_3_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -2389,7 +3524,34 @@ let
           } // packageOverrides)
       ) {};
 
-    bencode = bencode_0_3_0;
+    bencode_0_3_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, eqc_ex_1_2_4 }:
+          buildMix ({
+            name = "bencode";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "bencode";
+              version = "0.3.1";
+              sha256 =
+                "a66ba85941c0115fae4f96309d6a1eeeee12571aef72a53bf2c990f236b895be";
+            };
+            beamDeps  = [ eqc_ex_1_2_4 ];
+
+            meta = {
+              longDescription = ''A complete and correct Bencode encoder and
+                                decoder written in pure Elixir. The decoder will
+                                return the info hash with along with the decoded
+                                data, and the encoder is implemented as a
+                                protocol, allowing any data structure to be
+                                bcode encoded.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/gausby/bencode";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bencode = bencode_0_3_1;
 
     bencodex_1_0_0 = callPackage
       (
@@ -2414,17 +3576,17 @@ let
 
     bencodex = bencodex_1_0_0;
 
-    bento_0_9_0 = callPackage
+    bento_0_9_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
           buildMix ({
             name = "bento";
-            version = "0.9.0";
+            version = "0.9.2";
             src = fetchHex {
               pkg = "bento";
-              version = "0.9.0";
+              version = "0.9.2";
               sha256 =
-                "3bc189cab5909af848cda351cc2bf3ff8998f41b6c21524204217674cbcff8c4";
+                "8be4312c4eacf57ef0c319f5ddd0b31872b510dc8ca02c64206ee648ec0f91d1";
             };
             beamDeps  = [ poison_2_1_0 ];
 
@@ -2437,7 +3599,7 @@ let
           } // packageOverrides)
       ) {};
 
-    bento = bento_0_9_0;
+    bento = bento_0_9_2;
 
     bert_0_1_0 = callPackage
       (
@@ -2462,6 +3624,37 @@ let
 
     bert = bert_0_1_0;
 
+    big_query_0_0_5 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          jose_1_4_2,
+          httpoison_0_8_2
+        }:
+          buildMix ({
+            name = "big_query";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "big_query";
+              version = "0.0.5";
+              sha256 =
+                "f15795ee81245699d2d7a5cbf667637cbfc56a6b52143cacdfa145c0c4c11fbf";
+            };
+            beamDeps  = [ poison_2_1_0 jose_1_4_2 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''A Google BigQuery API client.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/companykitchen/big_query";
+            };
+          } // packageOverrides)
+      ) {};
+
+    big_query = big_query_0_0_5;
+
     bigflake_0_3_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, base62_1_2_0 }:
@@ -2528,6 +3721,42 @@ let
 
     bin_format = bin_format_0_0_1;
 
+    bing_translator_0_2_7 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_2_1_6,
+          poison_1_5_2,
+          httpoison_0_8_3,
+          floki_0_8_1
+        }:
+          buildMix ({
+            name = "bing_translator";
+            version = "0.2.7";
+            src = fetchHex {
+              pkg = "bing_translator";
+              version = "0.2.7";
+              sha256 =
+                "6dc4e9680f93ebc3f63bce85cbadf592145e635279dc23da87b2cb83d93b08ff";
+            };
+            beamDeps  = [
+                          timex_2_1_6 poison_1_5_2 httpoison_0_8_3 floki_0_8_1
+                        ];
+
+            meta = {
+              longDescription = ''Translate strings using the Bing HTTP API.
+                                Requires that you have a Client ID and Secret.
+                                See README.md for information.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ikeikeikeike/bing_translator";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bing_translator = bing_translator_0_2_7;
+
     binstructor_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -2552,6 +3781,36 @@ let
 
     binstructor = binstructor_0_0_1;
 
+    biometrics_facade_1_2_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpotion_2_2_2
+        }:
+          buildMix ({
+            name = "biometrics_facade";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "biometrics_facade";
+              version = "1.2.0";
+              sha256 =
+                "b0b40c11fc884229936e6547a31c44eae3fedea0bd47355e33153c8b8c7dd81b";
+            };
+            beamDeps  = [ poison_1_5_2 httpotion_2_2_2 ];
+
+            meta = {
+              description = ''An API facade for a private biometrics
+                            service.'';
+              license = stdenv.lib.licenses.mit;
+            };
+          } // packageOverrides)
+      ) {};
+
+    biometrics_facade = biometrics_facade_1_2_0;
+
     bit_field_set_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, eqc_ex_1_2_4 }:
@@ -2684,7 +3943,7 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -2696,7 +3955,7 @@ let
               sha256 =
                 "2900dc5b7c6f7810bdf5e0ede8749632997811ae5b72ada34f59699b4310a65a";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               description = ''Basic Access Authentication in Plug
@@ -2709,28 +3968,28 @@ let
 
     blaguth = blaguth_1_2_1;
 
-    blake2_0_0_1 = callPackage
+    blake2_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "blake2";
-            version = "0.0.1";
+            version = "0.1.0";
             src = fetchHex {
               pkg = "blake2";
-              version = "0.0.1";
+              version = "0.1.0";
               sha256 =
-                "3f4d66c465d424076f3673065bdd3f3cdcda2cdc59bbdfc7216fa405fa563264";
+                "5d1ac81724568d173ef9fa198b37abe39eb54ecd1f4871d8c62aabaf5d1ace25";
             };
 
             meta = {
-              description = ''BLAKE2 hash function'';
+              description = ''BLAKE2 hash functions'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mwmiller/blake2_ex";
             };
           } // packageOverrides)
       ) {};
 
-    blake2 = blake2_0_0_1;
+    blake2 = blake2_0_1_0;
 
     blanket_0_3_1 = callPackage
       (
@@ -2756,6 +4015,115 @@ let
 
     blanket = blanket_0_3_1;
 
+    blast_furnace_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "blast_furnace";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "blast_furnace";
+              version = "0.0.1";
+              sha256 =
+                "361bff3352803779f481ce56662228825c74ef45d34d05c79df5f56a37a2adb2";
+            };
+
+            meta = {
+              description = ''Elixir port of invaluable blast furnace
+                            functionality'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/markryall/blast_furnace_exs";
+            };
+          } // packageOverrides)
+      ) {};
+
+    blast_furnace = blast_furnace_0_0_1;
+
+    blaze_cloud_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_0_1,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "blaze_cloud";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "blaze_cloud";
+              version = "0.0.1";
+              sha256 =
+                "c5a26f194691d7c40a008c5aded034ca0a43d4fa6a9173952333479cf2661b2b";
+            };
+            beamDeps  = [ poison_2_0_1 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir Library for Backblaze B2 Cloud Storage.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/PerishableDave/blaze_cloud";
+            };
+          } // packageOverrides)
+      ) {};
+
+    blaze_cloud = blaze_cloud_0_0_1;
+
+    blazon_0_2_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "blazon";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "blazon";
+              version = "0.2.0";
+              sha256 =
+                "ef63180cafb9241602feb79155919e18eebd8da62e79544e4dae4273522f58c7";
+            };
+
+            meta = {
+              description = ''Declarative abstract serializers.'';
+              license = stdenv.lib.licenses.publicDomain;
+              homepage = "https://github.com/mtwilliams/blazon";
+            };
+          } // packageOverrides)
+      ) {};
+
+    blazon = blazon_0_2_0;
+
+    blockchain_info_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "blockchain_info";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "blockchain_info";
+              version = "0.0.2";
+              sha256 =
+                "81593db73e409e008a785798ee7e5482d4274fd5e748e8d74f458c1e187e822b";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''WIP BlockchainInfo API wrapper for Elixir.
+                                Provides access to bitcoin blockchain data.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/cyberpunk-ventures/blockchain_info_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    blockchain_info = blockchain_info_0_0_2;
+
     blocking_queue_1_3_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -2781,17 +4149,77 @@ let
 
     blocking_queue = blocking_queue_1_3_0;
 
-    bloomex_1_0_0 = callPackage
+    bloodhound_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "bloodhound";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "bloodhound";
+              version = "0.1.1";
+              sha256 =
+                "6aaab638fe90fc3714b650b659df774c7cdb12d098fee3910952e0a0f8fcd6ec";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An ElasticSearch library for Elixir that can be
+                            easily integrated with Ecto'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ianwalter/bloodhound";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bloodhound = bloodhound_0_1_1;
+
+    bloom_filter_1_0_1 = callPackage
+      (
+        {
+          buildMix, packageOverrides ? {}, fetchHex, math_0_2_0, fnv_0_3_2
+        }:
+          buildMix ({
+            name = "bloom_filter";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "bloom_filter";
+              version = "1.0.1";
+              sha256 =
+                "324d819a3901c0318e9cea51cc4a5555cc15ad6243c7150676e6e1b76d7aa081";
+            };
+            beamDeps  = [ math_0_2_0 fnv_0_3_2 ];
+
+            meta = {
+              longDescription = ''Bloom Filter implementation in Elixir. Bloom
+                                filters are probabilistic data structures
+                                designed to efficiently tell you whether an
+                                element is present in a set.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Leventhan/bloom_filter";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bloom_filter = bloom_filter_1_0_1;
+
+    bloomex_1_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "bloomex";
-            version = "1.0.0";
+            version = "1.0.1";
             src = fetchHex {
               pkg = "bloomex";
-              version = "1.0.0";
+              version = "1.0.1";
               sha256 =
-                "598f414e8bb23054843430fff449861ce7d8f6a81a220cbfed8cf42dcd1dd299";
+                "2d8424142550f226043e4e6fc05c10552022dfb8f5fe3e5f131252c8da45f6e9";
             };
 
             meta = {
@@ -2803,7 +4231,29 @@ let
           } // packageOverrides)
       ) {};
 
-    bloomex = bloomex_1_0_0;
+    bloomex = bloomex_1_0_1;
+
+    blume_0_1_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "blume";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "blume";
+              version = "0.1.0";
+              sha256 =
+                "8a87a43607d9dab1e3138052c18355bc1fc2a98bbcc4cb1657494c395aca0fd6";
+            };
+
+            meta = {
+              description = ''Pure erlang bloom Filters'';
+              license = stdenv.lib.licenses.free;
+            };
+          } // packageOverrides)
+      ) {};
+
+    blume = blume_0_1_0;
 
     bmark_1_0_3 = callPackage
       (
@@ -2829,17 +4279,41 @@ let
 
     bmark = bmark_1_0_3;
 
-    boltun_0_0_4 = callPackage
+    bmfont_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, tonic_0_0_1 }:
+          buildMix ({
+            name = "bmfont";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "bmfont";
+              version = "0.0.1";
+              sha256 =
+                "5b52d65c0345e64b2a72c54641593de19dcd33b0e8af6c80ebc29485a98bd279";
+            };
+            beamDeps  = [ tonic_0_0_1 ];
+
+            meta = {
+              description = ''A BMFont file format parser'';
+              license = stdenv.lib.licenses.bsd2;
+              homepage = "https://github.com/ScrimpyCat/BMFontEx";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bmfont = bmfont_0_0_1;
+
+    boltun_1_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, postgrex_0_11_1 }:
           buildMix ({
             name = "boltun";
-            version = "0.0.4";
+            version = "1.0.1";
             src = fetchHex {
               pkg = "boltun";
-              version = "0.0.4";
+              version = "1.0.1";
               sha256 =
-                "fcf18b4bfab0afcd1c31133c9c5232776ededd1fb3caa1536ded8265002ab867";
+                "4b787aa6cafedca1a3a35b40ca8fee944641b1577b18c4e9e8c234ffd728e8d9";
             };
             beamDeps  = [ postgrex_0_11_1 ];
 
@@ -2848,24 +4322,137 @@ let
                                 LISTEN/NOTIFY mechanism into callback
                                 execution'';
               license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/briksoftware/boltun";
+              homepage = "https://github.com/bitgamma/boltun";
             };
           } // packageOverrides)
       ) {};
 
-    boltun = boltun_0_0_4;
+    boltun = boltun_1_0_1;
 
-    braise_0_3_2 = callPackage
+    bookingsync_api_client_v3_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          json_0_3_3,
+          httpotion_2_2_2
+        }:
+          buildMix ({
+            name = "bookingsync_api_client_v3";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "bookingsync_api_client_v3";
+              version = "0.0.1";
+              sha256 =
+                "7f0625828f7c38dd37f5ea0f2054b5b902851dbc9679bd354bb928a1f66c5db0";
+            };
+            beamDeps  = [ json_0_3_3 httpotion_2_2_2 ];
+
+            meta = {
+              longDescription = ''Elixir BookingSync
+                                (https://www.bookingsync.com) API v3 client.
+                                Find more at:
+                                http://developers.bookingsync.com'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/Azdaroth/ex_bookingsync_api_client_v3";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bookingsync_api_client_v3 = bookingsync_api_client_v3_0_0_1;
+
+    botan_0_1_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "botan";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "botan";
+              version = "0.1.2";
+              sha256 =
+                "43541b5c52c91e46295a015f58857c347c85a7753d7c3cd3a1f835b25fdedaa9";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir wrapper for Botan.io'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mendab1e/exBotan";
+            };
+          } // packageOverrides)
+      ) {};
+
+    botan = botan_0_1_2;
+
+    bowfish_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "bowfish";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "bowfish";
+              version = "0.1.0";
+              sha256 =
+                "fcf3cccddd5d39adf5c5aceae924854d500f99bb45af97e118695db1cb633f67";
+            };
+
+            meta = {
+              longDescription = ''A fun, positional pipe operator macro >>> for
+                                when piping to the first arg just won`t cut
+                                it.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/coconaut/bowfish";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bowfish = bowfish_0_1_0;
+
+    braintree_0_5_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
+          buildMix ({
+            name = "braintree";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "braintree";
+              version = "0.5.0";
+              sha256 =
+                "9610f2c63e76732e733ee7a97d6971fb0698ae7425cb9b3faba83acfa8734fac";
+            };
+            beamDeps  = [ httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Native Braintree client library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sorentwo/braintree-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    braintree = braintree_0_5_0;
+
+    braise_0_3_4 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poison_1_3_1 }:
           buildMix ({
             name = "braise";
-            version = "0.3.2";
+            version = "0.3.4";
             src = fetchHex {
               pkg = "braise";
-              version = "0.3.2";
+              version = "0.3.4";
               sha256 =
-                "5efb63b074308be51d25b1f324799b8b715b5b025bfdbdd9a39972b36a7b957c";
+                "10325449af9365e886b2731a7709efded8e3443253c10c9af7a50fcfe5597707";
             };
             beamDeps  = [ poison_1_3_1 ];
 
@@ -2878,7 +4465,7 @@ let
           } // packageOverrides)
       ) {};
 
-    braise = braise_0_3_2;
+    braise = braise_0_3_4;
 
     brcpfcnpj_0_1_0 = callPackage
       (
@@ -2907,7 +4494,7 @@ let
 
     breadcrumble_1_0_3 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "breadcrumble";
             version = "1.0.3";
@@ -2917,7 +4504,7 @@ let
               sha256 =
                 "f1d3ec0d3bf74670c58d4ff6c1d10cad0757c003b56ba9f77e3d76a05ac68be3";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               description = ''Elixir port of Breadcrumble library'';
@@ -2952,17 +4539,47 @@ let
 
     briefly = briefly_0_3_0;
 
-    browser_0_1_2 = callPackage
+    brighterx_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "brighterx";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "brighterx";
+              version = "0.0.2";
+              sha256 =
+                "f05d90a6e01e6244aa0adfc68e9a5c92bf2a3d740f3093929557c043fc6b87b8";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A simple brighterlink api implementation'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Brightergy/brighterx";
+            };
+          } // packageOverrides)
+      ) {};
+
+    brighterx = brighterx_0_0_2;
+
+    browser_0_1_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "browser";
-            version = "0.1.2";
+            version = "0.1.3";
             src = fetchHex {
               pkg = "browser";
-              version = "0.1.2";
+              version = "0.1.3";
               sha256 =
-                "37919c96372654f687ee9d6645c50b8f6182baad589978326a00f671133446e7";
+                "e009b1af32a665393eb3e81b812e87f29f9e606426e30ae73507bf5c4c592af1";
             };
 
             meta = {
@@ -2973,7 +4590,7 @@ let
           } // packageOverrides)
       ) {};
 
-    browser = browser_0_1_2;
+    browser = browser_0_1_3;
 
     bstr_0_3_0 = callPackage
       (
@@ -3021,6 +4638,36 @@ let
 
     buffer = buffer_0_3_6;
 
+    bugsnag_1_2_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "bugsnag";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "bugsnag";
+              version = "1.2.0";
+              sha256 =
+                "23c6e8eb827ec1294684b5fe788d4d1cd670804ddfb74bb2bd427aed44a68f05";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An Elixir interface to the Bugsnag API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jarednorman/bugsnag-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bugsnag = bugsnag_1_2_0;
+
     build_client_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -3044,17 +4691,17 @@ let
 
     build_client = build_client_0_0_1;
 
-    bunt_0_1_5 = callPackage
+    bunt_0_1_6 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "bunt";
-            version = "0.1.5";
+            version = "0.1.6";
             src = fetchHex {
               pkg = "bunt";
-              version = "0.1.5";
+              version = "0.1.6";
               sha256 =
-                "5a365df70e90a021617d1bcf6dedada848176728c84a33b463e59fb0c9b8cc65";
+                "4fb7b2f7b04af13cf210b132f8d10db52d4a57d36cb974e8025d7fdb12ca97fc";
             };
 
             meta = {
@@ -3065,7 +4712,30 @@ let
           } // packageOverrides)
       ) {};
 
-    bunt = bunt_0_1_5;
+    bunt = bunt_0_1_6;
+
+    bus_bar_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "bus_bar";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "bus_bar";
+              version = "0.0.1";
+              sha256 =
+                "1781eebe238d7106cecaf947062684a0658033898282a4a0ab15f037a92ab985";
+            };
+
+            meta = {
+              description = ''A simple event bus.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/JonRowe/busbar";
+            };
+          } // packageOverrides)
+      ) {};
+
+    bus_bar = bus_bar_0_0_1;
 
     bypass_0_5_1 = callPackage
       (
@@ -3073,7 +4743,7 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -3085,7 +4755,7 @@ let
               sha256 =
                 "bbff87f453cd98a81c9caeb305e5bcee25fe4fe31089cb19127a36dd224c2454";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''Bypass provides a quick way to create a
@@ -3104,18 +4774,21 @@ let
 
     bypass = bypass_0_5_1;
 
-    cachex_0_8_0 = callPackage
+    cachex_1_1_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
+        {
+          buildMix, packageOverrides ? {}, fetchHex, gen_delegate_1_0_0
+        }:
           buildMix ({
             name = "cachex";
-            version = "0.8.0";
+            version = "1.1.1";
             src = fetchHex {
               pkg = "cachex";
-              version = "0.8.0";
+              version = "1.1.1";
               sha256 =
-                "b6fa0414bc725a557fc73deed144b318831f2f4ed5f67e525da8972eb789059d";
+                "b9f179ee6f61cbaec9d4be604b0001ff035158923aa4d53b56de495ebf025683";
             };
+            beamDeps  = [ gen_delegate_1_0_0 ];
 
             meta = {
               description = ''Powerful in-memory key/value storage for
@@ -3126,13 +4799,11 @@ let
           } // packageOverrides)
       ) {};
 
-    cachex = cachex_0_8_0;
+    cachex = cachex_1_1_1;
 
     calendar_0_12_4 = callPackage
       (
-        {
-          buildMix, packageOverrides ? {}, fetchHex, tzdata_0_1_201603
-        }:
+        {  buildMix, packageOverrides ? {}, fetchHex, tzdata_0_0_1 }:
           buildMix ({
             name = "calendar";
             version = "0.12.4";
@@ -3142,7 +4813,7 @@ let
               sha256 =
                 "1df7cc23b7dfa3228498fff3bd298495d8431433be94db62a60e93ffa455a060";
             };
-            beamDeps  = [ tzdata_0_1_201603 ];
+            beamDeps  = [ tzdata_0_0_1 ];
 
             meta = {
               longDescription = ''Calendar is a datetime library for Elixir.
@@ -3163,9 +4834,7 @@ let
 
     calendar_0_13_2 = callPackage
       (
-        {
-          buildMix, packageOverrides ? {}, fetchHex, tzdata_0_1_201603
-        }:
+        {  buildMix, packageOverrides ? {}, fetchHex, tzdata_0_0_1 }:
           buildMix ({
             name = "calendar";
             version = "0.13.2";
@@ -3175,7 +4844,7 @@ let
               sha256 =
                 "5be3a69db1a177ed39d24d582ac7be3dab59ee8aeae41ee17c36a263a9818460";
             };
-            beamDeps  = [ tzdata_0_1_201603 ];
+            beamDeps  = [ tzdata_0_0_1 ];
 
             meta = {
               longDescription = ''Calendar is a datetime library for Elixir.
@@ -3194,32 +4863,37 @@ let
           } // packageOverrides)
       ) {};
 
-    calendar = calendar_0_13_2;
-
-    calendar_translations_0_0_3 = callPackage
+    calendar_0_14_2 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, calendar_0_13_2 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, tzdata_0_0_1 }:
           buildMix ({
-            name = "calendar_translations";
-            version = "0.0.3";
+            name = "calendar";
+            version = "0.14.2";
             src = fetchHex {
-              pkg = "calendar_translations";
-              version = "0.0.3";
+              pkg = "calendar";
+              version = "0.14.2";
               sha256 =
-                "b232912959f7f645a34e1a6ceca4657156e64bb5db3573fbc61c603c648dcb09";
+                "8b76c5bcfbe77b454c4e38696ea0fb77d52fc212e377a4299884073012960f27";
             };
-            beamDeps  = [ calendar_0_13_2 ];
+            beamDeps  = [ tzdata_0_0_1 ];
 
             meta = {
-              description = ''Translations for the Calendar library.'';
+              longDescription = ''Calendar is a datetime library for Elixir.
+                                Providing explicit types for datetimes, dates
+                                and times. Full timezone support via its sister
+                                package `tzdata`. Safe parsing and formatting of
+                                standard formats (ISO, RFC, Unix, JS etc.) plus
+                                strftime formatting. Easy and safe
+                                interoperability with erlang style datetime
+                                tuples. Extendable through protocols. Related
+                                packages are available for i18n, Ecto and
+                                Phoenix interoperability.'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/padde/calendar_translations";
+              homepage = "https://github.com/lau/calendar";
             };
           } // packageOverrides)
       ) {};
 
-    calendar_translations = calendar_translations_0_0_3;
-
     calliope_0_3_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -3241,7 +4915,93 @@ let
           } // packageOverrides)
       ) {};
 
-    calliope = calliope_0_3_0;
+    calliope_0_4_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "calliope";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "calliope";
+              version = "0.4.0";
+              sha256 =
+                "4b5d6c87da9f635e8596f9ebb63f51aa10c6884a1898b308219281c8a897ff3a";
+            };
+
+            meta = {
+              description = ''An Elixir library for parsing haml templates.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nurugger07/calliope";
+            };
+          } // packageOverrides)
+      ) {};
+
+    calliope = calliope_0_4_0;
+
+    campminder_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_2_1_6,
+          poison_2_1_0,
+          httpoison_0_8_3,
+          hackney_1_6_0
+        }:
+          buildMix ({
+            name = "campminder";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "campminder";
+              version = "0.1.0";
+              sha256 =
+                "bd54e1c20b5cf566f28a827bcc0e32adb4aaf86206f4d9f90415adee2e9e5189";
+            };
+            beamDeps  = [
+                          timex_2_1_6 poison_2_1_0 httpoison_0_8_3 hackney_1_6_0
+                        ];
+
+            meta = {
+              description = ''A CampMinder API library for Elixir.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/GimliLongBow/campminder-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    campminder = campminder_0_1_0;
+
+    cartel_0_6_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          httpotion_2_2_2,
+          poison_2_1_0
+        }:
+          buildMix ({
+            name = "cartel";
+            version = "0.6.0";
+            src = fetchHex {
+              pkg = "cartel";
+              version = "0.6.0";
+              sha256 =
+                "04615b867d257b6cb9a32da568666f9e490b80f020a069be38fe261a60734fb8";
+            };
+            beamDeps  = [ poolboy_1_5_1 httpotion_2_2_2 poison_2_1_0 ];
+
+            meta = {
+              description = ''Multi platform, multi app push notifications'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lucacorti/cartel";
+            };
+          } // packageOverrides)
+      ) {};
+
+    cartel = cartel_0_6_0;
 
     cartographer_0_0_1 = callPackage
       (
@@ -3266,30 +5026,140 @@ let
 
     cartographer = cartographer_0_0_1;
 
-    certifi_0_1_1 = callPackage
+    cassette_1_2_4 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "certifi";
-            version = "0.1.1";
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          exml_0_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "cassette";
+            version = "1.2.4";
             src = fetchHex {
-              pkg = "certifi";
-              version = "0.1.1";
+              pkg = "cassette";
+              version = "1.2.4";
               sha256 =
-                "e6d1dda48fad1b1c5b454c8402e2ac375ae12bf85a9910decaf791f330a7de29";
+                "945a595edbaeaab781910bba0defedda2c6fc40fc5b35fdd7214dfae8c375137";
             };
-
-            buildPlugins  = [ rebar3_hex ];
-
+            beamDeps  = [ exml_0_1_0 httpoison_0_8_3 ];
 
             meta = {
-              description = ''An OTP library'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/certifi/erlang-certifi";
+              description = ''A CAS client and validation library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/locaweb/elixir-cassette";
             };
           } // packageOverrides)
       ) {};
 
+    cassette = cassette_1_2_4;
+
+    cassette_plug_1_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_5,
+          cassette_1_2_4
+        }:
+          buildMix ({
+            name = "cassette_plug";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "cassette_plug";
+              version = "1.0.1";
+              sha256 =
+                "7c6ca0bacb3660efd1367b95c8a2d70e485e2842b9bfc87bdeb85c33882dc164";
+            };
+            beamDeps  = [ plug_1_1_5 cassette_1_2_4 ];
+
+            meta = {
+              description = ''An auth Plug using Cassette'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/locaweb/cassette-plug";
+            };
+          } // packageOverrides)
+      ) {};
+
+    cassette_plug = cassette_plug_1_0_1;
+
+    caylir_0_2_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          poison_1_5_2,
+          hackney_1_6_0
+        }:
+          buildMix ({
+            name = "caylir";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "caylir";
+              version = "0.2.0";
+              sha256 =
+                "b3699171f2bef699ce1968394cb2aee3b5ec7db529a395d8bf7d85163067f888";
+            };
+            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 hackney_1_6_0 ];
+
+            meta = {
+              description = ''Cayley driver for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mneudert/caylir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    caylir = caylir_0_2_0;
+
+    cep_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          sweet_xml_0_6_1,
+          poolboy_1_5_1,
+          poison_2_1_0,
+          httpoison_0_8_3,
+          codepagex_0_1_2
+        }:
+          buildMix ({
+            name = "cep";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "cep";
+              version = "0.0.1";
+              sha256 =
+                "f76e67e1d989fc2edbfbd265f79e4a33a0aa7f9ff06934a1f2d49903df72b79f";
+            };
+            beamDeps  = [
+                          sweet_xml_0_6_1
+                          poolboy_1_5_1
+                          poison_2_1_0
+                          httpoison_0_8_3
+                          codepagex_0_1_2
+                        ];
+
+            meta = {
+              longDescription = ''A package to query Brazilian CEP codes. Has
+                                support for multiple source APIs (Correios,
+                                ViaCep, Postmon, etc). It can query one specific
+                                source or query until one source returns a valid
+                                result.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/douglascamata/cep";
+            };
+          } // packageOverrides)
+      ) {};
+
+    cep = cep_0_0_1;
+
     certifi_0_3_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -3399,17 +5269,17 @@ let
 
     chacha20 = chacha20_0_3_2;
 
-    changeset_0_2_1 = callPackage
+    changeset_0_2_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, defmemo_0_1_1 }:
           buildMix ({
             name = "changeset";
-            version = "0.2.1";
+            version = "0.2.2";
             src = fetchHex {
               pkg = "changeset";
-              version = "0.2.1";
+              version = "0.2.2";
               sha256 =
-                "b2ae6487630bcd2931f54331852f4d834dc1ae47687abc95fbc9194c15c55a5f";
+                "81aebf1c232620193fb4eab90962e4a69bbb84709fa4296bdc5593578d7d2758";
             };
             beamDeps  = [ defmemo_0_1_1 ];
 
@@ -3422,7 +5292,7 @@ let
           } // packageOverrides)
       ) {};
 
-    changeset = changeset_0_2_1;
+    changeset = changeset_0_2_2;
 
     changex_0_1_1 = callPackage
       (
@@ -3440,7 +5310,7 @@ let
             meta = {
               description = ''Automatically generate a CHANGELOG.md file based
                             on git commit history. '';
-              license = stdenv.lib.licenses.free;
+              license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Gazler/changex";
             };
           } // packageOverrides)
@@ -3448,13 +5318,45 @@ let
 
     changex = changex_0_1_1;
 
+    chaos_spawn_0_7_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_0_19_5,
+          exactor_2_2_0
+        }:
+          buildMix ({
+            name = "chaos_spawn";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "chaos_spawn";
+              version = "0.7.0";
+              sha256 =
+                "c4c8e985e750706fb4351d6eb036b513a4b7ea3e689a9aecd424251991f21eaa";
+            };
+            beamDeps  = [ timex_0_19_5 exactor_2_2_0 ];
+
+            meta = {
+              longDescription = ''Providing tools to randomly kill proceses.
+                                With the goal of creating robust supevision
+                                trees.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/meadsteve/chaos-spawn";
+            };
+          } // packageOverrides)
+      ) {};
+
+    chaos_spawn = chaos_spawn_0_7_0;
+
     chartkick_0_0_2 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          uuid_1_1_3,
+          uuid_1_1_4,
           poison_1_5_2
         }:
           buildMix ({
@@ -3466,7 +5368,7 @@ let
               sha256 =
                 "6a4f4170b162117f3be9d0a9d98b63b58da8ec2cea4e29155d14441a0b12ac6c";
             };
-            beamDeps  = [ uuid_1_1_3 poison_1_5_2 ];
+            beamDeps  = [ uuid_1_1_4 poison_1_5_2 ];
 
             meta = {    };
           } // packageOverrides)
@@ -3497,6 +5399,33 @@ let
 
     chash = chash_0_1_1;
 
+    chinese_translation_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
+          buildMix ({
+            name = "chinese_translation";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "chinese_translation";
+              version = "0.1.0";
+              sha256 =
+                "d5e4f59421bad59e465322ce7a8f366179e5f6a732d7e06435e8a7c01f42e7ab";
+            };
+            beamDeps  = [ httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''ChineseTranslation provides traditional
+                                chinese <-> simplified chinese translation, as
+                                well as pinyin translation and slugify for
+                                chinese phrases/characters. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tyrchen/chinese_translation";
+            };
+          } // packageOverrides)
+      ) {};
+
+    chinese_translation = chinese_translation_0_1_0;
+
     chronos_0_3_9 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -3595,34 +5524,6 @@ let
 
     cidr = cidr_1_0_0;
 
-    cipher_0_1_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "cipher";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "cipher";
-              version = "0.1.0";
-              sha256 =
-                "f70300294a15cc9db597f2c5f2251e87572cf701a6fe4e2981420fc902e640e5";
-            };
-
-            meta = {
-              longDescription = ''Elixir crypto library to encrypt/decrypt
-                                arbitrary binaries. It uses Erlang Crypto, so
-                                it`s not big deal. Mostly a collection of
-                                helpers wrapping it. It allows to use a crypted
-                                key to validate signed requests. The exact same
-                                cipher is implemented for Python, Ruby and
-                                Elixir, so it can be used to integrate apps from
-                                different languages.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rubencaro/cipher";
-            };
-          } // packageOverrides)
-      ) {};
-
     cirru_parser_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -3677,6 +5578,44 @@ let
 
     ckan = ckan_0_0_2;
 
+    clicksign_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_5,
+          httpoison_0_8_3,
+          exjsx_3_2_0,
+          cowboy_1_0_4,
+          bypass_0_5_1
+        }:
+          buildMix ({
+            name = "clicksign";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "clicksign";
+              version = "0.0.2";
+              sha256 =
+                "e6e9335c86298d5d5af6c18b85f3533554eca74d6129e1aea7dae17849b48ed2";
+            };
+            beamDeps  = [
+                          plug_1_1_5
+                          httpoison_0_8_3
+                          exjsx_3_2_0
+                          cowboy_1_0_4
+                          bypass_0_5_1
+                        ];
+
+            meta = {
+              description = ''Clicksign client'';
+
+            };
+          } // packageOverrides)
+      ) {};
+
+    clicksign = clicksign_0_0_2;
+
     clint_0_0_1 = callPackage
       (
         {
@@ -3759,6 +5698,129 @@ let
 
     close_enough = close_enough_0_0_1;
 
+    cloudex_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          tzdata_0_5_8,
+          timex_0_19_5,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "cloudex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "cloudex";
+              version = "0.0.2";
+              sha256 =
+                "eb424a8e6610de6f7a2f2be074937c571a86d11e4b942d2ea39900855a66b306";
+            };
+            beamDeps  = [
+                          tzdata_0_5_8 timex_0_19_5 poison_1_5_2 httpoison_0_8_3
+                        ];
+
+            meta = {
+              longDescription = ''A library that helps with uploading image
+                                files and urls to cloudinary. Also provides an
+                                helper to generate transformations and
+                                cloudinary urls pointing to your images'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/smeevil/cloudex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    cloudex = cloudex_0_0_2;
+
+    cloudinary_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_4_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "cloudinary";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "cloudinary";
+              version = "0.0.2";
+              sha256 =
+                "9e32b21717b193f90a526203725811b96294d7c88391e5ad4a57bf178678cc4c";
+            };
+            beamDeps  = [ poison_1_4_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Library to upload to Cloudinary'';
+              license = stdenv.lib.licenses.mit;
+            };
+          } // packageOverrides)
+      ) {};
+
+    cloudinary = cloudinary_0_0_2;
+
+    cloudinaryex_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_1_0_2,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "cloudinaryex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "cloudinaryex";
+              version = "0.0.2";
+              sha256 =
+                "31518baacfcca428e30ee8f1c411d76568344e7032ed93cf34535e279c8472fc";
+            };
+            beamDeps  = [ timex_1_0_2 poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A library for connecting with Cloudinary in
+                            Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/micahwedemeyer/cloudinaryex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    cloudinaryex = cloudinaryex_0_0_2;
+
+    cmark_0_6_10 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "cmark";
+            version = "0.6.10";
+            src = fetchHex {
+              pkg = "cmark";
+              version = "0.6.10";
+              sha256 =
+                "df6dd77f8fe0774b6e4cdedcadef56c1c7cb478c6aaed7445535ec87dba3a608";
+            };
+
+            meta = {
+              longDescription = ''Elixir NIF for cmark (C), a parser library
+                                following the CommonMark spec, a compatible
+                                implementation of Markdown.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/asaaki/cmark.ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    cmark = cmark_0_6_10;
+
     cobertura_cover_0_9_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -3834,6 +5896,40 @@ let
 
     coffee_rotor = coffee_rotor_0_2_1;
 
+    coincap_io_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3,
+          exconstructor_1_0_2
+        }:
+          buildMix ({
+            name = "coincap_io";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "coincap_io";
+              version = "0.0.2";
+              sha256 =
+                "23492902655cfff97d9988278dc1478562e236be631608a50d4d47106f132664";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 exconstructor_1_0_2 ];
+
+            meta = {
+              longDescription = ''WIP, unstable Elixir API wrapper for
+                                coincap.io. Provides access to market
+                                capitalization data of bitcoin, altcoins and
+                                cryptotokens.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cyberpunk-ventures/coincap_io_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    coincap_io = coincap_io_0_0_2;
+
     colixir_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -4019,11 +6115,125 @@ let
           } // packageOverrides)
       ) {};
 
-    combine = combine_0_7_0;
+    combine_0_8_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "combine";
+            version = "0.8.0";
+            src = fetchHex {
+              pkg = "combine";
+              version = "0.8.0";
+              sha256 =
+                "3adc5354d03ef96bc494850e5014e11150ddf16b3feee9ff3292a0da55f64301";
+            };
+
+            meta = {
+              description = ''A parser combinator library for Elixir
+                            projects.'';
+              license = stdenv.lib.licenses.mit;
+            };
+          } // packageOverrides)
+      ) {};
+
+    combine = combine_0_8_0;
+
+    comeonin_1_6_0 = callPackage
+      (
+        {
+          buildMix, packageOverrides ? {}, fetchHex, comeonin_i18n_0_1_3
+        }:
+          buildMix ({
+            name = "comeonin";
+            version = "1.6.0";
+            src = fetchHex {
+              pkg = "comeonin";
+              version = "1.6.0";
+              sha256 =
+                "40dd0da2c33696d19515888fd86b9ffdcad92d49e9a6b3b13df98e824897a1b1";
+            };
+            beamDeps  = [ comeonin_i18n_0_1_3 ];
+
+            meta = {
+              description = ''Password hashing (bcrypt, pbkdf2_sha512) library
+                            for Elixir.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/elixircnx/comeonin";
+            };
+          } // packageOverrides)
+      ) {};
+
+    comeonin_2_0_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "comeonin";
+            version = "2.0.3";
+            src = fetchHex {
+              pkg = "comeonin";
+              version = "2.0.3";
+              sha256 =
+                "a9a6f87107ebf6898adeca7130adb1b9e421c1be7e8b30b13ac1e0354ea15198";
+            };
+
+            meta = {
+              description = ''Password hashing (bcrypt, pbkdf2_sha512) library
+                            for Elixir.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/elixircnx/comeonin";
+            };
+          } // packageOverrides)
+      ) {};
+
+    comeonin_2_1_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "comeonin";
+            version = "2.1.1";
+            src = fetchHex {
+              pkg = "comeonin";
+              version = "2.1.1";
+              sha256 =
+                "7f85774ae5d453f664d0e7809cc1ab32ff22855d16ff6a2edd68c6d36cb1a1aa";
+            };
+
+            meta = {
+              description = ''Password hashing (bcrypt, pbkdf2_sha512) library
+                            for Elixir.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/elixircnx/comeonin";
+            };
+          } // packageOverrides)
+      ) {};
+
+    comeonin_2_4_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "comeonin";
+            version = "2.4.0";
+            src = fetchHex {
+              pkg = "comeonin";
+              version = "2.4.0";
+              sha256 =
+                "b326290a3143fdf4847a735f272ebd16d15216e97e968266a7b24125af4620be";
+            };
+
+            meta = {
+              description = ''Password hashing (bcrypt, pbkdf2_sha512) library
+                            for Elixir.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/elixircnx/comeonin";
+            };
+          } // packageOverrides)
+      ) {};
+
+    comeonin = comeonin_2_4_0;
 
     comeonin_i18n_0_1_3 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, gettext_0_10_0 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, gettext_0_11_0 }:
           buildMix ({
             name = "comeonin_i18n";
             version = "0.1.3";
@@ -4033,7 +6243,7 @@ let
               sha256 =
                 "4b45ca5af3cbf20bf7d3f7e874629041a2a921ad5a62ca9b94546a1e559023a6";
             };
-            beamDeps  = [ gettext_0_10_0 ];
+            beamDeps  = [ gettext_0_11_0 ];
 
             meta = {
               description = ''Internationalization support for the Comeonin
@@ -4046,6 +6256,29 @@ let
 
     comeonin_i18n = comeonin_i18n_0_1_3;
 
+    commander_0_1_4 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "commander";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "commander";
+              version = "0.1.4";
+              sha256 =
+                "091cd4de551771fed7eb258dbf1918875822896d44a730414fc6ac268e9ad3e4";
+            };
+
+            meta = {
+              description = ''A macro library to help create telegram bot'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/carlo-colombo/commander";
+            };
+          } // packageOverrides)
+      ) {};
+
+    commander = commander_0_1_4;
+
     complex_0_2_0 = callPackage
       (
         {
@@ -4077,6 +6310,31 @@ let
 
     complex = complex_0_2_0;
 
+    comredis_1_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
+            name = "comredis";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "comredis";
+              version = "1.0.1";
+              sha256 =
+                "03aa3a9235f39c666854027b88915b9f256c357ce6e0a493da54d6dec7b3a207";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              description = ''Comredis is your comrade for Redis command
+                            generation in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/iurifq/comredis";
+            };
+          } // packageOverrides)
+      ) {};
+
+    comredis = comredis_1_0_1;
+
     con_cache_0_11_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, exactor_2_2_0 }:
@@ -4127,6 +6385,29 @@ let
           } // packageOverrides)
       ) {};
 
+    concerto_0_1_4 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "concerto";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "concerto";
+              version = "0.1.4";
+              sha256 =
+                "3c8337ecc810f8812ab9dec8a63b4aa8feaed6142b24acbb89ad7938481ae912";
+            };
+
+            meta = {
+              description = ''file-based routing library for elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/exstruct/concerto";
+            };
+          } // packageOverrides)
+      ) {};
+
+    concerto = concerto_0_1_4;
+
     config_values_1_0_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -4174,125 +6455,6 @@ let
 
     configparser_ex = configparser_ex_0_2_1;
 
-    conform_0_16_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, neotoma_1_7_3 }:
-          buildMix ({
-            name = "conform";
-            version = "0.16.0";
-            src = fetchHex {
-              pkg = "conform";
-              version = "0.16.0";
-              sha256 =
-                "4d510e428fe05d7b505cefca66359bb4700aa7b68189624f5ba4cd1c22b5bf1a";
-            };
-            beamDeps  = [ neotoma_1_7_3 ];
-
-            meta = {
-              description = ''Easy release configuration for Elixir apps.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/conform";
-            };
-          } // packageOverrides)
-      ) {};
-
-    conform_1_0_0_rc8 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, neotoma_1_7_3 }:
-          buildMix ({
-            name = "conform";
-            version = "1.0.0-rc8";
-            src = fetchHex {
-              pkg = "conform";
-              version = "1.0.0-rc8";
-              sha256 =
-                "0177ab7eaf0f66372df9aadd1d4e198e205b76f561be0e26f6a52ca6adcadf80";
-            };
-            beamDeps  = [ neotoma_1_7_3 ];
-
-            meta = {
-              description = ''Easy release configuration for Elixir apps.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/conform";
-            };
-          } // packageOverrides)
-      ) {};
-
-    conform_2_0_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, neotoma_1_7_3 }:
-          buildMix ({
-            name = "conform";
-            version = "2.0.0";
-            src = fetchHex {
-              pkg = "conform";
-              version = "2.0.0";
-              sha256 =
-                "2a3bc36dd50363778c0cb2f13026d65b5e4c919abf91be21c1a51c480c723403";
-            };
-            beamDeps  = [ neotoma_1_7_3 ];
-
-            meta = {
-              description = ''Easy release configuration for Elixir apps.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/conform";
-            };
-          } // packageOverrides)
-      ) {};
-
-    conform = conform_2_0_0;
-
-    conform_exrm_1_0_0 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          exrm_1_0_3,
-          conform_2_0_0
-        }:
-          buildMix ({
-            name = "conform_exrm";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "conform_exrm";
-              version = "1.0.0";
-              sha256 =
-                "acf8eb831b0f8573a92694da4d3b513f551b8d854a8c4670c560379ae5c0f2fd";
-            };
-            beamDeps  = [ exrm_1_0_3 conform_2_0_0 ];
-
-            meta = {
-              description = ''Conform plugin for ExRM'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/conform_exrm";
-            };
-          } // packageOverrides)
-      ) {};
-
-    conform_exrm = conform_exrm_1_0_0;
-
-    connection_1_0_0_rc_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "connection";
-            version = "1.0.0-rc.1";
-            src = fetchHex {
-              pkg = "connection";
-              version = "1.0.0-rc.1";
-              sha256 =
-                "915a998f7bf30013611bf3cfc778b0d8ff163a968bd7604e7021aca272136a48";
-            };
-
-            meta = {
-              description = ''Connection behaviour for connection processes'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/fishcakez/connection";
-            };
-          } // packageOverrides)
-      ) {};
-
     connection_1_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -4371,6 +6533,36 @@ let
 
     console_tree = console_tree_0_0_1;
 
+    consolex_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          exjsx_3_2_0,
+          cowboy_1_0_4
+        }:
+          buildMix ({
+            name = "consolex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "consolex";
+              version = "0.1.0";
+              sha256 =
+                "d258becb7d14295e4df337ca1f5466de55c54d0be2761b9a93003814427c0ec1";
+            };
+            beamDeps  = [ exjsx_3_2_0 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''An IEx web console'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sivsushruth/consolex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    consolex = consolex_0_1_0;
+
     control_0_0_4 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -4419,25 +6611,49 @@ let
 
     convertat = convertat_1_1_0;
 
-    cors_plug_1_1_1 = callPackage
+    core_data_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, floki_0_1_1 }:
+          buildMix ({
+            name = "core_data";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "core_data";
+              version = "0.1.0";
+              sha256 =
+                "09b308a42f0697053c68f253e7f687c0f6b5f96bb1b114a7b1852c5b6804122e";
+            };
+            beamDeps  = [ floki_0_1_1 ];
+
+            meta = {
+              description = ''iOS Core Data parser'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/evolet-project/core_data";
+            };
+          } // packageOverrides)
+      ) {};
+
+    core_data = core_data_0_1_0;
+
+    cors_plug_1_1_2 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
             name = "cors_plug";
-            version = "1.1.1";
+            version = "1.1.2";
             src = fetchHex {
               pkg = "cors_plug";
-              version = "1.1.1";
+              version = "1.1.2";
               sha256 =
-                "12300007530a014c32f6dfe71a1775d1b39dd43fd7b35697574ab7d78c5e629c";
+                "2604f8352d3c072a8fd94dd1b6ed076b74f0952710c4a58269ffea56bfb6b2a7";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''An elixir plug that adds CORS headers to
@@ -4449,27 +6665,27 @@ let
           } // packageOverrides)
       ) {};
 
-    cors_plug = cors_plug_1_1_1;
+    cors_plug = cors_plug_1_1_2;
 
-    corsica_0_4_1 = callPackage
+    corsica_0_4_2 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
             name = "corsica";
-            version = "0.4.1";
+            version = "0.4.2";
             src = fetchHex {
               pkg = "corsica";
-              version = "0.4.1";
+              version = "0.4.2";
               sha256 =
-                "718b95d067cba24563b6fcc5ac64ced304c71323df3c0abe58351054125f964d";
+                "6a06d3ffb4395cec11f253618d6411db4b14edb6e76e700abc757722deaf0f8d";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               description = ''Plug-based swiss-army knife for CORS requests.'';
@@ -4479,7 +6695,7 @@ let
           } // packageOverrides)
       ) {};
 
-    corsica = corsica_0_4_1;
+    corsica = corsica_0_4_2;
 
     couch_factory_0_1_1 = callPackage
       (
@@ -4505,6 +6721,36 @@ let
 
     couch_factory = couch_factory_0_1_1;
 
+    couchbeam_1_3_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          jsx_2_8_0,
+          hackney_1_5_7
+        }:
+          buildMix ({
+            name = "couchbeam";
+            version = "1.3.0";
+            src = fetchHex {
+              pkg = "couchbeam";
+              version = "1.3.0";
+              sha256 =
+                "5d94bfc80532999e4f8e7f5da3abff74fbf3b59d5e02e0a99eb0dc3697c97a50";
+            };
+            beamDeps  = [ jsx_2_8_0 hackney_1_5_7 ];
+
+            meta = {
+              description = ''Erlang CouchDB client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/benoitc/couchbeam";
+            };
+          } // packageOverrides)
+      ) {};
+
+    couchbeam = couchbeam_1_3_0;
+
     couchex_0_6_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -4584,6 +6830,29 @@ let
 
     courier = courier_0_0_3;
 
+    cowbell_0_1_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "cowbell";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "cowbell";
+              version = "0.1.0";
+              sha256 =
+                "8a75f73afd29421150cc4dbe2993b5a2a7e3fe5fa5628a06ddb22adc2c36c998";
+            };
+
+            meta = {
+              description = ''A node connection manager.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ostinelli/cowbell";
+            };
+          } // packageOverrides)
+      ) {};
+
+    cowbell = cowbell_0_1_0;
+
     cowboy_1_0_4 = callPackage
       (
         {
@@ -4730,17 +6999,17 @@ let
 
     cowsay = cowsay_0_0_1;
 
-    cqex_0_1_4 = callPackage
+    cqex_0_2_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "cqex";
-            version = "0.1.4";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "cqex";
-              version = "0.1.4";
+              version = "0.2.0";
               sha256 =
-                "3c6a461605cc7e664178e6343cb585aa8c453831bb4447519007fcfe39697328";
+                "2180cb8083d38765bd3912f128b603826686300aef6f61adf9dc89fde3bb5429";
             };
 
             meta = {
@@ -4751,7 +7020,157 @@ let
           } // packageOverrides)
       ) {};
 
-    cqex = cqex_0_1_4;
+    cqex = cqex_0_2_0;
+
+    cqrs_0_0_7 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          cqrs_events_0_0_4,
+          cqrs_commands_0_0_6
+        }:
+          buildMix ({
+            name = "cqrs";
+            version = "0.0.7";
+            src = fetchHex {
+              pkg = "cqrs";
+              version = "0.0.7";
+              sha256 =
+                "feb8f5b6e8bb0a7bbc622ad6b0b518e218d3adfad6ef55b16d531c992240c41f";
+            };
+            beamDeps  = [ cqrs_events_0_0_4 cqrs_commands_0_0_6 ];
+
+            meta = {
+              description = ''This is not production ready yet but I want your
+                            feedback.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/amberbit/cqrs_commands";
+            };
+          } // packageOverrides)
+      ) {};
+
+    cqrs = cqrs_0_0_7;
+
+    cqrs_commands_0_0_6 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          vex_0_5_5,
+          uuid_1_1_4,
+          poison_2_0_1,
+          plug_1_1_5,
+          exconstructor_1_0_2
+        }:
+          buildMix ({
+            name = "cqrs_commands";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "cqrs_commands";
+              version = "0.0.6";
+              sha256 =
+                "3bc8419a057daf10db5a0a8895d7b917948e6e901f3e8286163f829b2f5652f3";
+            };
+            beamDeps  = [
+                          vex_0_5_5
+                          uuid_1_1_4
+                          poison_2_0_1
+                          plug_1_1_5
+                          exconstructor_1_0_2
+                        ];
+
+            meta = {
+              description = ''This is not production ready yet but I want your
+                            feedback.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/amberbit/cqrs_commands";
+            };
+          } // packageOverrides)
+      ) {};
+
+    cqrs_commands = cqrs_commands_0_0_6;
+
+    cqrs_events_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          syn_1_4_0,
+          poison_2_0_1,
+          moebius_2_0_1
+        }:
+          buildMix ({
+            name = "cqrs_events";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "cqrs_events";
+              version = "0.0.4";
+              sha256 =
+                "21c5ee4b8b814abf7ced3c88069511dd1a9a5c1c16a17c175228bfe5a9e4b7f8";
+            };
+            beamDeps  = [ syn_1_4_0 poison_2_0_1 moebius_2_0_1 ];
+
+            meta = {
+              description = ''This is not production ready yet but I want your
+                            feedback.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/amberbit/cqrs_commands";
+            };
+          } // packageOverrides)
+      ) {};
+
+    cqrs_events = cqrs_events_0_0_4;
+
+    crazy_pants_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "crazy_pants";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "crazy_pants";
+              version = "0.0.1";
+              sha256 =
+                "46e50adccb0d858e5a540c834d4e358ffa43ed9cdcac20ae36569fc7eaffa532";
+            };
+
+            meta = {
+              description = ''These pretzels are making me thirsty'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/whodat/crazy_pants";
+            };
+          } // packageOverrides)
+      ) {};
+
+    crazy_pants = crazy_pants_0_0_1;
+
+    crc_0_4_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "crc";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "crc";
+              version = "0.4.0";
+              sha256 =
+                "4f0d872d46faea966aeb687158b7e02bfc61c49c4f2fb33f5e52e3d167f4faeb";
+            };
+
+            meta = {
+              description = ''A library used to calculate CRC checksums for
+                            binary data'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/TattdCodeMonkey/crc";
+            };
+          } // packageOverrides)
+      ) {};
+
+    crc = crc_0_4_0;
 
     credit_card_1_0_0 = callPackage
       (
@@ -4776,19 +7195,19 @@ let
 
     credit_card = credit_card_1_0_0;
 
-    credo_0_3_10 = callPackage
+    credo_0_4_3 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, bunt_0_1_5 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, bunt_0_1_6 }:
           buildMix ({
             name = "credo";
-            version = "0.3.10";
+            version = "0.4.3";
             src = fetchHex {
               pkg = "credo";
-              version = "0.3.10";
+              version = "0.4.3";
               sha256 =
-                "dbc6e8ed6cd3567576bb6c4cc0dbea6fb3f7ef88a530aa2d17d13a1106cff156";
+                "2ab51e2446ebad5abc327fb18a4410f41bbab311cd760379e75d696dea8ed6ee";
             };
-            beamDeps  = [ bunt_0_1_5 ];
+            beamDeps  = [ bunt_0_1_6 ];
 
             meta = {
               longDescription = ''A static code analysis tool for the Elixir
@@ -4800,43 +7219,19 @@ let
           } // packageOverrides)
       ) {};
 
-    credo = credo_0_3_10;
+    credo = credo_0_4_3;
 
-    credo_0_3_2 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, bunt_0_1_5 }:
-          buildMix ({
-            name = "credo";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "credo";
-              version = "0.3.2";
-              sha256 =
-                "0040bfc7a76f3c345647dc32743f4c1ca2911cc1fc53bc2dc3f9fd98704da805";
-            };
-            beamDeps  = [ bunt_0_1_5 ];
-
-            meta = {
-              longDescription = ''A static code analysis tool for the Elixir
-                                language with a focus on code consistency and
-                                teaching.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rrrene/credo";
-            };
-          } // packageOverrides)
-      ) {};
-
-    croma_0_4_0 = callPackage
+    croma_0_4_4 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "croma";
-            version = "0.4.0";
+            version = "0.4.4";
             src = fetchHex {
               pkg = "croma";
-              version = "0.4.0";
+              version = "0.4.4";
               sha256 =
-                "6bcf8a0aad588fc57b4a4dedacf54ec4461e6906da5273c4bd8e121d179e3413";
+                "8dbcf50e925aa765f521d948250cafd5409fd4dbd5f23b2db6d6032e9397e312";
             };
 
             meta = {
@@ -4846,7 +7241,31 @@ let
           } // packageOverrides)
       ) {};
 
-    croma = croma_0_4_0;
+    croma = croma_0_4_4;
+
+    cronitor_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "cronitor";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "cronitor";
+              version = "1.0.0";
+              sha256 =
+                "d1353c83d1949b60e824ed934be02e7a4cc536fb5b7c912618b0052e0e01d490";
+            };
+
+            meta = {
+              description = ''An extremely simple wrapper for the cronitor.io
+                            ping endpoints.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jordan0day/cronitor";
+            };
+          } // packageOverrides)
+      ) {};
+
+    cronitor = cronitor_1_0_0;
 
     crutches_1_0_0 = callPackage
       (
@@ -4921,19 +7340,18 @@ let
 
     crypto_rsassa_pss = crypto_rsassa_pss_1_0_0;
 
-    cspex_1_0_0 = callPackage
+    cspex_1_1_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, exactor_2_2_0 }:
+        {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "cspex";
-            version = "1.0.0";
+            version = "1.1.0";
             src = fetchHex {
               pkg = "cspex";
-              version = "1.0.0";
+              version = "1.1.0";
               sha256 =
-                "f5df9923dd4250444a3e9f5f49fa76398c0b1415d468047b9a83ef5480348646";
+                "1eb6d83e0f4c43c68fe14ede5bb711654a6a653e94aa39d75ad67cf53ba79df1";
             };
-            beamDeps  = [ exactor_2_2_0 ];
 
             meta = {
               description = ''A library that brings all the CSP joy to the
@@ -4944,21 +7362,21 @@ let
           } // packageOverrides)
       ) {};
 
-    cspex = cspex_1_0_0;
+    cspex = cspex_1_1_0;
 
-    csv_1_3_3 = callPackage
+    csv_1_4_1 = callPackage
       (
         {
           buildMix, packageOverrides ? {}, fetchHex, parallel_stream_1_0_3
         }:
           buildMix ({
             name = "csv";
-            version = "1.3.3";
+            version = "1.4.1";
             src = fetchHex {
               pkg = "csv";
-              version = "1.3.3";
+              version = "1.4.1";
               sha256 =
-                "f3ef7b1ae28a55e53b8cb5c11d0e0b64e76e38d5f3e830bf2e3bf2cc0a89d848";
+                "167e5d3dd2e7716e5865f5a8d064d7a9f7004516c796684083f1cd180c2d4296";
             };
             beamDeps  = [ parallel_stream_1_0_3 ];
 
@@ -4970,19 +7388,19 @@ let
           } // packageOverrides)
       ) {};
 
-    csv = csv_1_3_3;
+    csv = csv_1_4_1;
 
-    csvlixir_2_0_2 = callPackage
+    csvlixir_2_0_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "csvlixir";
-            version = "2.0.2";
+            version = "2.0.3";
             src = fetchHex {
               pkg = "csvlixir";
-              version = "2.0.2";
+              version = "2.0.3";
               sha256 =
-                "f1e4ca61af3004a66efbe5d02486519a5d6c3610b9d5404352dbf6cd8ec593ec";
+                "8539326c9a484f94f9443878f5df21b3ed12d5a00be069b8b8346dff8cf35436";
             };
 
             meta = {
@@ -5000,7 +7418,7 @@ let
           } // packageOverrides)
       ) {};
 
-    csvlixir = csvlixir_2_0_2;
+    csvlixir = csvlixir_2_0_3;
 
     cth_readable_1_2_2 = callPackage
       (
@@ -5052,31 +7470,31 @@ let
 
     cuckoo = cuckoo_1_0_0;
 
-    cucumberl_0_0_6 = callPackage
+    cucumberl_0_0_10 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "cucumberl";
-            version = "0.0.6";
+            version = "0.0.10";
             src = fetchHex {
               pkg = "cucumberl";
-              version = "0.0.6";
+              version = "0.0.10";
               sha256 =
-                "3b9ea813997fd8c1e3d2b004e89288496dc21d2e5027f432e5900569d2c61cf3";
+                "53bd73d016602c8c46883dbcc5a57ee814fe4708b14e4406d566b5ca9d119110";
             };
 
-            buildPlugins  = [ rebar3_hex ];
-
-
             meta = {
-              description = ''A pure-erlang implementation of Cucumber.'';
+              longDescription = ''A pure-erlang, open-source, implementation of
+                                Cucumber (http://cukes.info). This provides a
+                                subset of the Cucumber feature definition
+                                language.'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ericbmerritt/cucumberl";
             };
           } // packageOverrides)
       ) {};
 
-    cucumberl = cucumberl_0_0_6;
+    cucumberl = cucumberl_0_0_10;
 
     cuid_0_1_0 = callPackage
       (
@@ -5101,6 +7519,30 @@ let
 
     cuid = cuid_0_1_0;
 
+    curl2httpoison_0_2_6 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "curl2httpoison";
+            version = "0.2.6";
+            src = fetchHex {
+              pkg = "curl2httpoison";
+              version = "0.2.6";
+              sha256 =
+                "d22fda1a85db812e9f6e0c8770f004cb7942f463bc59b07ad272c01330a7bfca";
+            };
+
+            meta = {
+              description = ''Curl2HTTPoison transform your curl request to
+                            HTTPPoison request code'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/httpoison";
+            };
+          } // packageOverrides)
+      ) {};
+
+    curl2httpoison = curl2httpoison_0_2_6;
+
     currency_formatter_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
@@ -5126,6 +7568,37 @@ let
 
     currency_formatter = currency_formatter_0_0_1;
 
+    current_streak_ex_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          floki_0_8_1
+        }:
+          buildMix ({
+            name = "current_streak_ex";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "current_streak_ex";
+              version = "0.1.1";
+              sha256 =
+                "1c62bcd7bdd69818dc05f0602e03a5aca6b21554206cb6634bedb807ee27d5a7";
+            };
+            beamDeps  = [ httpoison_0_8_3 floki_0_8_1 ];
+
+            meta = {
+              description = ''Get github current streak which support only
+                            public repositories.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KazuCocoa/current_streak_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    current_streak_ex = current_streak_ex_0_1_1;
+
     current_user_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -5332,8 +7805,8 @@ let
 
     cypher_query_0_0_1 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "cypher_query";
             version = "0.0.1";
             src = fetchHex {
@@ -5354,6 +7827,29 @@ let
 
     cypher_query = cypher_query_0_0_1;
 
+    damm_0_1_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "damm";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "damm";
+              version = "0.1.0";
+              sha256 =
+                "2d2d0adbf0ffe5888d0aaee784a25b3bb9b99acf33b6de350aee9f58c588cbd5";
+            };
+
+            meta = {
+              description = ''Damm algorithm implementation'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mururu/damm";
+            };
+          } // packageOverrides)
+      ) {};
+
+    damm = damm_0_1_0;
+
     data_leaf_walker_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -5379,6 +7875,33 @@ let
 
     data_leaf_walker = data_leaf_walker_0_1_0;
 
+    data_pool_1_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, e_queue_1_0_1 }:
+          buildMix ({
+            name = "data_pool";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "data_pool";
+              version = "1.0.1";
+              sha256 =
+                "ad5a2bdf81215d71e47f87624142f58d32a808ea98f4837fc1d28dc971124613";
+            };
+            beamDeps  = [ e_queue_1_0_1 ];
+
+            meta = {
+              longDescription = ''Utility to buffer items into a queue that
+                                follow a simple block pattern on calls to push
+                                and pop when the queue at a max size or
+                                empty.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/benfalk/data_pool";
+            };
+          } // packageOverrides)
+      ) {};
+
+    data_pool = data_pool_1_0_1;
+
     database_url_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -5403,26 +7926,50 @@ let
 
     database_url = database_url_0_1_0;
 
-    db_connection_0_2_4 = callPackage
+    datastructures_0_2_5 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "datastructures";
+            version = "0.2.5";
+            src = fetchHex {
+              pkg = "datastructures";
+              version = "0.2.5";
+              sha256 =
+                "ef4387043ecaa635995832f32473e8b6708044a6bc73983168eee4ab71b01f92";
+            };
+
+            meta = {
+              description = ''Elixir protocols and implementations for various
+                            data structures.'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/elixir-datastructures";
+            };
+          } // packageOverrides)
+      ) {};
+
+    datastructures = datastructures_0_2_5;
+
+    db_connection_1_0_0_rc_0 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          sbroker_0_7_0,
+          sbroker_0_6_2,
           poolboy_1_5_1,
           connection_1_0_2
         }:
           buildMix ({
             name = "db_connection";
-            version = "0.2.4";
+            version = "1.0.0-rc.0";
             src = fetchHex {
               pkg = "db_connection";
-              version = "0.2.4";
+              version = "1.0.0-rc.0";
               sha256 =
-                "fbb5074affe8d57d0f677cf3692371a1fa3f90673c81e61214b0388995b4d4a7";
+                "ff4e4805da74db0fe9dbe751ce39e1549c7bf80593dd1cd53b31458df801026d";
             };
-            beamDeps  = [ sbroker_0_7_0 poolboy_1_5_1 connection_1_0_2 ];
+            beamDeps  = [ sbroker_0_6_2 poolboy_1_5_1 connection_1_0_2 ];
 
             meta = {
               description = ''Database connection behaviour for database
@@ -5433,7 +7980,7 @@ let
           } // packageOverrides)
       ) {};
 
-    db_connection = db_connection_0_2_4;
+    db_connection = db_connection_1_0_0_rc_0;
 
     dbg_1_0_1 = callPackage
       (
@@ -5458,17 +8005,71 @@ let
 
     dbg = dbg_1_0_1;
 
-    decimal_1_1_1 = callPackage
+    dbux_1_0_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, connection_1_0_2 }:
+          buildMix ({
+            name = "dbux";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "dbux";
+              version = "1.0.3";
+              sha256 =
+                "79d01f620dd32ec4ed11423e0724bf7d8a46353e56f8d28cbdbf499a352caa1e";
+            };
+            beamDeps  = [ connection_1_0_2 ];
+
+            meta = {
+              description = ''Bindings for the D-Bus IPC protocol.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mspanc/dbux";
+            };
+          } // packageOverrides)
+      ) {};
+
+    dbux = dbux_1_0_3;
+
+    dealer_0_8_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "dealer";
+            version = "0.8.0";
+            src = fetchHex {
+              pkg = "dealer";
+              version = "0.8.0";
+              sha256 =
+                "c8c72d38e1cff6a181a6b6f627fb6fd5998279827519e598eb28bcef2be721ee";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An API Client for Stockfighter.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/larrylv/dealer";
+            };
+          } // packageOverrides)
+      ) {};
+
+    dealer = dealer_0_8_0;
+
+    decimal_1_1_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "decimal";
-            version = "1.1.1";
+            version = "1.1.2";
             src = fetchHex {
               pkg = "decimal";
-              version = "1.1.1";
+              version = "1.1.2";
               sha256 =
-                "c73f361389c2221e2fda0e2ba63c6de88d1545b00ddc0b4d5885202ccc34c568";
+                "7a6dfa1f4d389497acd7b807bf38c55022487c68b73d339d5114e3a691e006c5";
             };
 
             meta = {
@@ -5480,7 +8081,31 @@ let
           } // packageOverrides)
       ) {};
 
-    decimal = decimal_1_1_1;
+    decimal = decimal_1_1_2;
+
+    decimal_arithmetic_0_1_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_2 }:
+          buildMix ({
+            name = "decimal_arithmetic";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "decimal_arithmetic";
+              version = "0.1.1";
+              sha256 =
+                "b9c5dc722cc770aa5b905418d56e23eaa16e64659da0ccb552341a75068e0cfe";
+            };
+            beamDeps  = [ decimal_1_1_2 ];
+
+            meta = {
+              description = ''Extended arithmetic for Decimal library.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jacek-adamek/decimal_arithmetic";
+            };
+          } // packageOverrides)
+      ) {};
+
+    decimal_arithmetic = decimal_arithmetic_0_1_1;
 
     decks_0_0_1 = callPackage
       (
@@ -5578,17 +8203,17 @@ let
 
     delayed_otp = delayed_otp_0_0_2;
 
-    delegate_behaviour_0_1_3 = callPackage
+    delegate_behaviour_0_1_5 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "delegate_behaviour";
-            version = "0.1.3";
+            version = "0.1.5";
             src = fetchHex {
               pkg = "delegate_behaviour";
-              version = "0.1.3";
+              version = "0.1.5";
               sha256 =
-                "15b335b5c30072ce8e0845eeb8116397ef357efbfbc64b59b6c113b96520e9c5";
+                "d46e9c39d5be4e6b1ee62a9419d1a44d138aca5af0161f42f78b4eb24659ca58";
             };
 
             meta = {
@@ -5599,7 +8224,37 @@ let
           } // packageOverrides)
       ) {};
 
-    delegate_behaviour = delegate_behaviour_0_1_3;
+    delegate_behaviour = delegate_behaviour_0_1_5;
+
+    deltek_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          sweet_xml_0_6_1,
+          html_entities_0_3_0
+        }:
+          buildMix ({
+            name = "deltek";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "deltek";
+              version = "0.0.4";
+              sha256 =
+                "274eecc6aba76e19e30e5850746ee81241ac8cc334d9729588b2ba770ac53988";
+            };
+            beamDeps  = [ sweet_xml_0_6_1 html_entities_0_3_0 ];
+
+            meta = {
+              description = ''An Elixir wrapper for the SOAP Deltek API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lucidstack/elixir-deltek";
+            };
+          } // packageOverrides)
+      ) {};
+
+    deltek = deltek_0_0_4;
 
     demacro_0_0_1 = callPackage
       (
@@ -5619,6 +8274,52 @@ let
 
     demacro = demacro_0_0_1;
 
+    depcache_1_2_2 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "depcache";
+            version = "1.2.2";
+            src = fetchHex {
+              pkg = "depcache";
+              version = "1.2.2";
+              sha256 =
+                "0e70807140d485f1bf5ac50cd9a87b71ba5c5496a8ad02029847e569af80ed91";
+            };
+
+            meta = {
+              description = ''In-memory cache with cache key dependencies'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/zotonic/depcache";
+            };
+          } // packageOverrides)
+      ) {};
+
+    depcache = depcache_1_2_2;
+
+    deppie_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "deppie";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "deppie";
+              version = "1.0.0";
+              sha256 =
+                "6712dbae54f274d7f4f92979d82cec2d4636a0598e2474e47b190fc3c0ed378a";
+            };
+
+            meta = {
+              description = ''Elixir`s coolest deprecation logger'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zackehh/deppie";
+            };
+          } // packageOverrides)
+      ) {};
+
+    deppie = deppie_1_0_0;
+
     detergent_0_3_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -5667,6 +8368,38 @@ let
 
     detergentex = detergentex_0_0_7;
 
+    deviant_elixir_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          feeder_ex_0_0_2
+        }:
+          buildMix ({
+            name = "deviant_elixir";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "deviant_elixir";
+              version = "0.0.4";
+              sha256 =
+                "42473969889a47edab66384988e70ab6b4da158043e9231deab822743e3d9943";
+            };
+            beamDeps  = [ httpoison_0_8_3 feeder_ex_0_0_2 ];
+
+            meta = {
+              longDescription = ''WIP. Unstable alpha. Elixir API wrapper for
+                                Deviant Art. At this moment provides only RSS
+                                feeds intergac.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/vdaniuk/deviant-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    deviant_elixir = deviant_elixir_0_0_4;
+
     dflow_0_1_5 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -5690,6 +8423,36 @@ let
 
     dflow = dflow_0_1_5;
 
+    di_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "di";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "di";
+              version = "0.1.0";
+              sha256 =
+                "d7a89568c986c98399667faeb618d5cc42a89965717e758323aa5370d1547260";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir wrapper for DI.FM'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/JoshuaThompson/di";
+            };
+          } // packageOverrides)
+      ) {};
+
+    di = di_0_1_0;
+
     dialyxir_0_3_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -5760,39 +8523,40 @@ let
 
     dice = dice_0_0_1;
 
-    dice_roller_1_0_1 = callPackage
+    dice_roller_1_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "dice_roller";
-            version = "1.0.1";
+            version = "1.1.0";
             src = fetchHex {
               pkg = "dice_roller";
-              version = "1.0.1";
+              version = "1.1.0";
               sha256 =
-                "a9c4b9a85dc7d26a78ff1dcc58aee9e6bcc9df473531b032d95e6cd6e2402679";
+                "90e3485951605338f23686dcc001599354cb6eff7df851b1a1f6514b1c7fbd5c";
             };
 
             meta = {
-               license = stdenv.lib.licenses.mit;
+              description = ''An Elixir library for simulating dice rolls'';
+              license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/KevinGreene/DiceRoller";
             };
           } // packageOverrides)
       ) {};
 
-    dice_roller = dice_roller_1_0_1;
+    dice_roller = dice_roller_1_1_0;
 
-    dicon_0_3_0 = callPackage
+    dicon_0_4_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "dicon";
-            version = "0.3.0";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "dicon";
-              version = "0.3.0";
+              version = "0.4.0";
               sha256 =
-                "52c5839feb9e0fa4247a564b79ac6717d8adc0e65a34739caaf26982fa213a12";
+                "d6a5c56e376b13dcfd721bc2571fbabcb41409ac5f2b8fa243a0f14393e6b145";
             };
 
             meta = {
@@ -5803,37 +8567,60 @@ let
           } // packageOverrides)
       ) {};
 
-    dicon = dicon_0_3_0;
+    dicon = dicon_0_4_0;
 
-    difficult_0_0_2 = callPackage
+    diff_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "diff";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "diff";
+              version = "1.0.0";
+              sha256 =
+                "0dbd7abbf558031ccb8d703c751a20349326191026b07b53f4a3c603817728fb";
+            };
+
+            meta = {
+              description = ''A simple diff library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bryanjos/diff";
+            };
+          } // packageOverrides)
+      ) {};
+
+    diff = diff_1_0_0;
+
+    digoc_0_3_3 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          ex_doc_0_11_4,
-          earmark_0_2_1
+          poison_1_3_1,
+          httpoison_0_8_3
         }:
           buildMix ({
-            name = "difficult";
-            version = "0.0.2";
+            name = "digoc";
+            version = "0.3.3";
             src = fetchHex {
-              pkg = "difficult";
-              version = "0.0.2";
+              pkg = "digoc";
+              version = "0.3.3";
               sha256 =
-                "5e47c31935cd81082942ac4515c24cad2630ef024e27c5e9cde96f60a93cc39b";
+                "23d5c2f1b977b1f3e12567879a20bc211898efdfcac9a0b6802324bc42ea0605";
             };
-            beamDeps  = [ ex_doc_0_11_4 earmark_0_2_1 ];
+            beamDeps  = [ poison_1_3_1 httpoison_0_8_3 ];
 
             meta = {
-              description = ''Difficult, but computable functions'';
+              description = ''An Elixir client for the Digital Ocean API v2.'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/massn/Difficult";
+              homepage = "https://github.com/kevinmontuori/digoc";
             };
           } // packageOverrides)
       ) {};
 
-    difficult = difficult_0_0_2;
+    digoc = digoc_0_3_3;
 
     dir_walker_0_0_6 = callPackage
       (
@@ -5868,6 +8655,57 @@ let
 
     dir_walker = dir_walker_0_0_6;
 
+    disc_union_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "disc_union";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "disc_union";
+              version = "0.1.0";
+              sha256 =
+                "017f5532d1b444f3e0950771a80ed34b82aa405ca650174529706b8587ea23da";
+            };
+
+            meta = {
+              description = ''Discriminated unions for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/X4lldux/disc_union";
+            };
+          } // packageOverrides)
+      ) {};
+
+    disc_union = disc_union_0_1_0;
+
+    discourse_as_sso_erlang_0_7_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex, cowlib_1_3_0 }:
+          buildRebar3 ({
+            name = "discourse_as_sso_erlang";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "discourse_as_sso_erlang";
+              version = "0.7.0";
+              sha256 =
+                "be569178e6b0cb49d3fc48457b5233f9e82dc447bd452e5708a071412c24bc2d";
+            };
+
+            beamDeps  = [ cowlib_1_3_0 ];
+
+            meta = {
+              longDescription = ''Low-level erlang library to encode/decode
+                                payloads for using the forum software Discourse
+                                as an SSO endpoint.'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage =
+                "https://github.com/reverendpaco/discourse-as-sso-erlang";
+            };
+          } // packageOverrides)
+      ) {};
+
+    discourse_as_sso_erlang = discourse_as_sso_erlang_0_7_0;
+
     dismake_1_0_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -5892,17 +8730,17 @@ let
 
     dismake = dismake_1_0_0;
 
-    distance_0_1_2 = callPackage
+    distance_0_2_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "distance";
-            version = "0.1.2";
+            version = "0.2.1";
             src = fetchHex {
               pkg = "distance";
-              version = "0.1.2";
+              version = "0.2.1";
               sha256 =
-                "8eca7e3d5cf36bc52814a858b07380f13d236ba5d7b70c4d4b1c6a455294aaf3";
+                "847cf16e80c6905adc7f359b845358bbfbeb3383459f2bc1e9b310cfa1e917ec";
             };
 
             meta = {
@@ -5914,29 +8752,7 @@ let
           } // packageOverrides)
       ) {};
 
-    distance_0_2_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "distance";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "distance";
-              version = "0.2.0";
-              sha256 =
-                "5ee0a5d05468c50c74d6ae4bcb13c5cd8e31f9ea45fce12290f2ad093df04944";
-            };
-
-            meta = {
-              description = ''Various distance functions for geometric or
-                            geographic calculations'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/pkinney/distance";
-            };
-          } // packageOverrides)
-      ) {};
-
-    distance = distance_0_2_0;
+    distance = distance_0_2_1;
 
     distancex_0_1_0 = callPackage
       (
@@ -6012,17 +8828,48 @@ let
 
     dlist = dlist_0_0_1;
 
-    doc_first_formatter_0_0_1 = callPackage
+    dnsimple_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "dnsimple";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "dnsimple";
+              version = "0.1.0";
+              sha256 =
+                "f10326124aeabcfdcb388100d480413314609cbabfa5de31d0c486150ab28ebc";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An (experimental) Elixir client for the DNSimple
+                            API v2.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/aetrion/dnsimple-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    dnsimple = dnsimple_0_1_0;
+
+    doc_first_formatter_0_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "doc_first_formatter";
-            version = "0.0.1";
+            version = "0.0.2";
             src = fetchHex {
               pkg = "doc_first_formatter";
-              version = "0.0.1";
+              version = "0.0.2";
               sha256 =
-                "d1bd7a64e8a742847f910557b66d302b65a10b8180e4e660edfc22987cda3262";
+                "88500d55349571173f88d0f691e1ac7908b9663bfc06f9f0862e60ea8378313c";
             };
 
             meta = {
@@ -6036,11 +8883,11 @@ let
           } // packageOverrides)
       ) {};
 
-    doc_first_formatter = doc_first_formatter_0_0_1;
+    doc_first_formatter = doc_first_formatter_0_0_2;
 
     doc_plug_1_0_2 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "doc_plug";
             version = "1.0.2";
@@ -6050,7 +8897,7 @@ let
               sha256 =
                 "2813f85dcd4f7228d54c277898d3d7483d03ef27ed4f9abc9eae6f57b00e79b8";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               description = ''Plug to automatically generate and serve project
@@ -6063,17 +8910,17 @@ let
 
     doc_plug = doc_plug_1_0_2;
 
-    dogma_0_1_4 = callPackage
+    dogma_0_1_6 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
           buildMix ({
             name = "dogma";
-            version = "0.1.4";
+            version = "0.1.6";
             src = fetchHex {
               pkg = "dogma";
-              version = "0.1.4";
+              version = "0.1.6";
               sha256 =
-                "ebf6f6bf8291e4a73b2886fc35e05224f0068237594f0e0609d1834863172245";
+                "cd50b91d8b9ef53ee688d1e437bf4b186ec6bc6e922de7dbf7a7df7aea6dde45";
             };
             beamDeps  = [ poison_2_1_0 ];
 
@@ -6086,7 +8933,7 @@ let
           } // packageOverrides)
       ) {};
 
-    dogma = dogma_0_1_4;
+    dogma = dogma_0_1_6;
 
     dogstatsd_0_0_3 = callPackage
       (
@@ -6112,6 +8959,101 @@ let
 
     dogstatsd = dogstatsd_0_0_3;
 
+    dogstatsde_0_6_0 = callPackage
+      (
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          worker_pool_1_0_4,
+          stillir_1_0_0
+        }:
+          buildRebar3 ({
+            name = "dogstatsde";
+            version = "0.6.0";
+            src = fetchHex {
+              pkg = "dogstatsde";
+              version = "0.6.0";
+              sha256 =
+                "7d24f8a5573fcbdc3f072ff93685e5277900236df4a7d49d73d8579cf566eb45";
+            };
+
+            beamDeps  = [ worker_pool_1_0_4 stillir_1_0_0 ];
+
+            meta = {
+              description = ''Send StatsD metrics to Datadog'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/WhoopInc/dogstatsde";
+            };
+          } // packageOverrides)
+      ) {};
+
+    dogstatsde = dogstatsde_0_6_0;
+
+    domainr_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "domainr";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "domainr";
+              version = "0.0.1";
+              sha256 =
+                "f66ccfe9fdc6b388ce7633974313826f9acffe96b4b369bb904d519e4aa26039";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''Domainr is an [Domainr wrapper
+                                for](https://domainr.build) in Elixir that makes
+                                it easy to search and find available domains and
+                                TLDs.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/e-fu/domainr";
+            };
+          } // packageOverrides)
+      ) {};
+
+    domainr = domainr_0_0_1;
+
+    doorman_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_5,
+          comeonin_2_4_0
+        }:
+          buildMix ({
+            name = "doorman";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "doorman";
+              version = "0.0.3";
+              sha256 =
+                "07c9e7569ec6a8bf26702b6d6a201840b4e11213c5dc42aaecd23d2e169b8c85";
+            };
+            beamDeps  = [ plug_1_1_5 comeonin_2_4_0 ];
+
+            meta = {
+              description = ''Tools to make Elixir authentication simple and
+                            flexible'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/BlakeWilliams/doorman";
+            };
+          } // packageOverrides)
+      ) {};
+
+    doorman = doorman_0_0_3;
+
     dot_0_0_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -6130,17 +9072,41 @@ let
 
     dot = dot_0_0_3;
 
-    dotenv_2_0_0 = callPackage
+    dot_notes_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "dot_notes";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "dot_notes";
+              version = "1.0.0";
+              sha256 =
+                "0689a006ca36716eadac9f8f83699aff6d56520a15403610d08e2f397fd60996";
+            };
+
+            meta = {
+              description = ''Simple dot/bracket notation parsing/conversion
+                            for Maps/Lists'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zackehh/dot-notes-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    dot_notes = dot_notes_1_0_0;
+
+    dotenv_2_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "dotenv";
-            version = "2.0.0";
+            version = "2.1.0";
             src = fetchHex {
               pkg = "dotenv";
-              version = "2.0.0";
+              version = "2.1.0";
               sha256 =
-                "bff466b9c1976a17ec1536e095b192e77ec2e2554fd229f23bbb7b598838d95f";
+                "caddac72cac4955ae346306b210608dd6cf380a439b4e18bcdc3d6021f3e4d6b";
             };
 
             meta = {
@@ -6151,37 +9117,164 @@ let
           } // packageOverrides)
       ) {};
 
-    dotenv = dotenv_2_0_0;
+    dotenv = dotenv_2_1_0;
 
-    drawille_0_0_1 = callPackage
+    dovetail_0_0_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "dovetail";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "dovetail";
+              version = "0.0.3";
+              sha256 =
+                "01b6c3085ebb9cb7d43115c7a2d9780a840017e521daeb7d0a2233f61f8b0306";
+            };
+
+            meta = {
+              description = ''Dovetail provides a harness for running test
+                            dovecot servers.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/thusfresh/dovetail";
+            };
+          } // packageOverrides)
+      ) {};
+
+    dovetail = dovetail_0_0_3;
+
+    dp_decoder_0_2_1 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "dp_decoder";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "dp_decoder";
+              version = "0.2.1";
+              sha256 =
+                "66449f7691e4f4c8041d82d910c2c86b8ec1bdc6dd2b008d9b9169fda86b22e0";
+            };
+
+            meta = {
+              description = ''Collection of decoders for different metric
+                            protocols'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dalmatinerdb/dp_decoder";
+            };
+          } // packageOverrides)
+      ) {};
+
+    dp_decoder = dp_decoder_0_2_1;
+
+    dqe_idx_0_1_18 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "dqe_idx";
+            version = "0.1.18";
+            src = fetchHex {
+              pkg = "dqe_idx";
+              version = "0.1.18";
+              sha256 =
+                "6af4897e3e5fdff5055179dd765778450cdf8a43c61b5e2a2aeec483c4309c6c";
+            };
+
+            meta = {
+              description = ''Dalmatiner QE indexing'';
+              license = stdenv.lib.licenses.mit;
+            };
+          } // packageOverrides)
+      ) {};
+
+    dqe_idx = dqe_idx_0_1_18;
+
+    druuid_0_3_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "druuid";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "druuid";
+              version = "0.3.0";
+              sha256 =
+                "238dfa36cbb4f1277e44cd9ed5900ff3045c4c19724412bb94173ed2659d0ec8";
+            };
+
+            meta = {
+              longDescription = ''Date-relative (and relatively universally
+                                unique) UUID generation. Based on
+                                https://github.com/recurly/druuid'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bhelx/druuid";
+            };
+          } // packageOverrides)
+      ) {};
+
+    druuid = druuid_0_3_0;
+
+    dublin_bus_api_0_1_8 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          ex_doc_0_10_0,
-          earmark_0_1_19
+          httpoison_0_8_3,
+          floki_0_8_1
         }:
           buildMix ({
-            name = "drawille";
-            version = "0.0.1";
+            name = "dublin_bus_api";
+            version = "0.1.8";
             src = fetchHex {
-              pkg = "drawille";
-              version = "0.0.1";
+              pkg = "dublin_bus_api";
+              version = "0.1.8";
               sha256 =
-                "58d631fee40578dc077603c8cb969e3efa32c098c9d6295648432b07728d8ae3";
+                "b373da947594dfc4b3a2ef11e77f7e3a1ce7875d6aab90fc39a4f285b1e77e63";
             };
-            beamDeps  = [ ex_doc_0_10_0 earmark_0_1_19 ];
+            beamDeps  = [ httpoison_0_8_3 floki_0_8_1 ];
 
             meta = {
-              description = ''Drawings using terminal braille characters.'';
+              description = ''Access to the Real Time Passenger Information
+                            (RTPI) for Dublin Bus services.'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/massn/elixir-drawille";
+              homepage = "https://github.com/carlo-colombo/dublin-bus-api";
             };
           } // packageOverrides)
       ) {};
 
-    drawille = drawille_0_0_1;
+    dublin_bus_api = dublin_bus_api_0_1_8;
+
+    duckduckgo_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "duckduckgo";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "duckduckgo";
+              version = "0.1.0";
+              sha256 =
+                "349fd4b837634507a8e11280c244b064d1eb4e0d3333994f79e5341eec522c2f";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An Elixir client for the DuckDuckGo Instant
+                            Answer API.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/pjhampton/DuckDuckElixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    duckduckgo = duckduckgo_0_1_0;
 
     durga_transport_1_0_1 = callPackage
       (
@@ -6303,31 +9396,36 @@ let
 
     e_queue = e_queue_1_0_1;
 
-    earmark_0_1_15 = callPackage
+    e_quip_0_0_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
           buildMix ({
-            name = "earmark";
-            version = "0.1.15";
+            name = "e_quip";
+            version = "0.0.1";
             src = fetchHex {
-              pkg = "earmark";
-              version = "0.1.15";
+              pkg = "e_quip";
+              version = "0.0.1";
               sha256 =
-                "cffc809198d000cc9b81cce80ebc673da8647291451015da42fc523f9dd781d7";
+                "e6fe9eeb96dbc863b527a792e730ea41aea43caef2a5db68ea2c4c9fc21f552a";
             };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
 
             meta = {
-              longDescription = ''Earmark is a pure-Elixir Markdown converter.
-                                It is intended to be used as a library (just
-                                call Earmark.to_html), but can also be used as a
-                                command-line tool (just run mix escript.build
-                                first). Output generation is pluggable.'';
+              description = ''Simple Quip API Client'';
               license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/pragdave/earmark";
+              homepage = "https://github.com/mmartinson/e_quip";
             };
           } // packageOverrides)
       ) {};
 
+    e_quip = e_quip_0_0_1;
+
     earmark_0_1_19 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -6380,17 +9478,17 @@ let
 
     earmark = earmark_0_2_1;
 
-    eastar_0_3_8 = callPackage
+    eastar_0_4_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "eastar";
-            version = "0.3.8";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "eastar";
-              version = "0.3.8";
+              version = "0.4.0";
               sha256 =
-                "c36e6ba809fb6e228902349e6f794d0362edb4bfd4f6e814107ed9bbc8c8dd17";
+                "21a74b1ac6da2a24eb5e6e14e5537389dd671fa2fc94a4594e0e7ddcf4b4c87a";
             };
 
             meta = {
@@ -6405,7 +9503,7 @@ let
           } // packageOverrides)
       ) {};
 
-    eastar = eastar_0_3_8;
+    eastar = eastar_0_4_0;
 
     easy_server_0_0_1 = callPackage
       (
@@ -6479,39 +9577,6 @@ let
 
     ec2 = ec2_0_9_1;
 
-    ecdo_0_1_4 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          postgrex_0_11_1,
-          mariaex_0_7_0,
-          ecto_1_0_7
-        }:
-          buildMix ({
-            name = "ecdo";
-            version = "0.1.4";
-            src = fetchHex {
-              pkg = "ecdo";
-              version = "0.1.4";
-              sha256 =
-                "362c75113bca6c8379ac2b1654ae78ed099ab0faee4a1fbacb7b4b9b137b9f1d";
-            };
-            beamDeps  = [ postgrex_0_11_1 mariaex_0_7_0 ecto_1_0_7 ];
-
-            meta = {
-              longDescription = ''Ecdo is a dynamic interface for ecto aims to
-                                simplify building dynamic query API based on
-                                ecto models.'';
-
-              homepage = "https://github.com/xerions/ecdo";
-            };
-          } // packageOverrides)
-      ) {};
-
-    ecdo = ecdo_0_1_4;
-
     echo_0_2_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -6539,192 +9604,113 @@ let
 
     echo = echo_0_2_0;
 
-    econfig_0_7_1 = callPackage
+    echo_bot_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          telegram_0_0_3,
+          poison_2_1_0,
+          gproc_0_5_0
+        }:
+          buildMix ({
+            name = "echo_bot";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "echo_bot";
+              version = "0.0.2";
+              sha256 =
+                "f353984ab5ea36b423b2a18d788d5eeeb6ae45aca254129b99c5bbab9865b38c";
+            };
+            beamDeps  = [ telegram_0_0_3 poison_2_1_0 gproc_0_5_0 ];
+
+            meta = {
+              description = ''A demo telegram bot'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/col/echo_bot";
+            };
+          } // packageOverrides)
+      ) {};
+
+    echo_bot = echo_bot_0_0_2;
+
+    echonest_ex_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "echonest_ex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "echonest_ex";
+              version = "0.0.2";
+              sha256 =
+                "d8b3d7f2b04eb48b689877aaf9db30f33acea3ea02daca5aad8d105ac785bd98";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Echonest api wrapper for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/desmondhume/echonest_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    echonest_ex = echonest_ex_0_0_2;
+
+    econfig_0_7_3 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
           buildRebar3 ({
             name = "econfig";
-            version = "0.7.1";
+            version = "0.7.3";
             src = fetchHex {
               pkg = "econfig";
-              version = "0.7.1";
+              version = "0.7.3";
               sha256 =
-                "b11d68e3d288b5cb4bd34e668e03176c4ea42790c09f1f449cdbd46a649ea7f3";
+                "bddff19a757209d3e98b6952897fbf8790f6cf33d9e5caf2501263ea4ad46e3c";
             };
 
             meta = {
               description = ''simple Erlang config handler using INI files'';
-
+              license = stdenv.lib.licenses.free;
               homepage = "https://github.com/benoitc/econfig";
             };
           } // packageOverrides)
       ) {};
 
-    econfig = econfig_0_7_1;
+    econfig = econfig_0_7_3;
 
-    ecto_0_15_0 = callPackage
+    ecs_0_3_0 = callPackage
       (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          sbroker_0_7_0,
-          postgrex_0_9_1,
-          poolboy_1_5_1,
-          poison_1_5_2,
-          mariaex_0_4_3,
-          decimal_1_1_1
-        }:
+        {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
-            name = "ecto";
-            version = "0.15.0";
+            name = "ecs";
+            version = "0.3.0";
             src = fetchHex {
-              pkg = "ecto";
-              version = "0.15.0";
+              pkg = "ecs";
+              version = "0.3.0";
               sha256 =
-                "44bbe98d66c20aa70dcac2cb41f6ae058aa50c3029089e2158d043113110164b";
+                "266fe69adcb3772352bc47b1312e00e8ec0a15a03c412be1b63b147a916f6156";
             };
-            beamDeps  = [
-                          sbroker_0_7_0
-                          postgrex_0_9_1
-                          poolboy_1_5_1
-                          poison_1_5_2
-                          mariaex_0_4_3
-                          decimal_1_1_1
-                        ];
 
             meta = {
-              longDescription = ''Ecto is a domain specific language for
-                                writing queries and interacting with databases
-                                in Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/elixir-lang/ecto";
+              description = ''An experimental Entity-Component System (ECS)
+                            game engine.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joshforisha/ecs";
             };
           } // packageOverrides)
       ) {};
 
-    ecto_0_16_0 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          sbroker_0_7_0,
-          postgrex_0_9_1,
-          poolboy_1_5_1,
-          poison_1_5_2,
-          mariaex_0_4_3,
-          decimal_1_1_1
-        }:
-          buildMix ({
-            name = "ecto";
-            version = "0.16.0";
-            src = fetchHex {
-              pkg = "ecto";
-              version = "0.16.0";
-              sha256 =
-                "45643e7a09fdd0a32cf440c5b2e71c5120f24310280da50f51713399d9bb49d6";
-            };
-            beamDeps  = [
-                          sbroker_0_7_0
-                          postgrex_0_9_1
-                          poolboy_1_5_1
-                          poison_1_5_2
-                          mariaex_0_4_3
-                          decimal_1_1_1
-                        ];
-
-            meta = {
-              longDescription = ''Ecto is a domain specific language for
-                                writing queries and interacting with databases
-                                in Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/elixir-lang/ecto";
-            };
-          } // packageOverrides)
-      ) {};
-
-    ecto_1_0_7 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          sbroker_0_7_0,
-          postgrex_0_9_1,
-          poolboy_1_5_1,
-          poison_1_5_2,
-          mariaex_0_4_3,
-          decimal_1_1_1
-        }:
-          buildMix ({
-            name = "ecto";
-            version = "1.0.7";
-            src = fetchHex {
-              pkg = "ecto";
-              version = "1.0.7";
-              sha256 =
-                "d56766fb8e93dcec7e6dd9ef8bfe624b9b6d1f3a433fac4f0e7532681f501086";
-            };
-            beamDeps  = [
-                          sbroker_0_7_0
-                          postgrex_0_9_1
-                          poolboy_1_5_1
-                          poison_1_5_2
-                          mariaex_0_4_3
-                          decimal_1_1_1
-                        ];
-
-            meta = {
-              longDescription = ''Ecto is a domain specific language for
-                                writing queries and interacting with databases
-                                in Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/elixir-lang/ecto";
-            };
-          } // packageOverrides)
-      ) {};
-
-    ecto_1_1_5 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          sbroker_0_7_0,
-          postgrex_0_11_1,
-          poolboy_1_5_1,
-          poison_1_5_2,
-          mariaex_0_1_7,
-          decimal_1_1_1
-        }:
-          buildMix ({
-            name = "ecto";
-            version = "1.1.5";
-            src = fetchHex {
-              pkg = "ecto";
-              version = "1.1.5";
-              sha256 =
-                "6283cae93763257ac7a319e28ab2308efcd3a4c1571e65ef55721067a01caf69";
-            };
-            beamDeps  = [
-                          sbroker_0_7_0
-                          postgrex_0_11_1
-                          poolboy_1_5_1
-                          poison_1_5_2
-                          mariaex_0_1_7
-                          decimal_1_1_1
-                        ];
-
-            meta = {
-              longDescription = ''Ecto is a domain specific language for
-                                writing queries and interacting with databases
-                                in Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/elixir-lang/ecto";
-            };
-          } // packageOverrides)
-      ) {};
+    ecs = ecs_0_3_0;
 
     ecto_audit_0_0_1 = callPackage
       (
@@ -6750,76 +9736,42 @@ let
 
     ecto_audit = ecto_audit_0_0_1;
 
-    ecto_gettext_0_1_4 = callPackage
+    ed25519_0_2_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, gettext_0_10_0 }:
+        {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
-            name = "ecto_gettext";
-            version = "0.1.4";
+            name = "ed25519";
+            version = "0.2.0";
             src = fetchHex {
-              pkg = "ecto_gettext";
-              version = "0.1.4";
+              pkg = "ed25519";
+              version = "0.2.0";
               sha256 =
-                "fdd333fd0655a86f985bed4558132b6b382cdafbce23e21cab4a9afc08b47f82";
+                "ddd159c41eea85a2fc198a0a8ed06d69ef42b4657f7122610d5e0a5653d2ef03";
             };
-            beamDeps  = [ gettext_0_10_0 ];
 
             meta = {
-              description = ''EctoGettext - library for localization Ecto
-                            validation errors with using Gettext'';
+              description = ''Ed25519 signature functions'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/exbugs-elixir/ecto_gettext";
+              homepage = "https://github.com/mwmiller/ed25519_ex";
             };
           } // packageOverrides)
       ) {};
 
-    ecto_gettext = ecto_gettext_0_1_4;
+    ed25519 = ed25519_0_2_0;
 
-    ectograph_0_0_2 = callPackage
+    edeliver_1_2_9 = callPackage
       (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          graphql_0_2_0,
-          ecto_1_1_5
-        }:
-          buildMix ({
-            name = "ectograph";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "ectograph";
-              version = "0.0.2";
-              sha256 =
-                "44eff08624c5f93af30878f4e1e47d69354078ff9081bf2b0203513bb6e0ead9";
-            };
-            beamDeps  = [ graphql_0_2_0 ecto_1_1_5 ];
-
-            meta = {
-              longDescription = ''Ectograph is a set of utility functions for
-                                using Ecto in combination with GraphQL
-                                (joshprice/graphql-elixir)'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/icidasset/ectograph";
-            };
-          } // packageOverrides)
-      ) {};
-
-    ectograph = ectograph_0_0_2;
-
-    edeliver_1_1_4 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_5 }:
           buildMix ({
             name = "edeliver";
-            version = "1.1.4";
+            version = "1.2.9";
             src = fetchHex {
               pkg = "edeliver";
-              version = "1.1.4";
+              version = "1.2.9";
               sha256 =
-                "b7c95a499efb0fc9baf681dfaba3c09c64d9cde5c4cf4faafd44d6de9cba8928";
+                "0673ffc1f6eb6f2c29097afa81baa7f9be18cf54bd796724b16656297aff85df";
             };
-            beamDeps  = [ exrm_1_0_3 ];
+            beamDeps  = [ exrm_1_0_5 ];
 
             meta = {
               longDescription = ''Build and Deploy Elixir Applications and
@@ -6831,19 +9783,19 @@ let
           } // packageOverrides)
       ) {};
 
-    edeliver = edeliver_1_1_4;
+    edeliver = edeliver_1_2_9;
 
-    edib_0_5_1 = callPackage
+    edib_0_7_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "edib";
-            version = "0.5.1";
+            version = "0.7.0";
             src = fetchHex {
               pkg = "edib";
-              version = "0.5.1";
+              version = "0.7.0";
               sha256 =
-                "25218e2eca8c5b51b0344c04d635551689b4791760104227963173299b7d60e0";
+                "4ff16e9397a14d13a0a4bcef30634393999c24ed17e6f90817f5f115e09db5a2";
             };
 
             meta = {
@@ -6857,7 +9809,7 @@ let
           } // packageOverrides)
       ) {};
 
-    edib = edib_0_5_1;
+    edib = edib_0_7_0;
 
     edip_0_4_3 = callPackage
       (
@@ -6885,7 +9837,30 @@ let
 
     edip = edip_0_4_3;
 
-    eeb_0_1_3 = callPackage
+    edown_0_7_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "edown";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "edown";
+              version = "0.7.0";
+              sha256 =
+                "6d7365a7854cd724e8d1fd005f5faa4444eae6a87eb6df9b789b6e7f6f09110a";
+            };
+
+            meta = {
+              description = ''Markdown generated from Edoc.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/uwiger/edown";
+            };
+          } // packageOverrides)
+      ) {};
+
+    edown = edown_0_7_0;
+
+    eeb_0_2_0 = callPackage
       (
         {
           buildMix,
@@ -6899,12 +9874,12 @@ let
         }:
           buildMix ({
             name = "eeb";
-            version = "0.1.3";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "eeb";
-              version = "0.1.3";
+              version = "0.2.0";
               sha256 =
-                "c2f4bc1e6dbada6b7086e92db14a401ac1440d25d5c5ac078fc55e6545c73f4e";
+                "0615ccea012507ae35f6f1f4f8a46eac6d9eceba0cdface2df5c0d70b7caddbc";
             };
             beamDeps  = [
                           tzdata_0_1_201603
@@ -6922,7 +9897,7 @@ let
           } // packageOverrides)
       ) {};
 
-    eeb = eeb_0_1_3;
+    eeb = eeb_0_2_0;
 
     efirebirdsql_0_1_1 = callPackage
       (
@@ -6947,39 +9922,36 @@ let
 
     efirebirdsql = efirebirdsql_0_1_1;
 
-    egithub_0_2_2 = callPackage
+    egaugex_0_0_2 = callPackage
       (
         {
-          buildErlangMk,
+          buildMix,
           packageOverrides ? {},
           fetchHex,
-          shotgun_0_2_2,
-          jiffy_0_14_7,
-          lager_3_0_2,
-          goldrush_0_1_7
+          httpoison_0_8_3,
+          floki_0_8_1
         }:
-          buildErlangMk ({
-            name = "egithub";
-            version = "0.2.2";
+          buildMix ({
+            name = "egaugex";
+            version = "0.0.2";
             src = fetchHex {
-              pkg = "egithub";
-              version = "0.2.2";
+              pkg = "egaugex";
+              version = "0.0.2";
               sha256 =
-                "ff8e279d3868576cc2a05336c7ca4bed3972f7a01676be859b7e1750da4570f8";
+                "307c0a21c196db45431e5472ad090548f956ccb0e02f97491fba07a2a52d0c51";
             };
-            beamDeps  = [
-                          shotgun_0_2_2 jiffy_0_14_7 lager_3_0_2 goldrush_0_1_7
-                        ];
+            beamDeps  = [ httpoison_0_8_3 floki_0_8_1 ];
 
             meta = {
-              description = ''GitHub API client'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/inaka/erlang-github";
+              description = ''A simple egauge parser to retrieve and parse data
+                            from egauge devices'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Brightergy/egaugex";
             };
           } // packageOverrides)
       ) {};
 
-    egithub = egithub_0_2_2;
+    egaugex = egaugex_0_0_2;
 
     eh_0_2_0 = callPackage
       (
@@ -7052,6 +10024,30 @@ let
 
     eight_ball_dj = eight_ball_dj_0_0_2;
 
+    eikon_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "eikon";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "eikon";
+              version = "0.0.2";
+              sha256 =
+                "fc624850b69504dd3f05e65ce40b4480aef70b605045f3d79d218c39c443a205";
+            };
+
+            meta = {
+              description = ''Eikōn is an Elixir library providing a read-only
+                            interface for image files.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tchoutri/eikon";
+            };
+          } // packageOverrides)
+      ) {};
+
+    eikon = eikon_0_0_2;
+
     eio_0_1_0 = callPackage
       (
         {
@@ -7059,7 +10055,7 @@ let
           packageOverrides ? {},
           fetchHex,
           poison_1_5_2,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -7071,7 +10067,7 @@ let
               sha256 =
                 "f39f017c73713b36ee27d8a0635634ac2e96b4d540f28db9dd358d8744dccd88";
             };
-            beamDeps  = [ poison_1_5_2 plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ poison_1_5_2 plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               description = ''Engine.io server for Elixir.'';
@@ -7109,6 +10105,86 @@ let
 
     ejabberd_dev = ejabberd_dev_15_9_0;
 
+    ejwt_0_1_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex, jsx_2_8_0 }:
+          buildRebar3 ({
+            name = "ejwt";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ejwt";
+              version = "0.1.0";
+              sha256 =
+                "c316a4b7fd21b07b401a3a01db9039b7006f5a1c7e96a981b6cbcb36da1a4a84";
+            };
+
+            beamDeps  = [ jsx_2_8_0 ];
+
+            meta = {
+              description = ''Encode/decode JSON Web Token'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/artefactop/ejwt";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ejwt = ejwt_0_1_0;
+
+    elastex_0_1_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "elastex";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "elastex";
+              version = "0.1.2";
+              sha256 =
+                "eaab5305db3d5d326e471dc1799606b7055971dfb7d9a27571850d2ce7e97f9b";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Data driven elixir client for Elasticsearch.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/michaeldoaty/elastex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    elastex = elastex_0_1_2;
+
+    elaxtic_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
+          buildMix ({
+            name = "elaxtic";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "elaxtic";
+              version = "0.0.1";
+              sha256 =
+                "a912a0327bfe1c6443cec47a03d11450fed2e649bfdcd4e77bdb9176baa8cd45";
+            };
+            beamDeps  = [ httpoison_0_8_3 ];
+
+            meta = {
+              description = ''ElasticSearch client for Elixir and Ecto
+                            driver.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/vic/elaxtic";
+            };
+          } // packageOverrides)
+      ) {};
+
+    elaxtic = elaxtic_0_0_1;
+
     elixir_ami_0_0_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -7197,36 +10273,6 @@ let
 
     elixir_bencode = elixir_bencode_1_0_0;
 
-    elixir_drawille_0_0_3 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          ex_doc_0_10_0,
-          earmark_0_1_19
-        }:
-          buildMix ({
-            name = "elixir_drawille";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "elixir_drawille";
-              version = "0.0.3";
-              sha256 =
-                "5fab2af19c8f8c68e62aa4f0a3c17d23a9519e998617470df3ae3cb59516c52c";
-            };
-            beamDeps  = [ ex_doc_0_10_0 earmark_0_1_19 ];
-
-            meta = {
-              description = ''Drawings using terminal braille characters.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/massn/elixir-drawille";
-            };
-          } // packageOverrides)
-      ) {};
-
-    elixir_drawille = elixir_drawille_0_0_3;
-
     elixir_exif_0_1_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -7251,18 +10297,19 @@ let
 
     elixir_exif = elixir_exif_0_1_1;
 
-    elixir_feed_parser_0_9_0 = callPackage
+    elixir_feed_parser_1_1_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_2_1_6 }:
           buildMix ({
             name = "elixir_feed_parser";
-            version = "0.9.0";
+            version = "1.1.0";
             src = fetchHex {
               pkg = "elixir_feed_parser";
-              version = "0.9.0";
+              version = "1.1.0";
               sha256 =
-                "35e0164c63e513d100008a9ada090ba6f1efe89cafc7995f321c0168e39cce5c";
+                "d623eaf020971979601ff135b56776d1b4a73da7eb75d7ae757a8ea18fd41ca0";
             };
+            beamDeps  = [ timex_2_1_6 ];
 
             meta = {
               description = ''An Elixir Atom/RSS2 feed parser.'';
@@ -7272,7 +10319,7 @@ let
           } // packageOverrides)
       ) {};
 
-    elixir_feed_parser = elixir_feed_parser_0_9_0;
+    elixir_feed_parser = elixir_feed_parser_1_1_0;
 
     elixir_freshbooks_0_0_4 = callPackage
       (
@@ -7304,6 +10351,51 @@ let
 
     elixir_freshbooks = elixir_freshbooks_0_0_4;
 
+    elixir_gravatar_url_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "elixir_gravatar_url";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "elixir_gravatar_url";
+              version = "1.0.0";
+              sha256 =
+                "e298fbfc6c4ebf401cf4e62739d79696eff3ce454f037055523c08f2cf815db1";
+            };
+
+            meta = {
+              description = ''An Elixir module for generating Gravatar urls'';
+
+            };
+          } // packageOverrides)
+      ) {};
+
+    elixir_gravatar_url = elixir_gravatar_url_1_0_0;
+
+    elixir_make_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "elixir_make";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "elixir_make";
+              version = "0.1.0";
+              sha256 =
+                "940d1a8e6f6ed8f8bc5c349371b200416bcb657e3a7d0fc64e7292263bf02de6";
+            };
+
+            meta = {
+              description = ''A Make compiler for Mix'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/elixir_make";
+            };
+          } // packageOverrides)
+      ) {};
+
+    elixir_make = elixir_make_0_1_0;
+
     elixir_mbcs_0_1_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -7329,7 +10421,7 @@ let
 
     elixir_mod_event_0_0_5 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_4 }:
           buildMix ({
             name = "elixir_mod_event";
             version = "0.0.5";
@@ -7339,7 +10431,7 @@ let
               sha256 =
                 "d38fe29a32107e889c52f849ceec6267709591b7db98db14bd3890683ca78b0f";
             };
-            beamDeps  = [ uuid_1_1_3 ];
+            beamDeps  = [ uuid_1_1_4 ];
 
             meta = {
               longDescription = ''Elixir client for FreeSWITCH
@@ -7354,6 +10446,42 @@ let
 
     elixir_mod_event = elixir_mod_event_0_0_5;
 
+    elixir_nsq_1_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          uuid_1_1_4,
+          socket_0_3_4,
+          poison_1_5_2,
+          httpotion_2_2_2
+        }:
+          buildMix ({
+            name = "elixir_nsq";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "elixir_nsq";
+              version = "1.0.3";
+              sha256 =
+                "6d30c3754dfdd988f927b9c6ae51d3e0ec4b0d2477b99047baf7a52c96bf9494";
+            };
+            beamDeps  = [
+                          uuid_1_1_4 socket_0_3_4 poison_1_5_2 httpotion_2_2_2
+                        ];
+
+            meta = {
+              longDescription = ''A client library for NSQ, `elixir_nsq` aims
+                                to be complete, easy to use, and well tested.
+                                Developed at Wistia (http://wistia.com).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/wistia/elixir_nsq";
+            };
+          } // packageOverrides)
+      ) {};
+
+    elixir_nsq = elixir_nsq_1_0_3;
+
     elixir_prelude_0_2_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -7400,19 +10528,21 @@ let
 
     elixir_radius = elixir_radius_0_1_0;
 
-    elixir_script_0_16_0 = callPackage
+    elixir_script_0_20_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, estree_2_3_0 }:
+        {
+          buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2, estree_2_3_0
+        }:
           buildMix ({
             name = "elixir_script";
-            version = "0.16.0";
+            version = "0.20.0";
             src = fetchHex {
               pkg = "elixir_script";
-              version = "0.16.0";
+              version = "0.20.0";
               sha256 =
-                "a2ff037d9c3562198fb3e35ff112cb35827078b1a905368be5ff351c582966a9";
+                "259c8ff57f171eda4a9ac15fe6307063b76630168fd582f27e3dfb1c621e0533";
             };
-            beamDeps  = [ estree_2_3_0 ];
+            beamDeps  = [ fs_0_9_2 estree_2_3_0 ];
 
             meta = {
               description = ''ElixirScript: compiles Elixir code to
@@ -7423,7 +10553,33 @@ let
           } // packageOverrides)
       ) {};
 
-    elixir_script = elixir_script_0_16_0;
+    elixir_script = elixir_script_0_20_0;
+
+    elixir_talk_1_1_1 = callPackage
+      (
+        {
+          buildMix, packageOverrides ? {}, fetchHex, yaml_elixir_1_0_0
+        }:
+          buildMix ({
+            name = "elixir_talk";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "elixir_talk";
+              version = "1.1.1";
+              sha256 =
+                "29735f954662da43179de5af018e22b54eb44b5680dd526a5a158b3201324b47";
+            };
+            beamDeps  = [ yaml_elixir_1_0_0 ];
+
+            meta = {
+              description = ''ElixirTalk is an Elixir client for beanstalkd.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jsvisa/elixir_talk";
+            };
+          } // packageOverrides)
+      ) {};
+
+    elixir_talk = elixir_talk_1_1_1;
 
     elixir_tea_1_0_0 = callPackage
       (
@@ -7479,17 +10635,49 @@ let
 
     elixir_v8 = elixir_v8_0_2_2;
 
-    elixlsx_0_0_2 = callPackage
+    elixir_wit_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          uuid_1_1_4,
+          poison_2_1_0,
+          httpotion_2_2_2
+        }:
+          buildMix ({
+            name = "elixir_wit";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "elixir_wit";
+              version = "0.1.0";
+              sha256 =
+                "75b9046cd41146c4e3b486541cf37a5e27eea42d179af7fda127bdb391855224";
+            };
+            beamDeps  = [ uuid_1_1_4 poison_2_1_0 httpotion_2_2_2 ];
+
+            meta = {
+              longDescription = ''Elixir client for the Wit API. Wit is the
+                                natural language engine for creating Bots.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zabirauf/elixir_wit";
+            };
+          } // packageOverrides)
+      ) {};
+
+    elixir_wit = elixir_wit_0_1_0;
+
+    elixlsx_0_0_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "elixlsx";
-            version = "0.0.2";
+            version = "0.0.3";
             src = fetchHex {
               pkg = "elixlsx";
-              version = "0.0.2";
+              version = "0.0.3";
               sha256 =
-                "59778841cecdaec28cf6b008add62a7653a4bd5eb9031e6fb0a076cc9e69fb3d";
+                "baa903f52efd18705bc4f11f25674249e38ba22d111f49321b8f750c063fb932";
             };
 
             meta = {
@@ -7500,7 +10688,7 @@ let
           } // packageOverrides)
       ) {};
 
-    elixlsx = elixlsx_0_0_2;
+    elixlsx = elixlsx_0_0_3;
 
     elli_1_0_5 = callPackage
       (
@@ -7526,10 +10714,87 @@ let
 
     elli = elli_1_0_5;
 
+    elmer_0_0_11 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "elmer";
+            version = "0.0.11";
+            src = fetchHex {
+              pkg = "elmer";
+              version = "0.0.11";
+              sha256 =
+                "cefb6a31a8e4ab5de698cd24f9a02c1fef690f0111f49ffa3e3d57c027c5160c";
+            };
+
+            meta = {
+              description = ''Helper mix tasks for generating elm files like
+                            Main, Ports, Models, Msgs, etc.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nathanjohnson320/elmer";
+            };
+          } // packageOverrides)
+      ) {};
+
+    elmer = elmer_0_0_11;
+
+    elmxir_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "elmxir";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "elmxir";
+              version = "0.0.1";
+              sha256 =
+                "65ad59b4922b75fb7b6c888f3e5c7dea1d01a4a085a376261bcaa3cfd6ce0845";
+            };
+
+            meta = {
+              description = ''Helper functions for working with Elm + Elixir'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/NoRedInk/elmxir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    elmxir = elmxir_0_0_1;
+
+    email_checker_0_0_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, socket_0_3_4 }:
+          buildMix ({
+            name = "email_checker";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "email_checker";
+              version = "0.0.3";
+              sha256 =
+                "feac6fa5cc1343b437221ace18fa8fa7251dfa777e986063e13f435d6aff990c";
+            };
+            beamDeps  = [ socket_0_3_4 ];
+
+            meta = {
+              longDescription = ''Simple library checking the validity of an
+                                email. Checks are performed in the following
+                                order: - REGEX: validate the emails has a good
+                                looking format - MX: validate the domain sever
+                                contains MX records - SMTP: validate the SMTP
+                                behind the MX records knows this email address
+                                (no email sent)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kdisneur/email_checker";
+            };
+          } // packageOverrides)
+      ) {};
+
+    email_checker = email_checker_0_0_3;
+
     eministat_0_10_1 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "eministat";
             version = "0.10.1";
             src = fetchHex {
@@ -7577,28 +10842,84 @@ let
 
     eml = eml_0_7_1;
 
-    emodel_1_3_1 = callPackage
+    eno_0_0_1 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "emodel";
-            version = "1.3.1";
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          postgrex_0_11_1,
+          mariaex_0_7_5,
+          combine_0_7_0
+        }:
+          buildMix ({
+            name = "eno";
+            version = "0.0.1";
             src = fetchHex {
-              pkg = "emodel";
-              version = "1.3.1";
+              pkg = "eno";
+              version = "0.0.1";
               sha256 =
-                "6271ac4fb20c81b60ce568345ddec8abaea59a6b1eb63aa35ada25a009464ce2";
+                "217cabaf3d3a4f5e46d9b48a88a2cafded20a04a2f477f6bec37b3a82b40424a";
             };
+            beamDeps  = [ postgrex_0_11_1 mariaex_0_7_5 combine_0_7_0 ];
 
             meta = {
-              description = ''Erlang data transformation/validation library'';
+              description = ''lightweight SQL toolkit'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/egobrain/emodel";
+              homepage = "https://github.com/zweifisch/eno";
             };
           } // packageOverrides)
       ) {};
 
-    emodel = emodel_1_3_1;
+    eno = eno_0_0_1;
+
+    env_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "env";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "env";
+              version = "0.1.0";
+              sha256 =
+                "befbc0d4a4fc368c05a693a5d29860932c812f8dff2cd14dd62a590ba49b8875";
+            };
+
+            meta = {
+              description = ''Env is an improved application configuration
+                            reader for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/michalmuskala/env";
+            };
+          } // packageOverrides)
+      ) {};
+
+    env = env_0_1_0;
+
+    env_helper_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "env_helper";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "env_helper";
+              version = "0.0.2";
+              sha256 =
+                "36bb88f51ea9a967a9c86d0c9de790f1d88f8b25863c03e4a733d75b9bfb9f54";
+            };
+
+            meta = {
+              description = ''A simple add on to make working with environment
+                            variables slightly easier.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/manheim/env_helper";
+            };
+          } // packageOverrides)
+      ) {};
+
+    env_helper = env_helper_0_0_2;
 
     envy_0_0_2 = callPackage
       (
@@ -7623,6 +10944,29 @@ let
 
     envy = envy_0_0_2;
 
+    eon_3_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "eon";
+            version = "3.0.0";
+            src = fetchHex {
+              pkg = "eon";
+              version = "3.0.0";
+              sha256 =
+                "a19006b99ffbe846fe064adfb128cbb6b49c85d08becb60d1e204e1d1f0db94e";
+            };
+
+            meta = {
+              description = ''Use Elixir maps as a document storage format.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/supernintendo/eon";
+            };
+          } // packageOverrides)
+      ) {};
+
+    eon = eon_3_0_0;
+
     eper_0_94_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -7651,6 +10995,38 @@ let
 
     eper = eper_0_94_0;
 
+    epgpool_1_0_1 = callPackage
+      (
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_4_2,
+          lager_3_0_2,
+          epgsql_3_2_0
+        }:
+          buildRebar3 ({
+            name = "epgpool";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "epgpool";
+              version = "1.0.1";
+              sha256 =
+                "23435ebb6b6c8615b1e6ccd6277eb1e6b69b57d0a2079b536b0aaa60ddb094bd";
+            };
+
+            beamDeps  = [ poolboy_1_4_2 lager_3_0_2 epgsql_3_2_0 ];
+
+            meta = {
+              description = ''Erlang postgresql pool application'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/egobrain/epgpool";
+            };
+          } // packageOverrides)
+      ) {};
+
+    epgpool = epgpool_1_0_1;
+
     epgsql_3_1_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -7672,7 +11048,28 @@ let
           } // packageOverrides)
       ) {};
 
-    epgsql = epgsql_3_1_1;
+    epgsql_3_2_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "epgsql";
+            version = "3.2.0";
+            src = fetchHex {
+              pkg = "epgsql";
+              version = "3.2.0";
+              sha256 =
+                "ff88a419df7b3084e8358538ade8b1844f5d6d18e9fa8c2124acea889720665a";
+            };
+
+            meta = {
+              description = ''PostgreSQL Client'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/epgsql/epgsql";
+            };
+          } // packageOverrides)
+      ) {};
+
+    epgsql = epgsql_3_2_0;
 
     epiphany_0_1_0_dev = callPackage
       (
@@ -7724,8 +11121,8 @@ let
 
     eqc_ex_1_2_4 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "eqc_ex";
             version = "1.2.4";
             src = fetchHex {
@@ -7745,40 +11142,17 @@ let
 
     eqc_ex = eqc_ex_1_2_4;
 
-    eql_0_1_2 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "eql";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "eql";
-              version = "0.1.2";
-              sha256 =
-                "3b1a85c491d44262802058c0de97a2c90678d5d45851b88a076b1a45a8d6d4b3";
-            };
-
-            meta = {
-              description = ''Erlang with SQL'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/artemeff/eql";
-            };
-          } // packageOverrides)
-      ) {};
-
-    eql = eql_0_1_2;
-
-    equery_0_2_0 = callPackage
+    equery_0_6_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
           buildRebar3 ({
             name = "equery";
-            version = "0.2.0";
+            version = "0.6.1";
             src = fetchHex {
               pkg = "equery";
-              version = "0.2.0";
+              version = "0.6.1";
               sha256 =
-                "4e1f91ecdcaf61db99be759ebe133d351aec760ff8e7ea1c33e6f0626cf6068b";
+                "4a492b7cb64c0014c6be8fc763df665ec129bd56c7350e00cbd3d6fd556a8c60";
             };
 
             meta = {
@@ -7789,7 +11163,30 @@ let
           } // packageOverrides)
       ) {};
 
-    equery = equery_0_2_0;
+    equery = equery_0_6_1;
+
+    equivalex_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "equivalex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "equivalex";
+              version = "0.1.0";
+              sha256 =
+                "8c5cd7fb186085ce088839098a98366f798674a4018cb328978a5e0b2f55ad7d";
+            };
+
+            meta = {
+              description = ''constant time polymorphic comparisons'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/equivalex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    equivalex = equivalex_0_1_0;
 
     eredis_1_0_8 = callPackage
       (
@@ -7814,17 +11211,17 @@ let
 
     eredis = eredis_1_0_8;
 
-    erl2ex_0_0_8 = callPackage
+    erl2ex_0_0_9 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "erl2ex";
-            version = "0.0.8";
+            version = "0.0.9";
             src = fetchHex {
               pkg = "erl2ex";
-              version = "0.0.8";
+              version = "0.0.9";
               sha256 =
-                "bbe0b1a43e1621158d7985e77d7d1f00db0410d5987b429c30c8d0cc582e0f6f";
+                "4e49c461ecffc33986bb72a43ae87211fb33fed39077fb522c381b884d189514";
             };
 
             meta = {
@@ -7837,7 +11234,7 @@ let
           } // packageOverrides)
       ) {};
 
-    erl2ex = erl2ex_0_0_8;
+    erl2ex = erl2ex_0_0_9;
 
     erlang_localtime_1_0_0 = callPackage
       (
@@ -7863,6 +11260,27 @@ let
 
     erlang_localtime = erlang_localtime_1_0_0;
 
+    erlang_term_1_4_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "erlang_term";
+            version = "1.4.0";
+            src = fetchHex {
+              pkg = "erlang_term";
+              version = "1.4.0";
+              sha256 =
+                "1a4d491dbd13b7a714815af10fc658948a5a440de23755a32b741ca07d8ba592";
+            };
+
+            meta = {
+              description = ''Provide the in-memory size of Erlang terms'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/erlang_term";
+            };
+          } // packageOverrides)
+      ) {};
+
     erlang_term_1_5_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -7932,26 +11350,27 @@ let
 
     erlaudio = erlaudio_0_2_3;
 
-    erlcloud_0_13_0 = callPackage
+    erlcloud_0_11_0 = callPackage
       (
         {
           buildRebar3,
           packageOverrides ? {},
           fetchHex,
+          meck_0_8_3,
           lhttpc_1_3_0,
-          jsx_2_8_0
+          jsx_2_6_2
         }:
           buildRebar3 ({
             name = "erlcloud";
-            version = "0.13.0";
+            version = "0.11.0";
             src = fetchHex {
               pkg = "erlcloud";
-              version = "0.13.0";
+              version = "0.11.0";
               sha256 =
-                "70e1f5aa86b5f7a62d1141a7507a9e334f833793e3b909fe9c1cfc9916e516a0";
+                "ca9876dab57ed8fb5fb75ab6ce11e59a346387d357d7a038a2e18d1d31a30716";
             };
 
-            beamDeps  = [ lhttpc_1_3_0 jsx_2_8_0 ];
+            beamDeps  = [ meck_0_8_3 lhttpc_1_3_0 jsx_2_6_2 ];
 
             meta = {
               description = ''Erlang cloud computing library'';
@@ -7990,8 +11409,6 @@ let
           } // packageOverrides)
       ) {};
 
-    erlcloud = erlcloud_0_13_2;
-
     erlexec_1_1_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -8016,31 +11433,55 @@ let
           } // packageOverrides)
       ) {};
 
-    erlogger_0_1_0 = callPackage
+    erlexec_1_1_3 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
           buildRebar3 ({
-            name = "erlogger";
-            version = "0.1.0";
+            name = "erlexec";
+            version = "1.1.3";
             src = fetchHex {
-              pkg = "erlogger";
-              version = "0.1.0";
+              pkg = "erlexec";
+              version = "1.1.3";
               sha256 =
-                "de2d64f0932e8af46264d92a224ed46e41f2b698b1bbd245ae19321715322146";
+                "a4e62b46796a1b1b5e77798346e553e1460b4f97670c868f29d1e2853c02ae33";
             };
-
-            buildPlugins  = [ rebar3_hex ];
+            compilePorts = true;
+            buildPlugins  = [ pc ];
 
 
             meta = {
-              description = ''Logging service for Erlang Applications.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/knusbaum/erlogger";
+              description = ''OS Process Manager'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/saleyn/erlexec";
             };
           } // packageOverrides)
       ) {};
 
-    erlogger = erlogger_0_1_0;
+    erlexec_1_2_1 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "erlexec";
+            version = "1.2.1";
+            src = fetchHex {
+              pkg = "erlexec";
+              version = "1.2.1";
+              sha256 =
+                "47846ec5bcff158468bcbe4a0608c9c89e3822d1ba10ea4d2f04b0395dc03880";
+            };
+            compilePorts = true;
+            buildPlugins  = [ pc ];
+
+
+            meta = {
+              description = ''OS Process Manager'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/saleyn/erlexec";
+            };
+          } // packageOverrides)
+      ) {};
+
+    erlexec = erlexec_1_2_1;
 
     erlsh_0_1_0 = callPackage
       (
@@ -8067,27 +11508,51 @@ let
 
     erlsh = erlsh_0_1_0;
 
-    erlsom_1_2_1 = callPackage
+    erlsom_1_4_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
           buildRebar3 ({
             name = "erlsom";
-            version = "1.2.1";
+            version = "1.4.1";
             src = fetchHex {
               pkg = "erlsom";
-              version = "1.2.1";
+              version = "1.4.1";
               sha256 =
-                "e8f4d1d83583df7d1db8346aa30b82a6599b93fcc4b2d9165007e02ed40e7cae";
+                "57b777fe2522e342badfa35873b2266c6961e3a9f4d2ac195d761985c40c3247";
             };
 
             meta = {
-              description = ''erlsom XSD parser'';
-
+              longDescription = ''XML parser. Supports SAX style parsing as
+                                well as XML Schema based data mapping: create
+                                records from XML (and vice versa)'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/willemdj/erlsom";
             };
           } // packageOverrides)
       ) {};
 
-    erlsom = erlsom_1_2_1;
+    erlsom = erlsom_1_4_1;
+
+    erlware_commons_0_13_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "erlware_commons";
+            version = "0.13.0";
+            src = fetchHex {
+              pkg = "erlware_commons";
+              version = "0.13.0";
+              sha256 =
+                "d083bbb622a5df09857464f45e1b20a34c66c1376870ece6f9b093a236bbea27";
+            };
+
+            meta = {
+              description = ''Additional standard library for Erlang'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/erlware/erlware_commons";
+            };
+          } // packageOverrides)
+      ) {};
 
     erlware_commons_0_15_0 = callPackage
       (
@@ -8179,7 +11644,30 @@ let
           } // packageOverrides)
       ) {};
 
-    erlware_commons = erlware_commons_0_20_0;
+    erlware_commons_0_21_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex, cf_0_2_1 }:
+          buildRebar3 ({
+            name = "erlware_commons";
+            version = "0.21.0";
+            src = fetchHex {
+              pkg = "erlware_commons";
+              version = "0.21.0";
+              sha256 =
+                "e70a95762458a489dc37fe869f41517bd43c130e156ef08462f90c534300ab3f";
+            };
+
+            beamDeps  = [ cf_0_2_1 ];
+
+            meta = {
+              description = ''Additional standard library for Erlang'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/erlware/erlware_commons";
+            };
+          } // packageOverrides)
+      ) {};
+
+    erlware_commons = erlware_commons_0_21_0;
 
     erlydtl_0_11_1 = callPackage
       (
@@ -8227,6 +11715,30 @@ let
 
     erlydtl2 = erlydtl2_0_11_1;
 
+    erlzk_0_6_2 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "erlzk";
+            version = "0.6.2";
+            src = fetchHex {
+              pkg = "erlzk";
+              version = "0.6.2";
+              sha256 =
+                "b9b8e85e34f33550078e58e13fcb29c6bfe75e0585ee94f809d434fce546c246";
+            };
+
+            meta = {
+              description = ''A Pure Erlang ZooKeeper Client (no C
+                            dependency)'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/huaban/erlzk";
+            };
+          } // packageOverrides)
+      ) {};
+
+    erlzk = erlzk_0_6_2;
+
     esel_0_1_2 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -8249,6 +11761,82 @@ let
 
     esel = esel_0_1_2;
 
+    espec_0_8_21 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, meck_0_8_4 }:
+          buildMix ({
+            name = "espec";
+            version = "0.8.21";
+            src = fetchHex {
+              pkg = "espec";
+              version = "0.8.21";
+              sha256 =
+                "147d91a367d6bca9772b064195fd64f373a03e2d0bf57be5664ae780fd3508f5";
+            };
+            beamDeps  = [ meck_0_8_4 ];
+
+            meta = {
+              description = ''BDD testing framework for Elixir inspired by
+                            RSpec.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/antonmi/espec";
+            };
+          } // packageOverrides)
+      ) {};
+
+    espec = espec_0_8_21;
+
+    esqlcipher_1_0_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "esqlcipher";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "esqlcipher";
+              version = "1.0.0";
+              sha256 =
+                "f3a47df8cf7277b9352054e96a9745c77aa475a51ea36a18692a437b2af79b0b";
+            };
+            compilePorts = true;
+            buildPlugins  = [ pc ];
+
+
+            meta = {
+              description = ''sqlcipher nif interface'';
+
+            };
+          } // packageOverrides)
+      ) {};
+
+    esqlcipher = esqlcipher_1_0_0;
+
+    esqlite_0_2_2 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "esqlite";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "esqlite";
+              version = "0.2.2";
+              sha256 =
+                "5f15f8014baa9d31ee83817afe9164b3ecd76f77b2de7515f2cca2ca75b642e0";
+            };
+            compilePorts = true;
+            buildPlugins  = [ pc ];
+
+
+            meta = {
+              description = ''A Sqlite3 NIF'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mmzeeman/esqlite";
+            };
+          } // packageOverrides)
+      ) {};
+
+    esqlite = esqlite_0_2_2;
+
     estree_2_3_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -8300,8 +11888,8 @@ let
 
     ether_0_0_1 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ether";
             version = "0.0.1";
             src = fetchHex {
@@ -8321,6 +11909,39 @@ let
 
     ether = ether_0_0_1;
 
+    etherchain_org_0_0_5 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          vex_0_5_5,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "etherchain_org";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "etherchain_org";
+              version = "0.0.5";
+              sha256 =
+                "2ff545b4d78b507a664a5c246bb351be110cc647d960e39e65f2d9ce08669752";
+            };
+            beamDeps  = [ vex_0_5_5 poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''WIP Elixir API wrapper for etherchain.org.
+                                Provides access to ethereum blockchain data.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/cyberpunk-ventures/etherchain_org_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    etherchain_org = etherchain_org_0_0_5;
+
     ets_map_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -8345,25 +11966,49 @@ let
 
     ets_map = ets_map_0_0_1;
 
-    etude_0_3_7 = callPackage
+    ets_owner_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "ets_owner";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "ets_owner";
+              version = "1.0.0";
+              sha256 =
+                "54c0228a9134f4afe5c2a5418712a8b010bbc3f3e4864f3c854110f6cb65bca9";
+            };
+
+            meta = {
+              description = ''A simple GenServer that owns your ETS tables and
+                            won`t die, even if you do.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/meyercm/ets_owner";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ets_owner = ets_owner_1_0_0;
+
+    etude_0_1_5 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
           rebind_0_1_3,
-          lineo_0_1_0
+          lineo_0_0_1
         }:
           buildMix ({
             name = "etude";
-            version = "0.3.7";
+            version = "0.1.5";
             src = fetchHex {
               pkg = "etude";
-              version = "0.3.7";
+              version = "0.1.5";
               sha256 =
-                "ee18b03eec697eccfd7027c4aaaa944e0d3335ece6c150504248763d94bbc338";
+                "4600f34a15fe85e74e181e4af9e4504ba1fedf42fcad77fd9d571b7443038355";
             };
-            beamDeps  = [ rebind_0_1_3 lineo_0_1_0 ];
+            beamDeps  = [ rebind_0_1_3 lineo_0_0_1 ];
 
             meta = {
               description = ''parallel computation coordination utilities for
@@ -8403,7 +12048,36 @@ let
           } // packageOverrides)
       ) {};
 
-    etude = etude_1_0_0_beta_0;
+    etude_1_0_0_beta_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          nile_0_1_3
+        }:
+          buildMix ({
+            name = "etude";
+            version = "1.0.0-beta.2";
+            src = fetchHex {
+              pkg = "etude";
+              version = "1.0.0-beta.2";
+              sha256 =
+                "f05d1c5b191a19a3828a89be221b4a8f7bf9fb2227ebc05b7116dc1965872cef";
+            };
+            beamDeps  = [ poison_2_1_0 nile_0_1_3 ];
+
+            meta = {
+              description = ''parallel computation coordination utilities for
+                            erlang/elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/etude";
+            };
+          } // packageOverrides)
+      ) {};
+
+    etude = etude_1_0_0_beta_2;
 
     eunit_formatters_0_3_1 = callPackage
       (
@@ -8428,19 +12102,42 @@ let
 
     eunit_formatters = eunit_formatters_0_3_1;
 
-    evel_0_1_0 = callPackage
+    eunit_sugar_0_1_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "eunit_sugar";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "eunit_sugar";
+              version = "0.1.0";
+              sha256 =
+                "f30c41d711650270d8654f9067a3b5d16d73242e0eed19082b70676e9f05bb6e";
+            };
+
+            meta = {
+              description = ''Helpers and sugars for eunit tests'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/xenolinguist/eunit_sugar";
+            };
+          } // packageOverrides)
+      ) {};
+
+    eunit_sugar = eunit_sugar_0_1_0;
+
+    evel_0_1_1 = callPackage
       (
         {
           buildRebar3, packageOverrides ? {}, fetchHex, hash_ring_0_4_0
         }:
           buildRebar3 ({
             name = "evel";
-            version = "0.1.0";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "evel";
-              version = "0.1.0";
+              version = "0.1.1";
               sha256 =
-                "5f381ab07b2f914b437808da2ef01fb2905349d17d467f5b5008bfdb5a2418dd";
+                "b849699912f797e2b0082b43d0f58b18de838379b499c47dc24194d9fec03e6e";
             };
 
             beamDeps  = [ hash_ring_0_4_0 ];
@@ -8453,7 +12150,31 @@ let
           } // packageOverrides)
       ) {};
 
-    evel = evel_0_1_0;
+    evel = evel_0_1_1;
+
+    event_nanny_0_1_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "event_nanny";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "event_nanny";
+              version = "0.1.1";
+              sha256 =
+                "4d46b285e5187fc8e63f7911087dcff54fb46ca347b457013e9bd9901f9cc9d1";
+            };
+
+            meta = {
+              description = ''Nanny for GenEvent restart handler when it exit
+                            abnormally'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ammbot/event-nanny.git";
+            };
+          } // packageOverrides)
+      ) {};
+
+    event_nanny = event_nanny_0_1_1;
 
     eventstore_0_2_1 = callPackage
       (
@@ -8486,13 +12207,45 @@ let
 
     eventstore = eventstore_0_2_1;
 
+    eventstore_client_0_1_4 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          uuid_1_1_4,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "eventstore_client";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "eventstore_client";
+              version = "0.1.4";
+              sha256 =
+                "fa77e1a7906b3ed27c0dfa0bd41f27b3129285857948aa23a3f888b0dd531109";
+            };
+            beamDeps  = [ uuid_1_1_4 poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''HTTP Client for EventStore (geteventstore.com)'';
+
+              homepage =
+                "https://github.com/tbug/elixir-eventstore-http-client";
+            };
+          } // packageOverrides)
+      ) {};
+
+    eventstore_client = eventstore_client_0_1_4;
+
     ewebmachine_2_0_12 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -8504,7 +12257,7 @@ let
               sha256 =
                 "66a4ca701594da9396d6bab03f074f1ab56080a62e6545e6e455a24296c96a1a";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''Ewebmachine contains macros and plugs to
@@ -8572,6 +12325,70 @@ let
 
     ex_abnf = ex_abnf_0_2_7;
 
+    ex_bcrypt_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, bcrypt_0_5_0_p3a }:
+          buildMix ({
+            name = "ex_bcrypt";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ex_bcrypt";
+              version = "0.0.1";
+              sha256 =
+                "c6c91e333f3e84733bb8fca08af9fda01b20f3b2a8801e456b31103118418e81";
+            };
+            beamDeps  = [ bcrypt_0_5_0_p3a ];
+
+            meta = {
+              description = ''Elixir wrapper for the OpenBSD bcrypt password
+                            hashing algorithm'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/manelli/ex_bcrypt";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ex_bcrypt = ex_bcrypt_0_0_1;
+
+    ex_blocktrail_0_2_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          yuri_1_0_0,
+          vex_0_5_5,
+          exconstructor_1_0_2,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "ex_blocktrail";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "ex_blocktrail";
+              version = "0.2.1";
+              sha256 =
+                "96a4090676a01f6644b95e8f65b1bd19f4142435d2f1b3cb2dbd79d883579f42";
+            };
+            beamDeps  = [
+                          yuri_1_0_0
+                          vex_0_5_5
+                          exconstructor_1_0_2
+                          poison_2_1_0
+                          httpoison_0_8_3
+                        ];
+
+            meta = {
+              longDescription = ''WIP. Alpha. Elixir wrapper for blocktrail.com
+                                Bitcoin api and some utility functions.'';
+              license = stdenv.lib.licenses.mit;
+            };
+          } // packageOverrides)
+      ) {};
+
+    ex_blocktrail = ex_blocktrail_0_2_1;
+
     ex_brace_expansion_0_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -8599,19 +12416,19 @@ let
 
     ex_brace_expansion = ex_brace_expansion_0_0_2;
 
-    ex_clacks_0_1_1 = callPackage
+    ex_clacks_0_1_2 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "ex_clacks";
-            version = "0.1.1";
+            version = "0.1.2";
             src = fetchHex {
               pkg = "ex_clacks";
-              version = "0.1.1";
+              version = "0.1.2";
               sha256 =
-                "524f966b03b1a1ac4ab3f6beeef6ce5030cf3b16927c466d42a8b08c5355b231";
+                "8299396f26982bbaed7f12988277174d3d3e92e0a5efe685c8d0133e08e013cc";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               description = ''A Plug that pays homage to Terry Pratchett'';
@@ -8621,7 +12438,114 @@ let
           } // packageOverrides)
       ) {};
 
-    ex_clacks = ex_clacks_0_1_1;
+    ex_clacks = ex_clacks_0_1_2;
+
+    ex_cli_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "ex_cli";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ex_cli";
+              version = "0.1.0";
+              sha256 =
+                "81e42a05730752f891b8fc1cbced2e5733d48df144ab91aeb41a8093cb42264e";
+            };
+
+            meta = {
+              description = ''Library to build CLI applications'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tuvistavie/ex_cli";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ex_cli = ex_cli_0_1_0;
+
+    ex_closeio_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "ex_closeio";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "ex_closeio";
+              version = "0.1.1";
+              sha256 =
+                "0bf03085e9ac1d548a73f5e8fa91d78c201c8fa46b3e65b89aca82f887af9cce";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Close.io client library for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/taylorbrooks/ex_closeio";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ex_closeio = ex_closeio_0_1_1;
+
+    ex_cron_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "ex_cron";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "ex_cron";
+              version = "0.0.2";
+              sha256 =
+                "2d0be58e834bdadd69336f0dd9d61d5e678d99b4de9a766ed45ea85fc87a97cb";
+            };
+
+            meta = {
+              description = ''Cron schedule generator for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/codestuffers/ex-cron";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ex_cron = ex_cron_0_0_2;
+
+    ex_crypto_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          pipe_0_0_2
+        }:
+          buildMix ({
+            name = "ex_crypto";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "ex_crypto";
+              version = "0.1.1";
+              sha256 =
+                "6686151799d3fb5be28e43a05ef3689e1d1144a0d97e4ff3b41fb039265146cb";
+            };
+            beamDeps  = [ poison_2_1_0 pipe_0_0_2 ];
+
+            meta = {
+              longDescription = ''A wrapper around the Erlang Crypto module
+                                with sensible defaults for common tasks.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ntrepid8/ex_crypto";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ex_crypto = ex_crypto_0_1_1;
 
     ex_csv_0_1_4 = callPackage
       (
@@ -8646,142 +12570,9 @@ let
 
     ex_csv = ex_csv_0_1_4;
 
-    ex_doc_0_10_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, earmark_0_1_15 }:
-          buildMix ({
-            name = "ex_doc";
-            version = "0.10.0";
-            src = fetchHex {
-              pkg = "ex_doc";
-              version = "0.10.0";
-              sha256 =
-                "3d9f15777aa3fb62700d5984eb09ceeb6c1574d61be0f70801e3390e36942b35";
-            };
-            beamDeps  = [ earmark_0_1_15 ];
-
-            meta = {
-              description = ''ExDoc is a documentation generation tool for
-                            Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/elixir-lang/ex_doc";
-            };
-          } // packageOverrides)
-      ) {};
-
-    ex_doc_0_11_4 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, earmark_0_1_15 }:
-          buildMix ({
-            name = "ex_doc";
-            version = "0.11.4";
-            src = fetchHex {
-              pkg = "ex_doc";
-              version = "0.11.4";
-              sha256 =
-                "639e97b24c1c6c172f557163b830673646983417de9ac0da2c25c7063deed293";
-            };
-            beamDeps  = [ earmark_0_1_15 ];
-
-            meta = {
-              description = ''ExDoc is a documentation generation tool for
-                            Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/elixir-lang/ex_doc";
-            };
-          } // packageOverrides)
-      ) {};
-
-    ex_doc = ex_doc_0_11_4;
-
-    ex_doc_0_7_3 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, earmark_0_1_15 }:
-          buildMix ({
-            name = "ex_doc";
-            version = "0.7.3";
-            src = fetchHex {
-              pkg = "ex_doc";
-              version = "0.7.3";
-              sha256 =
-                "45efbc6d2dc58d864e41be8a4321a5ecf643a061ec71487453447b29539f81ff";
-            };
-            beamDeps  = [ earmark_0_1_15 ];
-
-            meta = {
-              description = ''ExDoc is a documentation generation tool for
-                            Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/elixir-lang/ex_doc";
-            };
-          } // packageOverrides)
-      ) {};
-
-    ex_doc_dash_0_3_0 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          ex_doc_0_11_4,
-          earmark_0_1_15
-        }:
-          buildMix ({
-            name = "ex_doc_dash";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "ex_doc_dash";
-              version = "0.3.0";
-              sha256 =
-                "0b511eecda1dd2c51fab8b1e071e3d6292f6a136232425d3f20baa9ca0fbeb43";
-            };
-            beamDeps  = [ ex_doc_0_11_4 earmark_0_1_15 ];
-
-            meta = {
-              description = ''Formatter for ExDoc to generate docset
-                            documentation for use in Dash.app.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/JonGretar/ExDocDash";
-            };
-          } // packageOverrides)
-      ) {};
-
-    ex_doc_dash = ex_doc_dash_0_3_0;
-
-    ex_doc_epub_0_0_2 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          ex_doc_0_11_4,
-          earmark_0_1_19
-        }:
-          buildMix ({
-            name = "ex_doc_epub";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "ex_doc_epub";
-              version = "0.0.2";
-              sha256 =
-                "dbb606e86c70cff37fb2e228f9b5971ee3afb08a10c247d5734b114c5d5fdb15";
-            };
-            beamDeps  = [ ex_doc_0_11_4 earmark_0_1_19 ];
-
-            meta = {
-              description = ''Create documentation for Elixir projects in EPUB
-                            format'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/milmazz/ex_doc_epub";
-            };
-          } // packageOverrides)
-      ) {};
-
-    ex_doc_epub = ex_doc_epub_0_0_2;
-
     ex_enum_0_1_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, gettext_0_10_0 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, gettext_0_11_0 }:
           buildMix ({
             name = "ex_enum";
             version = "0.1.0";
@@ -8791,7 +12582,7 @@ let
               sha256 =
                 "f6685959ef337018e42c4baccdce98cc9618974759d1fdb969fcf9a266e590ea";
             };
-            beamDeps  = [ gettext_0_10_0 ];
+            beamDeps  = [ gettext_0_11_0 ];
 
             meta = {
               description = ''Enum library for Elixir inspired by
@@ -8827,17 +12618,17 @@ let
 
     ex_fabricators = ex_fabricators_0_1_0;
 
-    ex_guard_0_10_0 = callPackage
+    ex_guard_1_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2 }:
           buildMix ({
             name = "ex_guard";
-            version = "0.10.0";
+            version = "1.1.0";
             src = fetchHex {
               pkg = "ex_guard";
-              version = "0.10.0";
+              version = "1.1.0";
               sha256 =
-                "5e099659bf2e197e8d7acfbad597b48c59961c1f61f8ec45d4e22a5d6f6e6fb5";
+                "5f990eb24b673c782b4e742351bab14ce466146f3ea1e5324b6b7c34122bd4f9";
             };
             beamDeps  = [ fs_0_9_2 ];
 
@@ -8851,19 +12642,19 @@ let
           } // packageOverrides)
       ) {};
 
-    ex_guard = ex_guard_0_10_0;
+    ex_guard = ex_guard_1_1_0;
 
-    ex_hl7_0_1_3 = callPackage
+    ex_hl7_0_2_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "ex_hl7";
-            version = "0.1.3";
+            version = "0.2.2";
             src = fetchHex {
               pkg = "ex_hl7";
-              version = "0.1.3";
+              version = "0.2.2";
               sha256 =
-                "57ea6567e6da3cb14098bddb95a843dbfb04981578ad5a0f3c437bce8ac9cd29";
+                "b6653fd28949f5dc37f18af4320f13dcdea796553e0c429a8260d5c4bf481b0f";
             };
 
             meta = {
@@ -8874,19 +12665,19 @@ let
           } // packageOverrides)
       ) {};
 
-    ex_hl7 = ex_hl7_0_1_3;
+    ex_hl7 = ex_hl7_0_2_2;
 
-    ex_ical_0_0_1 = callPackage
+    ex_ical_0_0_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
           buildMix ({
             name = "ex_ical";
-            version = "0.0.1";
+            version = "0.0.3";
             src = fetchHex {
               pkg = "ex_ical";
-              version = "0.0.1";
+              version = "0.0.3";
               sha256 =
-                "b8b41eb4626fc41e36f054de8983d944d100f103979bd82d069b3a982bb51959";
+                "435bade398c8b72e2515f91eef89f6309951800e8bd30a0a616c1039502c8c95";
             };
             beamDeps  = [ timex_1_0_2 ];
 
@@ -8898,19 +12689,52 @@ let
           } // packageOverrides)
       ) {};
 
-    ex_ical = ex_ical_0_0_1;
+    ex_ical = ex_ical_0_0_3;
 
-    ex_json_schema_0_3_1 = callPackage
+    ex_iss_1_0_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "ex_iss";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "ex_iss";
+              version = "1.0.0";
+              sha256 =
+                "8b2b2eebbd75593e814e712555c7f69138864317cf2f0093a82ca305138baa83";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''This package is for interfacing with the Open
+                                Notify API to information such as the ISS`s
+                                current location, crew, and when it will pass
+                                over a location.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/cryptobird/ex_iss";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ex_iss = ex_iss_1_0_0;
+
+    ex_json_schema_0_4_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "ex_json_schema";
-            version = "0.3.1";
+            version = "0.4.1";
             src = fetchHex {
               pkg = "ex_json_schema";
-              version = "0.3.1";
+              version = "0.4.1";
               sha256 =
-                "928faaafb82e08f0458257b4eea9e7fb7cc0bd2551103d0ae4fcb1840d343cc4";
+                "4acefaa5da4de55d984d1e86be40f6af2173e744cc4f77e70a701a0ea1604328";
             };
 
             meta = {
@@ -8923,19 +12747,19 @@ let
           } // packageOverrides)
       ) {};
 
-    ex_json_schema = ex_json_schema_0_3_1;
+    ex_json_schema = ex_json_schema_0_4_1;
 
-    ex_link_header_0_0_3 = callPackage
+    ex_link_header_0_0_4 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "ex_link_header";
-            version = "0.0.3";
+            version = "0.0.4";
             src = fetchHex {
               pkg = "ex_link_header";
-              version = "0.0.3";
+              version = "0.0.4";
               sha256 =
-                "f4edcb2194c7480f2b03f00da68d25de03c38d217497639ebdbca6325890e153";
+                "4ced0014c98703184c1afaf390298593a88503f7fc26b138b20c0a53cc614558";
             };
 
             meta = {
@@ -8946,7 +12770,7 @@ let
           } // packageOverrides)
       ) {};
 
-    ex_link_header = ex_link_header_0_0_3;
+    ex_link_header = ex_link_header_0_0_4;
 
     ex_machina_0_6_1 = callPackage
       (
@@ -8998,7 +12822,7 @@ let
 
     ex_marshal_0_0_3 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_1 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_2 }:
           buildMix ({
             name = "ex_marshal";
             version = "0.0.3";
@@ -9008,7 +12832,7 @@ let
               sha256 =
                 "28eaf18799bca83519d0ac517a4fd0a9a2211bea7f96c74b27952a20be2938a8";
             };
-            beamDeps  = [ decimal_1_1_1 ];
+            beamDeps  = [ decimal_1_1_2 ];
 
             meta = {
               description = ''Ruby Marshal format implemented in Elixir.'';
@@ -9020,6 +12844,37 @@ let
 
     ex_marshal = ex_marshal_0_0_3;
 
+    ex_microsoftbot_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpotion_2_2_2
+        }:
+          buildMix ({
+            name = "ex_microsoftbot";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ex_microsoftbot";
+              version = "0.1.0";
+              sha256 =
+                "638a30cab3f9bc85b76beb0dacd3e5d71724ad10de73170f00df12a29eed8d0a";
+            };
+            beamDeps  = [ poison_2_1_0 httpotion_2_2_2 ];
+
+            meta = {
+              description = ''This library provides Elixir API wrapper for the
+                            Microsoft Bot Framework.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zabirauf/ex_microsoftbot";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ex_microsoftbot = ex_microsoftbot_0_1_0;
+
     ex_minimatch_0_0_1 = callPackage
       (
         {
@@ -9145,6 +13000,30 @@ let
 
     ex_pool = ex_pool_0_1_1;
 
+    ex_prima_toolbox_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, ex_cli_0_1_0 }:
+          buildMix ({
+            name = "ex_prima_toolbox";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "ex_prima_toolbox";
+              version = "0.0.2";
+              sha256 =
+                "7fc93cf69afba247bbd97118fc56b6d3d79dc6767126581a262b97bff2ffd045";
+            };
+            beamDeps  = [ ex_cli_0_1_0 ];
+
+            meta = {
+              description = ''elixir toolbox for prima.it'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/primait/ex_toolbox";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ex_prima_toolbox = ex_prima_toolbox_0_0_2;
+
     ex_prometheus_io_0_0_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
@@ -9252,38 +13131,60 @@ let
 
     ex_rfc3986 = ex_rfc3986_0_2_6;
 
-    ex_slp_0_1_0 = callPackage
+    ex_sider_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "ex_sider";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ex_sider";
+              version = "0.1.0";
+              sha256 =
+                "00e1fba7bf19e4e072a98941c7ef11cc171e3ed44fdfd0c9bd0c110babf80e34";
+            };
+
+            meta = {
+              description = ''Elixir Map/List/Set interfaces for Redis
+                            datastructures.'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/ephe-meral/ex_sider";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ex_sider = ex_sider_0_1_0;
+
+    ex_sonar_0_0_4 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          ex_doc_0_11_4,
-          earmark_0_2_1
+          floki_0_8_1,
+          poison_2_1_0,
+          httpoison_0_8_3
         }:
           buildMix ({
-            name = "ex_slp";
-            version = "0.1.0";
+            name = "ex_sonar";
+            version = "0.0.4";
             src = fetchHex {
-              pkg = "ex_slp";
-              version = "0.1.0";
+              pkg = "ex_sonar";
+              version = "0.0.4";
               sha256 =
-                "9356a927d0809af648320b56d40929edb7c5807955b7460f362f674f1326e4c2";
+                "a0e83e87ae58522ed6f37bb8742a0873be0870e6a60673efa615551b68d5bd4b";
             };
-            beamDeps  = [ ex_doc_0_11_4 earmark_0_2_1 ];
+            beamDeps  = [ floki_0_8_1 poison_2_1_0 httpoison_0_8_3 ];
 
             meta = {
-              longDescription = ''Zero-config local network Elixir/Erlang node
-                                discovery lib. Allows an Elixir node to register
-                                itself as a local netowrk service and discover
-                                the orher registered services.'';
+              description = ''A Send Sonar API interface for Elixir'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/4pcbr/ex_slp_tk";
+              homepage = "https://github.com/enilsen16/ex_sonar";
             };
           } // packageOverrides)
       ) {};
 
-    ex_slp = ex_slp_0_1_0;
+    ex_sonar = ex_sonar_0_0_4;
 
     ex_spec_1_0_0 = callPackage
       (
@@ -9308,17 +13209,17 @@ let
 
     ex_spec = ex_spec_1_0_0;
 
-    ex_sshd_0_0_1 = callPackage
+    ex_sshd_0_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "ex_sshd";
-            version = "0.0.1";
+            version = "0.0.2";
             src = fetchHex {
               pkg = "ex_sshd";
-              version = "0.0.1";
+              version = "0.0.2";
               sha256 =
-                "5227d6e0bc1c2227f60529679bc60494f6599f1ebe786389e0d15a7a2d92d83e";
+                "9c7f73aab2d7697ef81eea582dfbde8033e8266dd6de2d34c36bd7e4905b7de4";
             };
 
             meta = {
@@ -9330,7 +13231,7 @@ let
           } // packageOverrides)
       ) {};
 
-    ex_sshd = ex_sshd_0_0_1;
+    ex_sshd = ex_sshd_0_0_2;
 
     ex_statsd_0_5_3 = callPackage
       (
@@ -9355,19 +13256,25 @@ let
 
     ex_statsd = ex_statsd_0_5_3;
 
-    ex_sync_0_0_2 = callPackage
+    ex_sync_0_0_3 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, connection_1_0_2 }:
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          connection_1_0_2
+        }:
           buildMix ({
             name = "ex_sync";
-            version = "0.0.2";
+            version = "0.0.3";
             src = fetchHex {
               pkg = "ex_sync";
-              version = "0.0.2";
+              version = "0.0.3";
               sha256 =
-                "2e6eb61310c708f59d10a5c53549230091a4e75c98352dcf04f34fabf3f81c35";
+                "bccd72623f75430ca10d5660c7316a6439921161beb7aa65b686713503ea147a";
             };
-            beamDeps  = [ connection_1_0_2 ];
+            beamDeps  = [ poolboy_1_5_1 connection_1_0_2 ];
 
             meta = {
               longDescription = ''A library to handle [Differential
@@ -9379,7 +13286,7 @@ let
           } // packageOverrides)
       ) {};
 
-    ex_sync = ex_sync_0_0_2;
+    ex_sync = ex_sync_0_0_3;
 
     ex_test_0_0_2 = callPackage
       (
@@ -9405,26 +13312,56 @@ let
 
     ex_test = ex_test_0_0_2;
 
-    ex_twilio_0_1_4 = callPackage
+    ex_tumblr_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          oauther_1_0_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "ex_tumblr";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ex_tumblr";
+              version = "0.0.1";
+              sha256 =
+                "9517b1ca411c91ad7e9776f7e2783908b400fee1779e497fdb1b3c515f61a253";
+            };
+            beamDeps  = [ poison_2_1_0 oauther_1_0_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A client for the Tumblr API v2.'';
+              license = stdenv.lib.licenses.mit;
+            };
+          } // packageOverrides)
+      ) {};
+
+    ex_tumblr = ex_tumblr_0_0_1;
+
+    ex_twilio_0_1_8 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          poison_1_5_2,
           inflex_1_5_0,
+          poison_2_1_0,
           httpotion_2_2_2
         }:
           buildMix ({
             name = "ex_twilio";
-            version = "0.1.4";
+            version = "0.1.8";
             src = fetchHex {
               pkg = "ex_twilio";
-              version = "0.1.4";
+              version = "0.1.8";
               sha256 =
-                "97caa270770cd0d9f17de05ad8498fab48eb8c6ac28e66cf6a64aa0ebf26b60d";
+                "0c7aed748ff4bfb9d8e1f43422d36d41433caa6cf19dc2fa208031d9f8240077";
             };
-            beamDeps  = [ poison_1_5_2 inflex_1_5_0 httpotion_2_2_2 ];
+            beamDeps  = [ inflex_1_5_0 poison_2_1_0 httpotion_2_2_2 ];
 
             meta = {
               description = ''Twilio API library for Elixir'';
@@ -9434,7 +13371,7 @@ let
           } // packageOverrides)
       ) {};
 
-    ex_twilio = ex_twilio_0_1_4;
+    ex_twilio = ex_twilio_0_1_8;
 
     ex_twiml_2_1_0 = callPackage
       (
@@ -9483,17 +13420,17 @@ let
 
     ex_unit_fixtures = ex_unit_fixtures_0_3_1;
 
-    ex_unit_notifier_0_1_0 = callPackage
+    ex_unit_notifier_0_1_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "ex_unit_notifier";
-            version = "0.1.0";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "ex_unit_notifier";
-              version = "0.1.0";
+              version = "0.1.1";
               sha256 =
-                "e7566bd9ec23dc6862ea660667f1e9525af26609cef5ed03694b4e33049c5325";
+                "78afb11d6a470b379de113bde1ff9e0537f5243bc957614961d8e8dadc062268";
             };
 
             meta = {
@@ -9504,9 +13441,9 @@ let
           } // packageOverrides)
       ) {};
 
-    ex_unit_notifier = ex_unit_notifier_0_1_0;
+    ex_unit_notifier = ex_unit_notifier_0_1_1;
 
-    ex_victor_ops_0_2_1 = callPackage
+    ex_victor_ops_0_3_1 = callPackage
       (
         {
           buildMix,
@@ -9517,12 +13454,12 @@ let
         }:
           buildMix ({
             name = "ex_victor_ops";
-            version = "0.2.1";
+            version = "0.3.1";
             src = fetchHex {
               pkg = "ex_victor_ops";
-              version = "0.2.1";
+              version = "0.3.1";
               sha256 =
-                "86941d8955783640b7991c0f049ba428a3595d55aa85dcd1cb3e4edaaee62125";
+                "7a8065e44c105952a843f532ab6b1cb59209e886f0770e20bf917fb742f0b9af";
             };
             beamDeps  = [ poison_2_1_0 httpotion_2_2_2 ];
 
@@ -9534,7 +13471,7 @@ let
           } // packageOverrides)
       ) {};
 
-    ex_victor_ops = ex_victor_ops_0_2_1;
+    ex_victor_ops = ex_victor_ops_0_3_1;
 
     ex_vmstats_0_0_1 = callPackage
       (
@@ -9584,19 +13521,18 @@ let
 
     exactor = exactor_2_2_0;
 
-    exalgebra_0_0_4 = callPackage
+    exalgebra_0_0_5 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, eye_drops_1_0_1 }:
+        {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "exalgebra";
-            version = "0.0.4";
+            version = "0.0.5";
             src = fetchHex {
               pkg = "exalgebra";
-              version = "0.0.4";
+              version = "0.0.5";
               sha256 =
-                "8994432fa46db0aa36fa1637a1a856c8ade4472435335220db4f9f56e2c23c4d";
+                "b84a96ffb7a2dd0c497f176c2e9d0ef07c719f09702d71fb8a801a3f2db1ab50";
             };
-            beamDeps  = [ eye_drops_1_0_1 ];
 
             meta = {
               longDescription = ''The ExAlgebra library is a collection of
@@ -9608,7 +13544,38 @@ let
           } // packageOverrides)
       ) {};
 
-    exalgebra = exalgebra_0_0_4;
+    exalgebra = exalgebra_0_0_5;
+
+    exalice_0_0_6_alpha = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          tirexs_0_8_0_beta6,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "exalice";
+            version = "0.0.6-alpha";
+            src = fetchHex {
+              pkg = "exalice";
+              version = "0.0.6-alpha";
+              sha256 =
+                "b5f95ddebb9def3efb926fc7e4c639bbad008e5e19073b56e13d684417520922";
+            };
+            beamDeps  = [ tirexs_0_8_0_beta6 poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''ExAlice, a geocoder with swappable storage'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/kpanic/exalice";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exalice = exalice_0_0_6_alpha;
 
     example_files_0_2_0 = callPackage
       (
@@ -9737,6 +13704,36 @@ let
 
     excellent = excellent_0_0_1;
 
+    excetera_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "excetera";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "excetera";
+              version = "0.0.3";
+              sha256 =
+                "e127e4f553c3925ce301b782cd8e8f123c72cf2463f7f032042f59892e5f37c3";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir bindings for etcd`s HTTP API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mingchuno/excetera";
+            };
+          } // packageOverrides)
+      ) {};
+
+    excetera = excetera_0_0_3;
+
     excoap_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -9760,6 +13757,31 @@ let
 
     excoap = excoap_0_0_1;
 
+    excollections_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "excollections";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "excollections";
+              version = "0.0.2";
+              sha256 =
+                "1924fd5bd3c1c7418a9150ca8fcb2d2700a82671f3a76972edc9bc51d32a2093";
+            };
+
+            meta = {
+              longDescription = ''A collection of data-structures and related
+                                algorithms for Elixir, implemented in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/metabrain/elixir-playground/tree/master/excollections";
+            };
+          } // packageOverrides)
+      ) {};
+
+    excollections = excollections_0_0_2;
+
     exconstructor_1_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -9787,6 +13809,29 @@ let
 
     exconstructor = exconstructor_1_0_2;
 
+    exdash_0_3_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "exdash";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "exdash";
+              version = "0.3.1";
+              sha256 =
+                "6a2a3e3c8ea80e5a9e6641db4a109a0a1e0a09c6b7bf190a8b98fa9a650325c5";
+            };
+
+            meta = {
+              description = ''Lodash implementation for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/TFarla/exdash";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exdash = exdash_0_3_1;
+
     exdatauri_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -9810,10 +13855,65 @@ let
 
     exdatauri = exdatauri_0_1_0;
 
+    exddb_0_1_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, erlcloud_0_11_0 }:
+          buildMix ({
+            name = "exddb";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "exddb";
+              version = "0.1.3";
+              sha256 =
+                "e57bd285110585476a457a843fdcff3cce6923c9472b6bec95ac9bf986dd27e4";
+            };
+            beamDeps  = [ erlcloud_0_11_0 ];
+
+            meta = {
+              description = ''Simple library for working with data in
+                            DynamoDB.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/muhmi/exddb";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exddb = exddb_0_1_3;
+
+    exdesk_0_2_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "exdesk";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "exdesk";
+              version = "0.2.0";
+              sha256 =
+                "0c1e02bb4aef9075ff4affb3354c0e318dc3be1817faae8b450ef590c7d67688";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Desk.com client library for elixir.'';
+
+              homepage = "https://github.com/deadkarma/exdesk";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exdesk = exdesk_0_2_0;
+
     exdisque_0_0_1 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex, eredis_1_0_8 }:
-          buildRebar3 ({
+        {  buildMix, packageOverrides ? {}, fetchHex, eredis_1_0_8 }:
+          buildMix ({
             name = "exdisque";
             version = "0.0.1";
             src = fetchHex {
@@ -9822,7 +13922,6 @@ let
               sha256 =
                 "c3b7ec89217df46ae6cf1adadb81118877c66272266f0ee5e2c7ff45d048fb31";
             };
-
             beamDeps  = [ eredis_1_0_8 ];
 
             meta = {
@@ -9836,30 +13935,6 @@ let
 
     exdisque = exdisque_0_0_1;
 
-    exdm_0_0_4 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, exrm_0_19_9 }:
-          buildMix ({
-            name = "exdm";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "exdm";
-              version = "0.0.4";
-              sha256 =
-                "85e8fa483a760c46e19f0e8e0f53eb35ed74cc17f23c72d3002e47a847011e39";
-            };
-            beamDeps  = [ exrm_0_19_9 ];
-
-            meta = {
-              description = ''Deploy Elixir applications via mix tasks'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/joeyates/exdm";
-            };
-          } // packageOverrides)
-      ) {};
-
-    exdm = exdm_0_0_4;
-
     exec_1_0_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -9935,6 +14010,30 @@ let
 
     exelli = exelli_0_1_0;
 
+    exexec_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, erlexec_1_1_3 }:
+          buildMix ({
+            name = "exexec";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exexec";
+              version = "0.0.1";
+              sha256 =
+                "890122cae91cc739f84dad66b7358c9e7961dadbebeb650e71ccdeab8963ff91";
+            };
+            beamDeps  = [ erlexec_1_1_3 ];
+
+            meta = {
+              description = ''An idiomatic Elixir wrapper for erlexec.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/antipax/exexec";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exexec = exexec_0_0_1;
+
     exexif_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -9986,6 +14085,36 @@ let
 
     exexif = exexif_0_0_1;
 
+    exfavicon_0_3_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          floki_0_8_1
+        }:
+          buildMix ({
+            name = "exfavicon";
+            version = "0.3.3";
+            src = fetchHex {
+              pkg = "exfavicon";
+              version = "0.3.3";
+              sha256 =
+                "f1c5aa3506c90ba28e6f3ddcf3e9feda8518af1b4b12a6d2f518f86a10d1719b";
+            };
+            beamDeps  = [ httpoison_0_8_3 floki_0_8_1 ];
+
+            meta = {
+              description = ''A exfavicon to detect a site`s favicon.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ikeikeikeike/exfavicon";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exfavicon = exfavicon_0_3_3;
+
     exfirebase_0_4_0 = callPackage
       (
         {
@@ -10017,6 +14146,36 @@ let
 
     exfirebase = exfirebase_0_4_0;
 
+    exfoaas_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "exfoaas";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "exfoaas";
+              version = "0.0.2";
+              sha256 =
+                "521f355f8c38c056f66cd8ac236f561c2a3502e451c07a88761e05c22c8848aa";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''brings the utility of FOAAS to elixir.'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/cryptobird/ExFOAAS.git";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exfoaas = exfoaas_0_0_2;
+
     exfsm_0_1_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -10090,6 +14249,69 @@ let
 
     exfuck = exfuck_0_1_0;
 
+    exgenius_0_0_5 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          exjsx_3_2_0
+        }:
+          buildMix ({
+            name = "exgenius";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "exgenius";
+              version = "0.0.5";
+              sha256 =
+                "f0f4463ac9ad79a102a1bf0ded91d77ed87ce262da6045990be51450ef240fd5";
+            };
+            beamDeps  = [ httpoison_0_8_3 exjsx_3_2_0 ];
+
+            meta = {
+              longDescription = '' Elixir library for the (undocumented) Rap
+                                Genius (and also Rock, Tech, Pop, Country, etc)
+                                API '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeffweiss/exgenius";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exgenius = exgenius_0_0_5;
+
+    exgingerapi_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_0_1,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "exgingerapi";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "exgingerapi";
+              version = "0.0.3";
+              sha256 =
+                "7375b282a1b290e851bbbb7de499c099ff0310443e8a51d8741554b92d4a08f1";
+            };
+            beamDeps  = [ poison_2_0_1 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir wrapper for ginger proofreading API
+                            (english)'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/nathanjohnson320/exgingerapi";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exgingerapi = exgingerapi_0_0_3;
+
     exgravatar_2_0_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -10181,7 +14403,28 @@ let
           } // packageOverrides)
       ) {};
 
-    exirc = exirc_0_10_0;
+    exirc_0_11_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "exirc";
+            version = "0.11.0";
+            src = fetchHex {
+              pkg = "exirc";
+              version = "0.11.0";
+              sha256 =
+                "797a91fd92ca93d639bf323ea4b31a42ed4ac2d67d3096100df7b1b615a88ace";
+            };
+
+            meta = {
+              description = ''An IRC client library for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/exirc";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exirc = exirc_0_11_0;
 
     exjson_0_5_0 = callPackage
       (
@@ -10209,7 +14452,7 @@ let
 
     exjsx_3_0_2 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, jsx_2_3_1 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, jsx_2_5_3 }:
           buildMix ({
             name = "exjsx";
             version = "3.0.2";
@@ -10219,7 +14462,7 @@ let
               sha256 =
                 "2cd67240a54e9cd2616bc83c0c352d47f87bccd2ec599eceedc00bcbe9063f07";
             };
-            beamDeps  = [ jsx_2_3_1 ];
+            beamDeps  = [ jsx_2_5_3 ];
 
             meta = {
               description = ''json for elixir'';
@@ -10231,7 +14474,7 @@ let
 
     exjsx_3_1_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, jsx_2_4_0 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, jsx_2_5_3 }:
           buildMix ({
             name = "exjsx";
             version = "3.1.0";
@@ -10241,7 +14484,7 @@ let
               sha256 =
                 "588a0b67ed0c45b21f018515fc478efac83c088661bd588831e41c9073a818fb";
             };
-            beamDeps  = [ jsx_2_4_0 ];
+            beamDeps  = [ jsx_2_5_3 ];
 
             meta = {
               description = ''json for elixir'';
@@ -10301,17 +14544,48 @@ let
 
     exkanji = exkanji_0_2_6;
 
-    exldap_0_1_1 = callPackage
+    exkismet_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "exkismet";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "exkismet";
+              version = "0.0.2";
+              sha256 =
+                "3648f010eb80891b0195f9ced0e02a5a08860a9d96e8f7bbe328c68f27b85b64";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A client (completely unofficial) for the
+                            Akismet.com comment-spam detection API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cameronp/exkismet";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exkismet = exkismet_0_0_2;
+
+    exldap_0_2_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "exldap";
-            version = "0.1.1";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "exldap";
-              version = "0.1.1";
+              version = "0.2.0";
               sha256 =
-                "5cade5ad64caaeb0e0d70fcd9567aa827e6f50cb375599e2887319c40807cc92";
+                "7e2d1e96dacaddd6b515cc2033b5c9e21d23d1897e3a9f8ca2b6f31d091d72a6";
             };
 
             meta = {
@@ -10322,7 +14596,7 @@ let
           } // packageOverrides)
       ) {};
 
-    exldap = exldap_0_1_1;
+    exldap = exldap_0_2_0;
 
     exleveldb_0_7_0 = callPackage
       (
@@ -10537,27 +14811,27 @@ let
 
     exmoji = exmoji_0_2_2;
 
-    exns_0_3_2_beta = callPackage
+    exns_0_3_5_beta = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          uuid_1_1_3,
+          uuid_1_1_4,
           poolboy_1_5_1,
           poison_1_5_2,
           msgpax_0_8_2
         }:
           buildMix ({
             name = "exns";
-            version = "0.3.2-beta";
+            version = "0.3.5-beta";
             src = fetchHex {
               pkg = "exns";
-              version = "0.3.2-beta";
+              version = "0.3.5-beta";
               sha256 =
-                "cc29b065ea9c346a14052e6ebe738fe93714ed936ef23d57b08786f968c4dc48";
+                "2c5b1f263ebfe9636802cca5559e74009ae4384418e44820f0ff05130dbcb593";
             };
-            beamDeps  = [ uuid_1_1_3 poolboy_1_5_1 poison_1_5_2 msgpax_0_8_2
+            beamDeps  = [ uuid_1_1_4 poolboy_1_5_1 poison_1_5_2 msgpax_0_8_2
                       ];
 
             meta = {
@@ -10569,7 +14843,7 @@ let
           } // packageOverrides)
       ) {};
 
-    exns = exns_0_3_2_beta;
+    exns = exns_0_3_5_beta;
 
     exnumerable_0_0_1 = callPackage
       (
@@ -10595,17 +14869,17 @@ let
 
     exnumerable = exnumerable_0_0_1;
 
-    exnumerator_1_0_0 = callPackage
+    exnumerator_1_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "exnumerator";
-            version = "1.0.0";
+            version = "1.1.0";
             src = fetchHex {
               pkg = "exnumerator";
-              version = "1.0.0";
+              version = "1.1.0";
               sha256 =
-                "7511385b408e6aa2f494444dac4fd8734b91456734adbc46f17c7185a504514a";
+                "1c52033471dfae7b32c897cb0034eb1d3602bcb14342ca08090c42b02001b2fd";
             };
 
             meta = {
@@ -10617,7 +14891,7 @@ let
           } // packageOverrides)
       ) {};
 
-    exnumerator = exnumerator_1_0_0;
+    exnumerator = exnumerator_1_1_0;
 
     exnumterator_1_0_0 = callPackage
       (
@@ -10689,6 +14963,37 @@ let
 
     expand = expand_0_0_3;
 
+    exparticle_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "exparticle";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "exparticle";
+              version = "0.0.2";
+              sha256 =
+                "ce70b77da48e84307791af00143ad4b9677d39765459865976d459d3b1bdcaf2";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''ExParticle is an elixir client to communicate
+                            with Particle Cloud API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mtanzi/exparticle";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exparticle = exparticle_0_0_2;
+
     experiment_0_0_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -10790,17 +15095,17 @@ let
 
     expool = expool_0_2_0;
 
-    export_0_0_2 = callPackage
+    export_0_0_7 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "export";
-            version = "0.0.2";
+            version = "0.0.7";
             src = fetchHex {
               pkg = "export";
-              version = "0.0.2";
+              version = "0.0.7";
               sha256 =
-                "f956aa84d18d089b9a8250d53ac6c8ecff3ea29313e661cbb19ed329762f2acb";
+                "76c2a174b01f0fac1c3bc5083a7982fb8d41778518e279a526b40e4ced05d1d0";
             };
 
             meta = {
@@ -10811,7 +15116,7 @@ let
           } // packageOverrides)
       ) {};
 
-    export = export_0_0_2;
+    export = export_0_0_7;
 
     expr_0_1_0 = callPackage
       (
@@ -10886,27 +15191,27 @@ let
 
     exprof = exprof_0_2_0;
 
-    exq_0_6_5 = callPackage
+    exq_0_7_1 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          uuid_1_1_3,
-          timex_2_1_3,
+          uuid_1_1_4,
+          timex_2_1_6,
           redix_0_3_6,
           poison_2_1_0
         }:
           buildMix ({
             name = "exq";
-            version = "0.6.5";
+            version = "0.7.1";
             src = fetchHex {
               pkg = "exq";
-              version = "0.6.5";
+              version = "0.7.1";
               sha256 =
-                "bacb92950e9c01532c9467dc7b4f7d930d8a70ef8d7b9797237aac6f0b608ba2";
+                "d6694cddf4a6808c7bb9d8bcc9b917fe1a3720a22a917767a4f0ddcaa5b6d148";
             };
-            beamDeps  = [ uuid_1_1_3 timex_2_1_3 redix_0_3_6 poison_2_1_0 ];
+            beamDeps  = [ uuid_1_1_4 timex_2_1_6 redix_0_3_6 poison_2_1_0 ];
 
             meta = {
               longDescription = ''Exq is a job processing library compatible
@@ -10918,28 +15223,28 @@ let
           } // packageOverrides)
       ) {};
 
-    exq = exq_0_6_5;
+    exq = exq_0_7_1;
 
-    exq_ui_0_6_5 = callPackage
+    exq_ui_0_7_1 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
-          exq_0_6_5,
+          plug_1_1_5,
+          exq_0_7_1,
           cowboy_1_0_4
         }:
           buildMix ({
             name = "exq_ui";
-            version = "0.6.5";
+            version = "0.7.1";
             src = fetchHex {
               pkg = "exq_ui";
-              version = "0.6.5";
+              version = "0.7.1";
               sha256 =
-                "88763e802738438d54e3b33966e2544832ed2d8215497c9c63b08d8c7199b7f3";
+                "5ff47501d6280afd4a07b74190f96e94345653db617d24e3ffc1c5cbb2f1de72";
             };
-            beamDeps  = [ plug_1_1_3 exq_0_6_5 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 exq_0_7_1 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''Exq UI is the UI component for Exq, a job
@@ -10951,7 +15256,7 @@ let
           } // packageOverrides)
       ) {};
 
-    exq_ui = exq_ui_0_6_5;
+    exq_ui = exq_ui_0_7_1;
 
     exql_0_0_3 = callPackage
       (
@@ -10977,39 +15282,6 @@ let
 
     exql = exql_0_0_3;
 
-    exquery_0_0_11 = callPackage
-      (
-        {
-          buildRebar3,
-          packageOverrides ? {},
-          fetchHex,
-          ex_doc_0_11_4,
-          earmark_0_1_19
-        }:
-          buildRebar3 ({
-            name = "exquery";
-            version = "0.0.11";
-            src = fetchHex {
-              pkg = "exquery";
-              version = "0.0.11";
-              sha256 =
-                "61b520599fa33dc8c97be32f41c8fe4a6eb9d8b98b72a72cb88185868692a0c1";
-            };
-
-            beamDeps  = [ ex_doc_0_11_4 earmark_0_1_19 ];
-
-            meta = {
-              longDescription = '' A library for parsing HTML and querying
-                                elements within. Handy for web scraping or
-                                autmated testing. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rozap/exquery";
-            };
-          } // packageOverrides)
-      ) {};
-
-    exquery = exquery_0_0_11;
-
     exquisite_0_1_6 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -11033,17 +15305,17 @@ let
 
     exquisite = exquisite_0_1_6;
 
-    exredis_0_2_3 = callPackage
+    exredis_0_2_4 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, eredis_1_0_8 }:
           buildMix ({
             name = "exredis";
-            version = "0.2.3";
+            version = "0.2.4";
             src = fetchHex {
               pkg = "exredis";
-              version = "0.2.3";
+              version = "0.2.4";
               sha256 =
-                "0d5a48cd27ec6200c3ffa5442d7dc615d7dbfe94a500d1240b9c0c9205ec4e56";
+                "fe43dc6e39220af9c06d575b86c24513dcb1c3ba48f31881a3708cdafe7d3188";
             };
             beamDeps  = [ eredis_1_0_8 ];
 
@@ -11055,19 +15327,19 @@ let
           } // packageOverrides)
       ) {};
 
-    exredis = exredis_0_2_3;
+    exredis = exredis_0_2_4;
 
-    exref_0_1_0 = callPackage
+    exref_0_1_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "exref";
-            version = "0.1.0";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "exref";
-              version = "0.1.0";
+              version = "0.1.1";
               sha256 =
-                "19597fbdd563e447608d5f3a43171c29cde4e0462f5163314cc1db74ccef2f65";
+                "92d73f1eff56f2d0493a2dbf5e932b48b99a2cdd2e3cc3fc0ffeb9c1ae5ed86c";
             };
 
             meta = {
@@ -11077,7 +15349,7 @@ let
           } // packageOverrides)
       ) {};
 
-    exref = exref_0_1_0;
+    exref = exref_0_1_1;
 
     exrequester_0_5_2 = callPackage
       (
@@ -11112,8 +15384,8 @@ let
 
     exrethinkdb_0_0_3 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex, poison_1_4_0 }:
-          buildRebar3 ({
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_4_0 }:
+          buildMix ({
             name = "exrethinkdb";
             version = "0.0.3";
             src = fetchHex {
@@ -11122,7 +15394,6 @@ let
               sha256 =
                 "c48a25a613de9f4c8ffe490044e448f01d816e0f6806af018494c3a19890ed1a";
             };
-
             beamDeps  = [ poison_1_4_0 ];
 
             meta = {
@@ -11135,25 +15406,19 @@ let
 
     exrethinkdb = exrethinkdb_0_0_3;
 
-    exrm_0_19_9 = callPackage
+    exrm_1_0_5 = callPackage
       (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          relx_3_5_0,
-          conform_1_0_0_rc8
-        }:
+        {  buildMix, packageOverrides ? {}, fetchHex, relx_3_19_0 }:
           buildMix ({
             name = "exrm";
-            version = "0.19.9";
+            version = "1.0.5";
             src = fetchHex {
               pkg = "exrm";
-              version = "0.19.9";
+              version = "1.0.5";
               sha256 =
-                "3107dcac0727f7e986ef36604e13943759a52188fbee630d72b1b3adb4594941";
+                "fef4ec90a6cafcff138cf51a5acc882392b7b34bd13372373ad8abc09ea0ef47";
             };
-            beamDeps  = [ relx_3_5_0 conform_1_0_0_rc8 ];
+            beamDeps  = [ relx_3_19_0 ];
 
             meta = {
               longDescription = ''Exrm, or Elixir Release Manager, provides mix
@@ -11165,60 +15430,28 @@ let
           } // packageOverrides)
       ) {};
 
-    exrm_1_0_3 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, relx_3_18_0 }:
-          buildMix ({
-            name = "exrm";
-            version = "1.0.3";
-            src = fetchHex {
-              pkg = "exrm";
-              version = "1.0.3";
-              sha256 =
-                "22ce83a1ffab133ebc94cef871d830971ca0b2f9df3ba44caa8f7eadb13bbe3b";
-            };
-            beamDeps  = [ relx_3_18_0 ];
+    exrm = exrm_1_0_5;
 
-            meta = {
-              longDescription = ''Exrm, or Elixir Release Manager, provides mix
-                                tasks for building, upgrading, and controlling
-                                release packages for your application.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/exrm";
-            };
-          } // packageOverrides)
-      ) {};
-
-    exrm = exrm_1_0_3;
-
-    exrm_deb_0_0_5 = callPackage
+    exrm_deb_0_0_6 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
           vex_0_5_5,
-          timex_1_0_2,
-          exrm_1_0_3,
-          ex_doc_0_11_4,
-          earmark_0_2_1
+          timex_2_1_6,
+          exrm_1_0_5
         }:
           buildMix ({
             name = "exrm_deb";
-            version = "0.0.5";
+            version = "0.0.6";
             src = fetchHex {
               pkg = "exrm_deb";
-              version = "0.0.5";
+              version = "0.0.6";
               sha256 =
-                "b74c80e7c25750f78c4fefc75e8df66356d235d2c038751037ae60dad0ac7fc3";
+                "f78edff8a5b6ef41a007869fc23614ebf577f679849fb5b3a6ce4013cd861d2c";
             };
-            beamDeps  = [
-                          vex_0_5_5
-                          timex_1_0_2
-                          exrm_1_0_3
-                          ex_doc_0_11_4
-                          earmark_0_2_1
-                        ];
+            beamDeps  = [ vex_0_5_5 timex_2_1_6 exrm_1_0_5 ];
 
             meta = {
               description = ''Create a deb for your elixir release with ease'';
@@ -11228,11 +15461,36 @@ let
           } // packageOverrides)
       ) {};
 
-    exrm_deb = exrm_deb_0_0_5;
+    exrm_deb = exrm_deb_0_0_6;
+
+    exrm_docker_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_5 }:
+          buildMix ({
+            name = "exrm_docker";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "exrm_docker";
+              version = "0.1.0";
+              sha256 =
+                "a10f0334d9d93f8e97bde71c2638e725f1e36790a817b40ca26da0771366a3a3";
+            };
+            beamDeps  = [ exrm_1_0_5 ];
+
+            meta = {
+              description = ''Exrm plugin to push your release into a Docker
+                            image.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/kwrooijen/exrm_docker";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exrm_docker = exrm_docker_0_1_0;
 
     exrm_heroku_0_1_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_5 }:
           buildMix ({
             name = "exrm_heroku";
             version = "0.1.1";
@@ -11242,7 +15500,7 @@ let
               sha256 =
                 "19fc16f1cfcc1c86bc64796a287028b8a8d951f7737024893c1772ba658da76d";
             };
-            beamDeps  = [ exrm_1_0_3 ];
+            beamDeps  = [ exrm_1_0_5 ];
 
             meta = {
               description = ''Publish Elixir releases created with exrm release
@@ -11255,6 +15513,60 @@ let
 
     exrm_heroku = exrm_heroku_0_1_1;
 
+    exrm_rpm_0_3_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_5 }:
+          buildMix ({
+            name = "exrm_rpm";
+            version = "0.3.3";
+            src = fetchHex {
+              pkg = "exrm_rpm";
+              version = "0.3.3";
+              sha256 =
+                "11de82ed0ba9e265577f255cdad0693bf191b30d56dbd85977201882e3652e53";
+            };
+            beamDeps  = [ exrm_1_0_5 ];
+
+            meta = {
+              longDescription = ''Adds simple Red Hat Package Manager (RPM)
+                                generation to the exrm package manager. The
+                                generated RPM file includes the Elixir release
+                                and an init.d script to manage the project`s
+                                service.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/smpallen99/exrm-rpm";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exrm_rpm = exrm_rpm_0_3_3;
+
+    exrm_smartos_gz_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_5 }:
+          buildMix ({
+            name = "exrm_smartos_gz";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "exrm_smartos_gz";
+              version = "1.0.0";
+              sha256 =
+                "700c3c9e80d24d1e0404c54391e582d786dbb3f8da9a3bf5d2b7f082841ba5af";
+            };
+            beamDeps  = [ exrm_1_0_5 ];
+
+            meta = {
+              longDescription = ''Trying to package an Elixir application for a
+                                SmartOS GZ but getting errors about ncurses?
+                                This will cure what ails you.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adam12/exrm_smartos_gz";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exrm_smartos_gz = exrm_smartos_gz_1_0_0;
+
     exromaji_0_3_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -11279,29 +15591,30 @@ let
 
     exromaji = exromaji_0_3_0;
 
-    exrun_0_1_1 = callPackage
+    exrun_0_1_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "exrun";
-            version = "0.1.1";
+            version = "0.1.2";
             src = fetchHex {
               pkg = "exrun";
-              version = "0.1.1";
+              version = "0.1.2";
               sha256 =
-                "d61b90c23ba37c9b44b379d6094ef8411522d17d94d33b786e1dc5bfac09bfc0";
+                "db9ea4befa015d7abe88ca610501187f12956d6fe6e527f02f8e4d9e630decf5";
             };
 
             meta = {
-              longDescription = ''Elixir - save and easy to use, tracing tools
-                                for running elixir and erlang applications'';
-
+              longDescription = ''Elixir - save and easy to use standalone,
+                                tracing tools for running elixir and erlang
+                                applications'';
+              license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/liveforeverx/exrun";
             };
           } // packageOverrides)
       ) {};
 
-    exrun = exrun_0_1_1;
+    exrun = exrun_0_1_2;
 
     exsamples_0_1_0 = callPackage
       (
@@ -11350,9 +15663,39 @@ let
 
     exscript = exscript_0_0_1;
 
+    exsolr_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "exsolr";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exsolr";
+              version = "0.0.1";
+              sha256 =
+                "dcd26d0301730cb1746702bfacf31de10be5d1b15475a1a7ec4da8c7c49e55d1";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Thin Wrapper around Solr api.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/dcarneiro/exsolr";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exsolr = exsolr_0_0_1;
+
     exstatic_0_1_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "exstatic";
             version = "0.1.0";
@@ -11362,7 +15705,7 @@ let
               sha256 =
                 "e063b91c0b2995e4a1a2c1aa56cdd578374320a8755844cc6471b58fa3874d0d";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               longDescription = ''Serve static files from memory in the Phoenix
@@ -11428,17 +15771,73 @@ let
 
     exsync = exsync_0_1_2;
 
-    extwitter_0_7_0 = callPackage
+    extripe_0_3_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "extripe";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "extripe";
+              version = "0.3.2";
+              sha256 =
+                "4df5dd859ad780bdb4dc0d1c823a8df82cf7421037f1ed40adf20b426d6729a1";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Stripe API wrapper'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/princemaple/extripe";
+            };
+          } // packageOverrides)
+      ) {};
+
+    extripe = extripe_0_3_2;
+
+    exts_0_3_1 = callPackage
+      (
+        {
+          buildMix, packageOverrides ? {}, fetchHex, datastructures_0_2_5
+        }:
+          buildMix ({
+            name = "exts";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "exts";
+              version = "0.3.1";
+              sha256 =
+                "428226945831d77083cab2a7f9a1f818e6554d789ed7183c215390d7f43cfa40";
+            };
+            beamDeps  = [ datastructures_0_2_5 ];
+
+            meta = {
+              description = ''ets wrapper'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/exts";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exts = exts_0_3_1;
+
+    extwitter_0_7_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
           buildMix ({
             name = "extwitter";
-            version = "0.7.0";
+            version = "0.7.1";
             src = fetchHex {
               pkg = "extwitter";
-              version = "0.7.0";
+              version = "0.7.1";
               sha256 =
-                "15fca145977192f315382d51258324ffd1862161deb586c67aaf0a205ca3cc73";
+                "9cc83932fbe77d47f0fafc2000574805aa42341eed07a8867b1c27df27c3554a";
             };
             beamDeps  = [ poison_1_5_2 ];
 
@@ -11450,7 +15849,116 @@ let
           } // packageOverrides)
       ) {};
 
-    extwitter = extwitter_0_7_0;
+    extwitter = extwitter_0_7_1;
+
+    exvcr_0_3_9 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          meck_0_8_4,
+          httpotion_2_2_2,
+          httpoison_0_8_3,
+          exjsx_3_2_0,
+          exactor_2_2_0
+        }:
+          buildMix ({
+            name = "exvcr";
+            version = "0.3.9";
+            src = fetchHex {
+              pkg = "exvcr";
+              version = "0.3.9";
+              sha256 =
+                "25645f6598111ba76ed30b4a2079169ae1aed0795ef87bf74d70a3a7ca8f2112";
+            };
+            beamDeps  = [
+                          meck_0_8_4
+                          httpotion_2_2_2
+                          httpoison_0_8_3
+                          exjsx_3_2_0
+                          exactor_2_2_0
+                        ];
+
+            meta = {
+              description = ''HTTP request/response recording library for
+                            elixir, inspired by VCR.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/parroty/exvcr";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exvcr_0_7_4 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          meck_0_8_4,
+          httpotion_2_2_2,
+          httpoison_0_8_3,
+          exjsx_3_2_0,
+          exactor_2_2_0
+        }:
+          buildMix ({
+            name = "exvcr";
+            version = "0.7.4";
+            src = fetchHex {
+              pkg = "exvcr";
+              version = "0.7.4";
+              sha256 =
+                "620eac79a63426340d31dcc44b66a0d8be89ce4c2dc59b09986e83114bd4c525";
+            };
+            beamDeps  = [
+                          meck_0_8_4
+                          httpotion_2_2_2
+                          httpoison_0_8_3
+                          exjsx_3_2_0
+                          exactor_2_2_0
+                        ];
+
+            meta = {
+              description = ''HTTP request/response recording library for
+                            elixir, inspired by VCR.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/parroty/exvcr";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exvcr = exvcr_0_7_4;
+
+    exyelp_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          oauther_1_0_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "exyelp";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "exyelp";
+              version = "0.0.2";
+              sha256 =
+                "1be8553ea0369a092eac1b6a0b47652b7c0570911483aa3ca454bef05ddd4d5d";
+            };
+            beamDeps  = [ poison_2_1_0 oauther_1_0_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An Elixir Yelp API client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gaslight/exyelp";
+            };
+          } // packageOverrides)
+      ) {};
+
+    exyelp = exyelp_0_0_2;
 
     exyz_1_0_0 = callPackage
       (
@@ -11476,30 +15984,6 @@ let
 
     exyz = exyz_1_0_0;
 
-    eye_drops_1_0_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2 }:
-          buildMix ({
-            name = "eye_drops";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "eye_drops";
-              version = "1.0.1";
-              sha256 =
-                "4b57c4e6ec58e8e278c5dd2849ad248ccbf1cb9c340476cfebb7ac31e1bbe85d";
-            };
-            beamDeps  = [ fs_0_9_2 ];
-
-            meta = {
-              longDescription = ''A configurable mix task to watch file changes
-                                Watch file changes in a project and run the
-                                corresponding command when a change happens.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rkotze/eye_drops";
-            };
-          } // packageOverrides)
-      ) {};
-
     eye_drops_1_2_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2 }:
@@ -11552,6 +16036,38 @@ let
 
     ezcryptex = ezcryptex_0_0_1;
 
+    facebook_messenger_0_3_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          plug_1_1_5,
+          httpotion_2_2_2
+        }:
+          buildMix ({
+            name = "facebook_messenger";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "facebook_messenger";
+              version = "0.3.0";
+              sha256 =
+                "30b1f7334649b671a4844dfcf7af1df00ad3082e8d42399466003636d95902ab";
+            };
+            beamDeps  = [ poison_2_1_0 plug_1_1_5 httpotion_2_2_2 ];
+
+            meta = {
+              longDescription = ''ExFacebookMessenger is a library that easy
+                                the creation of facebook messenger bots.'';
+
+              homepage = "https://github.com/oarrabi/facebook_messenger";
+            };
+          } // packageOverrides)
+      ) {};
+
+    facebook_messenger = facebook_messenger_0_3_0;
+
     factory_girl_elixir_0_1_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -11576,26 +16092,26 @@ let
 
     factory_girl_elixir = factory_girl_elixir_0_1_1;
 
-    fake_cas_1_0_1 = callPackage
+    fake_cas_1_1_0 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4,
           bypass_0_5_1
         }:
           buildMix ({
             name = "fake_cas";
-            version = "1.0.1";
+            version = "1.1.0";
             src = fetchHex {
               pkg = "fake_cas";
-              version = "1.0.1";
+              version = "1.1.0";
               sha256 =
-                "bb3522de447f7a3d84ced7b55e83b9ce72ce7c509581ed87ab26264fb39aafe5";
+                "2e3ce97b181f9de122fd7dc07bffdbe2a6f6439524407b976c9d1b70332206ae";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 bypass_0_5_1 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 bypass_0_5_1 ];
 
             meta = {
               description = ''A Cas server stub'';
@@ -11605,7 +16121,7 @@ let
           } // packageOverrides)
       ) {};
 
-    fake_cas = fake_cas_1_0_1;
+    fake_cas = fake_cas_1_1_0;
 
     faker_0_6_0 = callPackage
       (
@@ -11631,6 +16147,31 @@ let
 
     faker = faker_0_6_0;
 
+    fasta_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, parallel_0_0_3 }:
+          buildMix ({
+            name = "fasta";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "fasta";
+              version = "0.1.0";
+              sha256 =
+                "ebacba161985bf3d1bc5cf35e6ab0c01ce7f1f0fcc52151a35605eb9a6fac44b";
+            };
+            beamDeps  = [ parallel_0_0_3 ];
+
+            meta = {
+              description = ''FASTA is a tool for parsing FASTA-formatted
+                            strings in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/annejohnson/FASTA";
+            };
+          } // packageOverrides)
+      ) {};
+
+    fasta = fasta_0_1_0;
+
     faust_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -11682,7 +16223,7 @@ let
 
     feature_toggler_0_0_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, exredis_0_2_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, exredis_0_2_4 }:
           buildMix ({
             name = "feature_toggler";
             version = "0.0.1";
@@ -11692,7 +16233,7 @@ let
               sha256 =
                 "dac607aa67971e87b9d8fb8eb3057246d4480c99e11951faa1ed9f204b7f48ae";
             };
-            beamDeps  = [ exredis_0_2_3 ];
+            beamDeps  = [ exredis_0_2_4 ];
 
             meta = {
               description = ''This is a simple feature toggler/switch with
@@ -11707,8 +16248,8 @@ let
 
     feeder_1_4_7 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "feeder";
             version = "1.4.7";
             src = fetchHex {
@@ -11729,8 +16270,8 @@ let
 
     feeder_2_0_0 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "feeder";
             version = "2.0.0";
             src = fetchHex {
@@ -11775,17 +16316,17 @@ let
 
     feeder_ex = feeder_ex_0_0_2;
 
-    feederer_0_5_6 = callPackage
+    feederer_0_6_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poolboy_1_5_1 }:
           buildMix ({
             name = "feederer";
-            version = "0.5.6";
+            version = "0.6.0";
             src = fetchHex {
               pkg = "feederer";
-              version = "0.5.6";
+              version = "0.6.0";
               sha256 =
-                "07e25464b14b9263b343602b649bb9680764481b1dfe64270dcef5c83321522c";
+                "c5041617fc7e71db9a0763f36fbda3fa41598203ab8b47972e3e9dae81039861";
             };
             beamDeps  = [ poolboy_1_5_1 ];
 
@@ -11799,7 +16340,32 @@ let
           } // packageOverrides)
       ) {};
 
-    feederer = feederer_0_5_6;
+    feederer = feederer_0_6_0;
+
+    feedme_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_0_19_5 }:
+          buildMix ({
+            name = "feedme";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "feedme";
+              version = "0.0.1";
+              sha256 =
+                "021621981bbb03b317e4a948a39d269ab1a2dc6d9ec6ee1c744e565000da680d";
+            };
+            beamDeps  = [ timex_0_19_5 ];
+
+            meta = {
+              description = ''Elixir RSS/Atom parser built on erlang`s xmerl
+                            xml parser'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/umurgdk/elixir-feedme";
+            };
+          } // packageOverrides)
+      ) {};
+
+    feedme = feedme_0_0_1;
 
     feedparser_0_0_3 = callPackage
       (
@@ -11824,47 +16390,17 @@ let
 
     feedparser = feedparser_0_0_3;
 
-    fernet_ecto_0_0_5 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          fernetex_0_0_2,
-          ecto_1_1_5
-        }:
-          buildMix ({
-            name = "fernet_ecto";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "fernet_ecto";
-              version = "0.0.5";
-              sha256 =
-                "d4f9d0c6ffda955b9a1870bfc525def01fb65fef0bb3c4ed739ce5bbfbb98cda";
-            };
-            beamDeps  = [ fernetex_0_0_2 ecto_1_1_5 ];
-
-            meta = {
-              description = ''Fernet-encrypted fields for Ecto'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/jkakar/fernet-ecto";
-            };
-          } // packageOverrides)
-      ) {};
-
-    fernet_ecto = fernet_ecto_0_0_5;
-
-    fernetex_0_0_2 = callPackage
+    fernetex_0_2_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
           buildMix ({
             name = "fernetex";
-            version = "0.0.2";
+            version = "0.2.3";
             src = fetchHex {
               pkg = "fernetex";
-              version = "0.0.2";
+              version = "0.2.3";
               sha256 =
-                "a6d052384397defe780d3551a16b8b639dba6f89aeea7a6984ecadf44501cfc9";
+                "cf8ac1334cd1937e448bb0c873c1df94dc8bb38cb2320966ba69d9ff8f755805";
             };
             beamDeps  = [ timex_1_0_2 ];
 
@@ -11877,44 +16413,9 @@ let
           } // packageOverrides)
       ) {};
 
-    fernetex = fernetex_0_0_2;
+    fernetex = fernetex_0_2_3;
 
-    fifo_lager_0_1_3 = callPackage
-      (
-        {
-          buildRebar3,
-          packageOverrides ? {},
-          fetchHex,
-          lager_logstash_backend_0_1_0,
-          lager_graylog_0_1_0,
-          lager_3_0_2
-        }:
-          buildRebar3 ({
-            name = "fifo_lager";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "fifo_lager";
-              version = "0.1.3";
-              sha256 =
-                "89904ffcaaec1e92329d01d18805b26a71683b2ea646bbe8ed4f73de92ce267e";
-            };
-
-            beamDeps  = [
-                          lager_logstash_backend_0_1_0
-                          lager_graylog_0_1_0
-                          lager_3_0_2
-                        ];
-
-            meta = {
-              description = ''Lager config and dependencies'';
-
-            };
-          } // packageOverrides)
-      ) {};
-
-    fifo_lager = fifo_lager_0_1_3;
-
-    fifo_s3_0_1_16 = callPackage
+    fifo_s3_0_2_2 = callPackage
       (
         {
           buildRebar3,
@@ -11922,21 +16423,26 @@ let
           fetchHex,
           poolboy_1_5_1,
           lager_3_0_2,
-          erlcloud_0_13_0,
+          hackney_1_6_0,
+          erlcloud_0_13_2,
           base16_1_0_0
         }:
           buildRebar3 ({
             name = "fifo_s3";
-            version = "0.1.16";
+            version = "0.2.2";
             src = fetchHex {
               pkg = "fifo_s3";
-              version = "0.1.16";
+              version = "0.2.2";
               sha256 =
-                "14a3601a7586d37ae5fd8996db45d0f7a7ef82c0bc1adaefa36cd881997ed32f";
+                "871809a49fdb22ad7e9ee04fa7a53368e216072cf473046d8f74ee956e735b19";
             };
 
             beamDeps  = [
-                          poolboy_1_5_1 lager_3_0_2 erlcloud_0_13_0 base16_1_0_0
+                          poolboy_1_5_1
+                          lager_3_0_2
+                          hackney_1_6_0
+                          erlcloud_0_13_2
+                          base16_1_0_0
                         ];
 
             meta = {
@@ -11946,7 +16452,7 @@ let
           } // packageOverrides)
       ) {};
 
-    fifo_s3 = fifo_s3_0_1_16;
+    fifo_s3 = fifo_s3_0_2_2;
 
     fifocache_1_0_1 = callPackage
       (
@@ -12054,7 +16560,7 @@ let
           fetchHex,
           xml_builder_0_0_8,
           httpotion_2_2_2,
-          floki_0_8_0
+          floki_0_8_1
         }:
           buildMix ({
             name = "finicity";
@@ -12065,7 +16571,7 @@ let
               sha256 =
                 "b58ef39987976cf50851311a95b40504ba763c0d82256b012f5b1246bd92d9b4";
             };
-            beamDeps  = [ xml_builder_0_0_8 httpotion_2_2_2 floki_0_8_0 ];
+            beamDeps  = [ xml_builder_0_0_8 httpotion_2_2_2 floki_0_8_1 ];
 
             meta = {
               description = ''Client library for Finicity.'';
@@ -12149,17 +16655,17 @@ let
 
     fixme = fixme_0_0_4;
 
-    flasked_0_3_0 = callPackage
+    flasked_0_4_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "flasked";
-            version = "0.3.0";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "flasked";
-              version = "0.3.0";
+              version = "0.4.0";
               sha256 =
-                "371368ec9586939343fad0196f6dc3492bb4e56309490271d29bf46beede9210";
+                "8499535ce20f8e9d2e38ce7e9ecac1a9fc5f402f3f0ab58661c1ed8795f3178c";
             };
 
             meta = {
@@ -12175,7 +16681,7 @@ let
           } // packageOverrides)
       ) {};
 
-    flasked = flasked_0_3_0;
+    flasked = flasked_0_4_0;
 
     flock_0_0_1 = callPackage
       (
@@ -12222,21 +16728,19 @@ let
           } // packageOverrides)
       ) {};
 
-    floki_0_8_0 = callPackage
+    floki_0_1_1 = callPackage
       (
-        {
-          buildMix, packageOverrides ? {}, fetchHex, mochiweb_html_2_13_0
-        }:
+        {  buildMix, packageOverrides ? {}, fetchHex, mochiweb_2_12_2 }:
           buildMix ({
             name = "floki";
-            version = "0.8.0";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "floki";
-              version = "0.8.0";
+              version = "0.1.1";
               sha256 =
-                "9cc084ca7adf275f639bb7a292838d7dc86d8917314c22f8aa2d8f6ba8b8d18d";
+                "b608415520f6701acdbbffed86b62291b00ce695f7f3b067919594534c9858a9";
             };
-            beamDeps  = [ mochiweb_html_2_13_0 ];
+            beamDeps  = [ mochiweb_2_12_2 ];
 
             meta = {
               description = ''Floki is a simple HTML parser that enables search
@@ -12247,61 +16751,99 @@ let
           } // packageOverrides)
       ) {};
 
-    floki = floki_0_8_0;
+    floki_0_7_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, mochiweb_2_12_2 }:
+          buildMix ({
+            name = "floki";
+            version = "0.7.2";
+            src = fetchHex {
+              pkg = "floki";
+              version = "0.7.2";
+              sha256 =
+                "c7078ac2a54501a16ff469c78292bac5013e457ffa8801b74bc293616aa5b0d0";
+            };
+            beamDeps  = [ mochiweb_2_12_2 ];
 
-    floorplan_0_1_1 = callPackage
+            meta = {
+              description = ''Floki is a simple HTML parser that enables search
+                            for nodes using CSS selectors.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/philss/floki";
+            };
+          } // packageOverrides)
+      ) {};
+
+    floki_0_8_1 = callPackage
+      (
+        {
+          buildMix, packageOverrides ? {}, fetchHex, mochiweb_html_2_15_0
+        }:
+          buildMix ({
+            name = "floki";
+            version = "0.8.1";
+            src = fetchHex {
+              pkg = "floki";
+              version = "0.8.1";
+              sha256 =
+                "40da7fa2ae84a7e662d169ff375f745ae3d50200bba7262567d75e97a8b44485";
+            };
+            beamDeps  = [ mochiweb_html_2_15_0 ];
+
+            meta = {
+              description = ''Floki is a simple HTML parser that enables search
+                            for nodes using CSS selectors.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/philss/floki";
+            };
+          } // packageOverrides)
+      ) {};
+
+    floki = floki_0_8_1;
+
+    flub_0_9_0 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          xml_builder_0_0_8,
-          tzdata_0_1_201603,
-          timex_1_0_2,
-          postgrex_0_11_1,
-          poison_1_5_2,
-          httpotion_2_2_2
+          shorter_maps_1_0_0,
+          ex2ms_1_4_0,
+          ets_owner_1_0_0
         }:
           buildMix ({
-            name = "floorplan";
-            version = "0.1.1";
+            name = "flub";
+            version = "0.9.0";
             src = fetchHex {
-              pkg = "floorplan";
-              version = "0.1.1";
+              pkg = "flub";
+              version = "0.9.0";
               sha256 =
-                "56679e586efa7ae179a940920ef2b4d56e40b9b1d01cb4ce8528ef6870a77b00";
+                "8bb3936f7acbf813eee74b628fbe33e8d114c5a40c7b96540e53db4a66b3fa61";
             };
-            beamDeps  = [
-                          xml_builder_0_0_8
-                          tzdata_0_1_201603
-                          timex_1_0_2
-                          postgrex_0_11_1
-                          poison_1_5_2
-                          httpotion_2_2_2
-                        ];
+            beamDeps  = [ shorter_maps_1_0_0 ex2ms_1_4_0 ets_owner_1_0_0 ];
 
             meta = {
-              description = ''A module for generating sitemaps from a variety
-                            of data sources'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/househappy/floorplan";
+              description = ''Flub does Pub. Flub does Sub. Flub does PubSub,
+                            bub.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/meyercm/shorter_maps";
             };
           } // packageOverrides)
       ) {};
 
-    floorplan = floorplan_0_1_1;
+    flub = flub_0_9_0;
 
-    fluxter_0_2_0 = callPackage
+    fluxter_0_3_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "fluxter";
-            version = "0.2.0";
+            version = "0.3.1";
             src = fetchHex {
               pkg = "fluxter";
-              version = "0.2.0";
+              version = "0.3.1";
               sha256 =
-                "7834e830d156bf9ee819e69929a42f9ce8373a4d50c3e002ad9949cfeb42391d";
+                "0d0fd8497bd83e6c5552c7eff30a87be75da835f55874c3b2c8a36f5cc784337";
             };
 
             meta = {
@@ -12312,7 +16854,7 @@ let
           } // packageOverrides)
       ) {};
 
-    fluxter = fluxter_0_2_0;
+    fluxter = fluxter_0_3_1;
 
     fn_1_0_0 = callPackage
       (
@@ -12337,30 +16879,31 @@ let
 
     fn = fn_1_0_0;
 
-    fnv_0_2_1 = callPackage
+    fnv_0_3_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, hexate_0_5_1 }:
           buildMix ({
             name = "fnv";
-            version = "0.2.1";
+            version = "0.3.2";
             src = fetchHex {
               pkg = "fnv";
-              version = "0.2.1";
+              version = "0.3.2";
               sha256 =
-                "4f64367d63f0f40fd6bd1618164df41173c76517b10ce96d8358ccc01e1cb2a4";
+                "1993ca598fe7ca402f89ed1836c4a5de320330177104ca7eaac230312e069fe5";
             };
             beamDeps  = [ hexate_0_5_1 ];
 
             meta = {
-              description = ''Pure Elixir implementation of Fowler–Noll–Vo
-                            hash functions (FNV-1/FNV-1a)'';
+              longDescription = ''Some string transformation functions for
+                                Elixir. Heavily inspired by ActiveSupport`s
+                                String extensions (Ruby).'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/asaaki/fnv.ex";
+              homepage = "https://github.com/asaaki/strinx.ex";
             };
           } // packageOverrides)
       ) {};
 
-    fnv = fnv_0_2_1;
+    fnv = fnv_0_3_2;
 
     folsom_0_8_3 = callPackage
       (
@@ -12411,36 +16954,129 @@ let
 
     folsomite = folsomite_1_2_8;
 
-    forms_0_0_1 = callPackage
+    forcex_0_4_1 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "forms";
-            version = "0.0.1";
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_2_1_6,
+          httpoison_0_8_3,
+          exjsx_3_2_0
+        }:
+          buildMix ({
+            name = "forcex";
+            version = "0.4.1";
             src = fetchHex {
-              pkg = "forms";
-              version = "0.0.1";
+              pkg = "forcex";
+              version = "0.4.1";
               sha256 =
-                "530f63ed8ed5a171f744fc75bd69cb2e36496899d19dbef48101b4636b795868";
+                "82d1c772a369dfb8c705beaf1dae55853402cab06c2dfac1b3e056dbc4cb2c21";
             };
-
-            buildPlugins  = [ rebar3_hex ];
-
+            beamDeps  = [ timex_2_1_6 httpoison_0_8_3 exjsx_3_2_0 ];
 
             meta = {
-              description = ''Toolbox that simplifies working with Erlang`s
-                            abstract format'';
+              description = ''Elixir library for the Force.com / SalesForce /
+                            SFDC REST API'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/efcasado/forms";
+              homepage = "https://github.com/jeffweiss/forcex";
             };
           } // packageOverrides)
       ) {};
 
-    forms = forms_0_0_1;
+    forcex = forcex_0_4_1;
+
+    forecast_io_0_2_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          json_0_3_3,
+          httpotion_2_2_2
+        }:
+          buildMix ({
+            name = "forecast_io";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "forecast_io";
+              version = "0.2.2";
+              sha256 =
+                "d76c4f1839cb77038404c3d291e2449495e81469ddf05bef0dc01ed8544917ca";
+            };
+            beamDeps  = [ json_0_3_3 httpotion_2_2_2 ];
+
+            meta = {
+              description = ''Simple wrapper for Forecast.IO API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/r-icarus/forecast_io";
+            };
+          } // packageOverrides)
+      ) {};
+
+    forecast_io = forecast_io_0_2_2;
+
+    fox_1_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "fox";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "fox";
+              version = "1.0.1";
+              sha256 =
+                "e790c4dec0f840283c3e93825db259075ee45953ff1c29758a2aec22164c6865";
+            };
+
+            meta = {
+              longDescription = ''Collection of support utility functions and
+                                extensions for day-to-day web development with
+                                Elixir. Includes utility extension to strings,
+                                uri, dicts, integers, functions, parallel,
+                                records, random, and time'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/foxnewsnetwork/fox";
+            };
+          } // packageOverrides)
+      ) {};
+
+    fox = fox_1_0_1;
+
+    freegeoip_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "freegeoip";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "freegeoip";
+              version = "0.0.4";
+              sha256 =
+                "6776938ddc1318ee8a34ef6e3a5dcb85013bbb27feeae3c7d65487ff17e2b558";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Simple Elixir wrapper for freegeoip.net HTTP
+                            API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/juljimm/freegeoip-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    freegeoip = freegeoip_0_0_4;
 
     friendly_1_0_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, floki_0_8_0 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, floki_0_8_1 }:
           buildMix ({
             name = "friendly";
             version = "1.0.1";
@@ -12450,7 +17086,7 @@ let
               sha256 =
                 "5bacdeba9a6752613c037f7ffacd4f7185cf9b348b3b41c73497e539bbb17602";
             };
-            beamDeps  = [ floki_0_8_0 ];
+            beamDeps  = [ floki_0_8_1 ];
 
             meta = {
               longDescription = ''HTML and XML parser with the most friendly
@@ -12511,6 +17147,65 @@ let
 
     fsm = fsm_0_2_0;
 
+    fugue_0_1_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
+          buildMix ({
+            name = "fugue";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "fugue";
+              version = "0.1.3";
+              sha256 =
+                "de7fcfbbe261e189de894773c9332591a7ab42311972d8685bdb0524057c72f1";
+            };
+            beamDeps  = [ plug_1_1_5 ];
+
+            meta = {
+              description = ''Extendable testing utilities for Plug'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/fugue";
+            };
+          } // packageOverrides)
+      ) {};
+
+    fugue = fugue_0_1_3;
+
+    fulcrum_0_0_6 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "fulcrum";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "fulcrum";
+              version = "0.0.6";
+              sha256 =
+                "9cddd3906bad693cad791841d19b2be089e064a5f2dd35d340f46e6cd15d7930";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''Fulcrum library for Elixir. The aim is to
+                                present the Fulcrum API as a replacement for an
+                                Ecto Repo. So, instead of Repo.all(Form), you
+                                can write Fulcrum.all(Form). In this way, you
+                                only have to make minor changes to your
+                                controllers, to work with Fulcrum.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pinx/fulcrum";
+            };
+          } // packageOverrides)
+      ) {};
+
+    fulcrum = fulcrum_0_0_6;
+
     fumanchu_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -12534,17 +17229,47 @@ let
 
     fumanchu = fumanchu_0_0_1;
 
-    function_decorating_0_0_1 = callPackage
+    funchaku_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "funchaku";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "funchaku";
+              version = "0.1.0";
+              sha256 =
+                "621ed289eadcc5333d11b698c2d7c459143ff11036f3eedc0d79d3df76a5fd43";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir client for the Nu HTML Checker'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sitevalidator/funchaku";
+            };
+          } // packageOverrides)
+      ) {};
+
+    funchaku = funchaku_0_1_0;
+
+    function_decorating_0_0_6 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "function_decorating";
-            version = "0.0.1";
+            version = "0.0.6";
             src = fetchHex {
               pkg = "function_decorating";
-              version = "0.0.1";
+              version = "0.0.6";
               sha256 =
-                "06016a2765de8ea0243b7993226177c96d0f6d51a2db2f84ee9d224a355c3b92";
+                "8faf5588f98c833a25c9463df27e709cc5c645083a592b1a5add25fbb9e68d9a";
             };
 
             meta = {
@@ -12558,19 +17283,49 @@ let
           } // packageOverrides)
       ) {};
 
-    function_decorating = function_decorating_0_0_1;
+    function_decorating = function_decorating_0_0_6;
 
-    fuse_2_2_0 = callPackage
+    funkspector_0_0_1 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          floki_0_8_1,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "funkspector";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "funkspector";
+              version = "0.0.1";
+              sha256 =
+                "709574d5b5612c6188764b72b36c4eb2b85f3e27d859d1fe5631f31d17e79695";
+            };
+            beamDeps  = [ floki_0_8_1 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Web page inspector for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sitevalidator/funkspector";
+            };
+          } // packageOverrides)
+      ) {};
+
+    funkspector = funkspector_0_0_1;
+
+    fuse_2_3_1 = callPackage
+      (
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "fuse";
-            version = "2.2.0";
+            version = "2.3.1";
             src = fetchHex {
               pkg = "fuse";
-              version = "2.2.0";
+              version = "2.3.1";
               sha256 =
-                "c397f336455ab6596842d2199f018af69855f17df1635e212d3871a135ad46fa";
+                "580b6279115b74058982d58a898ac9e2e8fdb1884287d565f1ad987cacf1f8e7";
             };
 
             meta = {
@@ -12581,7 +17336,7 @@ let
           } // packageOverrides)
       ) {};
 
-    fuse = fuse_2_2_0;
+    fuse = fuse_2_3_1;
 
     fuzzyurl_0_8_1 = callPackage
       (
@@ -12637,17 +17392,147 @@ let
 
     fwatch = fwatch_0_5_0;
 
-    gb2260_0_4_0 = callPackage
+    game_of_life_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "game_of_life";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "game_of_life";
+              version = "1.0.0";
+              sha256 =
+                "4a7e64722d5841d91152352a19db51476fa3e950d7316aba089870248019958b";
+            };
+
+            meta = {
+              description = ''Distributed Game of Life with Board Server API.
+                            Run it on multiple nodes.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/BeyondScheme/elixir-game_of_life";
+            };
+          } // packageOverrides)
+      ) {};
+
+    game_of_life = game_of_life_1_0_0;
+
+    gardien_0_0_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "gardien";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "gardien";
+              version = "0.0.3";
+              sha256 =
+                "3b4f69bee6359789e57e6c7efb01358fa94ae52d48b9fced8ee22c8cc99740df";
+            };
+
+            meta = {
+              description = ''Authorization for Phoenix projects'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rpelyush/gardien";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gardien = gardien_0_0_3;
+
+    garph_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "garph";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "garph";
+              version = "0.0.1";
+              sha256 =
+                "32829d25bdc8cf78256c8fdf1e7294707f94b683ec6ce6d1da0a6a8cd4d77c9e";
+            };
+
+            meta = {
+              longDescription = ''Garph is a simple way to implement complex
+                                decision trees by using graphs. It can be used
+                                with plain elixir or beneath a phoenix
+                                project.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/faber-lotto/garph";
+            };
+          } // packageOverrides)
+      ) {};
+
+    garph = garph_0_0_1;
+
+    gatekeeper_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "gatekeeper";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "gatekeeper";
+              version = "0.0.1";
+              sha256 =
+                "d1ad9549998054c6ca4d4c7954687937e46b97f2ca4176c7e1d5bfdaf683ac2c";
+            };
+
+            meta = {
+              description = ''An opinionated authorization framework for Elixir
+                            projects.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/austinsmorris/gatekeeper";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gatekeeper = gatekeeper_0_0_1;
+
+    gateway_0_0_6 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3,
+          fox_1_0_1
+        }:
+          buildMix ({
+            name = "gateway";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "gateway";
+              version = "0.0.6";
+              sha256 =
+                "4d0de05b0168ee0cc41c9c38491a4b4641d446f38170ca170d0d7440b0c8f619";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 fox_1_0_1 ];
+
+            meta = {
+              longDescription = ''A generic set of macros and conventions to
+                                build clients to communicate with JSON REST
+                                APIs'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/foxnewsnetwork/gateway";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gateway = gateway_0_0_6;
+
+    gb2260_0_5_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
           buildMix ({
             name = "gb2260";
-            version = "0.4.0";
+            version = "0.5.0";
             src = fetchHex {
               pkg = "gb2260";
-              version = "0.4.0";
+              version = "0.5.0";
               sha256 =
-                "62e89f7f4fcee973e8092e41676a903831f0cf88e31d6bedcf88382dfe40f333";
+                "a3e4fc9435802613f2abc506c480321ac6eafa2eed72b52d85d2c19f8b84ffe7";
             };
             beamDeps  = [ poison_2_1_0 ];
 
@@ -12660,7 +17545,7 @@ let
           } // packageOverrides)
       ) {};
 
-    gb2260 = gb2260_0_4_0;
+    gb2260 = gb2260_0_5_0;
 
     gealts_0_0_1 = callPackage
       (
@@ -12742,31 +17627,73 @@ let
 
     gelfex = gelfex_0_0_1;
 
-    gen_leader_0_1_0 = callPackage
+    gen_delegate_1_0_0 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "gen_leader";
-            version = "0.1.0";
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "gen_delegate";
+            version = "1.0.0";
             src = fetchHex {
-              pkg = "gen_leader";
-              version = "0.1.0";
+              pkg = "gen_delegate";
+              version = "1.0.0";
               sha256 =
-                "31340f49935767f12b639b69cdc585f26ebcc1802ba46b33555b229da2366207";
+                "9790952ba41538e835613f064774189bd819c79fde8fa09c2ab2bc5143b9efbf";
             };
 
-            buildPlugins  = [ rebar3_hex ];
-
-
             meta = {
-              description = ''The gen_leader behaviour'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/knusbaum/gen_leader_revival";
+              description = ''Easy delegation of internal function to a
+                            GenServer interface'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zackehh/gen_delegate";
             };
           } // packageOverrides)
       ) {};
 
-    gen_leader = gen_leader_0_1_0;
+    gen_delegate = gen_delegate_1_0_0;
+
+    gen_fsm_0_0_4 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "gen_fsm";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "gen_fsm";
+              version = "0.0.4";
+              sha256 =
+                "c92bf89ea8dee0f924362b12b61d3cd02306e77a0e8174354044238329b6506a";
+            };
+
+            meta = {
+              description = ''Elixir wrapper around Erlang`s OTP gen_fsm.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/pavlos/gen_fsm";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gen_fsm_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "gen_fsm";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "gen_fsm";
+              version = "0.1.0";
+              sha256 =
+                "273281dbb6cf6171a6fb963538fde67146a11f6025a80113eae4b29822083a62";
+            };
+
+            meta = {
+              description = ''Elixir wrapper around Erlang`s OTP gen_fsm.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/pavlos/gen_fsm";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gen_fsm = gen_fsm_0_1_0;
 
     gen_listener_tcp_0_3_2 = callPackage
       (
@@ -12791,6 +17718,81 @@ let
 
     gen_listener_tcp = gen_listener_tcp_0_3_2;
 
+    gen_mqtt_0_2_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "gen_mqtt";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "gen_mqtt";
+              version = "0.2.1";
+              sha256 =
+                "3cb7f6099eca4fb46befdc0bee41d21756f50cc263a7234286c8fb9800db197a";
+            };
+
+            meta = {
+              description = ''An Elixir behaviour that makes it possible to
+                            communicate with a MQTT server'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/gausby/gen_mqtt";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gen_mqtt = gen_mqtt_0_2_1;
+
+    gen_retry_0_3_0 = callPackage
+      (
+        {
+          buildMix, packageOverrides ? {}, fetchHex, exconstructor_1_0_2
+        }:
+          buildMix ({
+            name = "gen_retry";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "gen_retry";
+              version = "0.3.0";
+              sha256 =
+                "dca3dd6948ed3683bb1414f7b8131a12dfdc38677fb3730f522c85c6640d73b7";
+            };
+            beamDeps  = [ exconstructor_1_0_2 ];
+
+            meta = {
+              longDescription = ''GenRetry provides utilities for retrying
+                                Elixir functions, with configurable delay and
+                                backoff characteristics.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/appcues/gen_retry";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gen_retry = gen_retry_0_3_0;
+
+    gen_smtp_0_10_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "gen_smtp";
+            version = "0.10.0";
+            src = fetchHex {
+              pkg = "gen_smtp";
+              version = "0.10.0";
+              sha256 =
+                "87baa484762849cdb9f9082fd12449eb02cca059ac6a225f24f436fdf6f683ae";
+            };
+
+            meta = {
+              description = ''A generic Erlang SMTP server/client framework'';
+              license = stdenv.lib.licenses.bsd2;
+              homepage = "https://github.com/Vagabond/gen_smtp";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gen_smtp = gen_smtp_0_10_0;
+
     gen_smtp_0_9_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -12805,17 +17807,13 @@ let
             };
 
             meta = {
-              longDescription = ''A generic Erlang SMTP server framework that
-                                can be extended via callback modules in the OTP
-                                style. '';
-
+              description = ''A generic Erlang SMTP server/client framework'';
+              license = stdenv.lib.licenses.bsd2;
               homepage = "https://github.com/Vagabond/gen_smtp";
             };
           } // packageOverrides)
       ) {};
 
-    gen_smtp = gen_smtp_0_9_0;
-
     gendex_0_5_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -12888,17 +17886,41 @@ let
 
     geohash = geohash_0_1_1;
 
-    geolix_0_9_0 = callPackage
+    geolite2data_0_0_1 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "geolite2data";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "geolite2data";
+              version = "0.0.1";
+              sha256 =
+                "ba3f48f86302c8f6214afb7822923fcd6b07470ce83cefa1db474e97eb57df97";
+            };
+
+            meta = {
+              description = ''Periodically fetches the free MaxMind GeoLite2
+                            databases'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage = "https://github.com/potatosalad/erlang-geolite2data";
+            };
+          } // packageOverrides)
+      ) {};
+
+    geolite2data = geolite2data_0_0_1;
+
+    geolix_0_10_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poolboy_1_5_1 }:
           buildMix ({
             name = "geolix";
-            version = "0.9.0";
+            version = "0.10.1";
             src = fetchHex {
               pkg = "geolix";
-              version = "0.9.0";
+              version = "0.10.1";
               sha256 =
-                "05bf3057a8997aaf70abc2e8f3ef04679c12b061829af263b3bfb44ad3e8e6a0";
+                "4f269b8b22f01b78b5e0929a3432679f692ae1ac9b31a0f23ca989efd13f9ae0";
             };
             beamDeps  = [ poolboy_1_5_1 ];
 
@@ -12910,7 +17932,7 @@ let
           } // packageOverrides)
       ) {};
 
-    geolix = geolix_0_9_0;
+    geolix = geolix_0_10_1;
 
     getopt_0_8_2 = callPackage
       (
@@ -12957,21 +17979,43 @@ let
           } // packageOverrides)
       ) {};
 
-    gettext = gettext_0_10_0;
-
-    gh_webhook_plug_0_0_2 = callPackage
+    gettext_0_11_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "gettext";
+            version = "0.11.0";
+            src = fetchHex {
+              pkg = "gettext";
+              version = "0.11.0";
+              sha256 =
+                "9688cb656d6bc13d174051256784066dde15c4ddae1f0335590a62952780b58b";
+            };
+
+            meta = {
+              description = ''Internationalization and localization through
+                            gettext'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-lang/gettext";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gettext = gettext_0_11_0;
+
+    gh_webhook_plug_0_0_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "gh_webhook_plug";
-            version = "0.0.2";
+            version = "0.0.3";
             src = fetchHex {
               pkg = "gh_webhook_plug";
-              version = "0.0.2";
+              version = "0.0.3";
               sha256 =
-                "f89c7b883923aea3a3c488e3344390e0771735df72dad7fec270ce49aba88854";
+                "9509e2a82e8b48e7eb3c90cb79602c5fbb12196d36d5e5f8bcd1ce1ac1b442a9";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               longDescription = ''This Plug makes it easy to listen and respond
@@ -12983,7 +18027,7 @@ let
           } // packageOverrides)
       ) {};
 
-    gh_webhook_plug = gh_webhook_plug_0_0_2;
+    gh_webhook_plug = gh_webhook_plug_0_0_3;
 
     gibran_0_0_2 = callPackage
       (
@@ -13079,6 +18123,116 @@ let
 
     gitex = gitex_0_2_0;
 
+    github_oauth_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "github_oauth";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "github_oauth";
+              version = "0.1.1";
+              sha256 =
+                "4e68983af9ed8146a2505ad759cb151c3202471285f07df6132a4acd47aa91f2";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''simple github oauth library'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/lidashuang/github_oauth";
+            };
+          } // packageOverrides)
+      ) {};
+
+    github_oauth = github_oauth_0_1_1;
+
+    github_trend_ex_0_1_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          floki_0_8_1
+        }:
+          buildMix ({
+            name = "github_trend_ex";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "github_trend_ex";
+              version = "0.1.2";
+              sha256 =
+                "019565ad8efe6c25414dcddc6a7fc99e34f0ff457989ec7b5ad03b79b0c8ca8b";
+            };
+            beamDeps  = [ httpoison_0_8_3 floki_0_8_1 ];
+
+            meta = {
+              description = ''Get trend repositories from Github.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KazuCocoa/github_trend_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    github_trend_ex = github_trend_ex_0_1_2;
+
+    gizoogle_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
+          buildMix ({
+            name = "gizoogle";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "gizoogle";
+              version = "0.0.2";
+              sha256 =
+                "c22d720fc60df8670a194c6ed1fb17fe272a7560b478037aef4a1437331f60e3";
+            };
+            beamDeps  = [ httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''Uses Gizoogle ta allow you ta drop a rhyme
+                                like a thug n` retrieve links fo` translated
+                                sitez'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/notdevinclark/gizoogle";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gizoogle = gizoogle_0_0_2;
+
+    gl_utils_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "gl_utils";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "gl_utils";
+              version = "0.0.1";
+              sha256 =
+                "ae529fef193423baa50c673b3f852e0c3ca7b08a85817be7113615dbdacb53f3";
+            };
+
+            meta = {
+              description = ''All of the Erlang gl macros exposed as normal
+                            functions'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/requnix/gl_utils";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gl_utils = gl_utils_0_0_1;
+
     glitchylicious_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -13149,6 +18303,69 @@ let
 
     gm = gm_0_0_2;
 
+    gmail_0_1_11 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_2_1_6,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "gmail";
+            version = "0.1.11";
+            src = fetchHex {
+              pkg = "gmail";
+              version = "0.1.11";
+              sha256 =
+                "14ff16f5eb2e705762dc383e59a22905f1f53d3f3e9e17615159bac3add91f7a";
+            };
+            beamDeps  = [ timex_2_1_6 poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A simple Gmail REST API client for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/craigp/elixir-gmail";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gmail = gmail_0_1_11;
+
+    gold_0_12_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3,
+          decimal_1_1_2
+        }:
+          buildMix ({
+            name = "gold";
+            version = "0.12.0";
+            src = fetchHex {
+              pkg = "gold";
+              version = "0.12.0";
+              sha256 =
+                "fba43501f6c25116c29358c4b5494de5e078cc516572045ac73a7944b918105b";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 decimal_1_1_2 ];
+
+            meta = {
+              description = ''An Elixir library to interface with the Bitcoin
+                            core JSON-RPC API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/solatis/gold";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gold = gold_0_12_0;
+
     goldrush_0_1_7 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -13163,19 +18380,39 @@ let
             };
 
             meta = {
-              description = ''Small, Fast event processing and monitoring for
-                            Erlang/OTP applications. '';
+              description = ''Erlang event stream processor'';
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/DeadZen/goldrush";
             };
           } // packageOverrides)
       ) {};
 
-    goldrush = goldrush_0_1_7;
+    goldrush_0_1_8 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "goldrush";
+            version = "0.1.8";
+            src = fetchHex {
+              pkg = "goldrush";
+              version = "0.1.8";
+              sha256 =
+                "ba71e005bbb6ebbc3c510a58b2bd6d3b25a8d091a8e87ac3d33ef10522cdcd51";
+            };
+
+            meta = {
+              description = ''Erlang event stream processor'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/DeadZen/goldrush";
+            };
+          } // packageOverrides)
+      ) {};
+
+    goldrush = goldrush_0_1_8;
 
     good_enough_geoid_0_0_2 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, csv_1_3_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, csv_1_4_1 }:
           buildMix ({
             name = "good_enough_geoid";
             version = "0.0.2";
@@ -13185,7 +18422,7 @@ let
               sha256 =
                 "7b2a556206f71e743d77c26a55b60b3282bd799b8254510f62afe2a4ec330746";
             };
-            beamDeps  = [ csv_1_3_3 ];
+            beamDeps  = [ csv_1_4_1 ];
 
             meta = {
               description = ''Get EGM Geoid heights that are good enough for
@@ -13228,7 +18465,7 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           module_mocker_0_2_0,
           cowboy_1_0_4,
           access_token_extractor_0_1_1
@@ -13243,7 +18480,7 @@ let
                 "029f2399456a7b7474635cab36544d35e200ddd7a470a905191de0fc3612adb5";
             };
             beamDeps  = [
-                          plug_1_1_3
+                          plug_1_1_5
                           module_mocker_0_2_0
                           cowboy_1_0_4
                           access_token_extractor_0_1_1
@@ -13263,6 +18500,159 @@ let
 
     google_auth = google_auth_0_0_2;
 
+    google_books_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "google_books";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "google_books";
+              version = "0.0.2";
+              sha256 =
+                "d20b5ca090df63cf4ed32d7257dcdad780bd89ca93bd644721c9d4d696e5734d";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A simple wrapper for Google Books API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nithinbekal/google_books.ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    google_books = google_books_0_0_2;
+
+    google_sheets_2_0_5 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          sweet_xml_0_6_1,
+          httpoison_0_8_3,
+          hackney_1_6_0
+        }:
+          buildMix ({
+            name = "google_sheets";
+            version = "2.0.5";
+            src = fetchHex {
+              pkg = "google_sheets";
+              version = "2.0.5";
+              sha256 =
+                "aeaaab3e2df75289cf14740a76b014652fb77a5ef95be3921fc36f4165812682";
+            };
+            beamDeps  = [ sweet_xml_0_6_1 httpoison_0_8_3 hackney_1_6_0 ];
+
+            meta = {
+              description = ''OTP application for fetching and polling Google
+                            spreadsheet data in CSV format.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/GrandCru/GoogleSheets";
+            };
+          } // packageOverrides)
+      ) {};
+
+    google_sheets = google_sheets_2_0_5;
+
+    goomoji_translator_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "goomoji_translator";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "goomoji_translator";
+              version = "0.0.2";
+              sha256 =
+                "b794dcccc306c4c5712895456c28012e1b9f8e8496392bafcfa9c1fc2c251f82";
+            };
+
+            meta = {
+              description = ''Used to change goomoji codes into normal emoji
+                            codes'';
+              license = stdenv.lib.licenses.asl20;
+              homepage =
+                "https://github.com/azranel/goomoji-translator_elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    goomoji_translator = goomoji_translator_0_0_2;
+
+    goth_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          json_web_token_0_2_5,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "goth";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "goth";
+              version = "0.0.3";
+              sha256 =
+                "0bbf59ae842dc4518cf42123b0fb0d0255bcb72ea37c8ec13bab2efe2339ccc3";
+            };
+            beamDeps  = [ poison_1_5_2 json_web_token_0_2_5 httpoison_0_8_3
+                      ];
+
+            meta = {
+              longDescription = ''A simple library to generate and retrieve
+                                Oauth2 tokens for use with Google Cloud Service
+                                accounts.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/peburrows/goth";
+            };
+          } // packageOverrides)
+      ) {};
+
+    goth_0_1_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          json_web_token_0_2_5,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "goth";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "goth";
+              version = "0.1.3";
+              sha256 =
+                "64a26a9b0682757acd59838eaa08f76b394c7fa086b5106c7b3f8682a8416d05";
+            };
+            beamDeps  = [ poison_2_1_0 json_web_token_0_2_5 httpoison_0_8_3
+                      ];
+
+            meta = {
+              longDescription = ''A simple library to generate and retrieve
+                                Oauth2 tokens for use with Google Cloud Service
+                                accounts.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/peburrows/goth";
+            };
+          } // packageOverrides)
+      ) {};
+
+    goth = goth_0_1_3;
+
     gproc_0_3_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -13360,6 +18750,28 @@ let
 
     graphex = graphex_0_2_1;
 
+    graphixir_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "graphixir";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "graphixir";
+              version = "0.0.1";
+              sha256 =
+                "8d355dc2ac225c2d74f15707908103ca051c74ef1668abf5240f6d3582750518";
+            };
+
+            meta = {
+              description = ''Graphite framework for elixir'';
+
+            };
+          } // packageOverrides)
+      ) {};
+
+    graphixir = graphixir_0_0_1;
+
     graphmath_1_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -13405,7 +18817,28 @@ let
           } // packageOverrides)
       ) {};
 
-    graphql = graphql_0_2_0;
+    graphql_0_3_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "graphql";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "graphql";
+              version = "0.3.1";
+              sha256 =
+                "ed756b2ee62d3e33c6eef6ffc4bf1a7184c1b5cd022a4550b085768eefa8f4a2";
+            };
+
+            meta = {
+              description = ''GraphQL Elixir implementation'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/graphql-elixir/graphql";
+            };
+          } // packageOverrides)
+      ) {};
+
+    graphql = graphql_0_3_1;
 
     graphql_ex_0_0_1 = callPackage
       (
@@ -13425,6 +18858,29 @@ let
 
     graphql_ex = graphql_ex_0_0_1;
 
+    gravatar_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "gravatar";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "gravatar";
+              version = "0.1.0";
+              sha256 =
+                "4fab4a0313312d4319496662b55f25d3aabaa740ef3d084456425db8c9bdb4fd";
+            };
+
+            meta = {
+              description = ''Gravatar URLs generator'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pilu/gravatar";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gravatar = gravatar_0_1_0;
+
     gravatarify_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -13472,6 +18928,38 @@ let
 
     gray = gray_0_0_2;
 
+    greenhouse_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_2_1_6,
+          httpoison_0_8_3,
+          exjsx_3_2_0
+        }:
+          buildMix ({
+            name = "greenhouse";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "greenhouse";
+              version = "0.0.1";
+              sha256 =
+                "7b32075492339d6ef03572891287689d48d938f36e19601433f47b4ad2f75b5d";
+            };
+            beamDeps  = [ timex_2_1_6 httpoison_0_8_3 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Elixir library for access the Greenhouse Harvest
+                            API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeffweiss/greenhouse";
+            };
+          } // packageOverrides)
+      ) {};
+
+    greenhouse = greenhouse_0_0_1;
+
     growl_0_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -13518,6 +19006,31 @@ let
 
     growl = growl_0_0_2;
 
+    gtfs_0_3_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, csv_1_4_1 }:
+          buildMix ({
+            name = "gtfs";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "gtfs";
+              version = "0.3.0";
+              sha256 =
+                "a77116b8886f3fa56fb1c9e722b7d62939ff85a38fa99a24daef5a26a0c939a5";
+            };
+            beamDeps  = [ csv_1_4_1 ];
+
+            meta = {
+              description = ''A library for parsing a GTFS folder into a
+                            hierarchy of structured data'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bhelx/gtfs";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gtfs = gtfs_0_3_0;
+
     guardsafe_0_5_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -13545,13 +19058,13 @@ let
     gun_1_0_0_pre_1 = callPackage
       (
         {
-          buildRebar3,
+          buildErlangMk,
           packageOverrides ? {},
           fetchHex,
           ranch_1_1_0,
           cowlib_1_3_0
         }:
-          buildRebar3 ({
+          buildErlangMk ({
             name = "gun";
             version = "1.0.0-pre.1";
             src = fetchHex {
@@ -13560,7 +19073,6 @@ let
               sha256 =
                 "53aca19e83b15127aa4e299435823b367d5ba6797852984af6c2b9b493be9d56";
             };
-
             beamDeps  = [ ranch_1_1_0 cowlib_1_3_0 ];
 
             meta = {
@@ -13572,6 +19084,39 @@ let
 
     gun = gun_1_0_0_pre_1;
 
+    guri_0_2_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          websocket_client_1_1_0,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "guri";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "guri";
+              version = "0.2.1";
+              sha256 =
+                "7fa0f2ebff111c368895798041d982f00eec34589d93f10bb323bb5a09e1f888";
+            };
+            beamDeps  = [ websocket_client_1_1_0 poison_1_5_2 httpoison_0_8_3
+                      ];
+
+            meta = {
+              description = ''Automate tasks and keep everyone in the loop with
+                            Guri'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/elvio/guri";
+            };
+          } // packageOverrides)
+      ) {};
+
+    guri = guri_0_2_1;
+
     gurka_0_1_7 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -13594,6 +19139,106 @@ let
 
     gurka = gurka_0_1_7;
 
+    gutenex_0_2_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, imagineer_0_2_1 }:
+          buildMix ({
+            name = "gutenex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "gutenex";
+              version = "0.2.0";
+              sha256 =
+                "5c8ab30570d7ddcd6cdb2eeaf1d3eba4db83f6ef955f4030f05cf476cbce79fa";
+            };
+            beamDeps  = [ imagineer_0_2_1 ];
+
+            meta = {
+              description = ''PDF Generation in Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/SenecaSystems/gutenex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    gutenex = gutenex_0_2_0;
+
+    hackney_1_5_7 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          ssl_verify_fun_1_1_0,
+          mimerl_1_0_2,
+          metrics_1_0_1,
+          idna_1_2_0,
+          certifi_0_4_0
+        }:
+          buildMix ({
+            name = "hackney";
+            version = "1.5.7";
+            src = fetchHex {
+              pkg = "hackney";
+              version = "1.5.7";
+              sha256 =
+                "627ed3f048b950d2dbbec918519f89f498a2136d74ca8180c15fad412b9bc869";
+            };
+            beamDeps  = [
+                          ssl_verify_fun_1_1_0
+                          mimerl_1_0_2
+                          metrics_1_0_1
+                          idna_1_2_0
+                          certifi_0_4_0
+                        ];
+
+            meta = {
+              description = ''simple HTTP client'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/benoitc/hackney";
+            };
+          } // packageOverrides)
+      ) {};
+
+    hackney_1_6_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          ssl_verify_fun_1_1_0,
+          mimerl_1_0_2,
+          metrics_1_0_1,
+          idna_1_2_0,
+          certifi_0_4_0
+        }:
+          buildMix ({
+            name = "hackney";
+            version = "1.6.0";
+            src = fetchHex {
+              pkg = "hackney";
+              version = "1.6.0";
+              sha256 =
+                "8b517f17c794ab611815042d24e149daafbd898d63aac8baf6750b890261c716";
+            };
+            beamDeps  = [
+                          ssl_verify_fun_1_1_0
+                          mimerl_1_0_2
+                          metrics_1_0_1
+                          idna_1_2_0
+                          certifi_0_4_0
+                        ];
+
+            meta = {
+              description = ''simple HTTP client'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/benoitc/hackney";
+            };
+          } // packageOverrides)
+      ) {};
+
+    hackney = hackney_1_6_0;
+
     haikunator_1_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -13618,6 +19263,34 @@ let
 
     haikunator = haikunator_1_0_1;
 
+    hairnet_1_0_0 = callPackage
+      (
+        {
+          buildRebar3, packageOverrides ? {}, fetchHex, base64url_0_0_1
+        }:
+          buildRebar3 ({
+            name = "hairnet";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "hairnet";
+              version = "1.0.0";
+              sha256 =
+                "b3f15cdb7d9e6183a5cde401ded684c88cc2ea09dca75facf82b5281f4596606";
+            };
+
+            beamDeps  = [ base64url_0_0_1 ];
+
+            meta = {
+              description = ''An Erlang library wrapping AES-GCM (AEAD) crypto
+                            in a Fernet-like interface'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/ferd/hairnet/";
+            };
+          } // packageOverrides)
+      ) {};
+
+    hairnet = hairnet_1_0_0;
+
     happy_1_1_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -13643,17 +19316,17 @@ let
 
     happy = happy_1_1_1;
 
-    harakiri_0_6_0 = callPackage
+    harakiri_1_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "harakiri";
-            version = "0.6.0";
+            version = "1.0.1";
             src = fetchHex {
               pkg = "harakiri";
-              version = "0.6.0";
+              version = "1.0.1";
               sha256 =
-                "0cd6f40db8d2e475ea4b9ae4c872656171bced2571e8f86caf49ac7680656b94";
+                "2c3bc7300cbded03bb1b01ebe67e74507a5350c79fe08276a2a17359a6c28d79";
             };
 
             meta = {
@@ -13664,7 +19337,63 @@ let
           } // packageOverrides)
       ) {};
 
-    harakiri = harakiri_0_6_0;
+    harakiri = harakiri_1_0_1;
+
+    harvest_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "harvest";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "harvest";
+              version = "0.0.3";
+              sha256 =
+                "a9b52f37959a97e876603da5a34a0683e9e4a8e534fb7c672175602768fc812a";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Harvest Time Tracking API wrapper written in
+                            Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/luishurtado/harvest";
+            };
+          } // packageOverrides)
+      ) {};
+
+    harvest = harvest_0_0_3;
+
+    hash_n_cache_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "hash_n_cache";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "hash_n_cache";
+              version = "0.0.2";
+              sha256 =
+                "3cd95f04cd6017894b1829307e568a72a3d42c6b70379c37b86c80ab0a6f68ec";
+            };
+
+            meta = {
+              longDescription = ''A simple utility to hash an erlang term, and
+                                cache the term in ETS with the hash as the key
+                                and the term as the value.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/elbow-jason/hash_n_cache";
+            };
+          } // packageOverrides)
+      ) {};
+
+    hash_n_cache = hash_n_cache_0_0_2;
 
     hash_ring_0_4_0 = callPackage
       (
@@ -13759,19 +19488,18 @@ let
 
     heapq = heapq_0_0_1;
 
-    hedwig_0_3_0 = callPackage
+    hedwig_0_1_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, gproc_0_5_0 }:
+        {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "hedwig";
-            version = "0.3.0";
+            version = "0.1.0";
             src = fetchHex {
               pkg = "hedwig";
-              version = "0.3.0";
+              version = "0.1.0";
               sha256 =
-                "2a1dfd91c56c43e804fbfb7a24fcaee67f17add19615e66321205ad486231e53";
+                "75139dc3ce629dcb703a17d053acf84da0787ab398e20566e10152cdf1ccad9c";
             };
-            beamDeps  = [ gproc_0_5_0 ];
 
             meta = {
               description = ''An adapter-based chat bot framework'';
@@ -13831,6 +19559,29 @@ let
 
     hermes = hermes_0_1_0;
 
+    hex2bin_1_0_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "hex2bin";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "hex2bin";
+              version = "1.0.0";
+              sha256 =
+                "e7012d1d9aadd26e680f0983d26fb8923707f05fac9688f19f530fa3795e716f";
+            };
+
+            meta = {
+              description = ''Hex string/binary conversion utilities'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/aesedepece/hex2bin";
+            };
+          } // packageOverrides)
+      ) {};
+
+    hex2bin = hex2bin_1_0_0;
+
     hex_math_0_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -13854,6 +19605,43 @@ let
 
     hex_math = hex_math_0_0_2;
 
+    hex_searcher_1_0_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          table_rex_0_4_0,
+          ibrowse_4_2_2,
+          httpotion_2_2_2,
+          floki_0_7_2
+        }:
+          buildMix ({
+            name = "hex_searcher";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "hex_searcher";
+              version = "1.0.0";
+              sha256 =
+                "26d2097aa0f950c67ea55822e15cfec26976f76a60ec51d758af9d60126b3538";
+            };
+            beamDeps  = [
+                          table_rex_0_4_0
+                          ibrowse_4_2_2
+                          httpotion_2_2_2
+                          floki_0_7_2
+                        ];
+
+            meta = {
+              description = ''Search hex packages from terminal'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nguyenvinhlinh/HexSearcher";
+            };
+          } // packageOverrides)
+      ) {};
+
+    hex_searcher = hex_searcher_1_0_0;
+
     hexate_0_5_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -13925,6 +19713,37 @@ let
 
     hexdocset = hexdocset_1_0_0;
 
+    hipchat_logger_backend_0_1_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "hipchat_logger_backend";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "hipchat_logger_backend";
+              version = "0.1.2";
+              sha256 =
+                "211bb8e174858c7858c76f992fa7b19d9373a29d7f501b774517534af17bf590";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A logger backend for posting errors to
+                            HipChat.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/fbcouch/hipchat_logger_backend";
+            };
+          } // packageOverrides)
+      ) {};
+
+    hipchat_logger_backend = hipchat_logger_backend_0_1_2;
+
     hlc_2_0_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -13948,17 +19767,17 @@ let
 
     hlc = hlc_2_0_0;
 
-    hoax_0_11_1 = callPackage
+    hoax_0_11_2 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
           buildRebar3 ({
             name = "hoax";
-            version = "0.11.1";
+            version = "0.11.2";
             src = fetchHex {
               pkg = "hoax";
-              version = "0.11.1";
+              version = "0.11.2";
               sha256 =
-                "49476b151d5aac771fca9fc079c745339203d5a7313b357e90942b5d929d0110";
+                "fca0d9056201e671719736b4f86fe2b8da6f8b42d88b28b1bcb2b307586928a8";
             };
 
             meta = {
@@ -13969,7 +19788,7 @@ let
           } // packageOverrides)
       ) {};
 
-    hoax = hoax_0_11_1;
+    hoax = hoax_0_11_2;
 
     holidays_0_1_1 = callPackage
       (
@@ -13995,6 +19814,40 @@ let
 
     holidays = holidays_0_1_1;
 
+    honeybadger_0_5_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          plug_1_1_5,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "honeybadger";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "honeybadger";
+              version = "0.5.0";
+              sha256 =
+                "a19b507955a229276af2af14b4a324d4b352d17b468e9c29215e1637bd493c42";
+            };
+            beamDeps  = [ poison_2_1_0 plug_1_1_5 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''Elixir client, Plug and error_logger for
+                                integrating with the Honeybadger.io exception
+                                tracker'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/honeybadger-io/honeybadger-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    honeybadger = honeybadger_0_5_0;
+
     hooks_1_1_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -14018,6 +19871,37 @@ let
 
     hooks = hooks_1_1_1;
 
+    hound_1_0_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "hound";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "hound";
+              version = "1.0.0";
+              sha256 =
+                "433c541048096b864f4a346231967d63f4acfcc32fd280f80505b95a2f9738a4";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Webdriver library for integration testing and
+                            browser automation'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/HashNuke/hound";
+            };
+          } // packageOverrides)
+      ) {};
+
+    hound = hound_1_0_0;
+
     hpack_1_0_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -14091,6 +19975,52 @@ let
 
     html_entities = html_entities_0_3_0;
 
+    html_sanitize_ex_0_1_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, mochiweb_2_12_2 }:
+          buildMix ({
+            name = "html_sanitize_ex";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "html_sanitize_ex";
+              version = "0.1.2";
+              sha256 =
+                "e6937b25832bcdccb8b547632428de7fe034199c871f037311d4340c345348a7";
+            };
+            beamDeps  = [ mochiweb_2_12_2 ];
+
+            meta = {
+              description = ''HTML sanitizer for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rrrene/html_sanitize_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    html_sanitize_ex_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, mochiweb_2_12_2 }:
+          buildMix ({
+            name = "html_sanitize_ex";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "html_sanitize_ex";
+              version = "1.0.0";
+              sha256 =
+                "5bf36372dafe900da8d9613502ce4efad3d885af5beb0d298386da0b6a1dbbc6";
+            };
+            beamDeps  = [ mochiweb_2_12_2 ];
+
+            meta = {
+              description = ''HTML sanitizer for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rrrene/html_sanitize_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    html_sanitize_ex = html_sanitize_ex_1_0_0;
+
     html_to_pdf_0_5_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -14138,6 +20068,30 @@ let
 
     http2 = http2_0_0_2;
 
+    http_digex_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "http_digex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "http_digex";
+              version = "0.0.1";
+              sha256 =
+                "43bca23be7809bd4e2a5efa23d294117457192c98bd1cdf6b90b61285bc4109a";
+            };
+
+            meta = {
+              description = ''A module to create basic digest http auth
+                            header'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/techgaun/http_digex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    http_digex = http_digex_0_0_1;
+
     http_params_serializer_0_1_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -14164,6 +20118,40 @@ let
 
     http_params_serializer = http_params_serializer_0_1_1;
 
+    http_proxy_1_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_5,
+          hackney_1_6_0,
+          exjsx_3_2_0,
+          cowboy_1_0_4
+        }:
+          buildMix ({
+            name = "http_proxy";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "http_proxy";
+              version = "1.0.2";
+              sha256 =
+                "157f7a75f41f9f1532244c0eb1587fa638518c2e9b0f95aaaf3f6d1489ec94e3";
+            };
+            beamDeps  = [ plug_1_1_5 hackney_1_6_0 exjsx_3_2_0 cowboy_1_0_4
+                      ];
+
+            meta = {
+              description = ''Multi port HTTP Proxy and support record/play
+                            request.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KazuCocoa/http_proxy";
+            };
+          } // packageOverrides)
+      ) {};
+
+    http_proxy = http_proxy_1_0_2;
+
     http_router_0_0_8 = callPackage
       (
         {
@@ -14172,7 +20160,7 @@ let
           fetchHex,
           xml_builder_0_0_8,
           poison_1_5_2,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -14185,7 +20173,7 @@ let
                 "9a2844cc8c880621ca2689e0056f50e2c19e3b0e87a8e2524489459b377a8dc3";
             };
             beamDeps  = [
-                          xml_builder_0_0_8 poison_1_5_2 plug_1_1_3 cowboy_1_0_4
+                          xml_builder_0_0_8 poison_1_5_2 plug_1_1_5 cowboy_1_0_4
                         ];
 
             meta = {
@@ -14203,8 +20191,8 @@ let
 
     http_signature_1_1_0 = callPackage
       (
-        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
-          buildErlangMk ({
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "http_signature";
             version = "1.1.0";
             src = fetchHex {
@@ -14257,6 +20245,102 @@ let
 
     httparrot = httparrot_0_3_4;
 
+    httpehaviour_0_9_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, hackney_1_6_0 }:
+          buildMix ({
+            name = "httpehaviour";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "httpehaviour";
+              version = "0.9.0";
+              sha256 =
+                "54e93dcf0e62d392781078cf029478194797fe67c98dffe99a91b5d5ec33e4e5";
+            };
+            beamDeps  = [ hackney_1_6_0 ];
+
+            meta = {
+              description = ''Yet Yet Another HTTP client for Elixir powered by
+                            hackney'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/httpehaviour";
+            };
+          } // packageOverrides)
+      ) {};
+
+    httpehaviour = httpehaviour_0_9_0;
+
+    httplacebo_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "httplacebo";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "httplacebo";
+              version = "0.1.0";
+              sha256 =
+                "0f1873e65bb97227d43b5c6fc2138f33ef83f90cd068d9a9aee06ed8ef44a7ec";
+            };
+
+            meta = {
+              description = ''The `do nothing` HTTP client for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/guilleiguaran/httplacebo";
+            };
+          } // packageOverrides)
+      ) {};
+
+    httplacebo = httplacebo_0_1_0;
+
+    httpoison_0_8_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, hackney_1_5_7 }:
+          buildMix ({
+            name = "httpoison";
+            version = "0.8.2";
+            src = fetchHex {
+              pkg = "httpoison";
+              version = "0.8.2";
+              sha256 =
+                "00738e34fe2e254199c0324ef60b8150a7b2ced66c2296c4df8425c8e9b8d5c0";
+            };
+            beamDeps  = [ hackney_1_5_7 ];
+
+            meta = {
+              description = ''Yet Another HTTP client for Elixir powered by
+                            hackney'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/httpoison";
+            };
+          } // packageOverrides)
+      ) {};
+
+    httpoison_0_8_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, hackney_1_6_0 }:
+          buildMix ({
+            name = "httpoison";
+            version = "0.8.3";
+            src = fetchHex {
+              pkg = "httpoison";
+              version = "0.8.3";
+              sha256 =
+                "74f2103e6eff47dcc2b288e37f42629874df3e4a4dce5fbc9dea508de4785e06";
+            };
+            beamDeps  = [ hackney_1_6_0 ];
+
+            meta = {
+              description = ''Yet Another HTTP client for Elixir powered by
+                            hackney'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/httpoison";
+            };
+          } // packageOverrides)
+      ) {};
+
+    httpoison = httpoison_0_8_3;
+
     httpotion_2_2_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, ibrowse_4_2_2 }:
@@ -14280,7 +20364,30 @@ let
           } // packageOverrides)
       ) {};
 
-    httpotion = httpotion_2_2_2;
+    httpotion_3_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, ibrowse_4_2_2 }:
+          buildMix ({
+            name = "httpotion";
+            version = "3.0.0";
+            src = fetchHex {
+              pkg = "httpotion";
+              version = "3.0.0";
+              sha256 =
+                "ca6364eaa9737ba305307e17d0277c80e57003fc0934b99f6a5048d7a4f932b8";
+            };
+            beamDeps  = [ ibrowse_4_2_2 ];
+
+            meta = {
+              description = ''Fancy HTTP client for Elixir, based on
+                            ibrowse.'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/myfreeweb/httpotion";
+            };
+          } // packageOverrides)
+      ) {};
+
+    httpotion = httpotion_3_0_0;
 
     huami_0_0_1 = callPackage
       (
@@ -14306,6 +20413,37 @@ let
 
     huami = huami_0_0_1;
 
+    huex_0_5_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          json_0_3_3,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "huex";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "huex";
+              version = "0.5.0";
+              sha256 =
+                "e5fe37fdc4299567922697516df8ade2f64d2c1573dc9a253e5037f66576858f";
+            };
+            beamDeps  = [ json_0_3_3 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir client for Philips Hue connected light
+                            bulbs'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/xavier/huex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    huex = huex_0_5_0;
+
     hufflehoff_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -14376,6 +20514,72 @@ let
 
     hulaaki = hulaaki_0_0_2;
 
+    hyde_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, exredis_0_2_4 }:
+          buildMix ({
+            name = "hyde";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "hyde";
+              version = "0.0.1";
+              sha256 =
+                "d4424adbf13e2aecafa38f73318885f56bd70eb8e5fede22858af8cf76e2475e";
+            };
+            beamDeps  = [ exredis_0_2_4 ];
+
+            meta = {
+              longDescription = ''Feature Toggles for Elixir - Basic Redis
+                                backed feature toggles for individual users or
+                                named groups'';
+
+              homepage = "https://github.com/beautifulcode/hyde";
+            };
+          } // packageOverrides)
+      ) {};
+
+    hyde = hyde_0_0_1;
+
+    hydra_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          porcelain_2_0_1,
+          poison_1_5_2,
+          plug_1_1_5,
+          httpoison_0_8_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
+            name = "hydra";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "hydra";
+              version = "0.0.1";
+              sha256 =
+                "ea35ec756dfaa0390ba53a0313bb50b924517f746922a98e3489bddf8e066b7d";
+            };
+            beamDeps  = [
+                          porcelain_2_0_1
+                          poison_1_5_2
+                          plug_1_1_5
+                          httpoison_0_8_3
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              description = ''A multi-headed beast: API gateway, request cache,
+                            and data transformations'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/doomspork/hydra";
+            };
+          } // packageOverrides)
+      ) {};
+
+    hydra = hydra_0_0_1;
+
     hypermedia_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -14400,9 +20604,83 @@ let
 
     hypermedia = hypermedia_0_0_1;
 
+    hypermock_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, meck_0_8_4 }:
+          buildMix ({
+            name = "hypermock";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "hypermock";
+              version = "0.0.2";
+              sha256 =
+                "dbb7ad24f651a3bb99475f39f9b0d6b7e9b3f959d8a80577ea6c803a5b548516";
+            };
+            beamDeps  = [ meck_0_8_4 ];
+
+            meta = {    };
+          } // packageOverrides)
+      ) {};
+
+    hypermock = hypermock_0_0_2;
+
+    hypex_1_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "hypex";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "hypex";
+              version = "1.1.0";
+              sha256 =
+                "32e153bee0dabea8941940711c9ed9a7e15c50fc3d474c5b75b14359fb408363";
+            };
+
+            meta = {
+              description = ''Fast HyperLogLog implementation for
+                            Elixir/Erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zackehh/hypex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    hypex = hypex_1_1_0;
+
+    i18n_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          tipo_0_0_3,
+          exprintf_0_1_6
+        }:
+          buildMix ({
+            name = "i18n";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "i18n";
+              version = "0.0.2";
+              sha256 =
+                "d3fbaccb502540565a9659fd21cff930b12ee698bfdac6d3df6487e2c101891f";
+            };
+            beamDeps  = [ tipo_0_0_3 exprintf_0_1_6 ];
+
+            meta = {
+              description = ''i18n locale translations helpers'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nathanfaucett/ex-i18n";
+            };
+          } // packageOverrides)
+      ) {};
+
+    i18n = i18n_0_0_2;
+
     iam_role_1_0_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, jsone_1_2_1 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, jsone_1_2_3 }:
           buildMix ({
             name = "iam_role";
             version = "1.0.0";
@@ -14412,7 +20690,7 @@ let
               sha256 =
                 "acfc5d5c5130a36dfb2b460f790bd9e32bf39274f17333bd65c28d216983761d";
             };
-            beamDeps  = [ jsone_1_2_1 ];
+            beamDeps  = [ jsone_1_2_3 ];
 
             meta = {
               description = ''Application for automatically fetching AWS IAM
@@ -14472,6 +20750,31 @@ let
 
     identicon = identicon_0_2_0;
 
+    idfk_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_2_1_6 }:
+          buildMix ({
+            name = "idfk";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "idfk";
+              version = "0.1.0";
+              sha256 =
+                "dab162904f49c852db763719364d5b3e6d75bfc319fe3d8f5179c6bb656acf6d";
+            };
+            beamDeps  = [ timex_2_1_6 ];
+
+            meta = {
+              description = ''The library of Elixir chunks of code that didn`t
+                            clearly belong anywhere else.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/amorphid/idfk";
+            };
+          } // packageOverrides)
+      ) {};
+
+    idfk = idfk_0_1_0;
+
     idna_1_0_2 = callPackage
       (
         {  buildErlangMk, packageOverrides ? {}, fetchHex }:
@@ -14674,6 +20977,52 @@ let
 
     immortal = immortal_0_2_0;
 
+    inaka_aleppo_1_0_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "inaka_aleppo";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "inaka_aleppo";
+              version = "1.0.0";
+              sha256 =
+                "06754b98702607ec742d8315b2e79188b38fbb60e3f1a1582de5673e230f74d4";
+            };
+
+            meta = {
+              description = ''Aleppo: ALternative Erlang Pre-ProcessOr'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/inaka/aleppo";
+            };
+          } // packageOverrides)
+      ) {};
+
+    inaka_aleppo = inaka_aleppo_1_0_0;
+
+    inaka_mixer_0_1_5 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "inaka_mixer";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "inaka_mixer";
+              version = "0.1.5";
+              sha256 =
+                "37af35b1c17a94a0cb643cba23cba2ca68d6fe51c3ad8337629d4c3c017cc912";
+            };
+
+            meta = {
+              description = ''Mix in public functions from external modules'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/inaka/mixer";
+            };
+          } // packageOverrides)
+      ) {};
+
+    inaka_mixer = inaka_mixer_0_1_5;
+
     indefinite_article_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -14723,28 +21072,138 @@ let
 
     inet_cidr = inet_cidr_1_0_1;
 
-    inflex_0_2_4 = callPackage
+    inflect_0_0_11 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
-            name = "inflex";
-            version = "0.2.4";
+            name = "inflect";
+            version = "0.0.11";
             src = fetchHex {
-              pkg = "inflex";
-              version = "0.2.4";
+              pkg = "inflect";
+              version = "0.0.11";
               sha256 =
-                "f4bf8389a59b04f2b92be024d6234fc3583863f06d23db70324f9cb6b5eba8bf";
+                "36636ccb31b1ca9f34d95af8fff97aa68d34d925c5128dc8f04fc77764fa208a";
             };
 
             meta = {
-              description = ''An Elixir library for handling word
-                            inflections.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/nurugger07/inflex";
+              description = ''case sensitive regular expression for splitting
+                            strings'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nathanfaucett/ex-inflect";
             };
           } // packageOverrides)
       ) {};
 
+    inflect = inflect_0_0_11;
+
+    inflections_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, inflector_0_0_11 }:
+          buildMix ({
+            name = "inflections";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "inflections";
+              version = "0.0.1";
+              sha256 =
+                "f1fe5f35313eb1bd6bfc3a0d5e3bd169a31bfbf09021b9928ecfff3052731efc";
+            };
+            beamDeps  = [ inflector_0_0_11 ];
+
+            meta = {
+              description = ''inflector helpers for managing different
+                            locales'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nathanfaucett/ex-inflections";
+            };
+          } // packageOverrides)
+      ) {};
+
+    inflections = inflections_0_0_1;
+
+    inflections_en_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          inflector_0_0_11,
+          inflections_0_0_1
+        }:
+          buildMix ({
+            name = "inflections_en";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "inflections_en";
+              version = "0.0.1";
+              sha256 =
+                "28c8e2f52974879499ea039bc8bf369b75e978f4ee60de8641e7efdef575bd77";
+            };
+            beamDeps  = [ inflector_0_0_11 inflections_0_0_1 ];
+
+            meta = {
+              description = ''inflector english rules'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nathanfaucett/ex-inflections_en";
+            };
+          } // packageOverrides)
+      ) {};
+
+    inflections_en = inflections_en_0_0_1;
+
+    inflections_es_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          inflector_0_0_11,
+          inflections_0_0_1
+        }:
+          buildMix ({
+            name = "inflections_es";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "inflections_es";
+              version = "0.0.1";
+              sha256 =
+                "28c6323f851d2287f77d7dd0b888e9888f5f785ff105a356078aff4a46544495";
+            };
+            beamDeps  = [ inflector_0_0_11 inflections_0_0_1 ];
+
+            meta = {
+              description = ''inflector spanish rules'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nathanfaucett/ex-inflections_es";
+            };
+          } // packageOverrides)
+      ) {};
+
+    inflections_es = inflections_es_0_0_1;
+
+    inflector_0_0_11 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "inflector";
+            version = "0.0.11";
+            src = fetchHex {
+              pkg = "inflector";
+              version = "0.0.11";
+              sha256 =
+                "4abd1e267d0df9536d3f54c579d74a0951fbbc6100e4b034a0905d99296a9e08";
+            };
+
+            meta = {
+              description = ''simple rule based inflector'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nathanfaucett/ex-inflector";
+            };
+          } // packageOverrides)
+      ) {};
+
+    inflector = inflector_0_0_11;
+
     inflex_0_3_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -14886,6 +21345,37 @@ let
 
     insert_ordered_set = insert_ordered_set_0_0_1;
 
+    insight_0_1_4 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "insight";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "insight";
+              version = "0.1.4";
+              sha256 =
+                "97b4bfd6f0b595b3febca7ea2f0bdf5cb429c18309f7acc8a2a308847aaded07";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir package for consuming any Insight-powered
+                            Bitcoin explorer.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stampery/elixir-insight";
+            };
+          } // packageOverrides)
+      ) {};
+
+    insight = insight_0_1_4;
+
     insights_0_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -14934,6 +21424,56 @@ let
 
     instrumental = instrumental_0_1_3;
 
+    ip2location_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, poolboy_1_5_1 }:
+          buildMix ({
+            name = "ip2location";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ip2location";
+              version = "0.1.0";
+              sha256 =
+                "77e059326d6c3f1348c53b3486dfa59d2b0ad90c999f51da86cabbb2d0099685";
+            };
+            beamDeps  = [ poolboy_1_5_1 ];
+
+            meta = {
+              description = ''An Elixir library for the IP2Location
+                            database.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/nazipov/ip2location-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ip2location = ip2location_0_1_0;
+
+    ipa_0_0_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "ipa";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "ipa";
+              version = "0.0.3";
+              sha256 =
+                "ff365e6ec32ae9159877fb464c6754387fe97168e15a0ce7de346106ec6d75a6";
+            };
+
+            meta = {
+              longDescription = ''A pale, hoppy library for working with IP
+                                Addresses. Validate and transform IPv4 addresses
+                                and subnet masks.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bordeltabernacle/IPA";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ipa = ipa_0_0_3;
+
     iplist_1_0_2 = callPackage
       (
         {
@@ -14965,17 +21505,17 @@ let
 
     iplist = iplist_1_0_2;
 
-    iptools_0_0_1 = callPackage
+    iptools_0_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "iptools";
-            version = "0.0.1";
+            version = "0.0.2";
             src = fetchHex {
               pkg = "iptools";
-              version = "0.0.1";
+              version = "0.0.2";
               sha256 =
-                "c8733e46e083c7497f3293e6e366e6fe384abb67557a72c3e362434e4eb0665d";
+                "33bf27bc72094bbc4e67c664c979e5cebfe17c5369c91fc2e2610cc726b252db";
             };
 
             meta = {
@@ -14987,7 +21527,7 @@ let
           } // packageOverrides)
       ) {};
 
-    iptools = iptools_0_0_1;
+    iptools = iptools_0_0_2;
 
     is_chinese_1_0_0 = callPackage
       (
@@ -15036,17 +21576,17 @@ let
 
     is_email = is_email_0_0_2;
 
-    is_up_1_0_0 = callPackage
+    is_up_1_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, httpotion_2_2_2 }:
           buildMix ({
             name = "is_up";
-            version = "1.0.0";
+            version = "1.0.2";
             src = fetchHex {
               pkg = "is_up";
-              version = "1.0.0";
+              version = "1.0.2";
               sha256 =
-                "8811dde26c0142174987941b6395e1934e54c3a88db1d5b19e38b6f794e93c87";
+                "e73713422ef99f9788d130eec1fd880ea15cc5e023137658263fe94bd12a56e1";
             };
             beamDeps  = [ httpotion_2_2_2 ];
 
@@ -15058,7 +21598,7 @@ let
           } // packageOverrides)
       ) {};
 
-    is_up = is_up_1_0_0;
+    is_up = is_up_1_0_2;
 
     is_url_0_0_1 = callPackage
       (
@@ -15112,25 +21652,55 @@ let
 
     isaac = isaac_0_0_1;
 
-    iso3166_0_0_3 = callPackage
+    isbndbex_0_1_0 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
           poison_2_1_0,
-          floki_0_8_0
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "isbndbex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "isbndbex";
+              version = "0.1.0";
+              sha256 =
+                "5c9fe6840a3beadb78a3b5f8d243475258d9d117ef0976cceb0d4c464a4cf4f4";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir wrapper for isbndb rest api.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rcoedo/isbndbex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    isbndbex = isbndbex_0_1_0;
+
+    iso3166_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          floki_0_8_1
         }:
           buildMix ({
             name = "iso3166";
-            version = "0.0.3";
+            version = "0.0.4";
             src = fetchHex {
               pkg = "iso3166";
-              version = "0.0.3";
+              version = "0.0.4";
               sha256 =
-                "9d531b578e4535fd7b85d8f50da3374d057ae7b7c7ecc522710eb7f638660b79";
+                "fde520eac52e491e0492a42a8f5f00b03435733e81f35e58685998e9142c4215";
             };
-            beamDeps  = [ poison_2_1_0 floki_0_8_0 ];
+            beamDeps  = [ poison_2_1_0 floki_0_8_1 ];
 
             meta = {
               longDescription = ''A library that provides a list of ISO3166
@@ -15143,7 +21713,91 @@ let
           } // packageOverrides)
       ) {};
 
-    iso3166 = iso3166_0_0_3;
+    iso3166 = iso3166_0_0_4;
+
+    janrain_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
+          buildMix ({
+            name = "janrain";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "janrain";
+              version = "0.0.1";
+              sha256 =
+                "35299ee088dfd5647e7a5cd129d5011f2d6319fe53045b2a8ce3ddf70792cc78";
+            };
+            beamDeps  = [ httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''A small library to help with Janrain logins.
+                                Probably most useful when used in conjuction
+                                with Phoenix and Guardian.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rickr/janrain";
+            };
+          } // packageOverrides)
+      ) {};
+
+    janrain = janrain_0_0_1;
+
+    japan_municipality_code_1_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "japan_municipality_code";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "japan_municipality_code";
+              version = "1.0.1";
+              sha256 =
+                "b03879f6a716f04579d19c9be818b0e3780b61ab2e79057ed3a7f64e576b5378";
+            };
+
+            meta = {
+              description = ''Elixir Library for Japan municipality key
+                            converting'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hykw/japan_municipality_key";
+            };
+          } // packageOverrides)
+      ) {};
+
+    japan_municipality_code = japan_municipality_code_1_0_1;
+
+    jc_1_2_0 = callPackage
+      (
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          ranch_1_1_0,
+          lager_3_0_1,
+          jwalk_1_1_0,
+          jsone_1_2_0
+        }:
+          buildRebar3 ({
+            name = "jc";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "jc";
+              version = "1.2.0";
+              sha256 =
+                "cbc043e4d0e6b1ccd6279426babcfd73ac186f9ddf780c0bff24f7e586aa3a6c";
+            };
+
+            beamDeps  = [ ranch_1_1_0 lager_3_0_1 jwalk_1_1_0 jsone_1_2_0 ];
+
+            meta = {
+              description = ''A simple, distributed, in-memory caching
+                            system'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jr0senblum/jc";
+            };
+          } // packageOverrides)
+      ) {};
+
+    jc = jc_1_2_0;
 
     jequalson_0_1_1 = callPackage
       (
@@ -15193,33 +21847,40 @@ let
 
     jesse = jesse_0_1_3;
 
-    jiffy_0_14_7 = callPackage
+    jira_0_0_8 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "jiffy";
-            version = "0.14.7";
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "jira";
+            version = "0.0.8";
             src = fetchHex {
-              pkg = "jiffy";
-              version = "0.14.7";
+              pkg = "jira";
+              version = "0.0.8";
               sha256 =
-                "2b3b0f7976dae9c8266036e0d7e0398b64ac5207e3beee4c57896e44b2c17e97";
+                "71c19ef23ea7351a2dc7b8f14d0c5794ff00382fa43a88a2235ec9c1741a73cb";
             };
-            compilePorts = true;
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
 
             meta = {
-              description = ''JSON Decoder/Encoder.'';
-              license = with stdenv.lib.licenses; [ mit bsd3 ];
-              homepage = "https://github.com/davisp/jiffy";
+              description = ''An Elixir client library for JIRA + JIRA Agile /
+                            Greenhopper'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeffweiss/jira";
             };
           } // packageOverrides)
       ) {};
 
-    jiffy = jiffy_0_14_7;
+    jira = jira_0_0_8;
 
     jobspool_0_1_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_4 }:
           buildMix ({
             name = "jobspool";
             version = "0.1.0";
@@ -15229,7 +21890,7 @@ let
               sha256 =
                 "f4ba59374f844fe8ac018606748b120b7860c0f568364514d1dc87eb42829aad";
             };
-            beamDeps  = [ uuid_1_1_3 ];
+            beamDeps  = [ uuid_1_1_4 ];
 
             meta = {
               description = ''Simple Elixir jobs pool'';
@@ -15241,27 +21902,6 @@ let
 
     jobspool = jobspool_0_1_0;
 
-    joken_0_13_1 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "joken";
-            version = "0.13.1";
-            src = fetchHex {
-              pkg = "joken";
-              version = "0.13.1";
-              sha256 =
-                "f9fd7803403651c891332aabc1f97ca87ad8f01be1262d5a9a51da7987e08163";
-            };
-
-            meta = {
-              description = ''JWT Library for Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/bryanjos/joken";
-            };
-          } // packageOverrides)
-      ) {};
-
     joken_0_16_1 = callPackage
       (
         {
@@ -15269,8 +21909,8 @@ let
           packageOverrides ? {},
           fetchHex,
           poison_1_5_2,
-          plug_1_1_3,
-          jose_1_7_3
+          plug_1_1_5,
+          jose_1_7_5
         }:
           buildMix ({
             name = "joken";
@@ -15281,7 +21921,7 @@ let
               sha256 =
                 "a804bfd350f61688f6ce8d9898bc17fd4b59990c054debeea44234d53048d93d";
             };
-            beamDeps  = [ poison_1_5_2 plug_1_1_3 jose_1_7_3 ];
+            beamDeps  = [ poison_1_5_2 plug_1_1_5 jose_1_7_5 ];
 
             meta = {
               description = ''JWT Library for Elixir'';
@@ -15298,7 +21938,7 @@ let
           packageOverrides ? {},
           fetchHex,
           poison_1_5_2,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -15310,7 +21950,7 @@ let
               sha256 =
                 "922498b234a1b0a813255d3abf5caa64a9afdc41eb4d8d71f87d71c41fe792e8";
             };
-            beamDeps  = [ poison_1_5_2 plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ poison_1_5_2 plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''A full REST JSON API with zero coding,
@@ -15371,17 +22011,17 @@ let
           } // packageOverrides)
       ) {};
 
-    jose_1_7_3 = callPackage
+    jose_1_7_5 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, base64url_0_0_1 }:
           buildMix ({
             name = "jose";
-            version = "1.7.3";
+            version = "1.7.5";
             src = fetchHex {
               pkg = "jose";
-              version = "1.7.3";
+              version = "1.7.5";
               sha256 =
-                "d77d20c25873a138da8a64eb867c4115ba9cf44b74c00be2bc255e363da727c8";
+                "c473f64b03fb4541b8b3f56982e563d1090a1168d0dc154e6275135515c4b65d";
             };
             beamDeps  = [ base64url_0_0_1 ];
 
@@ -15394,7 +22034,7 @@ let
           } // packageOverrides)
       ) {};
 
-    jose = jose_1_7_3;
+    jose = jose_1_7_5;
 
     jsex_2_0_0 = callPackage
       (
@@ -15444,6 +22084,29 @@ let
 
     json = json_0_3_3;
 
+    json_api_assert_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "json_api_assert";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "json_api_assert";
+              version = "0.0.1";
+              sha256 =
+                "b85f48d26e62977b77ed0a8a62b2079ae9e1ddd6dfba988a13b3366cb6dfd51e";
+            };
+
+            meta = {
+              description = ''assertions for JSON API payload'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/DockYard/json_api_assert";
+            };
+          } // packageOverrides)
+      ) {};
+
+    json_api_assert = json_api_assert_0_0_1;
+
     json_diff_ex_0_5_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -15467,17 +22130,17 @@ let
 
     json_diff_ex = json_diff_ex_0_5_0;
 
-    json_logger_0_5_1 = callPackage
+    json_logger_0_6_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, json_0_3_3 }:
           buildMix ({
             name = "json_logger";
-            version = "0.5.1";
+            version = "0.6.0";
             src = fetchHex {
               pkg = "json_logger";
-              version = "0.5.1";
+              version = "0.6.0";
               sha256 =
-                "08b4868fe8396fc27fc2d248a8aedac72f8ca82a671a163cc575bfa3e8a2be93";
+                "4b3aaa23c2d0fec4fe4ba7c001ec6a72b1ae36f0268ede87557c59663843a0c3";
             };
             beamDeps  = [ json_0_3_3 ];
 
@@ -15490,7 +22153,7 @@ let
           } // packageOverrides)
       ) {};
 
-    json_logger = json_logger_0_5_1;
+    json_logger = json_logger_0_6_0;
 
     json_pointer_0_0_2 = callPackage
       (
@@ -15517,19 +22180,45 @@ let
 
     json_pointer = json_pointer_0_0_2;
 
-    json_web_token_0_2_4 = callPackage
+    json_stream_0_0_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, jsx_2_8_0 }:
+          buildMix ({
+            name = "json_stream";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "json_stream";
+              version = "0.0.1";
+              sha256 =
+                "07e2283f7f211f50d4fa686f1814f7a8b9637cfe3f358f6f15332489b2b7f2ab";
+            };
+            beamDeps  = [ jsx_2_8_0 ];
+
+            meta = {
+              longDescription = ''Small but useful wrapper above erlang `jsx`
+                                to stream json elements from an Elixir binary
+                                stream.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/json_stream";
+            };
+          } // packageOverrides)
+      ) {};
+
+    json_stream = json_stream_0_0_1;
+
+    json_web_token_0_2_5 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
           buildMix ({
             name = "json_web_token";
-            version = "0.2.4";
+            version = "0.2.5";
             src = fetchHex {
               pkg = "json_web_token";
-              version = "0.2.4";
+              version = "0.2.5";
               sha256 =
-                "49d11e61cf31e212ccd80bcffe1b9c911144c2399ec062a514394376d037fa8a";
+                "2e90fca59a7f9a4862ff8688622da5f12e880134b11ac1eb0eb0b19143d7a309";
             };
-            beamDeps  = [ poison_1_5_2 ];
+            beamDeps  = [ poison_2_1_0 ];
 
             meta = {
               description = ''Elixir implementation of the JSON Web Token
@@ -15540,21 +22229,21 @@ let
           } // packageOverrides)
       ) {};
 
-    json_web_token = json_web_token_0_2_4;
+    json_web_token = json_web_token_0_2_5;
 
-    jsonapi_0_1_0 = callPackage
+    jsonapi_0_3_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "jsonapi";
-            version = "0.1.0";
+            version = "0.3.0";
             src = fetchHex {
               pkg = "jsonapi";
-              version = "0.1.0";
+              version = "0.3.0";
               sha256 =
-                "b4c7d4797a680f23ae8dae666b4e71573f0bb3330223ebb53985e754ade265c8";
+                "f0e3c00a2af7394621695ded4e31cdf369436916ffc47347835f06616d594b33";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               longDescription = ''Fully functional JSONAPI V1 Serializer as
@@ -15566,19 +22255,19 @@ let
           } // packageOverrides)
       ) {};
 
-    jsonapi = jsonapi_0_1_0;
+    jsonapi = jsonapi_0_3_0;
 
-    jsone_1_2_1 = callPackage
+    jsone_1_2_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
           buildRebar3 ({
             name = "jsone";
-            version = "1.2.1";
+            version = "1.2.0";
             src = fetchHex {
               pkg = "jsone";
-              version = "1.2.1";
+              version = "1.2.0";
               sha256 =
-                "d7e772c545a8df144790c3891d09e3be9f917965ebc0bed301f8fd8d3b319059";
+                "a60e74284d3a923cde65c00a39dd4542fd7da7c22e8385c0378ad419c54b2e08";
             };
 
             meta = {
@@ -15589,7 +22278,49 @@ let
           } // packageOverrides)
       ) {};
 
-    jsone = jsone_1_2_1;
+    jsone_1_2_2 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "jsone";
+            version = "1.2.2";
+            src = fetchHex {
+              pkg = "jsone";
+              version = "1.2.2";
+              sha256 =
+                "253c18c7dc6fc27290b1f507f3adc6863f4396b099d0eb396e3c0e58dcfe0ee4";
+            };
+
+            meta = {
+              description = ''Erlang JSON Library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sile/jsone";
+            };
+          } // packageOverrides)
+      ) {};
+
+    jsone_1_2_3 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "jsone";
+            version = "1.2.3";
+            src = fetchHex {
+              pkg = "jsone";
+              version = "1.2.3";
+              sha256 =
+                "629369e718a50a2fcb23c210b6f2eb2fd08b0a6a2c5edade4fca24cda368ac13";
+            };
+
+            meta = {
+              description = ''Erlang JSON Library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sile/jsone";
+            };
+          } // packageOverrides)
+      ) {};
+
+    jsone = jsone_1_2_3;
 
     jsx_1_4_5 = callPackage
       (
@@ -15614,64 +22345,19 @@ let
           } // packageOverrides)
       ) {};
 
-    jsx_2_3_1 = callPackage
+    jsx_2_5_3 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
+        {  buildMix, packageOverrides ? {}, fetchHex, mixunit_0_9_2 }:
           buildMix ({
             name = "jsx";
-            version = "2.3.1";
+            version = "2.5.3";
             src = fetchHex {
               pkg = "jsx";
-              version = "2.3.1";
+              version = "2.5.3";
               sha256 =
-                "b57bc292e08c0f4a796c2d2fbb541265ff92474de294131b62468dc5ae808495";
-            };
-
-            meta = {
-              longDescription = ''an erlang application for consuming,
-                                producing and manipulating json. inspired by
-                                yajl'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/talentdeficit/jsx";
-            };
-          } // packageOverrides)
-      ) {};
-
-    jsx_2_4_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "jsx";
-            version = "2.4.0";
-            src = fetchHex {
-              pkg = "jsx";
-              version = "2.4.0";
-              sha256 =
-                "f9044993bfc94371a7757656ab4b9ba2daaad3ddc97df37c2368875eea049b19";
-            };
-
-            meta = {
-              longDescription = ''an erlang application for consuming,
-                                producing and manipulating json. inspired by
-                                yajl'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/talentdeficit/jsx";
-            };
-          } // packageOverrides)
-      ) {};
-
-    jsx_2_6_1 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "jsx";
-            version = "2.6.1";
-            src = fetchHex {
-              pkg = "jsx";
-              version = "2.6.1";
-              sha256 =
-                "5d0700bce9b5ef7c4bd5dd1004c9cc80d20a60f1bd02f8792fc3b3b2da90db59";
+                "528ab2fdadbcfe95a44ddb831724ee28d48bd3dbd11f2e8109874c855c43dd12";
             };
+            beamDeps  = [ mixunit_0_9_2 ];
 
             meta = {
               longDescription = ''an erlang application for consuming,
@@ -15685,8 +22371,8 @@ let
 
     jsx_2_6_2 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "jsx";
             version = "2.6.2";
             src = fetchHex {
@@ -15778,17 +22464,17 @@ let
 
     jsxd = jsxd_0_1_10;
 
-    junit_formatter_1_0_0 = callPackage
+    junit_formatter_1_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "junit_formatter";
-            version = "1.0.0";
+            version = "1.1.0";
             src = fetchHex {
               pkg = "junit_formatter";
-              version = "1.0.0";
+              version = "1.1.0";
               sha256 =
-                "f01064940927874ef2c3d275182822951167c7bd685f5d2b0dfcc84928fa0dcb";
+                "d173ee429c98c9829eb9b24a8615ac584b49c58c29cefc9532eff5e19404ea8b";
             };
 
             meta = {
@@ -15802,7 +22488,30 @@ let
           } // packageOverrides)
       ) {};
 
-    junit_formatter = junit_formatter_1_0_0;
+    junit_formatter = junit_formatter_1_1_0;
+
+    jwalk_1_1_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "jwalk";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "jwalk";
+              version = "1.1.0";
+              sha256 =
+                "10c150910ba3539583887cb2b5c3f70d602138471e6f6b5c22498aa18ed654e1";
+            };
+
+            meta = {
+              longDescription = ''Helper module for working with Erlang
+                                representations of JSON, handling eep-18, map,
+                                mochijson-style and proplists representations'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jr0senblum/jwalk";
+            };
+          } // packageOverrides)
+      ) {};
 
     jwalk_1_1_2 = callPackage
       (
@@ -15863,7 +22572,7 @@ let
     jwt_claims_0_0_3 = callPackage
       (
         {
-          buildMix, packageOverrides ? {}, fetchHex, json_web_token_0_2_4
+          buildMix, packageOverrides ? {}, fetchHex, json_web_token_0_2_5
         }:
           buildMix ({
             name = "jwt_claims";
@@ -15874,7 +22583,7 @@ let
               sha256 =
                 "baf94583907a4d774079a8a98c13c0cf5d306ee6211e805f156523a20658e230";
             };
-            beamDeps  = [ json_web_token_0_2_4 ];
+            beamDeps  = [ json_web_token_0_2_5 ];
 
             meta = {
               description = ''Elixir implementation of JWT registered claims,
@@ -15959,17 +22668,17 @@ let
 
     kafka_ex = kafka_ex_0_5_0;
 
-    kaguya_0_4_1 = callPackage
+    kaguya_0_4_7 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "kaguya";
-            version = "0.4.1";
+            version = "0.4.7";
             src = fetchHex {
               pkg = "kaguya";
-              version = "0.4.1";
+              version = "0.4.7";
               sha256 =
-                "071fbb9b096d2c4e987a820ea1a9d749d3da378c306053f3c44f5c9a9c748fa1";
+                "d687b8832c42e4d3d03e09e68b9df3a9bb4b208d287d8c2835170c343e2e4554";
             };
 
             meta = {
@@ -15983,130 +22692,90 @@ let
           } // packageOverrides)
       ) {};
 
-    kaguya = kaguya_0_4_1;
+    kaguya = kaguya_0_4_7;
 
-    kalecto_0_3_3 = callPackage
-      (
-        {
-          buildRebar3,
-          packageOverrides ? {},
-          fetchHex,
-          kalends_0_6_5,
-          ecto_0_16_0
-        }:
-          buildRebar3 ({
-            name = "kalecto";
-            version = "0.3.3";
-            src = fetchHex {
-              pkg = "kalecto";
-              version = "0.3.3";
-              sha256 =
-                "c83d417718f626eb43ffa5527ea25fa5348f6f24f7930d27db7556759094eb1b";
-            };
-
-            beamDeps  = [ kalends_0_6_5 ecto_0_16_0 ];
-
-            meta = {
-              longDescription = ''Library for using Kalends with Ecto. This
-                                lets you save Kalends types in Ecto and work
-                                with date-times in multiple timezones. '';
-
-              homepage = "https://github.com/lau/kalecto";
-            };
-          } // packageOverrides)
-      ) {};
-
-    kalecto = kalecto_0_3_3;
-
-    kalends_0_6_5 = callPackage
-      (
-        {
-          buildRebar3, packageOverrides ? {}, fetchHex, tzdata_0_1_201603
-        }:
-          buildRebar3 ({
-            name = "kalends";
-            version = "0.6.5";
-            src = fetchHex {
-              pkg = "kalends";
-              version = "0.6.5";
-              sha256 =
-                "b16621edbccdbe5d3f76efe03dab59292f3782d0d7e29bbe2de9943e49968fe2";
-            };
-
-            beamDeps  = [ tzdata_0_1_201603 ];
-
-            meta = {
-              longDescription = ''Kalends is a datetime library in pure Elixir
-                                with up-to-date timezone support using the Olson
-                                database. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/lau/kalends";
-            };
-          } // packageOverrides)
-      ) {};
-
-    kalends = kalends_0_6_5;
-
-    kcl_0_4_1 = callPackage
+    kcl_0_6_2 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
           salsa20_0_3_0,
-          poly1305_0_4_0,
+          poly1305_0_4_1,
+          ed25519_0_2_0,
           curve25519_0_1_0
         }:
           buildMix ({
             name = "kcl";
-            version = "0.4.1";
+            version = "0.6.2";
             src = fetchHex {
               pkg = "kcl";
-              version = "0.4.1";
+              version = "0.6.2";
               sha256 =
-                "90c2492dc4333ae444d2ec4facee567c73f061e3c10878fcd02b426e347495bc";
+                "20dfbd4fb5fd71d612d9c4989adbb35a8d1ffabc70bc0729f2648c9489344e9f";
             };
-            beamDeps  = [ salsa20_0_3_0 poly1305_0_4_0 curve25519_0_1_0 ];
+            beamDeps  = [
+                          salsa20_0_3_0
+                          poly1305_0_4_1
+                          ed25519_0_2_0
+                          curve25519_0_1_0
+                        ];
 
             meta = {
-              description = ''KCl - a poor NaCL crypto suite substitute'';
+              description = ''KCl - a less savory pure Elixir NaCl crypto suite
+                            substitute'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mwmiller/kcl";
             };
           } // packageOverrides)
       ) {};
 
-    kcl = kcl_0_4_1;
+    kcl = kcl_0_6_2;
 
-    keenex_0_2_0 = callPackage
+    kennitala_1_0_0 = callPackage
       (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          poison_1_3_1,
-          httpotion_2_2_2
-        }:
+        {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
-            name = "keenex";
-            version = "0.2.0";
+            name = "kennitala";
+            version = "1.0.0";
             src = fetchHex {
-              pkg = "keenex";
-              version = "0.2.0";
+              pkg = "kennitala";
+              version = "1.0.0";
               sha256 =
-                "5f66d942fe7066bec625985779d7e69647462e586a704e449cc7229ea752ccb9";
+                "8f22c152fb5de86455d4570ec23f96b3ee110c8f7243e9fd7ffd85fbccf63838";
             };
-            beamDeps  = [ poison_1_3_1 httpotion_2_2_2 ];
 
             meta = {
-              description = ''Keen.io API Client'';
+              longDescription = ''Elixir library for validating and handling
+                                the Icelandic Kennitala identity number.'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bryanjos/keenex";
+              homepage = "https://github.com/JonGretar/Kennitala.ex";
             };
           } // packageOverrides)
       ) {};
 
-    keenex = keenex_0_2_0;
+    kennitala = kennitala_1_0_0;
+
+    key2value_1_4_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "key2value";
+            version = "1.4.0";
+            src = fetchHex {
+              pkg = "key2value";
+              version = "1.4.0";
+              sha256 =
+                "ad63453fcf54ab853581b78c6d2df56be41ea691ba4bc05920264c19f35a0ded";
+            };
+
+            meta = {
+              description = ''Erlang 2-way Map'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/key2value";
+            };
+          } // packageOverrides)
+      ) {};
 
     key2value_1_5_1 = callPackage
       (
@@ -16131,6 +22800,37 @@ let
 
     key2value = key2value_1_5_1;
 
+    keymaster_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          plug_1_1_5
+        }:
+          buildMix ({
+            name = "keymaster";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "keymaster";
+              version = "0.0.3";
+              sha256 =
+                "93ba90778f0dbe162fde8584c1510a61fcbf0f08d20ed24ea8548a3f84790fa8";
+            };
+            beamDeps  = [ poison_2_1_0 plug_1_1_5 ];
+
+            meta = {
+              description = ''An opinionated OAuth 2.0 server for Elixir
+                            projects.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/austinsmorris/keymaster";
+            };
+          } // packageOverrides)
+      ) {};
+
+    keymaster = keymaster_0_0_3;
+
     keys1value_1_5_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -16154,6 +22854,36 @@ let
 
     keys1value = keys1value_1_5_1;
 
+    kinja_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "kinja";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "kinja";
+              version = "0.0.1";
+              sha256 =
+                "97b68a603fb5e665f07aac0396ee53d28690bdc42845c38b23741675c053b761";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A wrapper for the Kinja API.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/adampash/kinjaex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    kinja = kinja_0_0_1;
+
     kitsune_0_5_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
@@ -16180,6 +22910,67 @@ let
 
     kitsune = kitsune_0_5_2;
 
+    kitto_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          plug_1_1_5,
+          cowboy_1_0_4
+        }:
+          buildMix ({
+            name = "kitto";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "kitto";
+              version = "0.0.1";
+              sha256 =
+                "36a2c19a364fd9998ee3d0635fb6386104733d9887143f2ade8fe39f7096e635";
+            };
+            beamDeps  = [ poison_2_1_0 plug_1_1_5 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Framework for creating interactive dashboards'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kittoframework/kitto";
+            };
+          } // packageOverrides)
+      ) {};
+
+    kitto = kitto_0_0_1;
+
+    kubex_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "kubex";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "kubex";
+              version = "0.1.1";
+              sha256 =
+                "b0bd22246731b1c4d4d7f832cd0015fd6586022c779fb6672f45a648da7dcf79";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Kubernetes integration for and in pure Elixir.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/ingerslevio/kubex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    kubex = kubex_0_1_1;
+
     kwfuns_0_0_4 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -16258,32 +23049,32 @@ let
           } // packageOverrides)
       ) {};
 
-    lager = lager_3_0_2;
-
-    lager_graylog_0_1_0 = callPackage
+    lager_3_2_1 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex, lager_3_0_2 }:
+        {
+          buildRebar3, packageOverrides ? {}, fetchHex, goldrush_0_1_8
+        }:
           buildRebar3 ({
-            name = "lager_graylog";
-            version = "0.1.0";
+            name = "lager";
+            version = "3.2.1";
             src = fetchHex {
-              pkg = "lager_graylog";
-              version = "0.1.0";
+              pkg = "lager";
+              version = "3.2.1";
               sha256 =
-                "539ddc1b5a4280bf5ef8c377cfa037830a2fbe989fd378af10f5355c502fc8d9";
+                "09a751789852094bf1ffad239a602bc47829da13ca5937b9d12df27470692095";
             };
 
-            beamDeps  = [ lager_3_0_2 ];
+            beamDeps  = [ goldrush_0_1_8 ];
 
             meta = {
-              description = ''An Erlang lager_graylog library'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/esl/lager_graylog";
+              description = ''Erlang logging framework'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/basho/lager";
             };
           } // packageOverrides)
       ) {};
 
-    lager_graylog = lager_graylog_0_1_0;
+    lager = lager_3_2_1;
 
     lager_hipchat_0_2_0 = callPackage
       (
@@ -16312,7 +23103,7 @@ let
 
     lager_logger_1_0_2 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, lager_3_0_2 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, lager_3_2_1 }:
           buildMix ({
             name = "lager_logger";
             version = "1.0.2";
@@ -16322,7 +23113,7 @@ let
               sha256 =
                 "28e13b1a5d43acefdf7f49d219ecb268dd934da448d2e1d4c3f74378fdea9e89";
             };
-            beamDeps  = [ lager_3_0_2 ];
+            beamDeps  = [ lager_3_2_1 ];
 
             meta = {
               longDescription = ''LagerLogger is a lager backend that forwards
@@ -16335,37 +23126,6 @@ let
 
     lager_logger = lager_logger_1_0_2;
 
-    lager_logstash_backend_0_1_0 = callPackage
-      (
-        {
-          buildRebar3,
-          packageOverrides ? {},
-          fetchHex,
-          lager_3_0_2,
-          jsx_2_6_1
-        }:
-          buildRebar3 ({
-            name = "lager_logstash_backend";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "lager_logstash_backend";
-              version = "0.1.0";
-              sha256 =
-                "9d729050a9cae2bb965d6211d428a79838e48f8acac394f24c48e3d47e6758c9";
-            };
-
-            beamDeps  = [ lager_3_0_2 jsx_2_6_1 ];
-
-            meta = {
-              description = ''Lager Logstash Logging Backend'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/inaka/lager_logstash_backend.git";
-            };
-          } // packageOverrides)
-      ) {};
-
-    lager_logstash_backend = lager_logstash_backend_0_1_0;
-
     lasse_1_1_0 = callPackage
       (
         {  buildErlangMk, packageOverrides ? {}, fetchHex }:
@@ -16389,6 +23149,30 @@ let
 
     lasse = lasse_1_1_0;
 
+    ldap_ex_0_2_4 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "ldap_ex";
+            version = "0.2.4";
+            src = fetchHex {
+              pkg = "ldap_ex";
+              version = "0.2.4";
+              sha256 =
+                "5ecdbce6e0243f92ce012b4fdf7daff4bbf6e748d37e028a4674e1ec87d81dbe";
+            };
+
+            meta = {
+              longDescription = ''This is a binary instead of char_list version
+                                of the stock Erlang :eldap library.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/OvermindDL1/ldap_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ldap_ex = ldap_ex_0_2_4;
+
     left_pad_0_0_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -16437,10 +23221,40 @@ let
 
     leftpad = leftpad_1_0_1;
 
+    lessonly_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "lessonly";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "lessonly";
+              version = "0.0.1";
+              sha256 =
+                "a7c53da4a3153043a36636e9c9b188e7bad54caac4c994705afe4d47fd2ef111";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An Elixir wrapper for the Lesson.ly API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stevegrossi/lessonly-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    lessonly = lessonly_0_0_1;
+
     level_1_0_0 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "level";
             version = "1.0.0";
             src = fetchHex {
@@ -16555,21 +23369,21 @@ let
 
     lhttpc = lhttpc_1_4_0;
 
-    librex_1_0_0 = callPackage
+    librex_1_0_1 = callPackage
       (
         {
-          buildMix, packageOverrides ? {}, fetchHex, secure_random_0_2_0
+          buildMix, packageOverrides ? {}, fetchHex, secure_random_0_3_0
         }:
           buildMix ({
             name = "librex";
-            version = "1.0.0";
+            version = "1.0.1";
             src = fetchHex {
               pkg = "librex";
-              version = "1.0.0";
+              version = "1.0.1";
               sha256 =
-                "c047e48eca2414394ecf5291e626fa813c8baaa9d35ab917dc6937f99461948c";
+                "70a33754fed13f653cc26f91bac47bef90e793f1283d0cef946d14fe17f2ff70";
             };
-            beamDeps  = [ secure_random_0_2_0 ];
+            beamDeps  = [ secure_random_0_3_0 ];
 
             meta = {
               description = ''Convert office documents to other formats using
@@ -16580,7 +23394,7 @@ let
           } // packageOverrides)
       ) {};
 
-    librex = librex_1_0_0;
+    librex = librex_1_0_1;
 
     libsnarlmatch_0_1_7 = callPackage
       (
@@ -16605,10 +23419,30 @@ let
 
     libsnarlmatch = libsnarlmatch_0_1_7;
 
+    lineo_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "lineo";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "lineo";
+              version = "0.0.1";
+              sha256 =
+                "cbf80d2a2315803949dc186decce770c6850fb45fb919982ed24da758893093a";
+            };
+
+            meta = {
+               license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/lineo";
+            };
+          } // packageOverrides)
+      ) {};
+
     lineo_0_1_0 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "lineo";
             version = "0.1.0";
             src = fetchHex {
@@ -16650,17 +23484,17 @@ let
 
     linguist = linguist_0_1_5;
 
-    liquid_0_1_0 = callPackage
+    liquid_0_2_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "liquid";
-            version = "0.1.0";
+            version = "0.2.2";
             src = fetchHex {
               pkg = "liquid";
-              version = "0.1.0";
+              version = "0.2.2";
               sha256 =
-                "f2f4e2499419de30a984b706e2119007cc9f46e79a22a865715ed040a6a1f4db";
+                "b68ae1dbc002e05028f7a74bb717d9a7863397eddde802d6ed5d96394120d1b1";
             };
 
             meta = {
@@ -16671,7 +23505,7 @@ let
           } // packageOverrides)
       ) {};
 
-    liquid = liquid_0_1_0;
+    liquid = liquid_0_2_2;
 
     lob_0_1_0 = callPackage
       (
@@ -16727,17 +23561,17 @@ let
 
     logfmt = logfmt_3_0_2;
 
-    logger_file_backend_0_0_7 = callPackage
+    logger_file_backend_0_0_8 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "logger_file_backend";
-            version = "0.0.7";
+            version = "0.0.8";
             src = fetchHex {
               pkg = "logger_file_backend";
-              version = "0.0.7";
+              version = "0.0.8";
               sha256 =
-                "135823f39e810f1826cbd6fa5e1207c6d60a6de09b563c9a204f5b55587cf5a4";
+                "1d89664561365545517114eeba9f96b193fd1f52c90b5f055b79f1e40547ffea";
             };
 
             meta = {
@@ -16748,7 +23582,56 @@ let
           } // packageOverrides)
       ) {};
 
-    logger_file_backend = logger_file_backend_0_0_7;
+    logger_file_backend = logger_file_backend_0_0_8;
+
+    logger_lager_backend_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "logger_lager_backend";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "logger_lager_backend";
+              version = "0.0.2";
+              sha256 =
+                "cd9f4c0df86d9209d905b451f4177aa0cbe341488ae36969c49af772830432a0";
+            };
+
+            meta = {
+              description = ''A Logger backend that forwards messages to
+                            lager'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/jonathanperret/logger_lager_backend";
+            };
+          } // packageOverrides)
+      ) {};
+
+    logger_lager_backend = logger_lager_backend_0_0_2;
+
+    logger_loggly_backend_0_2_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
+          buildMix ({
+            name = "logger_loggly_backend";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "logger_loggly_backend";
+              version = "0.2.0";
+              sha256 =
+                "111d0e256ace86e2af366b1afc7152b4aadd3cd6c093d5d2b119c08a84395fd6";
+            };
+            beamDeps  = [ httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Loggly logger backend'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joeyfeldberg/loggly_backend";
+            };
+          } // packageOverrides)
+      ) {};
+
+    logger_loggly_backend = logger_loggly_backend_0_2_0;
 
     logger_logstash_backend_2_0_0 = callPackage
       (
@@ -16756,7 +23639,7 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          timex_2_1_3,
+          timex_2_1_6,
           exjsx_3_1_0
         }:
           buildMix ({
@@ -16768,7 +23651,7 @@ let
               sha256 =
                 "e0c709aa8fbddd825ef5cc5287e0d04f4470498173555e07156675aeba2b2b7a";
             };
-            beamDeps  = [ timex_2_1_3 exjsx_3_1_0 ];
+            beamDeps  = [ timex_2_1_6 exjsx_3_1_0 ];
 
             meta = {
               description = ''Logstash UDP producer backend for Logger.'';
@@ -16780,17 +23663,17 @@ let
 
     logger_logstash_backend = logger_logstash_backend_2_0_0;
 
-    logger_papertrail_backend_0_0_2 = callPackage
+    logger_papertrail_backend_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "logger_papertrail_backend";
-            version = "0.0.2";
+            version = "0.1.0";
             src = fetchHex {
               pkg = "logger_papertrail_backend";
-              version = "0.0.2";
+              version = "0.1.0";
               sha256 =
-                "afc8bce277dc827172d33b20024970811950a139552ed1d0e1ea75e2860a055e";
+                "ae2bff0588a702cb3bd87080c5f4558d34efd0fbf19f976397fe9b0538b1c20b";
             };
 
             meta = {
@@ -16802,18 +23685,90 @@ let
           } // packageOverrides)
       ) {};
 
-    logger_papertrail_backend = logger_papertrail_backend_0_0_2;
+    logger_papertrail_backend = logger_papertrail_backend_0_1_0;
+
+    logglix_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
+          buildMix ({
+            name = "logglix";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "logglix";
+              version = "0.0.1";
+              sha256 =
+                "c193945b52e7fe3f6973e7defec46683b794baacd784eaa0c1f7c65978fea654";
+            };
+            beamDeps  = [ httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir loggly application event subscriber'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/pragmaticivan/logglix";
+            };
+          } // packageOverrides)
+      ) {};
+
+    logglix = logglix_0_0_1;
+
+    logi_0_5_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "logi";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "logi";
+              version = "0.5.0";
+              sha256 =
+                "45619004d3735f27e6f397ba0696c5fc6ea1ee89e037fd50847d975e0330de8f";
+            };
+
+            meta = {
+              description = ''A Logger Interface Library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sile/logi";
+            };
+          } // packageOverrides)
+      ) {};
+
+    logi = logi_0_5_0;
+
+    logi_stdlib_0_1_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex, logi_0_5_0 }:
+          buildRebar3 ({
+            name = "logi_stdlib";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "logi_stdlib";
+              version = "0.1.0";
+              sha256 =
+                "a2e12cf14fe6660e81b6351f51711c4891147eb4140d1b2b8c23007bb750312b";
+            };
+
+            beamDeps  = [ logi_0_5_0 ];
+
+            meta = {
+              description = ''Standard Library for logi'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sile/logi_stdlib";
+            };
+          } // packageOverrides)
+      ) {};
+
+    logi_stdlib = logi_stdlib_0_1_0;
 
     lolcat_0_0_1 = callPackage
       (
         {
-          buildRebar3,
+          buildMix,
           packageOverrides ? {},
           fetchHex,
           quickrand_1_5_1,
           colorful_0_6_0
         }:
-          buildRebar3 ({
+          buildMix ({
             name = "lolcat";
             version = "0.0.1";
             src = fetchHex {
@@ -16822,7 +23777,6 @@ let
               sha256 =
                 "884799d2e7f294a6a5455e19c9816592d7b1314cefaba18952876fef0c4a10af";
             };
-
             beamDeps  = [ quickrand_1_5_1 colorful_0_6_0 ];
 
             meta = {
@@ -16951,17 +23905,17 @@ let
 
     luhn = luhn_0_3_1;
 
-    luhnatex_0_5_0 = callPackage
+    luhnatex_0_5_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "luhnatex";
-            version = "0.5.0";
+            version = "0.5.1";
             src = fetchHex {
               pkg = "luhnatex";
-              version = "0.5.0";
+              version = "0.5.1";
               sha256 =
-                "d2edc93e2058f1608217eb90402cc776b40f389f445e6c2a82792a0993f4b6de";
+                "f08bb73777cd8a12780ea12697064c942a08184074512d4e593443da74526eed";
             };
 
             meta = {
@@ -16972,7 +23926,7 @@ let
           } // packageOverrides)
       ) {};
 
-    luhnatex = luhnatex_0_5_0;
+    luhnatex = luhnatex_0_5_1;
 
     lz4_0_2_2 = callPackage
       (
@@ -16998,17 +23952,17 @@ let
 
     lz4 = lz4_0_2_2;
 
-    lz_string_0_0_3 = callPackage
+    lz_string_0_0_5 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "lz_string";
-            version = "0.0.3";
+            version = "0.0.5";
             src = fetchHex {
               pkg = "lz_string";
-              version = "0.0.3";
+              version = "0.0.5";
               sha256 =
-                "747ddaee6f146d6133c16c53f18ca9dc429d5c1e0ca11d8eeb322630448ec08b";
+                "318ce091382febc3ca63e0ff9bff6bda78a797dd90f2a2f95fec6d0e2757d6fa";
             };
 
             meta = {
@@ -17020,19 +23974,150 @@ let
           } // packageOverrides)
       ) {};
 
-    lz_string = lz_string_0_0_3;
+    lz_string = lz_string_0_0_5;
 
-    magic_number_0_0_1 = callPackage
+    m2x_2_0_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          json_0_3_3,
+          hackney_1_6_0
+        }:
+          buildMix ({
+            name = "m2x";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "m2x";
+              version = "2.0.0";
+              sha256 =
+                "e125cf588d48d9b04fb4a003bb62ab1a8e8df359866dba0cde6444e9fd7ce939";
+            };
+            beamDeps  = [ json_0_3_3 hackney_1_6_0 ];
+
+            meta = {
+              longDescription = ''Elixir client library for the AT&T M2X
+                                (http://m2x.att.com) API. AT&T M2X is a
+                                cloud-based fully managed time-series data
+                                storage service for network connected
+                                machine-to-machine (M2M) devices and the
+                                Internet of Things (IoT).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/attm2x/m2x-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    m2x = m2x_2_0_0;
+
+    m2x_erlang_1_3_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          jsx_2_8_0,
+          hackney_1_6_0
+        }:
+          buildMix ({
+            name = "m2x_erlang";
+            version = "1.3.1";
+            src = fetchHex {
+              pkg = "m2x_erlang";
+              version = "1.3.1";
+              sha256 =
+                "873db746f4428490670b54aabcc93fda8d94c3c4e25c94a9aef7275858a8b809";
+            };
+            beamDeps  = [ jsx_2_8_0 hackney_1_6_0 ];
+
+            meta = {
+              longDescription = ''Erlang client library for the AT&T M2X
+                                (http://m2x.att.com) API. AT&T M2X is a
+                                cloud-based fully managed time-series data
+                                storage service for network connected
+                                machine-to-machine (M2M) devices and the
+                                Internet of Things (IoT).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/attm2x/m2x-erlang";
+            };
+          } // packageOverrides)
+      ) {};
+
+    m2x_erlang = m2x_erlang_1_3_1;
+
+    maas_1_0_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          poison_2_1_0
+        }:
+          buildMix ({
+            name = "maas";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "maas";
+              version = "1.0.0";
+              sha256 =
+                "f6c2a3dd4e291b7000d45938abd975a21e055ef2eba57701ed7e0399e7a64617";
+            };
+            beamDeps  = [ httpoison_0_8_3 poison_2_1_0 ];
+
+            meta = {
+              description = ''A wrapper for the Mars Atmospheric Weather System
+                            API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lucidstack/ex-maas";
+            };
+          } // packageOverrides)
+      ) {};
+
+    maas = maas_1_0_0;
+
+    maester_1_0_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "maester";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "maester";
+              version = "1.0.0";
+              sha256 =
+                "4fa324e1545ba5805d2eef2341c9554b52a51dfd79146dc13ec4b589e55efddd";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An API of Ice and Fire client for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sotojuan/maester";
+            };
+          } // packageOverrides)
+      ) {};
+
+    maester = maester_1_0_0;
+
+    magic_number_0_0_4 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "magic_number";
-            version = "0.0.1";
+            version = "0.0.4";
             src = fetchHex {
               pkg = "magic_number";
-              version = "0.0.1";
+              version = "0.0.4";
               sha256 =
-                "aef41d128da2cc8f5a4302a15048edd5ff58fcff68e847b6a6ebb000d8d44cc1";
+                "5b6fa41f5d24c3fd2f3cf9a96fefcf762c98bdd301158a95ab5355fe4f9eb61a";
             };
 
             meta = {
@@ -17044,7 +24129,30 @@ let
           } // packageOverrides)
       ) {};
 
-    magic_number = magic_number_0_0_1;
+    magic_number = magic_number_0_0_4;
+
+    magnet_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "magnet";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "magnet";
+              version = "0.0.1";
+              sha256 =
+                "064af72e9422262813977752e2f7439501894bce48e5679576ceb93f6b649581";
+            };
+
+            meta = {
+              description = ''A magnet-uri encoder and decoder'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/gausby/magnet";
+            };
+          } // packageOverrides)
+      ) {};
+
+    magnet = magnet_0_0_1;
 
     mail_0_0_4 = callPackage
       (
@@ -17075,8 +24183,8 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          timex_2_1_3,
-          gen_smtp_0_9_0
+          timex_2_1_6,
+          gen_smtp_0_10_0
         }:
           buildMix ({
             name = "mailer";
@@ -17087,7 +24195,7 @@ let
               sha256 =
                 "08b834102ad6eb2f2a363b70939935d3d23d1e3a68d96a2a7f8730fb7834c63d";
             };
-            beamDeps  = [ timex_2_1_3 gen_smtp_0_9_0 ];
+            beamDeps  = [ timex_2_1_6 gen_smtp_0_10_0 ];
 
             meta = {
               description = ''Mailer - A simple email client'';
@@ -17099,27 +24207,6 @@ let
 
     mailer = mailer_1_0_1;
 
-    mailgun_0_0_2 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "mailgun";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "mailgun";
-              version = "0.0.2";
-              sha256 =
-                "9e00f4411d5838556d326b02038f6fa3f173a67af28148329014f9889cd4a5c4";
-            };
-
-            meta = {
-              description = ''Elixir Mailgun Client'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/chrismccord/mailgun";
-            };
-          } // packageOverrides)
-      ) {};
-
     mailgun_0_1_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
@@ -17144,38 +24231,6 @@ let
 
     mailgun = mailgun_0_1_2;
 
-    mailman_0_2_2 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          gen_smtp_0_9_0,
-          ex_doc_0_11_4,
-          earmark_0_2_1
-        }:
-          buildMix ({
-            name = "mailman";
-            version = "0.2.2";
-            src = fetchHex {
-              pkg = "mailman";
-              version = "0.2.2";
-              sha256 =
-                "3a7aaf863017c0b9d924e31ccb34649ba31bcbbd8eac4837bbe3a040c37f94ab";
-            };
-            beamDeps  = [ gen_smtp_0_9_0 ex_doc_0_11_4 earmark_0_2_1 ];
-
-            meta = {
-              description = ''Library providing a clean way of defining mailers
-                            in Elixir apps'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/kamilc/mailman";
-            };
-          } // packageOverrides)
-      ) {};
-
-    mailman = mailman_0_2_2;
-
     majremind_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -17204,7 +24259,7 @@ let
 
     mandrag_0_1_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_5 }:
           buildMix ({
             name = "mandrag";
             version = "0.1.1";
@@ -17214,7 +24269,7 @@ let
               sha256 =
                 "e9e9fcbb844a2a86ecd95f5f8fa7db9f6ff88f3e2a6dca2bd996f4f71bbf125d";
             };
-            beamDeps  = [ exrm_1_0_3 ];
+            beamDeps  = [ exrm_1_0_5 ];
 
             meta = {
               description = ''A simple, extremely assumptive deploy script for
@@ -17251,6 +24306,38 @@ let
 
     mandrake = mandrake_0_0_4;
 
+    mandrill_0_5_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          exjsx_3_2_0
+        }:
+          buildMix ({
+            name = "mandrill";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "mandrill";
+              version = "0.5.0";
+              sha256 =
+                "9fb3a65d01de47cfc979a492079960506f21f8975e37e994478a70ee04c8d9a6";
+            };
+            beamDeps  = [ httpoison_0_8_3 exjsx_3_2_0 ];
+
+            meta = {
+              longDescription = ''A Mandrill wrapper for Elixir Requires an
+                                active account with Mandrill
+                                (http://mandrill.com).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slogsdon/mandrill-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    mandrill = mandrill_0_5_0;
+
     maptu_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -17275,25 +24362,25 @@ let
 
     maptu = maptu_0_1_0;
 
-    marco_polo_0_2_1 = callPackage
+    marco_polo_0_2_2 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          decimal_1_1_1,
-          connection_1_0_0_rc_1
+          decimal_1_1_2,
+          connection_1_0_2
         }:
           buildMix ({
             name = "marco_polo";
-            version = "0.2.1";
+            version = "0.2.2";
             src = fetchHex {
               pkg = "marco_polo";
-              version = "0.2.1";
+              version = "0.2.2";
               sha256 =
-                "60730b3b488e11c91b57f0d3490baf86fd2972cd51a481480a5aec1e2aacf5fd";
+                "a3107bb545590f4533dee040432659566b9c5ddbbbdbf7d1ee92381f450c0956";
             };
-            beamDeps  = [ decimal_1_1_1 connection_1_0_0_rc_1 ];
+            beamDeps  = [ decimal_1_1_2 connection_1_0_2 ];
 
             meta = {
               description = ''Binary driver for the OrientDB database.'';
@@ -17303,21 +24390,21 @@ let
           } // packageOverrides)
       ) {};
 
-    marco_polo = marco_polo_0_2_1;
+    marco_polo = marco_polo_0_2_2;
 
-    mariaex_0_1_7 = callPackage
+    mariaex_0_4_4 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_1 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_2 }:
           buildMix ({
             name = "mariaex";
-            version = "0.1.7";
+            version = "0.4.4";
             src = fetchHex {
               pkg = "mariaex";
-              version = "0.1.7";
+              version = "0.4.4";
               sha256 =
-                "58daf08d513327b422a68de199202e6a2c1785472e2fa8d8ffe212e6ee51b1fb";
+                "fadba91ff3719ac0fae7d454abfd812819630ea9f9aec768c5321331baa38b79";
             };
-            beamDeps  = [ decimal_1_1_1 ];
+            beamDeps  = [ decimal_1_1_2 ];
 
             meta = {
               description = ''Pure elixir database driver for MariaDB /
@@ -17328,48 +24415,25 @@ let
           } // packageOverrides)
       ) {};
 
-    mariaex_0_4_3 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_1 }:
-          buildMix ({
-            name = "mariaex";
-            version = "0.4.3";
-            src = fetchHex {
-              pkg = "mariaex";
-              version = "0.4.3";
-              sha256 =
-                "5403290df22598e0152c7f1edd64f6372238055d5e72cc830780d019f4d22d57";
-            };
-            beamDeps  = [ decimal_1_1_1 ];
-
-            meta = {
-              description = ''Pure elixir database driver for MariaDB /
-                            MySQL.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/xerions/mariaex";
-            };
-          } // packageOverrides)
-      ) {};
-
-    mariaex_0_7_0 = callPackage
+    mariaex_0_7_5 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          decimal_1_1_1,
-          db_connection_0_2_4
+          decimal_1_1_2,
+          db_connection_1_0_0_rc_0
         }:
           buildMix ({
             name = "mariaex";
-            version = "0.7.0";
+            version = "0.7.5";
             src = fetchHex {
               pkg = "mariaex";
-              version = "0.7.0";
+              version = "0.7.5";
               sha256 =
-                "758c1d8a75a9ce71f047e8d54b0fa1cde518252b25aecb9b8c42f918340bdfb6";
+                "36a09e08ff2583d4cb2f9fbeec720730a04c202bb486726276368a2be1e4cb95";
             };
-            beamDeps  = [ decimal_1_1_1 db_connection_0_2_4 ];
+            beamDeps  = [ decimal_1_1_2 db_connection_1_0_0_rc_0 ];
 
             meta = {
               description = ''Pure elixir database driver for MariaDB /
@@ -17380,7 +24444,7 @@ let
           } // packageOverrides)
       ) {};
 
-    mariaex = mariaex_0_7_0;
+    mariaex = mariaex_0_7_5;
 
     marked_0_0_1 = callPackage
       (
@@ -17404,6 +24468,68 @@ let
 
     marked = marked_0_0_1;
 
+    markit_0_1_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "markit";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "markit";
+              version = "0.1.2";
+              sha256 =
+                "6304ceb1e7a5787555bc7d048bf3c9c0b432fe5378c6d630fb02d0bb871e57b5";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Access stock market data from markit.com'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/col/markit";
+            };
+          } // packageOverrides)
+      ) {};
+
+    markit = markit_0_1_2;
+
+    markit_skill_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          markit_0_1_2,
+          inflex_1_5_0,
+          alexa_0_1_14
+        }:
+          buildMix ({
+            name = "markit_skill";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "markit_skill";
+              version = "0.0.2";
+              sha256 =
+                "166d8ef88c08c21821dda379a053af761db4de5dff50226bfcb0e3a18fc855db";
+            };
+            beamDeps  = [ markit_0_1_2 inflex_1_5_0 alexa_0_1_14 ];
+
+            meta = {
+              description = ''Amazon Alexa skill that uses data from
+                            Markit.com'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/col/markit_skill";
+            };
+          } // packageOverrides)
+      ) {};
+
+    markit_skill = markit_skill_0_0_2;
+
     maru_entity_0_1_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -17426,17 +24552,17 @@ let
 
     maru_entity = maru_entity_0_1_2;
 
-    math_0_0_1 = callPackage
+    math_0_2_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "math";
-            version = "0.0.1";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "math";
-              version = "0.0.1";
+              version = "0.2.0";
               sha256 =
-                "ca9c87163b052d2c849a7b4ef3d8664f9400024f26c6add1ce200aa72604a90d";
+                "75557fb9743e866f743d894102da851531ffc69b4c0f8fdd12cd749acb1a6215";
             };
 
             meta = {
@@ -17499,7 +24625,7 @@ let
           } // packageOverrides)
       ) {};
 
-    math = math_0_0_1;
+    math = math_0_2_0;
 
     matrix_0_3_1 = callPackage
       (
@@ -17533,6 +24659,34 @@ let
 
     matrix = matrix_0_3_1;
 
+    maxwell_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, mimerl_1_0_2 }:
+          buildMix ({
+            name = "maxwell";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "maxwell";
+              version = "1.0.0";
+              sha256 =
+                "4a71f54a7645210f5274c00171a217a03a04635620d5eef52d0463a88f64d106";
+            };
+            beamDeps  = [ mimerl_1_0_2 ];
+
+            meta = {
+              longDescription = ''Maxwell is an HTTP client that provides a
+                                common interface over many adapters (such as
+                                hackney, ibrowse) and embraces the concept of
+                                Rack middleware when processing the
+                                request/response cycle.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zhongwencool/maxwell";
+            };
+          } // packageOverrides)
+      ) {};
+
+    maxwell = maxwell_1_0_0;
+
     maybe_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -17556,40 +24710,21 @@ let
 
     maybe = maybe_0_0_1;
 
-    mazurka_0_3_34 = callPackage
+    mazurka_1_0_0 = callPackage
       (
         {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          xml_builder_0_0_8,
-          poison_2_1_0,
-          plug_1_1_3,
-          mimetype_parser_0_1_2,
-          mazurka_dsl_0_1_1,
-          html_builder_0_1_1,
-          etude_0_3_7,
-          ecto_1_0_7
+          buildMix, packageOverrides ? {}, fetchHex, mimetype_parser_0_1_2
         }:
           buildMix ({
             name = "mazurka";
-            version = "0.3.34";
+            version = "1.0.0";
             src = fetchHex {
               pkg = "mazurka";
-              version = "0.3.34";
+              version = "1.0.0";
               sha256 =
-                "4efd11082e2c6af965bc2f5e282601858f5e8d78f9ace30ba7baa27b03333023";
+                "7f035374ceb139b7531ca24bd111ee25cbf3be11b45af1bbf663ed3b832e7b13";
             };
-            beamDeps  = [
-                          xml_builder_0_0_8
-                          poison_2_1_0
-                          plug_1_1_3
-                          mimetype_parser_0_1_2
-                          mazurka_dsl_0_1_1
-                          html_builder_0_1_1
-                          etude_0_3_7
-                          ecto_1_0_7
-                        ];
+            beamDeps  = [ mimetype_parser_0_1_2 ];
 
             meta = {
               description = ''hypermedia api toolkit'';
@@ -17599,7 +24734,7 @@ let
           } // packageOverrides)
       ) {};
 
-    mazurka = mazurka_0_3_34;
+    mazurka = mazurka_1_0_0;
 
     mazurka_dsl_0_1_1 = callPackage
       (
@@ -17627,7 +24762,7 @@ let
     mazurka_mediatype_0_2_0 = callPackage
       (
         {
-          buildMix, packageOverrides ? {}, fetchHex, etude_1_0_0_beta_0
+          buildMix, packageOverrides ? {}, fetchHex, etude_1_0_0_beta_2
         }:
           buildMix ({
             name = "mazurka_mediatype";
@@ -17638,7 +24773,7 @@ let
               sha256 =
                 "4ccd8b27d6405e93cb34861f211d69b79ab46c2dbc5c7874d4ee3c580a5754bb";
             };
-            beamDeps  = [ etude_1_0_0_beta_0 ];
+            beamDeps  = [ etude_1_0_0_beta_2 ];
 
             meta = {
               description = ''mazurka mediatype interface'';
@@ -17658,7 +24793,7 @@ let
           fetchHex,
           poison_1_3_1,
           mazurka_mediatype_0_2_0,
-          etude_1_0_0_beta_0
+          etude_1_0_0_beta_2
         }:
           buildMix ({
             name = "mazurka_mediatype_hyperjson";
@@ -17672,7 +24807,7 @@ let
             beamDeps  = [
                           poison_1_3_1
                           mazurka_mediatype_0_2_0
-                          etude_1_0_0_beta_0
+                          etude_1_0_0_beta_2
                         ];
 
             meta = {
@@ -17686,17 +24821,17 @@ let
 
     mazurka_mediatype_hyperjson = mazurka_mediatype_hyperjson_0_2_3;
 
-    mc_data_0_0_2 = callPackage
+    mc_data_0_0_5 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
           buildMix ({
             name = "mc_data";
-            version = "0.0.2";
+            version = "0.0.5";
             src = fetchHex {
               pkg = "mc_data";
-              version = "0.0.2";
+              version = "0.0.5";
               sha256 =
-                "8faba98530129d3a79d7a3062db1f4fa358363be1575fb28acb6e74abb031e86";
+                "0ad4b4489554951f93fc9da39b8f14e5b87dada3005d6d012528cbc387d0aa27";
             };
             beamDeps  = [ poison_2_1_0 ];
 
@@ -17709,36 +24844,7 @@ let
           } // packageOverrides)
       ) {};
 
-    mc_data = mc_data_0_0_2;
-
-    mc_protocol_0_0_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_3 }:
-          buildMix ({
-            name = "mc_protocol";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "mc_protocol";
-              version = "0.0.1";
-              sha256 =
-                "683d92c0c6efd034f56a664bcb4f21f17050a89577f4aa0200343673fd357865";
-            };
-            beamDeps  = [ uuid_1_1_3 ];
-
-            meta = {
-              longDescription = ''Implementation of the Minecraft protocol in
-                                Elixir. Aims to provide functional ways to
-                                interact with the minecraft protocol on all
-                                levels, including packet reading and writing,
-                                encryption, compression, authentication and
-                                more.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/hansihe/elixir_mc_protocol";
-            };
-          } // packageOverrides)
-      ) {};
-
-    mc_protocol = mc_protocol_0_0_1;
+    mc_data = mc_data_0_0_5;
 
     mcup_0_0_2 = callPackage
       (
@@ -17819,6 +24925,50 @@ let
 
     mdns_server_lib = mdns_server_lib_0_2_3;
 
+    meck_0_8_3 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "meck";
+            version = "0.8.3";
+            src = fetchHex {
+              pkg = "meck";
+              version = "0.8.3";
+              sha256 =
+                "53bd3873d0193d6b2b4a165cfc4b9ffc3934355c3ba19e88239ef6a027cc02b6";
+            };
+
+            meta = {
+              description = ''A mocking framework for Erlang'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/eproxus/meck";
+            };
+          } // packageOverrides)
+      ) {};
+
+    meck_0_8_4 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "meck";
+            version = "0.8.4";
+            src = fetchHex {
+              pkg = "meck";
+              version = "0.8.4";
+              sha256 =
+                "2cdfbd0edd8f62b3d2061efc03c0e490282dd2ea6de44e15d2006e83f4f8eead";
+            };
+
+            meta = {
+              description = ''A mocking framework for Erlang'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/eproxus/meck";
+            };
+          } // packageOverrides)
+      ) {};
+
+    meck = meck_0_8_4;
+
     meld_0_1_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -17849,7 +24999,7 @@ let
           packageOverrides ? {},
           fetchHex,
           poison_2_1_0,
-          plug_1_1_3
+          plug_1_1_5
         }:
           buildMix ({
             name = "mellon";
@@ -17860,7 +25010,7 @@ let
               sha256 =
                 "2b05fca901c0b9609cdd65cfb015a7646a9ec239cf1694ee8f1384a53a5ac0b4";
             };
-            beamDeps  = [ poison_2_1_0 plug_1_1_3 ];
+            beamDeps  = [ poison_2_1_0 plug_1_1_5 ];
 
             meta = {
               longDescription = ''Mellon is a Plug used in authentication of
@@ -17874,17 +25024,17 @@ let
 
     mellon = mellon_0_1_1;
 
-    mem_0_1_2 = callPackage
+    mem_0_2_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "mem";
-            version = "0.1.2";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "mem";
-              version = "0.1.2";
+              version = "0.2.0";
               sha256 =
-                "492f8bc52ca5d7ccdfdfac19d8a6f145eb9d268b712b02c207544022dfe2d42b";
+                "6a97047af66ab2c4283460ae43611c9a843abb95584dca4e648ed320c7fdfa34";
             };
 
             meta = {
@@ -17895,7 +25045,7 @@ let
           } // packageOverrides)
       ) {};
 
-    mem = mem_0_1_2;
+    mem = mem_0_2_0;
 
     memcache_client_1_1_0 = callPackage
       (
@@ -17929,36 +25079,149 @@ let
 
     memcache_client = memcache_client_1_1_0;
 
-    meta_0_0_1 = callPackage
+    merkle_0_0_4 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex, forms_0_0_1 }:
-          buildRebar3 ({
-            name = "meta";
-            version = "0.0.1";
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          sha3_1_0_0,
+          rlist_0_0_1
+        }:
+          buildMix ({
+            name = "merkle";
+            version = "0.0.4";
             src = fetchHex {
-              pkg = "meta";
-              version = "0.0.1";
+              pkg = "merkle";
+              version = "0.0.4";
               sha256 =
-                "9aa1be58e265a16eafb9092d9675427672721ca9d3c924664e561b0857c6dcb8";
+                "76e33e4736f670ac380a0e46914143ae83429f6fc2355d05dfbdf4cd8bbc29d1";
             };
-
-            buildPlugins  = [ rebar3_hex ];
-
-            beamDeps  = [ forms_0_0_1 ];
+            beamDeps  = [ sha3_1_0_0 rlist_0_0_1 ];
 
             meta = {
-              description = ''A metaprogramming library for Erlang'';
+              description = ''Implementation of binary Merkle Tree in
+                            Elixir.'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/efcasado/forms";
+              homepage = "https://github.com/stampery/elixir-merkle";
             };
           } // packageOverrides)
       ) {};
 
-    meta = meta_0_0_1;
+    merkle = merkle_0_0_4;
+
+    merkle_tree_1_1_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "merkle_tree";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "merkle_tree";
+              version = "1.1.1";
+              sha256 =
+                "6020578ceee91ae26c63aab9bf8112fbb83cc029d25e6ad4f35b2ed4bfdcaf7a";
+            };
+
+            meta = {
+              longDescription = ''A hash tree or Merkle tree is a tree in which
+                                every non-leaf node is labelled with the hash of
+                                the labels or values (in case of leaves) of its
+                                child nodes. Hash trees are useful because they
+                                allow efficient and secure verification of the
+                                contents of large data structures.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yosriady/merkle_tree";
+            };
+          } // packageOverrides)
+      ) {};
+
+    merkle_tree = merkle_tree_1_1_1;
+
+    messagepack_0_4_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "messagepack";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "messagepack";
+              version = "0.4.1";
+              sha256 =
+                "cdf2d4a2af846a8c3cd43a9f80082883ff7c2c5e221ec078375102db0fb5ca2f";
+            };
+
+            meta = {
+              description = ''MessagePack for Erlang / Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/tomaon/messagepack";
+            };
+          } // packageOverrides)
+      ) {};
+
+    messagepack = messagepack_0_4_1;
+
+    messenger_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "messenger";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "messenger";
+              version = "0.0.2";
+              sha256 =
+                "dda5b1bde69852ac8f2ae7f2d10d55209fd7b6babfc4e664779e3204a9e258b8";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Facebook messenger API client for Elixir'';
+
+            };
+          } // packageOverrides)
+      ) {};
+
+    messenger = messenger_0_0_2;
+
+    meta_inspector_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "meta_inspector";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "meta_inspector";
+              version = "0.0.2";
+              sha256 =
+                "60edc00c2af5ab30e2abebe5f40614421fde2861e147147b33ae54bf4beb180a";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''HTTP Metadata inspector'';
+              license = stdenv.lib.licenses.mit;
+            };
+          } // packageOverrides)
+      ) {};
+
+    meta_inspector = meta_inspector_0_0_2;
 
     metainvestigator_0_0_3 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, floki_0_8_0 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, floki_0_8_1 }:
           buildMix ({
             name = "metainvestigator";
             version = "0.0.3";
@@ -17968,7 +25231,7 @@ let
               sha256 =
                 "774b3973090491a9a342a68c5cf099c98581ae0f1b1d313a08a7d2030d541781";
             };
-            beamDeps  = [ floki_0_8_0 ];
+            beamDeps  = [ floki_0_8_1 ];
 
             meta = {
               description = ''A library for web scraping, inspired by
@@ -17981,6 +25244,31 @@ let
 
     metainvestigator = metainvestigator_0_0_3;
 
+    meter_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
+          buildMix ({
+            name = "meter";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "meter";
+              version = "0.1.0";
+              sha256 =
+                "029f4f4a05b10c05b45c70671a353d780964759c3f4b90cf1531c02ef5466724";
+            };
+            beamDeps  = [ httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Track your elixir application on google
+                            analytycs'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/carlo-colombo/meter";
+            };
+          } // packageOverrides)
+      ) {};
+
+    meter = meter_0_1_0;
+
     metrics_1_0_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -18025,7 +25313,29 @@ let
           } // packageOverrides)
       ) {};
 
-    metrics = metrics_1_1_0;
+    metrics_1_2_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "metrics";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "metrics";
+              version = "1.2.0";
+              sha256 =
+                "c27c7786b8ad0c5f941956fc413f7f31a2e26ba72ebf2fb1396cf363b0b9e70b";
+            };
+
+            meta = {
+              description = ''A generic interface to different metrics systems
+                            in Erlang.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/benoitc/erlang-metrics";
+            };
+          } // packageOverrides)
+      ) {};
+
+    metrics = metrics_1_2_0;
 
     metrix_0_2_0 = callPackage
       (
@@ -18078,6 +25388,69 @@ let
 
     mex = mex_0_0_5;
 
+    microformats2_0_0_5 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpotion_2_2_2,
+          floki_0_7_2
+        }:
+          buildMix ({
+            name = "microformats2";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "microformats2";
+              version = "0.0.5";
+              sha256 =
+                "890ca1812738869aa65865339a730c5542949cac4b017b25fc276e81b37157b2";
+            };
+            beamDeps  = [ httpotion_2_2_2 floki_0_7_2 ];
+
+            meta = {
+              description = ''A microformats2 parser
+                            (http://microformats.org/wiki/microformats-2) for
+                            Elixir'';
+              license = stdenv.lib.licenses.agpl3;
+              homepage = "https://github.com/ckruse/microformats2-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    microformats2 = microformats2_0_0_5;
+
+    milkpotion_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          poison_2_1_0
+        }:
+          buildMix ({
+            name = "milkpotion";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "milkpotion";
+              version = "0.0.2";
+              sha256 =
+                "1106589d5bdb3d65fd18ff997760b8c3ad9bca7744ae1a0b48b2995227f0c0fd";
+            };
+            beamDeps  = [ httpoison_0_8_3 poison_2_1_0 ];
+
+            meta = {
+              description = ''milkpotion is an api wrapper for Remember the
+                            Milk'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/croesnick/milkpotion.git";
+            };
+          } // packageOverrides)
+      ) {};
+
+    milkpotion = milkpotion_0_0_2;
+
     milliseconds_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -18104,53 +25477,53 @@ let
 
     milliseconds = milliseconds_0_0_1;
 
-    mime_0_0_1 = callPackage
+    mime_1_0_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "mime";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "mime";
-              version = "0.0.1";
-              sha256 =
-                "24098ddfbd23433846d064a337531dcd3b1c3abdad4c359bf4f1a89243270a00";
-            };
-
-            meta = {
-              description = ''A mime type module for elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/elixirdrops/mime";
-            };
-          } // packageOverrides)
-      ) {};
-
-    mime = mime_0_0_1;
-
-    mimerl_1_0_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "mimerl";
             version = "1.0.0";
             src = fetchHex {
-              pkg = "mimerl";
+              pkg = "mime";
               version = "1.0.0";
               sha256 =
-                "a30b01104a29bd3a363db8646e4ce0f7980f9ecd23a98707c46c3ced918c41b4";
+                "069f07e17e67069195b747ed8b935c547a79adf32c4f8b4cae6dec7d3f1c805c";
             };
 
-            buildPlugins  = [ rebar3_hex ];
-
-
             meta = {
-              description = ''Library to handle mimetypes'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/benoitc/mimerl";
+              description = ''A MIME type module for Elixir'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/mime";
             };
           } // packageOverrides)
       ) {};
 
+    mime = mime_1_0_0;
+
+    mime_types_0_1_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "mime_types";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "mime_types";
+              version = "0.1.1";
+              sha256 =
+                "46b4f4a52deda3ac9fa48ae6e3582efb851d6c72de4a11e4dfcc7e386dab710b";
+            };
+
+            meta = {
+              description = ''A toolbelt for working with MIME types in
+                            Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/christhekeele/mime_types";
+            };
+          } // packageOverrides)
+      ) {};
+
+    mime_types = mime_types_0_1_1;
+
     mimerl_1_0_2 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -18291,17 +25664,17 @@ let
 
     misc_random = misc_random_0_2_6;
 
-    mix_apidoc_0_1_0 = callPackage
+    mix_apidoc_0_2_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
           buildMix ({
             name = "mix_apidoc";
-            version = "0.1.0";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "mix_apidoc";
-              version = "0.1.0";
+              version = "0.2.0";
               sha256 =
-                "e22e8a2ebf33efb6feb9a7ee6ee69a2df73496c8c6793a57cd426e9e9b1ba82e";
+                "0f6119dc530050b8344e62e82b450dcd8cdad9a370d39af17420d8e7299eb059";
             };
             beamDeps  = [ poison_1_5_2 ];
 
@@ -18315,7 +25688,7 @@ let
           } // packageOverrides)
       ) {};
 
-    mix_apidoc = mix_apidoc_0_1_0;
+    mix_apidoc = mix_apidoc_0_2_0;
 
     mix_deps_tree_0_1_0 = callPackage
       (
@@ -18440,6 +25813,37 @@ let
 
     mix_test_watch = mix_test_watch_0_2_6;
 
+    mixgraph_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          json_0_3_3,
+          httpotion_2_2_2
+        }:
+          buildMix ({
+            name = "mixgraph";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "mixgraph";
+              version = "0.0.1";
+              sha256 =
+                "0c911c4e300d7e5196ff9d427b9d66d935d540309cb8a54a397641f7059f1700";
+            };
+            beamDeps  = [ json_0_3_3 httpotion_2_2_2 ];
+
+            meta = {
+              description = ''Create an interactive dependency graph for any
+                            hex package published in hex.pm'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sivsushruth/mixgraph";
+            };
+          } // packageOverrides)
+      ) {};
+
+    mixgraph = mixgraph_0_0_1;
+
     mixpanel_0_0_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, exjsx_3_1_0 }:
@@ -18465,10 +25869,71 @@ let
 
     mixpanel = mixpanel_0_0_3;
 
+    mixpanel_api_ex_0_8_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "mixpanel_api_ex";
+            version = "0.8.3";
+            src = fetchHex {
+              pkg = "mixpanel_api_ex";
+              version = "0.8.3";
+              sha256 =
+                "1ff5eb4aa333495a86868873deb8fcd04c5f2e6f2560d77ac6ccbe07e2e3d7b4";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir client for the Mixpanel API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/agevio/mixpanel_api_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    mixpanel_api_ex = mixpanel_api_ex_0_8_3;
+
+    mixpanel_data_client_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_3_1,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "mixpanel_data_client";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "mixpanel_data_client";
+              version = "0.0.2";
+              sha256 =
+                "7f3bbd608ae18153655f27bd50ea01ad85630d6c1cc6ab9ed336e95419f06c86";
+            };
+            beamDeps  = [ poison_1_3_1 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Client library for interacting with the Mixpanel
+                            Data API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeregrine/mixpanel_data_client";
+            };
+          } // packageOverrides)
+      ) {};
+
+    mixpanel_data_client = mixpanel_data_client_0_0_2;
+
     mixunit_0_9_2 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mixunit";
             version = "0.9.2";
             src = fetchHex {
@@ -18519,6 +25984,82 @@ let
 
     mmExchangeRate = mmExchangeRate_0_0_1;
 
+    mmath_0_2_0_alpha4 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "mmath";
+            version = "0.2.0-alpha4";
+            src = fetchHex {
+              pkg = "mmath";
+              version = "0.2.0-alpha4";
+              sha256 =
+                "a855fe72b1939659a2856b32c74e148ed6c1d58cfb6eea5a24787995d66c05d7";
+            };
+            compilePorts = true;
+            buildPlugins  = [ pc ];
+
+
+            meta = {
+              description = ''math library for metric sequences and binary
+                            arrays.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dalmatinerdb/mmath";
+            };
+          } // packageOverrides)
+      ) {};
+
+    mmath_0_2_0_alpha7 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "mmath";
+            version = "0.2.0-alpha7";
+            src = fetchHex {
+              pkg = "mmath";
+              version = "0.2.0-alpha7";
+              sha256 =
+                "b4d68cce7e243b4e16f7a93cbdb16605f00c469cd9ebf7aa58c8b3214f8f8868";
+            };
+            compilePorts = true;
+            buildPlugins  = [ pc ];
+
+
+            meta = {
+              description = ''math library for metric sequences and binary
+                            arrays.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dalmatinerdb/mmath";
+            };
+          } // packageOverrides)
+      ) {};
+
+    mmath = mmath_0_2_0_alpha7;
+
+    mnemonex_1_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, the_fuzz_0_3_0 }:
+          buildMix ({
+            name = "mnemonex";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "mnemonex";
+              version = "1.1.0";
+              sha256 =
+                "e3b0bf58cdee4d18cdc324d3bb6f6241724e6d38b4fcb24fc04e2dae243339b9";
+            };
+            beamDeps  = [ the_fuzz_0_3_0 ];
+
+            meta = {
+              description = ''mnemonicode encoder/decoder'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/mnemonex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    mnemonex = mnemonex_1_1_0;
+
     mnemonic_slugs_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -18543,28 +26084,81 @@ let
 
     mnemonic_slugs = mnemonic_slugs_0_0_1;
 
-    mochiweb_html_2_13_0 = callPackage
+    mochiweb_2_12_2 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
           buildRebar3 ({
-            name = "mochiweb_html";
-            version = "2.13.0";
+            name = "mochiweb";
+            version = "2.12.2";
             src = fetchHex {
-              pkg = "mochiweb_html";
-              version = "2.13.0";
+              pkg = "mochiweb";
+              version = "2.12.2";
               sha256 =
-                "c05f969fd011b357ea2f577c2b996776241d179ba2eb1bcba274cc23fdcf5439";
+                "d3e681d4054b74a96cf2efcd09e94157ab83a5f55ddc4ce69f90b8144673bd7a";
             };
 
             meta = {
-              description = ''Mochiweb HTML parser'';
+              description = ''MochiWeb is an Erlang library for building
+                            lightweight HTTP servers. '';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mochi/mochiweb";
             };
           } // packageOverrides)
       ) {};
 
-    mochiweb_html = mochiweb_html_2_13_0;
+    mochiweb = mochiweb_2_12_2;
+
+    mochiweb_html_2_15_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "mochiweb_html";
+            version = "2.15.0";
+            src = fetchHex {
+              pkg = "mochiweb_html";
+              version = "2.15.0";
+              sha256 =
+                "7651a4ef29bd6d69819b37b6aa12c7616c5cf75e67ccd849cfb499e2bbbf0ce6";
+            };
+
+            meta = {
+              description = ''Mochiweb HTML parser'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/philss/mochiweb_html";
+            };
+          } // packageOverrides)
+      ) {};
+
+    mochiweb_html = mochiweb_html_2_15_0;
+
+    mock_0_1_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, meck_0_8_4 }:
+          buildMix ({
+            name = "mock";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "mock";
+              version = "0.1.3";
+              sha256 =
+                "bf7cf50d528394d870cdecac4920ab719cec0af98eff95759b57cab0e5ee143e";
+            };
+            beamDeps  = [ meck_0_8_4 ];
+
+            meta = {
+              longDescription = ''A mocking libary for the Elixir language. We
+                                use the Erlang meck library to provide module
+                                mocking functionality for Elixir. It uses macros
+                                in Elixir to expose the functionality in a
+                                convenient manner for integrating in Elixir
+                                tests.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jjh42/mock";
+            };
+          } // packageOverrides)
+      ) {};
+
+    mock = mock_0_1_3;
 
     module_mocker_0_2_0 = callPackage
       (
@@ -18591,28 +26185,68 @@ let
 
     module_mocker = module_mocker_0_2_0;
 
-    mogrify_0_2_0 = callPackage
+    moebius_2_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_2_1_6,
+          postgrex_0_11_1,
+          poolboy_1_5_1,
+          poison_2_0_1,
+          inflex_1_5_0
+        }:
+          buildMix ({
+            name = "moebius";
+            version = "2.0.1";
+            src = fetchHex {
+              pkg = "moebius";
+              version = "2.0.1";
+              sha256 =
+                "00e6dbde61bae910463d5a0a7334776946b14c4de390b6f7d839fe6e31089add";
+            };
+            beamDeps  = [
+                          timex_2_1_6
+                          postgrex_0_11_1
+                          poolboy_1_5_1
+                          poison_2_0_1
+                          inflex_1_5_0
+                        ];
+
+            meta = {
+              description = ''A functional approach to data access with
+                            Elixir'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/robconery/moebius";
+            };
+          } // packageOverrides)
+      ) {};
+
+    moebius = moebius_2_0_1;
+
+    mogrify_0_3_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "mogrify";
-            version = "0.2.0";
+            version = "0.3.0";
             src = fetchHex {
               pkg = "mogrify";
-              version = "0.2.0";
+              version = "0.3.0";
               sha256 =
-                "47e9c3c9eba9772f0d5da28e430efef4e9317a7f805357de06a18945ebbf9a5e";
+                "490631d662a0303d468b48868929df99cc62081b5711c3a6b3eb7b0b2dac21e5";
             };
 
             meta = {
               description = ''ImageMagick command line wrapper.'';
-              license = stdenv.lib.licenses.asl20;
+              license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/route/mogrify";
             };
           } // packageOverrides)
       ) {};
 
-    mogrify = mogrify_0_2_0;
+    mogrify = mogrify_0_3_0;
 
     mojoauth_1_0_2 = callPackage
       (
@@ -18738,62 +26372,36 @@ let
 
     monadex = monadex_1_0_2;
 
-    monetized_0_3_2 = callPackage
+    mondo_0_1_0 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          poison_1_5_2,
-          ecto_1_1_5,
-          decimal_1_1_1
+          poison_2_1_0,
+          plug_1_1_5,
+          httpoison_0_8_3
         }:
           buildMix ({
-            name = "monetized";
-            version = "0.3.2";
+            name = "mondo";
+            version = "0.1.0";
             src = fetchHex {
-              pkg = "monetized";
-              version = "0.3.2";
+              pkg = "mondo";
+              version = "0.1.0";
               sha256 =
-                "1978e46c6dd352fea0e9ce208835886ea4fd07dfc1555ee2f9adce98a9e82ce6";
+                "f557216314e098137f5140f1194e2eba7a2a030d78affc23ea5943f586ab1095";
             };
-            beamDeps  = [ poison_1_5_2 ecto_1_1_5 decimal_1_1_1 ];
+            beamDeps  = [ poison_2_1_0 plug_1_1_5 httpoison_0_8_3 ];
 
             meta = {
-              description = ''A lightweight solution for handling and storing
-                            money.'';
+              description = ''An Elixir client for the Mondo API.'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/theocodes/monetized";
+              homepage = "https://github.com/stevedomin/mondo_elixir";
             };
           } // packageOverrides)
       ) {};
 
-    monetized = monetized_0_3_2;
-
-    money_0_0_1_dev = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "money";
-            version = "0.0.1-dev";
-            src = fetchHex {
-              pkg = "money";
-              version = "0.0.1-dev";
-              sha256 =
-                "ea032fa5bbed9b9e8a91192601d612b805b1855e0ed6cdb99e3277b0a2735aeb";
-            };
-
-            meta = {
-              longDescription = ''Elixir library for working with Money safer,
-                                easier, and fun, is an interpretation of the
-                                Fowler`s Money pattern in fun.prog.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/liuggio/money";
-            };
-          } // packageOverrides)
-      ) {};
-
-    money = money_0_0_1_dev;
+    mondo = mondo_0_1_0;
 
     mongodb_0_1_1 = callPackage
       (
@@ -18825,36 +26433,6 @@ let
 
     mongodb = mongodb_0_1_1;
 
-    mongodb_ecto_0_1_4 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          mongodb_0_1_1,
-          ecto_1_0_7
-        }:
-          buildMix ({
-            name = "mongodb_ecto";
-            version = "0.1.4";
-            src = fetchHex {
-              pkg = "mongodb_ecto";
-              version = "0.1.4";
-              sha256 =
-                "2f9cc8c8cd316e187f4b8b94d0a88618ce4a6cb1b6cfa7856573f3376fb443bf";
-            };
-            beamDeps  = [ mongodb_0_1_1 ecto_1_0_7 ];
-
-            meta = {
-              description = ''MongoDB adapter for Ecto'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/michalmuskala/mongodb_ecto";
-            };
-          } // packageOverrides)
-      ) {};
-
-    mongodb_ecto = mongodb_ecto_0_1_4;
-
     monk_0_1_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -18902,6 +26480,30 @@ let
 
     morph = morph_0_1_0;
 
+    mortgage_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "mortgage";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "mortgage";
+              version = "0.0.2";
+              sha256 =
+                "fbd6e7dcf2d8213b4b1ab3b00904482a6aadf32625245bdc02eb76b7cd265173";
+            };
+
+            meta = {
+              description = ''A set of functions for working with mortgages and
+                            mortgage notes.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/geolessel/mortgage";
+            };
+          } // packageOverrides)
+      ) {};
+
+    mortgage = mortgage_0_0_2;
+
     moxie_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -18947,6 +26549,59 @@ let
 
     mpinyin = mpinyin_0_0_2;
 
+    mpower_1_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "mpower";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "mpower";
+              version = "1.0.1";
+              sha256 =
+                "d08a6ec51f1da683507ed08d0787a726eb3e56dd16084fffc279a5391fa02014";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir wrapper for MPowerPayments API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/abakhi/mpower";
+            };
+          } // packageOverrides)
+      ) {};
+
+    mpower = mpower_1_0_1;
+
+    mr_roboto_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
+          buildMix ({
+            name = "mr_roboto";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "mr_roboto";
+              version = "1.0.0";
+              sha256 =
+                "80c5af8f07bd85f28b60e350a5cfc92d1a5c2bcde9a0c3d93fcaa378a033a371";
+            };
+            beamDeps  = [ httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A simple robots.txt service'';
+
+            };
+          } // packageOverrides)
+      ) {};
+
+    mr_roboto = mr_roboto_1_0_0;
+
     msgpack_0_5_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -18970,29 +26625,6 @@ let
 
     msgpack = msgpack_0_5_0;
 
-    msgpax_0_7_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "msgpax";
-            version = "0.7.1";
-            src = fetchHex {
-              pkg = "msgpax";
-              version = "0.7.1";
-              sha256 =
-                "3d2bb32de9552482f35b86cbdc547ee94b67615bfcc831222cde869afa202f2c";
-            };
-
-            meta = {
-              longDescription = ''This library provides an API for serializing
-                                and de-serializing Elixir terms using the
-                                MessagePack format'';
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/lexmag/msgpax";
-            };
-          } // packageOverrides)
-      ) {};
-
     msgpax_0_8_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -19092,6 +26724,39 @@ let
 
     multiset = multiset_0_0_4;
 
+    murdoch_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3,
+          goth_0_0_3
+        }:
+          buildMix ({
+            name = "murdoch";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "murdoch";
+              version = "0.0.1";
+              sha256 =
+                "77ec44ca76d6b4a14df7222104a36cb29ed25f7d52fb3ffe30807ddc82a2d9ad";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 goth_0_0_3 ];
+
+            meta = {
+              longDescription = ''A library for interacting with Google Cloud
+                                Pub/Sub (PubSub). Supports both publication and
+                                pull subscription'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/peburrows/murdoch";
+            };
+          } // packageOverrides)
+      ) {};
+
+    murdoch = murdoch_0_0_1;
+
     murmur_0_2_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -19261,6 +26926,107 @@ let
 
     n2o = n2o_2_3_0;
 
+    nadia_0_4_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "nadia";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "nadia";
+              version = "0.4.0";
+              sha256 =
+                "e76217333ad6d02ec971bfa781e70268285fc417aebb486318e0584affccb08d";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Telegram Bot API Wrapper written in Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zhyu/nadia";
+            };
+          } // packageOverrides)
+      ) {};
+
+    nadia = nadia_0_4_0;
+
+    naive_bayes_0_1_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "naive_bayes";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "naive_bayes";
+              version = "0.1.3";
+              sha256 =
+                "4b65f199852dcb95ba483b7eeae0afed36931418854aadf6b8235197a985d29e";
+            };
+
+            meta = {
+              description = ''An Elixir implementation of Naive Bayes'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ashleyw/naive_bayes";
+            };
+          } // packageOverrides)
+      ) {};
+
+    naive_bayes = naive_bayes_0_1_3;
+
+    named_args_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "named_args";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "named_args";
+              version = "0.1.0";
+              sha256 =
+                "d90285d6fab53c66762e6b3cec655d79df24251e8ed277faa4b308d6f2789c1e";
+            };
+
+            meta = {
+              description = ''Ensures default maps and keyword lists have the
+                            defaults specified.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mgwidmann/named_args";
+            };
+          } // packageOverrides)
+      ) {};
+
+    named_args = named_args_0_1_0;
+
+    narp_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "narp";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "narp";
+              version = "0.0.1";
+              sha256 =
+                "90800be330ed49563b24d891a578678865ce108cd77fa2427e09dbb6b1bac737";
+            };
+
+            meta = {
+              description = ''Narp is an easy and flexible way to authorize
+                            function calls in elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/faber-lotto/narp";
+            };
+          } // packageOverrides)
+      ) {};
+
+    narp = narp_0_0_1;
+
     nat_set_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -19389,8 +27155,8 @@ let
 
     natural_sort_0_3_0 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "natural_sort";
             version = "0.3.0";
             src = fetchHex {
@@ -19413,7 +27179,7 @@ let
 
     navigation_history_0_2_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "navigation_history";
             version = "0.2.0";
@@ -19423,7 +27189,7 @@ let
               sha256 =
                 "9fbddedd831930c3f2e784c53442558d90d68040f9921dfa9441da63d6b8dacc";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               description = ''Navigation history tracking plug'';
@@ -19464,31 +27230,33 @@ let
 
     navigation_tree = navigation_tree_0_4_4;
 
-    ndc_ex_sdk_0_0_7 = callPackage
+    ndc_ex_sdk_0_2_1 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          xml_builder_0_0_8,
-          pipe_0_0_2,
+          timex_2_1_6,
+          httpotion_2_2_2,
           ibrowse_4_2_2,
-          httpotion_2_2_2
+          pipe_0_0_2,
+          xml_builder_0_0_8
         }:
           buildMix ({
             name = "ndc_ex_sdk";
-            version = "0.0.7";
+            version = "0.2.1";
             src = fetchHex {
               pkg = "ndc_ex_sdk";
-              version = "0.0.7";
+              version = "0.2.1";
               sha256 =
-                "73402d51ce6da305409d48e1638e864a336038a03205e66c75c090115c8fe8b8";
+                "2d17a23afbbe4f348abb6c1e9fb787ff609ba678828f2cd41dedb6a79b9c8232";
             };
             beamDeps  = [
-                          xml_builder_0_0_8
-                          pipe_0_0_2
-                          ibrowse_4_2_2
+                          timex_2_1_6
                           httpotion_2_2_2
+                          ibrowse_4_2_2
+                          pipe_0_0_2
+                          xml_builder_0_0_8
                         ];
 
             meta = {
@@ -19496,13 +27264,12 @@ let
                                 NDC-compliant API. It`s host-agnostic and quite
                                 flexible-through-configuration so that it can
                                 reach NDC hosts with a certain flexibility'';
-
-              homepage = "https://github.com/open-ndc/ndc-ex-sdk";
+              license = stdenv.lib.licenses.free;
             };
           } // packageOverrides)
       ) {};
 
-    ndc_ex_sdk = ndc_ex_sdk_0_0_7;
+    ndc_ex_sdk = ndc_ex_sdk_0_2_1;
 
     neat_ex_1_1_0 = callPackage
       (
@@ -19561,56 +27328,138 @@ let
 
     nectar = nectar_0_0_1;
 
-    neotoma_1_7_3 = callPackage
+    nerves_io_neopixel_0_2_0 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "neotoma";
-            version = "1.7.3";
-            src = fetchHex {
-              pkg = "neotoma";
-              version = "1.7.3";
-              sha256 =
-                "2da322b9b1567ffa0706a7f30f6bbbde70835ae44a1050615f4b4a3d436e0f28";
-            };
-
-            buildPlugins  = [ rebar3_hex ];
-
-
-            meta = {
-              description = ''PEG/Packrat toolkit and parser-generator.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/seancribbs/neotoma";
-            };
-          } // packageOverrides)
-      ) {};
-
-    neotoma = neotoma_1_7_3;
-
-    nerves_0_2_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
-            name = "nerves";
+            name = "nerves_io_neopixel";
             version = "0.2.0";
             src = fetchHex {
-              pkg = "nerves";
+              pkg = "nerves_io_neopixel";
               version = "0.2.0";
               sha256 =
-                "b53cd891c3d719597ccb084bdcfc6eb714f820d9c53c44f1bab4d530c9b0734f";
+                "662ca0af01330399eba9aff9806c086027ec5b3a2e235af4cd909282a6d09afa";
             };
-            beamDeps  = [ exrm_1_0_3 ];
 
             meta = {
-              longDescription = ''Nerves - Create firmware for embedded devices
-                                like Raspberry Pi, BeagleBone Black, and more'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/nerves-project/nerves";
+              description = ''Drive WS2812B \"NeoPixel\" RGB LED strips from a
+                            Raspberry Pi using Elixir.'';
+              license = with stdenv.lib.licenses; [ mit bsd2 ];
+              homepage = "https://github.com/GregMefford/nerves_io_neopixel";
             };
           } // packageOverrides)
       ) {};
 
-    nerves = nerves_0_2_0;
+    nerves_io_neopixel = nerves_io_neopixel_0_2_0;
+
+    nerves_system_0_1_4 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          porcelain_2_0_1,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "nerves_system";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "nerves_system";
+              version = "0.1.4";
+              sha256 =
+                "2ad32ff5a6d9a827fb89f93a9c0626add1c72ffaf9068f3cea94fa5fd0eff591";
+            };
+            beamDeps  = [ porcelain_2_0_1 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''Elixir compilers and scripts for building
+                                Nerves Systems. For useable system
+                                configurations see nerves_system_*'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nerves-project/nerves_system";
+            };
+          } // packageOverrides)
+      ) {};
+
+    nerves_system = nerves_system_0_1_4;
+
+    nerves_system_br_0_5_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "nerves_system_br";
+            version = "0.5.2";
+            src = fetchHex {
+              pkg = "nerves_system_br";
+              version = "0.5.2";
+              sha256 =
+                "43747294af52161eb7d58269a18d1927d7fe66185047fbfae204938d9ebe56c3";
+            };
+
+            meta = {
+              description = ''Nerves System BR - Buildroot based build platform
+                            for Nerves Systems'';
+              license = with stdenv.lib.licenses; [ asl20 free ];
+              homepage = "https://github.com/nerves-project/nerves_system_br";
+            };
+          } // packageOverrides)
+      ) {};
+
+    nerves_system_br = nerves_system_br_0_5_2;
+
+    nerves_toolchain_0_6_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
+          buildMix ({
+            name = "nerves_toolchain";
+            version = "0.6.2";
+            src = fetchHex {
+              pkg = "nerves_toolchain";
+              version = "0.6.2";
+              sha256 =
+                "0e2c841389de2b3a9d527dee288e5a8d01883cea424edf951e70e7d9855f45f1";
+            };
+            beamDeps  = [ httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''Elixir compilers and scripts for building
+                                Nerves Toolchains. For useable toolchain
+                                configurations see nerves_toolchain_*'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nerves-project/nerves_toolchain";
+            };
+          } // packageOverrides)
+      ) {};
+
+    nerves_toolchain = nerves_toolchain_0_6_2;
+
+    nerves_uart_0_0_6 = callPackage
+      (
+        {
+          buildMix, packageOverrides ? {}, fetchHex, elixir_make_0_1_0
+        }:
+          buildMix ({
+            name = "nerves_uart";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "nerves_uart";
+              version = "0.0.6";
+              sha256 =
+                "1de94781598204b33f21ac27346390421f377c18b9503c86de60265b37573768";
+            };
+            beamDeps  = [ elixir_make_0_1_0 ];
+
+            meta = {
+              description = ''Discover and use UARTs and serial ports in
+                            Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nerves-project/nerves_uart";
+            };
+          } // packageOverrides)
+      ) {};
+
+    nerves_uart = nerves_uart_0_0_6;
 
     nest_0_0_1 = callPackage
       (
@@ -19637,33 +27486,6 @@ let
 
     nest = nest_0_0_1;
 
-    nested_set_0_0_2 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, ecto_1_1_5 }:
-          buildMix ({
-            name = "nested_set";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "nested_set";
-              version = "0.0.2";
-              sha256 =
-                "283fac1cbaf129d29a7ea6b6c050248bdc63631421d395f0b909510c3f7d2e83";
-            };
-            beamDeps  = [ ecto_1_1_5 ];
-
-            meta = {
-              longDescription = ''Nested Set implementation for Ecto/Phoenix.
-                                It is our first attempt to make something like
-                                acts_as_nested_set in rails. Still in WIP, be
-                                cautious if planing to use.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/bansalakhil/elixir_nested_set";
-            };
-          } // packageOverrides)
-      ) {};
-
-    nested_set = nested_set_0_0_2;
-
     netrc_0_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -19710,6 +27532,35 @@ let
 
     netstrings = netstrings_2_0_1;
 
+    neural_net_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "neural_net";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "neural_net";
+              version = "1.0.0";
+              sha256 =
+                "164cead198d6f8e2ba396346c4c4f8ec8c5b6e6ae00d6915eec902c436779239";
+            };
+
+            meta = {
+              longDescription = ''NeuralNet is an A.I. library that allows for
+                                the construction and training of complex
+                                recurrent neural networks. Architectures such as
+                                LSTM or GRU can be specified in under 20 lines
+                                of code. Any neural network that can be built
+                                with the NeuralNet DSL can be trainined with
+                                automatically implemented BPTT (back-propagation
+                                through time).'';
+              license = stdenv.lib.licenses.asl20;
+            };
+          } // packageOverrides)
+      ) {};
+
+    neural_net = neural_net_1_0_0;
+
     neural_network_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -19804,6 +27655,89 @@ let
 
     nile = nile_0_1_3;
 
+    ninjaproxies_0_2_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "ninjaproxies";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "ninjaproxies";
+              version = "0.2.0";
+              sha256 =
+                "5524329d00944690b362d30fef9c4032c03c401cc44d0ad9e98e147f5792fade";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Ninjaproxies client library for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zensavona/ninjaproxies";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ninjaproxies = ninjaproxies_0_2_0;
+
+    njord_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "njord";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "njord";
+              version = "0.1.1";
+              sha256 =
+                "b438430dbf6ceaf2bede01a285c5032be3041cbedd7c1552653d75179fab4dfb";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A wrapper over HTTPoison to build client APIs.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gmtprime/njord";
+            };
+          } // packageOverrides)
+      ) {};
+
+    njord = njord_0_1_1;
+
+    noise_0_0_4 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "noise";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "noise";
+              version = "0.0.4";
+              sha256 =
+                "2a448e5aff72edd08a587de16c9887ca80ffcde00004eaa2f94dae56536958be";
+            };
+
+            meta = {
+              description = ''A pseudo-random noise generation library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joshforisha/noise";
+            };
+          } // packageOverrides)
+      ) {};
+
+    noise = noise_0_0_4;
+
     normalize_email_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, is_email_0_0_2 }:
@@ -19828,17 +27762,17 @@ let
 
     normalize_email = normalize_email_0_0_1;
 
-    normalize_url_0_0_2 = callPackage
+    normalize_url_0_1_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "normalize_url";
-            version = "0.0.2";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "normalize_url";
-              version = "0.0.2";
+              version = "0.1.1";
               sha256 =
-                "491ea6aa41e044dd85248407e5ebc94a608f89b30292e7ee72d52c3659421016";
+                "7d1c75f4bf5156636e8d0b5c6addb0cae802b970f8412f4b0429b3547220d88e";
             };
 
             meta = {
@@ -19849,11 +27783,11 @@ let
           } // packageOverrides)
       ) {};
 
-    normalize_url = normalize_url_0_0_2;
+    normalize_url = normalize_url_0_1_1;
 
     not_qwerty123_1_1_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, gettext_0_10_0 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, gettext_0_11_0 }:
           buildMix ({
             name = "not_qwerty123";
             version = "1.1.0";
@@ -19863,7 +27797,7 @@ let
               sha256 =
                 "4997296d742f72fe95f8933cba92ab6cee3147888dc9bbd7b703c7f970e8ab58";
             };
-            beamDeps  = [ gettext_0_10_0 ];
+            beamDeps  = [ gettext_0_11_0 ];
 
             meta = {
               description = ''Library to check password strength and generate
@@ -19900,6 +27834,62 @@ let
 
     number = number_0_4_1;
 
+    numerix_0_0_4 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "numerix";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "numerix";
+              version = "0.0.4";
+              sha256 =
+                "b837acc1c095fe580cc69314b72c9171a0d7d6f8734f81ee2ec1f917614c997f";
+            };
+
+            meta = {
+              description = ''A collection of (potentially) useful mathematical
+                            functions'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/safwank/Numerix";
+            };
+          } // packageOverrides)
+      ) {};
+
+    numerix = numerix_0_0_4;
+
+    oauth2_0_3_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          plug_1_1_5,
+          httpoison_0_8_3,
+          hackney_1_6_0
+        }:
+          buildMix ({
+            name = "oauth2";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "oauth2";
+              version = "0.3.0";
+              sha256 =
+                "ee23e6fb6ac84abce23713ba93f1df2fd368c9ad7b9288f0ef6fcec0e0249043";
+            };
+            beamDeps  = [
+                          poison_1_5_2 plug_1_1_5 httpoison_0_8_3 hackney_1_6_0
+                        ];
+
+            meta = {
+              description = ''An Elixir OAuth 2.0 Client Library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/scrogson/oauth2";
+            };
+          } // packageOverrides)
+      ) {};
+
     oauth2_erlang_0_6_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -19970,17 +27960,49 @@ let
 
     octet = octet_0_0_2;
 
-    odgn_json_pointer_1_1_0 = callPackage
+    octokit_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_1_0_2,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "octokit";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "octokit";
+              version = "0.1.0";
+              sha256 =
+                "1c761130e94dbbe16a7751ee1289e1334c9208222da03a8ae9fd77c50f5e969b";
+            };
+            beamDeps  = [ timex_1_0_2 poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An Elixir library for accessing the GitHub
+                            API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lee-dohm/octokit.ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    octokit = octokit_0_1_0;
+
+    odgn_json_pointer_1_2_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "odgn_json_pointer";
-            version = "1.1.0";
+            version = "1.2.0";
             src = fetchHex {
               pkg = "odgn_json_pointer";
-              version = "1.1.0";
+              version = "1.2.0";
               sha256 =
-                "04330904e76a596342a5a9ac09c5d10250a237fc39c59d5576c8ac3b15842f3d";
+                "fd99e3d11e4d2a52fd3b4ee5d3d1fb1f1d316ebaf1b7e699e563c813cc7f8e77";
             };
 
             meta = {
@@ -19992,7 +28014,31 @@ let
           } // packageOverrides)
       ) {};
 
-    odgn_json_pointer = odgn_json_pointer_1_1_0;
+    odgn_json_pointer = odgn_json_pointer_1_2_0;
+
+    odin_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "odin";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "odin";
+              version = "0.0.1";
+              sha256 =
+                "17951e0c8c73f10b38e4110e6ecefe507b4ea6203bcea7d55e34320be60b5a4a";
+            };
+
+            meta = {
+              description = ''elixir toolkit for building command-line
+                            interfaces.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/plus-eg/odin";
+            };
+          } // packageOverrides)
+      ) {};
+
+    odin = odin_0_0_1;
 
     odt_potion_0_0_1 = callPackage
       (
@@ -20018,17 +28064,17 @@ let
 
     odt_potion = odt_potion_0_0_1;
 
-    og_0_0_6 = callPackage
+    og_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "og";
-            version = "0.0.6";
+            version = "0.1.0";
             src = fetchHex {
               pkg = "og";
-              version = "0.0.6";
+              version = "0.1.0";
               sha256 =
-                "8934f5e495dc8fcc8ed56f37f0067e0a360c9588c04c6b800d91eb593b9067d3";
+                "0b858c07cb6d6d40eca28e3462c03213aeb1f3f1a22bd98e53c2bda445ee98b7";
             };
 
             meta = {
@@ -20040,7 +28086,7 @@ let
           } // packageOverrides)
       ) {};
 
-    og = og_0_0_6;
+    og = og_0_1_0;
 
     ok_0_1_3 = callPackage
       (
@@ -20088,6 +28134,36 @@ let
 
     ok_jose = ok_jose_2_0_0;
 
+    one_signal_0_0_6 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "one_signal";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "one_signal";
+              version = "0.0.6";
+              sha256 =
+                "d90ec5f9e43d164e2942422d3c1e9a6b26a956ea135eb1a316380e12ef6b27d1";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir wrapper of OneSignal'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yoavlt/one_signal";
+            };
+          } // packageOverrides)
+      ) {};
+
+    one_signal = one_signal_0_0_6;
+
     onetime_1_0_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
@@ -20112,17 +28188,17 @@ let
 
     onetime = onetime_1_0_0;
 
-    oop_0_0_4 = callPackage
+    oop_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "oop";
-            version = "0.0.4";
+            version = "0.1.0";
             src = fetchHex {
               pkg = "oop";
-              version = "0.0.4";
+              version = "0.1.0";
               sha256 =
-                "ab09b287b80ce860f34bf07652c23a9a21c4064aca730a25becfe30c6b46b81b";
+                "eee8595a9f8bee5967850b143070d1a6c9b819c69ea19c82ae7c353e5991785e";
             };
 
             meta = {
@@ -20133,7 +28209,197 @@ let
           } // packageOverrides)
       ) {};
 
-    oop = oop_0_0_4;
+    oop = oop_0_1_0;
+
+    opbeat_0_3_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "opbeat";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "opbeat";
+              version = "0.3.0";
+              sha256 =
+                "20977e8ae08a1789326a3e5c0c8fa3265dd0e6ddc1fb6abe25c3a33d3fc9e692";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir client for opbeat'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/teodor-pripoae/opbeat";
+            };
+          } // packageOverrides)
+      ) {};
+
+    opbeat = opbeat_0_3_0;
+
+    open_graphx_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          floki_0_8_1
+        }:
+          buildMix ({
+            name = "open_graphx";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "open_graphx";
+              version = "0.0.2";
+              sha256 =
+                "2eef951c4fbb8a01f11ed3ab6ca62dc695a84baf9ae0fbe7698058eac8020b70";
+            };
+            beamDeps  = [ httpoison_0_8_3 floki_0_8_1 ];
+
+            meta = {
+              description = ''Load Open Graph Protocol'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yoavlt/open_graphx";
+            };
+          } // packageOverrides)
+      ) {};
+
+    open_graphx = open_graphx_0_0_2;
+
+    openmaize_jwt_0_9_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          plug_1_1_5,
+          cowboy_1_0_4
+        }:
+          buildMix ({
+            name = "openmaize_jwt";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "openmaize_jwt";
+              version = "0.9.0";
+              sha256 =
+                "1c07dc9646a6270d9a21669ca27b55453e3af568724715a26feef395d5b105ab";
+            };
+            beamDeps  = [ poison_2_1_0 plug_1_1_5 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''JSON Web Token library for use with the Openmaize
+                            authentication library.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/riverrun/openmaizejwt";
+            };
+          } // packageOverrides)
+      ) {};
+
+    openmaize_jwt = openmaize_jwt_0_9_0;
+
+    openstack_0_0_5 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          maybe_0_0_1,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "openstack";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "openstack";
+              version = "0.0.5";
+              sha256 =
+                "f3387f15fea0ae51eacc7c7b3667ac5cc611c479ae48a7ce8ea61d5ae1c6ba57";
+            };
+            beamDeps  = [ poison_1_5_2 maybe_0_0_1 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Openstack Client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zweifisch/openstack.ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    openstack = openstack_0_0_5;
+
+    openstax_keystone_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_2_1_6,
+          poison_1_5_2,
+          httpoison_0_8_3,
+          connection_1_0_2
+        }:
+          buildMix ({
+            name = "openstax_keystone";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "openstax_keystone";
+              version = "0.1.1";
+              sha256 =
+                "0ca484da2caef05a6aa4ce71c009f249142cc83f504160c179e783e9639c7de9";
+            };
+            beamDeps  = [
+                          timex_2_1_6
+                          poison_1_5_2
+                          httpoison_0_8_3
+                          connection_1_0_2
+                        ];
+
+            meta = {
+              description = ''OpenStack Keystone client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mspanc/openstax_keystone";
+            };
+          } // packageOverrides)
+      ) {};
+
+    openstax_keystone = openstax_keystone_0_1_1;
+
+    openstax_swift_0_1_4 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "openstax_swift";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "openstax_swift";
+              version = "0.1.4";
+              sha256 =
+                "244bf77997b366950ec9852b2a65ab58bb1370e86028ae5efe8f84668384e903";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''OpenStack Swift client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mspanc/openstax_swift";
+            };
+          } // packageOverrides)
+      ) {};
+
+    openstax_swift = openstax_swift_0_1_4;
 
     ordered_list_0_1_0 = callPackage
       (
@@ -20204,56 +28470,6 @@ let
 
     osc = osc_0_1_1;
 
-    p1_oauth2_0_6_1 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "p1_oauth2";
-            version = "0.6.1";
-            src = fetchHex {
-              pkg = "p1_oauth2";
-              version = "0.6.1";
-              sha256 =
-                "304923dcaf1edcc84b7f3f6fab1d5235777604ec3334453cf50de1060300e002";
-            };
-
-            buildPlugins  = [ rebar3_hex ];
-
-
-            meta = {
-              description = ''Erlang OAuth 2.0 implementation'';
-              license = with stdenv.lib.licenses; [ mit asl20 ];
-              homepage = "https://github.com/processone/p1_oauth2";
-            };
-          } // packageOverrides)
-      ) {};
-
-    p1_oauth2 = p1_oauth2_0_6_1;
-
-    p1_utils_1_0_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "p1_utils";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "p1_utils";
-              version = "1.0.0";
-              sha256 =
-                "b2c6316286b071f2f667fb1c59b44fe0c996917515fa93374a4a3264affc5105";
-            };
-
-            buildPlugins  = [ rebar3_hex ];
-
-
-            meta = {
-              description = ''Erlang utility modules from ProcessOne'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/p1_utils";
-            };
-          } // packageOverrides)
-      ) {};
-
     pact_0_2_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -20278,6 +28494,66 @@ let
 
     pact = pact_0_2_0;
 
+    pagarmex_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "pagarmex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "pagarmex";
+              version = "0.1.0";
+              sha256 =
+                "9678030fc6b9ffe0d312967f85a3dacd4ef70e4b14f6eea7d8c6c3fc3796816e";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A PagarMe Library for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gullitmiranda/pagarmex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pagarmex = pagarmex_0_1_0;
+
+    pagexduty_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          exjsx_3_1_0
+        }:
+          buildMix ({
+            name = "pagexduty";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "pagexduty";
+              version = "0.1.0";
+              sha256 =
+                "7292a63eeb27637ff19f91f50910d2bbbc860e1eb0413aa5a5035ef32b41b232";
+            };
+            beamDeps  = [ httpoison_0_8_3 exjsx_3_1_0 ];
+
+            meta = {
+              description = ''A Pagerduty client for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ride/pagexduty";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pagexduty = pagexduty_0_1_0;
+
     paginex_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -20551,6 +28827,61 @@ let
 
     parselix = parselix_0_1_0;
 
+    parsey_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "parsey";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "parsey";
+              version = "0.0.1";
+              sha256 =
+                "5d2db82a9f9109e3ae95058d7405ff379c88635ef2393dda27d76b13cd28d155";
+            };
+
+            meta = {
+              description = ''A library to parse non-complex nested inputs with
+                            a given ruleset.'';
+              license = stdenv.lib.licenses.bsd2;
+              homepage = "https://github.com/ScrimpyCat/Parsey";
+            };
+          } // packageOverrides)
+      ) {};
+
+    parsey = parsey_0_0_1;
+
+    pass_0_3_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_5,
+          json_web_token_0_2_5
+        }:
+          buildMix ({
+            name = "pass";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "pass";
+              version = "0.3.0";
+              sha256 =
+                "e2d44e9a94ce802b0723cd6e8c149c85c696e8ff3bf939f4c81ebd08938d0496";
+            };
+            beamDeps  = [ plug_1_1_5 json_web_token_0_2_5 ];
+
+            meta = {
+              description = ''A simple authentication manager for Plug
+                            applications.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-extracts/pass";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pass = pass_0_3_0;
+
     pathway_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
@@ -20600,6 +28931,34 @@ let
 
     pattern_tap = pattern_tap_0_2_2;
 
+    pavlov_0_2_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, meck_0_8_4 }:
+          buildMix ({
+            name = "pavlov";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "pavlov";
+              version = "0.2.3";
+              sha256 =
+                "4d38e96b7581261a49f00d2046603ad3c9af6d52abd26d16bbf6a0a5a82c9643";
+            };
+            beamDeps  = [ meck_0_8_4 ];
+
+            meta = {
+              longDescription = ''Pavlov is a BDD library for your Elixir
+                                projects, allowing you to write expressive unit
+                                tests that tell the story of how your
+                                application behaves. The syntax tries to follow
+                                RSpec`s wherever possible.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sproutapp/pavlov";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pavlov = pavlov_0_2_3;
+
     pbkdf2_2_0_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -20696,7 +29055,7 @@ let
 
     pdf2htmlex = pdf2htmlex_0_2_0;
 
-    pdf_generator_0_3_1 = callPackage
+    pdf_generator_0_3_3 = callPackage
       (
         {
           buildMix,
@@ -20707,26 +29066,26 @@ let
         }:
           buildMix ({
             name = "pdf_generator";
-            version = "0.3.1";
+            version = "0.3.3";
             src = fetchHex {
               pkg = "pdf_generator";
-              version = "0.3.1";
+              version = "0.3.3";
               sha256 =
-                "d81181dd60db4bfbf121161208c69d2aeabce74e24125a009761e1bf4cab11a7";
+                "1aeb29a3b4821de0f86985e65661c7dedae28d2c924ef42677e1f02093607856";
             };
             beamDeps  = [ porcelain_2_0_1 misc_random_0_2_6 ];
 
             meta = {
-              longDescription = ''A simple wrapper for wkhtmltopdf (HTML to
-                                PDF) and PDFTK (adds in encryption) for use in
-                                Elixir projects.'';
+              longDescription = ''A wrapper for wkhtmltopdf (HTML to PDF) and
+                                PDFTK (adds in encryption) for use in Elixir
+                                projects.'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/gutschilla/elixir-pdf-generator";
             };
           } // packageOverrides)
       ) {};
 
-    pdf_generator = pdf_generator_0_3_1;
+    pdf_generator = pdf_generator_0_3_3;
 
     peon_2_0_0 = callPackage
       (
@@ -20751,6 +29110,30 @@ let
 
     peon = peon_2_0_0;
 
+    permission_ex_0_2_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "permission_ex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "permission_ex";
+              version = "0.2.0";
+              sha256 =
+                "efaf05029f498689b93e254f120bb01dd7bafd205a23e4246b70e97565af097e";
+            };
+
+            meta = {
+              description = ''Permission management and checking library for
+                            Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/OvermindDL1/permission_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    permission_ex = permission_ex_0_2_0;
+
     petick_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -20774,17 +29157,17 @@ let
 
     petick = petick_0_0_1;
 
-    pg2pubsub_0_1_12 = callPackage
+    pg2pubsub_0_2_13 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "pg2pubsub";
-            version = "0.1.12";
+            version = "0.2.13";
             src = fetchHex {
               pkg = "pg2pubsub";
-              version = "0.1.12";
+              version = "0.2.13";
               sha256 =
-                "13d653d3f35108b3d83430794127d3df3294f205790ab27ac58e353614487af2";
+                "a2c3ef4dcf031c71c75781ec49236220f405e836f4ee384bdcfbbf8abd6fc4db";
             };
 
             meta = {
@@ -20796,28 +29179,61 @@ let
           } // packageOverrides)
       ) {};
 
-    pg2pubsub = pg2pubsub_0_1_12;
+    pg2pubsub = pg2pubsub_0_2_13;
 
-    phasedb_0_0_1 = callPackage
+    pgapp_0_0_1 = callPackage
+      (
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          epgsql_3_1_1
+        }:
+          buildRebar3 ({
+            name = "pgapp";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "pgapp";
+              version = "0.0.1";
+              sha256 =
+                "5155404f5caa82d6b4f052703cdadddfbc2089e9512bfeef72092933ec1e521d";
+            };
+
+            beamDeps  = [ poolboy_1_5_1 epgsql_3_1_1 ];
+
+            meta = {
+              description = ''epgsql application'';
+              license = stdenv.lib.licenses.mit;
+            };
+          } // packageOverrides)
+      ) {};
+
+    pgapp = pgapp_0_0_1;
+
+    phasedb_0_0_2 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
+          poison_2_1_0,
           inflex_1_5_0,
           heap_1_0_0,
           calendar_0_12_4
         }:
           buildMix ({
             name = "phasedb";
-            version = "0.0.1";
+            version = "0.0.2";
             src = fetchHex {
               pkg = "phasedb";
-              version = "0.0.1";
+              version = "0.0.2";
               sha256 =
-                "42927c48bc8ab9645ec799b5cb7f1379692bb7ba14eff8a6895dacd98217e22d";
+                "d9d7d5f7317ad0ce20da3b95e26b286d45d91a61a63a684fba42681a5ced68ee";
             };
-            beamDeps  = [ inflex_1_5_0 heap_1_0_0 calendar_0_12_4 ];
+            beamDeps  = [
+                          poison_2_1_0 inflex_1_5_0 heap_1_0_0 calendar_0_12_4
+                        ];
 
             meta = {
               description = ''A real-time time series database.'';
@@ -20826,7 +29242,76 @@ let
           } // packageOverrides)
       ) {};
 
-    phasedb = phasedb_0_0_1;
+    phasedb = phasedb_0_0_2;
+
+    phasedb_client_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          websocket_client_1_1_0,
+          table_rex_0_8_0,
+          poison_2_1_0,
+          phasedb_0_0_2,
+          calendar_0_12_4
+        }:
+          buildMix ({
+            name = "phasedb_client";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "phasedb_client";
+              version = "0.0.1";
+              sha256 =
+                "11019f0c5c2ecbfe578150434f064c84a54752093d004a9cc15296fa054b94fa";
+            };
+            beamDeps  = [
+                          websocket_client_1_1_0
+                          table_rex_0_8_0
+                          poison_2_1_0
+                          phasedb_0_0_2
+                          calendar_0_12_4
+                        ];
+
+            meta = {
+              description = ''A real-time time series database - command line
+                            client.'';
+
+            };
+          } // packageOverrides)
+      ) {};
+
+    phasedb_client = phasedb_client_0_0_1;
+
+    phasedb_server_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          phasedb_0_0_2,
+          cowboy_1_0_4,
+          calendar_0_12_4
+        }:
+          buildMix ({
+            name = "phasedb_server";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "phasedb_server";
+              version = "0.0.1";
+              sha256 =
+                "dfde579bb29ed0d805276effb4f7a27d6a302a9615881051fb25eba8cf16da05";
+            };
+            beamDeps  = [ phasedb_0_0_2 cowboy_1_0_4 calendar_0_12_4 ];
+
+            meta = {
+              description = ''A real-time time series database.'';
+
+            };
+          } // packageOverrides)
+      ) {};
+
+    phasedb_server = phasedb_server_0_0_1;
 
     phoenix_1_0_4 = callPackage
       (
@@ -20835,7 +29320,7 @@ let
           packageOverrides ? {},
           fetchHex,
           poison_1_5_2,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -20847,7 +29332,7 @@ let
               sha256 =
                 "591d5f7f3a6f5407e8491a92dc6a2d0b7b94ef4f3526ad8ef4eb82660e6f69f6";
             };
-            beamDeps  = [ poison_1_5_2 plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ poison_1_5_2 plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''Productive. Reliable. Fast. A productive web
@@ -20884,6 +29369,30 @@ let
 
     phoenix_generator = phoenix_generator_0_2_1;
 
+    phoenix_jsroutes_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "phoenix_jsroutes";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "phoenix_jsroutes";
+              version = "0.0.1";
+              sha256 =
+                "f1f94ced7edb338d802290265e25784e32ad9e5f51eea65286f22663d831e44e";
+            };
+
+            meta = {
+              description = ''Brings phoenix router helpers to your javascript
+                            code.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tiagoengel/phoenix-jsroutes";
+            };
+          } // packageOverrides)
+      ) {};
+
+    phoenix_jsroutes = phoenix_jsroutes_0_0_1;
+
     phoenix_pubsub_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -20905,7 +29414,28 @@ let
           } // packageOverrides)
       ) {};
 
-    phoenix_pubsub = phoenix_pubsub_0_0_1;
+    phoenix_pubsub_1_0_0_rc_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "phoenix_pubsub";
+            version = "1.0.0-rc.0";
+            src = fetchHex {
+              pkg = "phoenix_pubsub";
+              version = "1.0.0-rc.0";
+              sha256 =
+                "94765c0866ffe55f76894daa5e5adcc30822d3710718b0c03980db8f093b575f";
+            };
+
+            meta = {
+              description = ''Distributed PubSub and Presence platform'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/phoenixframework/phoenix_pubsub";
+            };
+          } // packageOverrides)
+      ) {};
+
+    phoenix_pubsub = phoenix_pubsub_1_0_0_rc_0;
 
     phoenix_pubsub_postgres_0_0_2 = callPackage
       (
@@ -20985,41 +29515,40 @@ let
 
     phoenix_webpack = phoenix_webpack_0_1_0;
 
-    phone_0_0_1 = callPackage
+    phone_0_2_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "phone";
-            version = "0.0.1";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "phone";
-              version = "0.0.1";
+              version = "0.2.0";
               sha256 =
-                "9f56ea4a2a3790b779d9bedbe04f63bae4e68c7a57c6331258917edc78f0f8bd";
+                "af836882ba2e1b8feec420d181a15ac3c9a9230f9f7a87753e33e2da8a591d22";
             };
 
             meta = {
-              description = ''Parser for phone numbers in international
-                            standard. NOT READY FOR USE.'';
+              description = ''Get useful info from telephone numbers.'';
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/fcevado/phone";
             };
           } // packageOverrides)
       ) {};
 
-    phone = phone_0_0_1;
+    phone = phone_0_2_0;
 
-    phst_transform_0_9_0 = callPackage
+    phst_transform_1_0_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "phst_transform";
-            version = "0.9.0";
+            version = "1.0.0";
             src = fetchHex {
               pkg = "phst_transform";
-              version = "0.9.0";
+              version = "1.0.0";
               sha256 =
-                "a5e76cd5b0549a36ec6268644a04366a7672bf449ecb5065dba441faf0c29dc1";
+                "f18683a70d858a9d9459881458f985d13233a3c04e6b0005458a51e560fdfd84";
             };
 
             meta = {
@@ -21031,7 +29560,125 @@ let
           } // packageOverrides)
       ) {};
 
-    phst_transform = phst_transform_0_9_0;
+    phst_transform = phst_transform_1_0_0;
+
+    pigeon_0_7_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "pigeon";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "pigeon";
+              version = "0.7.0";
+              sha256 =
+                "16d2745d952553088248185d5371b42a17c9885293f54e7c7871d8a256e182be";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''HTTP2-compliant wrapper for sending iOS
+                                (APNS) and Android (GCM) push notifications.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/codedge-llc/pigeon";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pigeon = pigeon_0_7_0;
+
+    piliponi_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "piliponi";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "piliponi";
+              version = "0.0.1";
+              sha256 =
+                "1729646601f1f12aff154e0401063298ec54bfd745f9137a64f63384f106a645";
+            };
+
+            meta = {
+              description = ''Simple mobile phone formatter for the
+                            Philippines'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/wetoolaguer/piliponi";
+            };
+          } // packageOverrides)
+      ) {};
+
+    piliponi = piliponi_0_0_1;
+
+    pinboardixir_0_2_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "pinboardixir";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "pinboardixir";
+              version = "0.2.0";
+              sha256 =
+                "360050f089cd50515bf51a5634420beab54bb7ec3b2063d49d91179182e423d7";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A Pinboard client in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ElaWorkshop/pinboardixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pinboardixir = pinboardixir_0_2_0;
+
+    pinglix_1_1_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_0_19_5,
+          poison_1_4_0,
+          plug_1_1_5
+        }:
+          buildMix ({
+            name = "pinglix";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "pinglix";
+              version = "1.1.1";
+              sha256 =
+                "bff8166655cc143518c0089aca104755ab188816707fb73a5739dd094f45e895";
+            };
+            beamDeps  = [ timex_0_19_5 poison_1_4_0 plug_1_1_5 ];
+
+            meta = {
+              longDescription = ''Plug compatible health check system in Elixir
+                                based on
+                                https://github.com/jbarnette/pinglish.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pvdvreede/pinglix";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pinglix = pinglix_1_1_1;
 
     pinyin_0_1_4 = callPackage
       (
@@ -21058,8 +29705,8 @@ let
 
     pipe_0_0_2 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pipe";
             version = "0.0.2";
             src = fetchHex {
@@ -21128,6 +29775,53 @@ let
 
     pipe_while_ok = pipe_while_ok_0_0_2;
 
+    pipette_0_0_4 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, mock_0_1_3 }:
+          buildMix ({
+            name = "pipette";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "pipette";
+              version = "0.0.4";
+              sha256 =
+                "8742ea9b115071c3aa7cec4ddacfa161ff63fd647e0491ac442cb118d7198e26";
+            };
+            beamDeps  = [ mock_0_1_3 ];
+
+            meta = {
+              description = ''new_data = pipette(data, template)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/liquidz/pipette";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pipette = pipette_0_0_4;
+
+    pipper_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "pipper";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "pipper";
+              version = "1.0.0";
+              sha256 =
+                "a6b5100f6bab060674e5a828dcfb1b7c12e65739186e54809a23320a5550e149";
+            };
+
+            meta = {
+              description = ''Provides a \"pipe-equals\" operator'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/drewblas/pipper";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pipper = pipper_1_0_0;
+
     pkcs7_1_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -21151,6 +29845,63 @@ let
 
     pkcs7 = pkcs7_1_0_2;
 
+    plaid_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "plaid";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "plaid";
+              version = "0.0.1";
+              sha256 =
+                "1168a916f1a2fa5528b7891fe32784a1c415dbd5fc8b05bb9a7571f887f3ee9e";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Client for Plaid, the finance API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/travisjeffery/plaid";
+            };
+          } // packageOverrides)
+      ) {};
+
+    plaid = plaid_0_0_1;
+
+    plantuml_mix_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "plantuml_mix";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "plantuml_mix";
+              version = "0.0.1";
+              sha256 =
+                "6d064ebc3be722642875ea5e2ce63a5678b95d96353c3605f6e83684651947f0";
+            };
+
+            meta = {
+              longDescription = ''Add plantuml task to mix. Execute mix
+                                plantuml --help for options. Requires that the
+                                env var PLANTUML_JAR points to a valid PlantUML
+                                jar file. Requires Java > 1.6 installed on the
+                                system.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/binarytemple/plantuml_mix";
+            };
+          } // packageOverrides)
+      ) {};
+
+    plantuml_mix = plantuml_mix_0_0_1;
+
     plist_0_0_4 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -21175,6 +29926,36 @@ let
 
     plist = plist_0_0_4;
 
+    plivo_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "plivo";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "plivo";
+              version = "0.0.1";
+              sha256 =
+                "e710b4132ece4f648b772dc540dd1ba7d0fb241fe2f271639cf0764bdb024848";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An elixir client for Plivo API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/aarvay/plivo-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    plivo = plivo_0_0_1;
+
     plug_0_11_3 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
@@ -21336,17 +30117,17 @@ let
           } // packageOverrides)
       ) {};
 
-    plug_1_1_3 = callPackage
+    plug_1_1_5 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
           buildMix ({
             name = "plug";
-            version = "1.1.3";
+            version = "1.1.5";
             src = fetchHex {
               pkg = "plug";
-              version = "1.1.3";
+              version = "1.1.5";
               sha256 =
-                "3063801910afe580891477f7e03c5c7a51592fa790a04f12815a127e4e0e336f";
+                "706871cb3d66c8c44cad4bceaa1f500eba34d5400450b9d63163d9dd4de88d3d";
             };
             beamDeps  = [ cowboy_1_0_4 ];
 
@@ -21359,7 +30140,7 @@ let
           } // packageOverrides)
       ) {};
 
-    plug = plug_1_1_3;
+    plug = plug_1_1_5;
 
     plug_accept_language_0_1_0 = callPackage
       (
@@ -21384,6 +30165,38 @@ let
 
     plug_accept_language = plug_accept_language_0_1_0;
 
+    plug_accesslog_0_11_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          tzdata_0_5_8,
+          timex_2_1_6,
+          plug_1_1_5,
+          cowboy_1_0_4
+        }:
+          buildMix ({
+            name = "plug_accesslog";
+            version = "0.11.0";
+            src = fetchHex {
+              pkg = "plug_accesslog";
+              version = "0.11.0";
+              sha256 =
+                "86ee180fd234a3c6d413153764f2a9e2d57171d3e89df2643a276b8760bcc867";
+            };
+            beamDeps  = [ tzdata_0_5_8 timex_2_1_6 plug_1_1_5 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Plug for writing access logs'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mneudert/plug_accesslog";
+            };
+          } // packageOverrides)
+      ) {};
+
+    plug_accesslog = plug_accesslog_0_11_0;
+
     plug_assign_1_0_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, plug_1_0_3 }:
@@ -21412,7 +30225,7 @@ let
     plug_cloudflare_1_3_0 = callPackage
       (
         {
-          buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3, cidr_1_0_0
+          buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5, cidr_1_0_0
         }:
           buildMix ({
             name = "plug_cloudflare";
@@ -21423,7 +30236,7 @@ let
               sha256 =
                 "641df2e40267446172c43b2f52dd9a1cbcd1f24dccd101bda29732a13335ab21";
             };
-            beamDeps  = [ plug_1_1_3 cidr_1_0_0 ];
+            beamDeps  = [ plug_1_1_5 cidr_1_0_0 ];
 
             meta = {
               description = ''Convert CloudFlare`s CF-Connecting-IP header to
@@ -21438,7 +30251,7 @@ let
 
     plug_forwarded_peer_0_0_2 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "plug_forwarded_peer";
             version = "0.0.2";
@@ -21448,7 +30261,7 @@ let
               sha256 =
                 "c2466e0f0ef75a0d925a957fa50dfcded2c4788fe67857a675411e7184ae5ec3";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               longDescription = ''Very simple plug which reads
@@ -21493,8 +30306,8 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
-          geolix_0_9_0
+          plug_1_1_5,
+          geolix_0_10_1
         }:
           buildMix ({
             name = "plug_geoip2";
@@ -21505,7 +30318,7 @@ let
               sha256 =
                 "2a6443040e07e677b0ff7749d2cdf7797a97254466f6740aee11544a18f4993a";
             };
-            beamDeps  = [ plug_1_1_3 geolix_0_9_0 ];
+            beamDeps  = [ plug_1_1_5 geolix_0_10_1 ];
 
             meta = {
               longDescription = ''Adds geo location to a Plug connection based
@@ -21524,7 +30337,7 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -21536,7 +30349,7 @@ let
               sha256 =
                 "23cb357dad510695b6bb339fdbf5d3fc8581546124f7389d63c9cf723e4ad40f";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               description = ''A tiny plug for responding to heartbeat requests
@@ -21551,7 +30364,7 @@ let
 
     plug_media_type_router_0_0_2 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "plug_media_type_router";
             version = "0.0.2";
@@ -21561,7 +30374,7 @@ let
               sha256 =
                 "e5f72ee4fd1a43321532e3165b3609a1184ba2d576279a1a63e17afba084f12b";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               longDescription = ''An Elixir Plug for routing requests to other
@@ -21580,7 +30393,7 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -21592,7 +30405,7 @@ let
               sha256 =
                 "8f33202de45d772dd1f416a10d43f8e2daabf937d459e010fa9c850834e1877f";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               description = ''Plug for full page response caching'';
@@ -21610,7 +30423,7 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -21622,7 +30435,7 @@ let
               sha256 =
                 "e08041d2ad4884826d8296a5560609df04a936ceca492d094f06458699ac69da";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               description = ''Rails compatible Plug session store'';
@@ -21636,9 +30449,39 @@ let
     plug_rails_cookie_session_store =
       plug_rails_cookie_session_store_0_1_0;
 
+    plug_range_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_5,
+          cowboy_1_0_4
+        }:
+          buildMix ({
+            name = "plug_range";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "plug_range";
+              version = "0.0.2";
+              sha256 =
+                "0dbe3c166e01180913f07a5e4c46cd9427f3e797dd7be515871631b0ed60b9eb";
+            };
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''An elixir plug that serves HTTP range requests'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "http://github.com/TheSquad/plug_range";
+            };
+          } // packageOverrides)
+      ) {};
+
+    plug_range = plug_range_0_0_2;
+
     plug_redirect_0_1_2 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "plug_redirect";
             version = "0.1.2";
@@ -21648,7 +30491,7 @@ let
               sha256 =
                 "f5fb2653ed39cf843bcc3cb13ba2bf547b1f66ef7c24f963551acd0b8e1c4705";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               description = ''A plug builder for redirecting requests.'';
@@ -21662,7 +30505,7 @@ let
 
     plug_redirect_https_0_0_6 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "plug_redirect_https";
             version = "0.0.6";
@@ -21672,7 +30515,7 @@ let
               sha256 =
                 "73f1b3172183005f0fb59a43c50a94a708c06ffcc35a7387967d87e001369068";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               description = ''Plug to redirect http requests to https requests
@@ -21692,7 +30535,7 @@ let
           packageOverrides ? {},
           fetchHex,
           poison_1_5_2,
-          plug_1_1_3
+          plug_1_1_5
         }:
           buildMix ({
             name = "plug_require_header";
@@ -21703,7 +30546,7 @@ let
               sha256 =
                 "b721158316f6d2efd4b24bd05a8a1c06caa699ee25249185c8c4f03f9204b283";
             };
-            beamDeps  = [ poison_1_5_2 plug_1_1_3 ];
+            beamDeps  = [ poison_1_5_2 plug_1_1_5 ];
 
             meta = {
               description = ''An Elixir Plug for requiring and extracting a
@@ -21718,7 +30561,7 @@ let
 
     plug_response_header_0_2_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "plug_response_header";
             version = "0.2.1";
@@ -21728,7 +30571,7 @@ let
               sha256 =
                 "82fd11fc70d925ed5a608ac13a9f604a80e24827f6603999d6a0f3f123862048";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               description = ''This plug allows manipulation of HTTP response
@@ -21743,7 +30586,7 @@ let
 
     plug_ribbon_0_2_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "plug_ribbon";
             version = "0.2.1";
@@ -21753,7 +30596,7 @@ let
               sha256 =
                 "34fcbffb6fc3adde6bb167506934ab19787d2fff82b6bf93918e0000159bfe9d";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               description = ''Injects a ribbon to your web application
@@ -21768,7 +30611,7 @@ let
 
     plug_runtime_1_0_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "plug_runtime";
             version = "1.0.0";
@@ -21778,7 +30621,7 @@ let
               sha256 =
                 "58e213a40fe339771ab93520da56c2108488cfd9e99c7e92def367567ce225a7";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               longDescription = ''A simple Plug to measure the runtime of a
@@ -21792,41 +30635,6 @@ let
 
     plug_runtime = plug_runtime_1_0_0;
 
-    plug_session_memcached_0_3_3 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          plug_1_1_3,
-          ex_doc_0_11_4,
-          earmark_0_2_1,
-          cowboy_1_0_4
-        }:
-          buildMix ({
-            name = "plug_session_memcached";
-            version = "0.3.3";
-            src = fetchHex {
-              pkg = "plug_session_memcached";
-              version = "0.3.3";
-              sha256 =
-                "f9cd5de250dbab0180166c873a50d297036d72f7cbac1a076972444c41f0b4c3";
-            };
-            beamDeps  = [ plug_1_1_3 ex_doc_0_11_4 earmark_0_2_1 cowboy_1_0_4
-                      ];
-
-            meta = {
-              description = ''A memcached session store for use with
-                            Plug.Session'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/gutschilla/plug-session-memcached";
-            };
-          } // packageOverrides)
-      ) {};
-
-    plug_session_memcached = plug_session_memcached_0_3_3;
-
     plug_session_redis_0_1_0 = callPackage
       (
         {
@@ -21858,25 +30666,25 @@ let
 
     plug_session_redis = plug_session_redis_0_1_0;
 
-    plug_statsd_0_4_0 = callPackage
+    plug_statsd_0_4_1 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           ex_statsd_0_5_3
         }:
           buildMix ({
             name = "plug_statsd";
-            version = "0.4.0";
+            version = "0.4.1";
             src = fetchHex {
               pkg = "plug_statsd";
-              version = "0.4.0";
+              version = "0.4.1";
               sha256 =
-                "c618161e5ad93c727be6ce776e7f53542950d97a602691aee2acef2d57dbdea9";
+                "af3158b9d43101e39e22472fcea98180911298c92a735d5ff14dce309e5e30f2";
             };
-            beamDeps  = [ plug_1_1_3 ex_statsd_0_5_3 ];
+            beamDeps  = [ plug_1_1_5 ex_statsd_0_5_3 ];
 
             meta = {
               description = ''A (Phoenix) plug for sending request counts and
@@ -21887,7 +30695,7 @@ let
           } // packageOverrides)
       ) {};
 
-    plug_statsd = plug_statsd_0_4_0;
+    plug_statsd = plug_statsd_0_4_1;
 
     plug_test_helpers_0_1_0 = callPackage
       (
@@ -21925,7 +30733,7 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -21937,7 +30745,7 @@ let
               sha256 =
                 "d473d6b360f5a9189cee2a0f95c06ffb1cb9495a9bb8c729a631c2fa33ed5fc9";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               description = ''UTM tracking parameters to cookies'';
@@ -21949,7 +30757,7 @@ let
 
     plug_utm = plug_utm_0_0_2;
 
-    plug_wait1_0_1_4 = callPackage
+    plug_wait1_0_1_5 = callPackage
       (
         {
           buildMix,
@@ -21961,12 +30769,12 @@ let
         }:
           buildMix ({
             name = "plug_wait1";
-            version = "0.1.4";
+            version = "0.1.5";
             src = fetchHex {
               pkg = "plug_wait1";
-              version = "0.1.4";
+              version = "0.1.5";
               sha256 =
-                "4ef36a750c07484e6c6513421e56ad42fa023cb424cbb4cf11a2e686a4fa4be7";
+                "33d45e8c5dba4b9639c115b079581954877184c2c7ab394b80514cfd4199bb15";
             };
             beamDeps  = [ poison_1_3_1 plug_0_13_1 cowboy_1_0_4 ];
 
@@ -21978,7 +30786,7 @@ let
           } // packageOverrides)
       ) {};
 
-    plug_wait1 = plug_wait1_0_1_4;
+    plug_wait1 = plug_wait1_0_1_5;
 
     plug_x_forwarded_for_0_1_0 = callPackage
       (
@@ -22027,25 +30835,25 @@ let
 
     plugin = plugin_0_1_0;
 
-    plugs_0_1_0 = callPackage
+    plugs_0_1_1 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
             name = "plugs";
-            version = "0.1.0";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "plugs";
-              version = "0.1.0";
+              version = "0.1.1";
               sha256 =
-                "8d6cafd3ea0d373795774c9de2a0503433d65d9c2c0d58bd23ba0d9ba3547297";
+                "d11f4122bcd3fd83ac1b442ebf908ebb1f1ad535fa305446c90cf2ce51222c07";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               description = ''A collection of Plug middleware for web
@@ -22056,7 +30864,31 @@ let
           } // packageOverrides)
       ) {};
 
-    plugs = plugs_0_1_0;
+    plugs = plugs_0_1_1;
+
+    plugsnag_1_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, bugsnag_1_2_0 }:
+          buildMix ({
+            name = "plugsnag";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "plugsnag";
+              version = "1.1.0";
+              sha256 =
+                "aa3a9e587042f5519d8309fc4cf764a0262eda0da752ddf87c5fcfea176208ad";
+            };
+            beamDeps  = [ bugsnag_1_2_0 ];
+
+            meta = {
+              description = ''Bugsnag reporter for Elixir`s Plug'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jarednorman/plugsnag";
+            };
+          } // packageOverrides)
+      ) {};
+
+    plugsnag = plugsnag_1_1_0;
 
     plumber_girl_0_9_6 = callPackage
       (
@@ -22082,34 +30914,113 @@ let
 
     plumber_girl = plumber_girl_0_9_6;
 
-    png_0_1_1 = callPackage
+    pmbag_1_0_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
           buildRebar3 ({
-            name = "png";
-            version = "0.1.1";
+            name = "pmbag";
+            version = "1.0.0";
             src = fetchHex {
-              pkg = "png";
-              version = "0.1.1";
+              pkg = "pmbag";
+              version = "1.0.0";
               sha256 =
-                "f8d4a17c118dcc16bb18d0fda6e26947001f9312bc6c061d2236b424fc3dd9ea";
+                "9f12262ac93faf29c00e3da5f5836086542fbcfa0539bf733ab3e5cca0d34872";
             };
 
-            buildPlugins  = [ rebar3_hex ];
-
-
             meta = {
-              longDescription = ''A pure Erlang library for creating PNG
-                                images. It can currently create 8 and 16 bit
-                                RGB, RGB with alpha, indexed, grayscale and
-                                grayscale with alpha images.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/yuce/png";
+              description = ''Erlang Private Mail Bag.'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage = "https://github.com/potatosalad/pmbag";
             };
           } // packageOverrides)
       ) {};
 
-    png = png_0_1_1;
+    pmbag = pmbag_1_0_0;
+
+    pobox_1_0_2 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "pobox";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "pobox";
+              version = "1.0.2";
+              sha256 =
+                "372090633c2565cd645acf2d1e2354c0791d5a5dc2f74885795b8807d402fe88";
+            };
+
+            meta = {
+              description = ''External buffer processes to protect against
+                            mailbox overflow'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ferd/pobox/";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pobox = pobox_1_0_2;
+
+    pocketeer_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpotion_2_2_2
+        }:
+          buildMix ({
+            name = "pocketeer";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "pocketeer";
+              version = "0.1.1";
+              sha256 =
+                "886367d81a41a7668805e06877aedfa1b9b4f1506ef1b42e95a4b3bf722d8e76";
+            };
+            beamDeps  = [ poison_2_1_0 httpotion_2_2_2 ];
+
+            meta = {
+              description = ''An Elixir client for the Pocket API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://www.github.com/justahero/pocketeer";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pocketeer = pocketeer_0_1_1;
+
+    pocketex_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_3_1,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "pocketex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "pocketex";
+              version = "0.1.0";
+              sha256 =
+                "b832df8e3f3102b69892cc5cfab4418de876a6ecc5780805458b9946aa407cbf";
+            };
+            beamDeps  = [ poison_1_3_1 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Pocketex is an Elixir client for the Pocket read
+                            later service (getpocket.com) '';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/essenciary/pocketex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pocketex = pocketex_0_1_0;
 
     poison_1_3_1 = callPackage
       (
@@ -22262,19 +31173,64 @@ let
 
     poker = poker_0_0_2;
 
-    poly1305_0_4_0 = callPackage
+    poloniex_0_0_8 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, chacha20_0_3_2 }:
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          vex_0_5_5,
+          poison_2_1_0,
+          httpoison_0_8_3,
+          exconstructor_1_0_2
+        }:
+          buildMix ({
+            name = "poloniex";
+            version = "0.0.8";
+            src = fetchHex {
+              pkg = "poloniex";
+              version = "0.0.8";
+              sha256 =
+                "7890a5f26178ec224379fa4160092d55f9098131eaab8711a75ef1fe6808cc83";
+            };
+            beamDeps  = [
+                          vex_0_5_5
+                          poison_2_1_0
+                          httpoison_0_8_3
+                          exconstructor_1_0_2
+                        ];
+
+            meta = {
+              longDescription = ''WIP Poloniex API wrapper for Elixir. Provides
+                                access to market data including trading pairs
+                                between ETH, BTC, DOGE, LTC and others.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cyberpunk-ventures/poloniex_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    poloniex = poloniex_0_0_8;
+
+    poly1305_0_4_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          equivalex_0_1_0,
+          chacha20_0_3_2
+        }:
           buildMix ({
             name = "poly1305";
-            version = "0.4.0";
+            version = "0.4.1";
             src = fetchHex {
               pkg = "poly1305";
-              version = "0.4.0";
+              version = "0.4.1";
               sha256 =
-                "a31cd3dcc1244033b0981adfe9b2d0766115152ea42ba1c62a8dc93c87f094b7";
+                "b0f804a21e3c1f57cd37b6e439107a1eaf8d7a2404717fb95d21eb3f134973bb";
             };
-            beamDeps  = [ chacha20_0_3_2 ];
+            beamDeps  = [ equivalex_0_1_0 chacha20_0_3_2 ];
 
             meta = {
               description = ''Poly1305 message authentication'';
@@ -22284,7 +31240,7 @@ let
           } // packageOverrides)
       ) {};
 
-    poly1305 = poly1305_0_4_0;
+    poly1305 = poly1305_0_4_1;
 
     polyglot_0_0_1 = callPackage
       (
@@ -22313,7 +31269,7 @@ let
 
     polyline_0_1_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, vector_0_1_0 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, vector_0_3_0 }:
           buildMix ({
             name = "polyline";
             version = "0.1.0";
@@ -22323,7 +31279,7 @@ let
               sha256 =
                 "6df2ebd1a5f55d6f680924200175bc5473beadd013acec72d201fcec18d31afd";
             };
-            beamDeps  = [ vector_0_1_0 ];
+            beamDeps  = [ vector_0_3_0 ];
 
             meta = {
               description = ''Encoding and decoding of Polylines'';
@@ -22382,6 +31338,51 @@ let
 
     pool_ring = pool_ring_0_1_5;
 
+    pool_sup_0_2_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, croma_0_4_4 }:
+          buildMix ({
+            name = "pool_sup";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "pool_sup";
+              version = "0.2.2";
+              sha256 =
+                "73cebc2ad393a7ef92c6787b8b581051ddc299372d25bc1175d94dee0ec28e90";
+            };
+            beamDeps  = [ croma_0_4_4 ];
+
+            meta = {
+              description = ''A supervisor specialized to manage pool of
+                            workers'';
+              license = stdenv.lib.licenses.mit;
+            };
+          } // packageOverrides)
+      ) {};
+
+    pool_sup = pool_sup_0_2_2;
+
+    poolboy_1_4_1 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "poolboy";
+            version = "1.4.1";
+            src = fetchHex {
+              pkg = "poolboy";
+              version = "1.4.1";
+              sha256 =
+                "b112f2bfa13010f751ecc013f74af0601eb41315bb0ccfa5eed641d73fbbe899";
+            };
+
+            meta = {
+              description = ''A hunky Erlang worker pool factory'';
+              license = with stdenv.lib.licenses; [ unlicense asl20 ];
+              homepage = "https://github.com/devinus/poolboy";
+            };
+          } // packageOverrides)
+      ) {};
+
     poolboy_1_4_2 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -22426,6 +31427,58 @@ let
 
     poolboy = poolboy_1_5_1;
 
+    pooler_1_5_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "pooler";
+            version = "1.5.0";
+            src = fetchHex {
+              pkg = "pooler";
+              version = "1.5.0";
+              sha256 =
+                "f493b4b947967fa4250dd1f96e86a5440ecab51da114d2c256cced58ad991908";
+            };
+
+            meta = {
+              description = ''An OTP Process Pool Application'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/seth/pooler";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pooler = pooler_1_5_0;
+
+    pop3mail_0_1_6 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "pop3mail";
+            version = "0.1.6";
+            src = fetchHex {
+              pkg = "pop3mail";
+              version = "0.1.6";
+              sha256 =
+                "ca8496c92a3c0caa479836f254980c2af69a66a29e08cea45a164874801c54da";
+            };
+
+            meta = {
+              longDescription = ''Pop3 client to download email (including
+                                attachments) from the inbox. Decodes multipart
+                                content, quoted-printables, base64 and
+                                encoded-words. Uses an Erlang pop3 client with
+                                SSL support derived from the epop package. Add
+                                this dependency in mix.exs: {:erlpop, github:
+                                \"trifork/erlpop\"}'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nico-amsterdam/pop3mail";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pop3mail = pop3mail_0_1_6;
+
     populator_0_4_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -22501,10 +31554,33 @@ let
 
     porter = porter_0_0_1;
 
+    posexional_0_2_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "posexional";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "posexional";
+              version = "0.2.1";
+              sha256 =
+                "c3cedc2c99ed10c400be538e558fcb09cdb675d972d3f5deb33d4029b916da82";
+            };
+
+            meta = {
+              description = ''A library to manage positional files'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/primait/posexional";
+            };
+          } // packageOverrides)
+      ) {};
+
+    posexional = posexional_0_2_1;
+
     positive_13_3_7 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "positive";
             version = "13.3.7";
             src = fetchHex {
@@ -22524,35 +31600,36 @@ let
 
     positive = positive_13_3_7;
 
-    posterize_0_10_0 = callPackage
+    posterize_0_11_0 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          postgrex_0_11_1,
-          jsx_2_8_0
+          sbroker_0_7_0,
+          postgrex_0_11_1
         }:
           buildMix ({
             name = "posterize";
-            version = "0.10.0";
+            version = "0.11.0";
             src = fetchHex {
               pkg = "posterize";
-              version = "0.10.0";
+              version = "0.11.0";
               sha256 =
-                "3569fd8f8097acb2a49fb23c446d3a8ff57879779866d71929eb356d076e7eb9";
+                "9c6b189d0924788edb42f3fff493caec10c36bc0e457983a33045cc891cf589d";
             };
-            beamDeps  = [ postgrex_0_11_1 jsx_2_8_0 ];
+            beamDeps  = [ sbroker_0_7_0 postgrex_0_11_1 ];
 
             meta = {
-              description = ''erlang wrapper for postgrex'';
+              description = ''erlang wrapper for the postgrex postgres
+                            client'';
               license = with stdenv.lib.licenses; [ asl20 mit ];
               homepage = "https://github.com/talentdeficit/posterize";
             };
           } // packageOverrides)
       ) {};
 
-    posterize = posterize_0_10_0;
+    posterize = posterize_0_11_0;
 
     postgrex_0_11_1 = callPackage
       (
@@ -22560,8 +31637,8 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          decimal_1_1_1,
-          db_connection_0_2_4,
+          decimal_1_1_2,
+          db_connection_1_0_0_rc_0,
           connection_1_0_2
         }:
           buildMix ({
@@ -22573,8 +31650,11 @@ let
               sha256 =
                 "f56d47038f4f642cee0f9c40eeea0ef9ba645b7fc77723b4764f282df95baeb8";
             };
-            beamDeps  = [ decimal_1_1_1 db_connection_0_2_4 connection_1_0_2
-                      ];
+            beamDeps  = [
+                          decimal_1_1_2
+                          db_connection_1_0_0_rc_0
+                          connection_1_0_2
+                        ];
 
             meta = {
               description = ''PostgreSQL driver for Elixir.'';
@@ -22586,31 +31666,9 @@ let
 
     postgrex = postgrex_0_11_1;
 
-    postgrex_0_8_4 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_1 }:
-          buildMix ({
-            name = "postgrex";
-            version = "0.8.4";
-            src = fetchHex {
-              pkg = "postgrex";
-              version = "0.8.4";
-              sha256 =
-                "19c205c8de0e2e5817f2250100281c58e717cb11ff1bb410bf661ee78c24e79b";
-            };
-            beamDeps  = [ decimal_1_1_1 ];
-
-            meta = {
-              description = ''PostgreSQL driver for Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/ericmj/postgrex";
-            };
-          } // packageOverrides)
-      ) {};
-
     postgrex_0_9_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_1 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_2 }:
           buildMix ({
             name = "postgrex";
             version = "0.9.1";
@@ -22620,7 +31678,7 @@ let
               sha256 =
                 "9c9a4ffca145479b343d7a51730557305425aab69e8d31cc32f348f85996fb5a";
             };
-            beamDeps  = [ decimal_1_1_1 ];
+            beamDeps  = [ decimal_1_1_2 ];
 
             meta = {
               description = ''PostgreSQL driver for Elixir.'';
@@ -22679,6 +31737,31 @@ let
 
     power_assert = power_assert_0_0_8;
 
+    ppg_0_1_3 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex, evel_0_1_1 }:
+          buildRebar3 ({
+            name = "ppg";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "ppg";
+              version = "0.1.3";
+              sha256 =
+                "8bbd51b5c1f2e08636839ad6f6151b3ad2a5c46e3fe8bdb1f33f79a2b57d1e13";
+            };
+
+            beamDeps  = [ evel_0_1_1 ];
+
+            meta = {
+              description = ''Plumtree based Process Group'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sile/ppg";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ppg = ppg_0_1_3;
+
     pqueue_1_5_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -22702,17 +31785,17 @@ let
 
     pqueue = pqueue_1_5_1;
 
-    pragmatic_0_1_6 = callPackage
+    pragmatic_0_1_7 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "pragmatic";
-            version = "0.1.6";
+            version = "0.1.7";
             src = fetchHex {
               pkg = "pragmatic";
-              version = "0.1.6";
+              version = "0.1.7";
               sha256 =
-                "e26b1b60d9657a61b6543646817a5d2dff73120bae33fa3de4c60bb356cf49b0";
+                "a86e89bf594108715bf7db70ccb93eb2a020367a9bb6c441ca74d3eb92c35fa3";
             };
 
             meta = {
@@ -22725,7 +31808,7 @@ let
           } // packageOverrides)
       ) {};
 
-    pragmatic = pragmatic_0_1_6;
+    pragmatic = pragmatic_0_1_7;
 
     prefecture_jp_0_0_2 = callPackage
       (
@@ -22855,17 +31938,40 @@ let
 
     pricing = pricing_0_0_1;
 
-    progress_bar_1_4_0 = callPackage
+    priority_queue_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "priority_queue";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "priority_queue";
+              version = "1.0.0";
+              sha256 =
+                "ba3dc420a5898d863803455c05ad870c6b6f3adb12b50ebea6cd6aeed1b358b7";
+            };
+
+            meta = {
+              description = ''Priority Queue for Elixir. Heap implementation'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ewildgoose/elixir_priority_queue";
+            };
+          } // packageOverrides)
+      ) {};
+
+    priority_queue = priority_queue_1_0_0;
+
+    progress_bar_1_5_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "progress_bar";
-            version = "1.4.0";
+            version = "1.5.0";
             src = fetchHex {
               pkg = "progress_bar";
-              version = "1.4.0";
+              version = "1.5.0";
               sha256 =
-                "c184bba509ec32f81ee03a596972b84e7e9d04de2ae076a408bd08a7a80e98fa";
+                "36fa99f89b876078a19f9d929dd74a043a5e34bbf8d62cda5d9cd26e2ce94426";
             };
 
             meta = {
@@ -22876,7 +31982,114 @@ let
           } // packageOverrides)
       ) {};
 
-    progress_bar = progress_bar_1_4_0;
+    progress_bar = progress_bar_1_5_0;
+
+    project_info_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "project_info";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "project_info";
+              version = "1.0.0";
+              sha256 =
+                "749553b710d363e5b900a6d3d37da7c461b8f7a977c9da814124f5862cf209a0";
+            };
+
+            meta = {
+              longDescription = ''A mix task to get info about the current mix
+                                project such as name or version number. Useful
+                                to automate tasks using a CI server or a build
+                                script.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nubleer/project_info";
+            };
+          } // packageOverrides)
+      ) {};
+
+    project_info = project_info_1_0_0;
+
+    prometheus_0_2_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "prometheus";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "prometheus";
+              version = "0.2.0";
+              sha256 =
+                "9fbf8aeee723667f86f1d24bbe2562a4db4322ef850d5d6cc353d15c54f64937";
+            };
+
+            meta = {
+              description = ''Prometheus monitoring system and time series
+                            database client in Erlang.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/deadtrickster/prometheus.erl";
+            };
+          } // packageOverrides)
+      ) {};
+
+    prometheus = prometheus_0_2_0;
+
+    prometheus_plugs_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          prometheus_0_2_0,
+          plug_1_1_5,
+          cowboy_1_0_4
+        }:
+          buildMix ({
+            name = "prometheus_plugs";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "prometheus_plugs";
+              version = "0.0.3";
+              sha256 =
+                "b15e425ba78e1c76368b66b22f5e22d283fa3cff26f3a4d45a2498cb5db6c0ff";
+            };
+            beamDeps  = [ prometheus_0_2_0 plug_1_1_5 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Prometheus monitoring system client Plugs. Http
+                            metrics collector and exporter'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/deadtrickster/prometheus-plugs";
+            };
+          } // packageOverrides)
+      ) {};
+
+    prometheus_plugs = prometheus_plugs_0_0_3;
+
+    prop_types_0_0_11 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, tipo_0_0_3 }:
+          buildMix ({
+            name = "prop_types";
+            version = "0.0.11";
+            src = fetchHex {
+              pkg = "prop_types";
+              version = "0.0.11";
+              sha256 =
+                "d786fbef06701e21871f39c9c1bb3354966f24cd606d1b1fd7bff1cc97d2873f";
+            };
+            beamDeps  = [ tipo_0_0_3 ];
+
+            meta = {
+              description = ''Property Type validations and checkers for elixir
+                            apps'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bakasho/prop_types";
+            };
+          } // packageOverrides)
+      ) {};
+
+    prop_types = prop_types_0_0_11;
 
     proper_case_0_1_1 = callPackage
       (
@@ -22929,19 +32142,25 @@ let
 
     proplist = proplist_1_1_0;
 
-    proto_def_0_0_1 = callPackage
+    proto_def_0_0_4 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          estree_2_3_0
+        }:
           buildMix ({
             name = "proto_def";
-            version = "0.0.1";
+            version = "0.0.4";
             src = fetchHex {
               pkg = "proto_def";
-              version = "0.0.1";
+              version = "0.0.4";
               sha256 =
-                "0b045cd0f4684c7b0fe8100e136e7b54c2be247423cad741d4d9405e6178a769";
+                "155b17cd62296cc1d5ee0333a87df4b25616a6dff7863a8e7ad219437db5a37e";
             };
-            beamDeps  = [ poison_2_1_0 ];
+            beamDeps  = [ poison_2_1_0 estree_2_3_0 ];
 
             meta = {
               longDescription = ''ProtoDef compiler for Elixir. (mostly)
@@ -22953,33 +32172,7 @@ let
           } // packageOverrides)
       ) {};
 
-    proto_def = proto_def_0_0_1;
-
-    provider_asn1_0_2_1 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "provider_asn1";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "provider_asn1";
-              version = "0.2.1";
-              sha256 =
-                "1fbf4a1a9711b6308423a213d45dbe409937cdfbad0816491d18aea5d3c44242";
-            };
-
-            buildPlugins  = [ rebar3_hex ];
-
-
-            meta = {
-              description = ''Compile ASN.1 with Rebar3'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/knusbaum/provider_asn1";
-            };
-          } // packageOverrides)
-      ) {};
-
-    provider_asn1 = provider_asn1_0_2_1;
+    proto_def = proto_def_0_0_4;
 
     providers_1_4_1 = callPackage
       (
@@ -23029,6 +32222,117 @@ let
 
     providers = providers_1_6_0;
 
+    proxy_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_5,
+          httpoison_0_8_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
+            name = "proxy";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "proxy";
+              version = "0.0.1";
+              sha256 =
+                "74691b18a0918d6e14df1f254ee9f342a547bc280151a4d88a540839ae75bbae";
+            };
+            beamDeps  = [ plug_1_1_5 httpoison_0_8_3 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Proxy plug for upstream servers'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/chadwpry/elixir-proxy";
+            };
+          } // packageOverrides)
+      ) {};
+
+    proxy = proxy_0_0_1;
+
+    public_suffix_0_3_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, idna_2_0_0 }:
+          buildMix ({
+            name = "public_suffix";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "public_suffix";
+              version = "0.3.0";
+              sha256 =
+                "ffced61dca1d881ed91b4c6ee675e707bd1dbff14adb48adebf0bebbaeccae48";
+            };
+            beamDeps  = [ idna_2_0_0 ];
+
+            meta = {
+              longDescription = ''Operate on domain names using the public
+                                suffix rules provided by
+                                https://publicsuffix.org/.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/seomoz/publicsuffix-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    public_suffix = public_suffix_0_3_0;
+
+    publicsuffix_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "publicsuffix";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "publicsuffix";
+              version = "0.0.1";
+              sha256 =
+                "c20351c883ab00a424c6eace4adb23726fbf242240bc63f583f4c07cbe0a824b";
+            };
+
+            meta = {
+              description = ''Domain name parser for Elixir based on the Public
+                            Suffix List.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/weppos/publicsuffix-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    publicsuffix = publicsuffix_0_0_1;
+
+    pubnub_ex_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          exjsx_3_2_0
+        }:
+          buildMix ({
+            name = "pubnub_ex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "pubnub_ex";
+              version = "0.0.2";
+              sha256 =
+                "83d270cfe2be6728fb96d9145371a87ddc876a97f91cdca2584cc82c2a0b91cb";
+            };
+            beamDeps  = [ httpoison_0_8_3 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''A pubsub tool for pubnub.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ryuone/pubnub_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pubnub_ex = pubnub_ex_0_0_2;
+
     pubsub_0_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -23052,26 +32356,83 @@ let
 
     pubsub = pubsub_0_0_2;
 
-    qdate_0_4_2 = callPackage
+    pulse_0_1_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, sonic_0_1_3 }:
+          buildMix ({
+            name = "pulse";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "pulse";
+              version = "0.1.3";
+              sha256 =
+                "8d9ab6b8f5b3e8da2feedb32062b97243bfc8c250ad5bab09fd61944e51e6aa0";
+            };
+            beamDeps  = [ sonic_0_1_3 ];
+
+            meta = {
+              longDescription = ''Service registration and discovery library
+                                for Elixir. Relies on etcd as an external
+                                service registry.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/heroiclabs/pulse";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pulse = pulse_0_1_3;
+
+    pusher_0_1_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          signaturex_1_0_1,
+          httpoison_0_8_3,
+          exjsx_3_2_0
+        }:
+          buildMix ({
+            name = "pusher";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "pusher";
+              version = "0.1.3";
+              sha256 =
+                "1443c9652d3a3d03fcfef0e8dca817affa80d1c4e0eb582282af0d9c69a087f3";
+            };
+            beamDeps  = [ signaturex_1_0_1 httpoison_0_8_3 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Pusher HTTP client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/pusher";
+            };
+          } // packageOverrides)
+      ) {};
+
+    pusher = pusher_0_1_3;
+
+    qdate_0_4_3 = callPackage
       (
         {
           buildRebar3,
           packageOverrides ? {},
           fetchHex,
-          erlware_commons_0_18_0,
+          erlware_commons_0_20_0,
           erlang_localtime_1_0_0
         }:
           buildRebar3 ({
             name = "qdate";
-            version = "0.4.2";
+            version = "0.4.3";
             src = fetchHex {
               pkg = "qdate";
-              version = "0.4.2";
+              version = "0.4.3";
               sha256 =
-                "4cb9dcc4418e57e27aff12d0e7d6c6e373a18e130ad66155a3dfdccde848c052";
+                "0bbad4929a7cf2432c832fe45310080776c64973037c5b1aa21bbe05dbc61401";
             };
 
-            beamDeps  = [ erlware_commons_0_18_0 erlang_localtime_1_0_0 ];
+            beamDeps  = [ erlware_commons_0_20_0 erlang_localtime_1_0_0 ];
 
             meta = {
               description = ''Simple Date and Timezone handling for Erlang'';
@@ -23081,7 +32442,67 @@ let
           } // packageOverrides)
       ) {};
 
-    qdate = qdate_0_4_2;
+    qdate = qdate_0_4_3;
+
+    qiita_ex_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          exjsx_3_2_0
+        }:
+          buildMix ({
+            name = "qiita_ex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "qiita_ex";
+              version = "0.0.2";
+              sha256 =
+                "0bb9a5535c0915c426ff13350b907cbd2b455bb99d8bcb8324ffadb6c9bcf1eb";
+            };
+            beamDeps  = [ httpoison_0_8_3 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Qiita API v2 Interface for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ma2gedev/qiita_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    qiita_ex = qiita_ex_0_0_2;
+
+    qiniu_0_3_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "qiniu";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "qiniu";
+              version = "0.3.0";
+              sha256 =
+                "f47360528cd289be5f5bb444d289e90f5f330a3230c9386f5a7aecd019a73081";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Qiniu Resource (Cloud) Storage SDK for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tony612/qiniu";
+            };
+          } // packageOverrides)
+      ) {};
+
+    qiniu = qiniu_0_3_0;
 
     qlc_1_0_0 = callPackage
       (
@@ -23108,7 +32529,7 @@ let
 
     quantum_1_7_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, timex_2_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_2_1_6 }:
           buildMix ({
             name = "quantum";
             version = "1.7.1";
@@ -23118,7 +32539,7 @@ let
               sha256 =
                 "55a74be6a021816fe78d9a4a9450281e027302806313c9fa6e51694d44106c0a";
             };
-            beamDeps  = [ timex_2_1_3 ];
+            beamDeps  = [ timex_2_1_6 ];
 
             meta = {
               description = ''Cron-like job scheduler for Elixir.'';
@@ -23153,6 +32574,29 @@ let
 
     quark = quark_1_0_2;
 
+    queue_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "queue";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "queue";
+              version = "0.0.1";
+              sha256 =
+                "a383d4b4a64e7639e66f314ae9e38e387453bcce6c96173e3d90b497c82bed9b";
+            };
+
+            meta = {
+              description = ''Elixir wrapper for erlang double sided FIFO
+                            queue'';
+
+            };
+          } // packageOverrides)
+      ) {};
+
+    queue = queue_0_0_1;
+
     queuex_0_2_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -23202,28 +32646,6 @@ let
 
     quickrand = quickrand_1_5_1;
 
-    quintana_0_2_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex, folsom_0_8_3 }:
-          buildRebar3 ({
-            name = "quintana";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "quintana";
-              version = "0.2.0";
-              sha256 =
-                "0646fe332ca3415ca6b0b273b4a5689ec902b9f9004ca62229ded00bd5f64cda";
-            };
-
-            beamDeps  = [ folsom_0_8_3 ];
-
-            meta = {
-              description = ''Wrapper around some Folsom functions'';
-
-            };
-          } // packageOverrides)
-      ) {};
-
     quintana_0_2_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex, folsom_0_8_3 }:
@@ -23323,7 +32745,7 @@ let
 
     rails_4_2_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "rails";
             version = "4.2.0";
@@ -23333,7 +32755,7 @@ let
               sha256 =
                 "731692769aa106a20c87b12dca15336fd1d16a7f02e2615ad76f6ce83a2b0b46";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               longDescription = ''A plug to get your plug/phoenix applications
@@ -23346,6 +32768,60 @@ let
 
     rails = rails_4_2_0;
 
+    ralitobu_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "ralitobu";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ralitobu";
+              version = "0.1.0";
+              sha256 =
+                "c131ef38e9f9e438e7479ba34430c7c874d1646670d6636a8cc98db2f113d075";
+            };
+
+            meta = {
+              description = ''The Rate Limiter with Token Bucket algorithm'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/asaaki/ralitobu";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ralitobu = ralitobu_0_1_0;
+
+    ralitobu_plug_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          ralitobu_0_1_0,
+          plug_1_1_5
+        }:
+          buildMix ({
+            name = "ralitobu_plug";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ralitobu_plug";
+              version = "0.1.0";
+              sha256 =
+                "f6c425f0dea74222243ffb3d4aaefd24b5ee0547ec71ac78896f1cfe02821e74";
+            };
+            beamDeps  = [ ralitobu_0_1_0 plug_1_1_5 ];
+
+            meta = {
+              description = ''Elixir Plug for Ralitobu, the Rate Limiter with
+                            Token Bucket algorithm'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/asaaki/ralitobu_plug";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ralitobu_plug = ralitobu_plug_0_1_0;
+
     ranch_1_1_0 = callPackage
       (
         {  buildErlangMk, packageOverrides ? {}, fetchHex }:
@@ -23438,19 +32914,19 @@ let
 
     range_extras = range_extras_0_1_0;
 
-    rankmatcher_0_1_4 = callPackage
+    rankmatcher_0_1_5 = callPackage
       (
         {
           buildRebar3, packageOverrides ? {}, fetchHex, libsnarlmatch_0_1_7
         }:
           buildRebar3 ({
             name = "rankmatcher";
-            version = "0.1.4";
+            version = "0.1.5";
             src = fetchHex {
               pkg = "rankmatcher";
-              version = "0.1.4";
+              version = "0.1.5";
               sha256 =
-                "ae02bd458ba5c4298809e056668206dac3675c15319780808cbdde48068185c6";
+                "304704fcc294c636d80f030001495ada0e6b66a36c7a2f785964c8f491e3f197";
             };
 
             beamDeps  = [ libsnarlmatch_0_1_7 ];
@@ -23463,7 +32939,71 @@ let
           } // packageOverrides)
       ) {};
 
-    rankmatcher = rankmatcher_0_1_4;
+    rankmatcher = rankmatcher_0_1_5;
+
+    rapidax_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
+            name = "rapidax";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "rapidax";
+              version = "0.0.3";
+              sha256 =
+                "9912b79b3d2729465bf66315bd955e031aeb038f05a63faa2dc0414026edb18c";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Rapidly develop your API client - based on
+                            rapidash gem'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/victorlcampos/rapidax";
+            };
+          } // packageOverrides)
+      ) {};
+
+    rapidax = rapidax_0_0_3;
+
+    ratio_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "ratio";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "ratio";
+              version = "1.0.0";
+              sha256 =
+                "bd20f7aff8c5052a59037a66b603df55a7f23db1b23e7f8287bd331c0d9b8e9c";
+            };
+
+            meta = {
+              longDescription = ''This library allows you to use Rational
+                                numbers in Elixir, to enable exact calculations
+                                with all numbers big and small. It defines the
+                                new <|> operator, (optionally) overrides the
+                                arithmetic +, -, * and / operators to work with
+                                ints, floats and Rational numbers all alike.
+                                Floats are also automatically coerced into
+                                Rationals whenever possible. And don`t worry: If
+                                you don`t like operator-overloading: There are
+                                longhand function aliases available too.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/qqwy/elixir-rational";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ratio = ratio_1_0_0;
 
     rational_0_2_0 = callPackage
       (
@@ -23517,36 +33057,240 @@ let
 
     ratx = ratx_0_1_0;
 
-    readme_md_doc_0_1_2 = callPackage
+    ravel_0_0_6 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "ravel";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "ravel";
+              version = "0.0.6";
+              sha256 =
+                "a8fc97393216e2c4429982deefb77b48031ca7feca1f81835451af8977d4932e";
+            };
+
+            meta = {
+              description = ''Extendable validation for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/revati/ravel";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ravel = ravel_0_0_6;
+
+    ravenex_0_0_5 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          ex_doc_0_11_4,
-          argument_parser_0_1_3
+          uuid_1_1_4,
+          poison_2_1_0,
+          httpoison_0_8_3
         }:
           buildMix ({
-            name = "readme_md_doc";
-            version = "0.1.2";
+            name = "ravenex";
+            version = "0.0.5";
             src = fetchHex {
-              pkg = "readme_md_doc";
-              version = "0.1.2";
+              pkg = "ravenex";
+              version = "0.0.5";
               sha256 =
-                "3353e8598991afbaa8d12344212fdd9c85413d1664b026a7ee1036573c6f536c";
+                "909039771fc414dd95d72d3e57c474f5ba7e593c9a9b448e3849ea68aa9d58cc";
             };
-            beamDeps  = [ ex_doc_0_11_4 argument_parser_0_1_3 ];
+            beamDeps  = [ uuid_1_1_4 poison_2_1_0 httpoison_0_8_3 ];
 
             meta = {
-              description = ''README.md generation tool for small Elixir
-                            project'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/jisaacstone/readme_md_docgen";
+              longDescription = ''Ravenex is an Elixir client for Sentry.
+                                Automatically send error notifications to
+                                Sentry. Easily connects with Phoenix through
+                                adding a logger or Plug.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hayesgm/ravenex";
             };
           } // packageOverrides)
       ) {};
 
-    readme_md_doc = readme_md_doc_0_1_2;
+    ravenex = ravenex_0_0_5;
+
+    raxx_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
+            name = "raxx";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "raxx";
+              version = "0.0.1";
+              sha256 =
+                "b4a2fbb7d4e85932626656d38adb4de95d47bce04255a9c5b7c2562a27f92111";
+            };
+            beamDeps  = [ httpoison_0_8_3 cowboy_1_0_4 ];
+
+            meta = {
+              longDescription = ''A Elixir webserver interface, for stateless
+                                HTTP. Raxx exists to simplify handling the HTTP
+                                request-response cycle. It deliberately does not
+                                handle other communication styles that are part
+                                of the modern web.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/crowdhailer/raxx";
+            };
+          } // packageOverrides)
+      ) {};
+
+    raxx = raxx_0_0_1;
+
+    react_on_elixir_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          poison_1_5_2
+        }:
+          buildMix ({
+            name = "react_on_elixir";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "react_on_elixir";
+              version = "0.0.4";
+              sha256 =
+                "5747938079acd15a39768a77ab013b199d429d725397fcd1e8313abf6eeb7c3b";
+            };
+            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 ];
+
+            meta = {
+              description = ''Server render react components from Elixir'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/gauravtiwari/react_on_elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    react_on_elixir = react_on_elixir_0_0_4;
+
+    read_repos_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "read_repos";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "read_repos";
+              version = "0.0.1";
+              sha256 =
+                "f981ea689d21956e1470d947ba24c5480e808fdf1a9da4cd148e5a4e1247e8b4";
+            };
+
+            meta = {
+              description = ''Simple master-slave library for Ecto.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kenta-aktsk/read_repos";
+            };
+          } // packageOverrides)
+      ) {};
+
+    read_repos = read_repos_0_0_1;
+
+    readability_0_5_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          floki_0_8_1
+        }:
+          buildMix ({
+            name = "readability";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "readability";
+              version = "0.5.0";
+              sha256 =
+                "82b03705957be376e748029a9ac94a699f5dac072fdef662c46258c83d7e1a3e";
+            };
+            beamDeps  = [ httpoison_0_8_3 floki_0_8_1 ];
+
+            meta = {
+              description = ''Readability library for extracting and curating
+                            articles.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/keepcosmos/readability";
+            };
+          } // packageOverrides)
+      ) {};
+
+    readability = readability_0_5_0;
+
+    readit_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "readit";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "readit";
+              version = "0.0.3";
+              sha256 =
+                "a3f99c65e9ef62c625c81150735b7456db71e350cf892ee1119d3839cfab361e";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A Simple Read-Only Reddit API Client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adamzaninovich/readit";
+            };
+          } // packageOverrides)
+      ) {};
+
+    readit = readit_0_0_3;
+
+    reagent_0_1_9 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          socket_0_3_4,
+          exts_0_3_1
+        }:
+          buildMix ({
+            name = "reagent";
+            version = "0.1.9";
+            src = fetchHex {
+              pkg = "reagent";
+              version = "0.1.9";
+              sha256 =
+                "c76c57437dff9d46fcc617a2c2ae9d87bef1c3619c2e6da84fa0bd2392591e5b";
+            };
+            beamDeps  = [ socket_0_3_4 exts_0_3_1 ];
+
+            meta = {
+              description = ''You need more reagents to conjure this server'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/reagent";
+            };
+          } // packageOverrides)
+      ) {};
+
+    reagent = reagent_0_1_9;
 
     reap_0_1_3 = callPackage
       (
@@ -23600,17 +33344,17 @@ let
 
     reaxive = reaxive_0_1_0;
 
-    rebar3_appup_plugin_1_0_0 = callPackage
+    rebar3_appup_plugin_1_1_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
           buildRebar3 ({
             name = "rebar3_appup_plugin";
-            version = "1.0.0";
+            version = "1.1.1";
             src = fetchHex {
               pkg = "rebar3_appup_plugin";
-              version = "1.0.0";
+              version = "1.1.1";
               sha256 =
-                "8211e7cf4f251cdd3c324864e6e090d89a9edb58d019f4cdb7e1084cc6a4b9d7";
+                "ea6d33c962770187021c528d0472a4f0b123c4adaf3242afb33465b796a34497";
             };
 
             meta = {
@@ -23621,7 +33365,7 @@ let
           } // packageOverrides)
       ) {};
 
-    rebar3_appup_plugin = rebar3_appup_plugin_1_0_0;
+    rebar3_appup_plugin = rebar3_appup_plugin_1_1_1;
 
     rebar3_asn1_compiler_1_0_0 = callPackage
       (
@@ -23646,2423 +33390,6 @@ let
 
     rebar3_asn1_compiler = rebar3_asn1_compiler_1_0_0;
 
-    rebar3_cuttlefish_0_10_0 = callPackage
-      (
-        {
-          buildRebar3, packageOverrides ? {}, fetchHex, cuttlefish_2_0_7
-        }:
-          buildRebar3 ({
-            name = "rebar3_cuttlefish";
-            version = "0.10.0";
-            src = fetchHex {
-              pkg = "rebar3_cuttlefish";
-              version = "0.10.0";
-              sha256 =
-                "e19a7393b09f2ed35e6ebbac392290d6ff1428e6d8573eac9ce49684b324b6e0";
-            };
-
-            beamDeps  = [ cuttlefish_2_0_7 ];
-
-            meta = {
-              description = ''A rebar plugin'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/tsloughter/rebar3_cuttlefish";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rebar3_cuttlefish = rebar3_cuttlefish_0_10_0;
-
-    rebar3_diameter_compiler_0_3_1 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "rebar3_diameter_compiler";
-            version = "0.3.1";
-            src = fetchHex {
-              pkg = "rebar3_diameter_compiler";
-              version = "0.3.1";
-              sha256 =
-                "c5965e3810ccf9ef9ba9185a81fe569ef6e9f3a9e546e99c5e900736b0c39274";
-            };
-
-            meta = {
-              description = ''Compile diameter .dia files'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/carlosedp/rebar3_diameter_compiler";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rebar3_diameter_compiler = rebar3_diameter_compiler_0_3_1;
-
-    rebar3_elixirc_0_1_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "rebar3_elixirc";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "rebar3_elixirc";
-              version = "0.1.0";
-              sha256 =
-                "1c6ae367737306beefa0891d60cabf0357b85fcf472a2808c3e2295882f6ead8";
-            };
-
-            meta = {
-              description = ''A rebar plugin'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/tsloughter/rebar3_elixirc";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rebar3_elixirc = rebar3_elixirc_0_1_0;
-
-    rebar3_hex_1_19_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "rebar3_hex";
-            version = "1.19.0";
-            src = fetchHex {
-              pkg = "rebar3_hex";
-              version = "1.19.0";
-              sha256 =
-                "b7c291d742e25eeae5dc5bd97e5b0a8987dab17da65054f757311ad90b16b73e";
-            };
-
-            meta = {
-              description = ''Hex.pm plugin for rebar3'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tsloughter/rebar3_hex";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rebar3_hex = rebar3_hex_1_19_0;
-
-    rebar3_idl_compiler_0_3_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "rebar3_idl_compiler";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "rebar3_idl_compiler";
-              version = "0.3.0";
-              sha256 =
-                "31ba95205c40b990cb3c49abb397abc47b4d5f9c402db83f9daebbc44e69789d";
-            };
-
-            meta = {
-              description = ''Rebar3 IDL Compiler'';
-
-              homepage = "https://github.com/sebastiw/rebar3_idl_compiler";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rebar3_idl_compiler = rebar3_idl_compiler_0_3_0;
-
-    rebar3_neotoma_plugin_0_2_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex, neotoma_1_7_3 }:
-          buildRebar3 ({
-            name = "rebar3_neotoma_plugin";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "rebar3_neotoma_plugin";
-              version = "0.2.0";
-              sha256 =
-                "c0ebbdb08c017cac90c7d3310a9bd4a5088a46abd4e2fef9e9a9805a657396b8";
-            };
-
-            beamDeps  = [ neotoma_1_7_3 ];
-
-            meta = {
-              description = ''Neotoma rebar plugin'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage =
-                "https://github.com/zamotivator/rebar3_neotoma_plugin";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rebar3_neotoma_plugin = rebar3_neotoma_plugin_0_2_0;
-
-    rebar3_vendor_0_1_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "rebar3_vendor";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "rebar3_vendor";
-              version = "0.1.0";
-              sha256 =
-                "db0c9623e1c45eda4daa04752768d580682a827a314a548e5fd61ffcf950b301";
-            };
-
-            meta = {
-              description = ''Rebar3 plugin for vendoring dependencies.'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "http://github.com/tsloughter/rebar3_vendor";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rebar3_vendor = rebar3_vendor_0_1_0;
-
-    rebar_alias_0_1_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "rebar_alias";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "rebar_alias";
-              version = "0.1.0";
-              sha256 =
-                "59fb42b39964af3a29ebe94c11247f618dd4d5e4e1a69cfaffabbed03ccff70f";
-            };
-
-            meta = {
-              description = ''A rebar plugin'';
-
-            };
-          } // packageOverrides)
-      ) {};
-
-    rebar_alias = rebar_alias_0_1_0;
-
-    rebar_erl_vsn_0_1_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "rebar_erl_vsn";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "rebar_erl_vsn";
-              version = "0.1.0";
-              sha256 =
-                "7cf1e2e85a80785a4e4e1529a2c837dbd2d540214cf791214e56f931e5e9865d";
-            };
-
-            meta = {
-              description = ''defines for erlang versions'';
-              license = stdenv.lib.licenses.mit;
-            };
-          } // packageOverrides)
-      ) {};
-
-    rebar_erl_vsn = rebar_erl_vsn_0_1_0;
-
-    rebind_0_1_3 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "rebind";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "rebind";
-              version = "0.1.3";
-              sha256 =
-                "043322759e646ef255e91440d275573b70d9ac6bdf10988ec976ddcf1baf99c3";
-            };
-
-            meta = {
-              description = ''rebind parse transform for erlang'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/camshaft/rebind";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rebind = rebind_0_1_3;
-
-    recon_2_2_1 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "recon";
-            version = "2.2.1";
-            src = fetchHex {
-              pkg = "recon";
-              version = "2.2.1";
-              sha256 =
-                "6c548ad0f4916495a78977674a251847869f85b5125b7c2a44da3178955adfd1";
-            };
-
-            meta = {
-              description = ''Diagnostic tools for production use'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/ferd/recon/";
-            };
-          } // packageOverrides)
-      ) {};
-
-    recon = recon_2_2_1;
-
-    red_0_0_5 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, exredis_0_2_3 }:
-          buildMix ({
-            name = "red";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "red";
-              version = "0.0.5";
-              sha256 =
-                "191b394672817e1ef955cc9b99bd26c61daab9bbbbc089825e7957e92c0eba60";
-            };
-            beamDeps  = [ exredis_0_2_3 ];
-
-            meta = {
-              longDescription = ''Red is an Elixir library that uses Redis to
-                                persist relationships between objects, like a
-                                graph.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/rodrigues/red";
-            };
-          } // packageOverrides)
-      ) {};
-
-    red = red_0_0_5;
-
-    red_black_tree_1_2_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "red_black_tree";
-            version = "1.2.0";
-            src = fetchHex {
-              pkg = "red_black_tree";
-              version = "1.2.0";
-              sha256 =
-                "1e8e7b85d075e249f9384ba0fcd2aacbff3697a5cb3cb5c9838c86f762b79725";
-            };
-
-            meta = {
-              description = ''Red-Black trees: an ordered key-value store with
-                            O(log(N)) performance'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/SenecaSystems/red_black_tree";
-            };
-          } // packageOverrides)
-      ) {};
-
-    red_black_tree = red_black_tree_1_2_0;
-
-    redis_pool_0_2_3 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          poolboy_1_5_1,
-          eredis_1_0_8
-        }:
-          buildMix ({
-            name = "redis_pool";
-            version = "0.2.3";
-            src = fetchHex {
-              pkg = "redis_pool";
-              version = "0.2.3";
-              sha256 =
-                "e30620f1376b516fb0ccbb40b0f1097e23a21c5676b1cd3fe9fe89fb9f655339";
-            };
-            beamDeps  = [ poolboy_1_5_1 eredis_1_0_8 ];
-
-            meta = {
-              description = ''Redis pool for Elixir. Build on top of eredis and
-                            poolboy.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/le0pard/redis_pool";
-            };
-          } // packageOverrides)
-      ) {};
-
-    redis_pool = redis_pool_0_2_3;
-
-    redis_poolex_0_0_5 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          poolboy_1_5_1,
-          exredis_0_2_3
-        }:
-          buildMix ({
-            name = "redis_poolex";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "redis_poolex";
-              version = "0.0.5";
-              sha256 =
-                "aec40aa6807c6629a20657af502073849263bc35385abbcbb13748aaf8c995b6";
-            };
-            beamDeps  = [ poolboy_1_5_1 exredis_0_2_3 ];
-
-            meta = {
-              description = ''Redis connection pool using poolboy and exredis
-                            libraries'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/oivoodoo/redis_poolex";
-            };
-          } // packageOverrides)
-      ) {};
-
-    redis_poolex = redis_poolex_0_0_5;
-
-    redix_0_3_6 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, connection_1_0_2 }:
-          buildMix ({
-            name = "redix";
-            version = "0.3.6";
-            src = fetchHex {
-              pkg = "redix";
-              version = "0.3.6";
-              sha256 =
-                "6c7e3d6bf904eeff99232d28832d3234e4309179dc11516829dd672c8a98a663";
-            };
-            beamDeps  = [ connection_1_0_2 ];
-
-            meta = {
-              description = ''Superfast, pipelined, resilient Redis driver for
-                            Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/whatyouhide/redix";
-            };
-          } // packageOverrides)
-      ) {};
-
-    redix = redix_0_3_6;
-
-    redo_2_0_1 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "redo";
-            version = "2.0.1";
-            src = fetchHex {
-              pkg = "redo";
-              version = "2.0.1";
-              sha256 =
-                "f7b2be8c825ec34413c54d8f302cc935ce4ecac8421ae3914c5dadd816dcb1e6";
-            };
-
-            meta = {
-              description = ''Pipelined Redis Erlang Driver'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/heroku/redo";
-            };
-          } // packageOverrides)
-      ) {};
-
-    redo = redo_2_0_1;
-
-    ref_inspector_0_8_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, poolboy_1_5_1 }:
-          buildMix ({
-            name = "ref_inspector";
-            version = "0.8.0";
-            src = fetchHex {
-              pkg = "ref_inspector";
-              version = "0.8.0";
-              sha256 =
-                "3bef725ae702cfd9724fb1adabf1210740a15d6861feab01d13ccb9007f9a634";
-            };
-            beamDeps  = [ poolboy_1_5_1 ];
-
-            meta = {
-              description = ''Referer parser library'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/elixytics/ref_inspector";
-            };
-          } // packageOverrides)
-      ) {};
-
-    ref_inspector = ref_inspector_0_8_0;
-
-    regdom_0_0_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "regdom";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "regdom";
-              version = "0.0.1";
-              sha256 =
-                "845cdc5c60e50bac9684fa762ecd42627a84eedf96c7f554fceb0d8f3bfc86bd";
-            };
-
-            meta = {
-              description = ''elixir port of regdom-lib'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/adqio/regdom-lib";
-            };
-          } // packageOverrides)
-      ) {};
-
-    regdom = regdom_0_0_1;
-
-    relflow_1_0_5 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "relflow";
-            version = "1.0.5";
-            src = fetchHex {
-              pkg = "relflow";
-              version = "1.0.5";
-              sha256 =
-                "7a991b7e5e390f1cdb16dd0cbb9327bd70ce785e6cebcb6ea25a6693fd836b18";
-            };
-
-            buildPlugins  = [ rebar3_hex ];
-
-
-            meta = {
-              description = ''Rebar3 release workflow plugin'';
-              license = stdenv.lib.licenses.apsl20;
-            };
-          } // packageOverrides)
-      ) {};
-
-    relflow = relflow_1_0_5;
-
-    relief_0_0_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "relief";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "relief";
-              version = "0.0.1";
-              sha256 =
-                "81c51cdf1fbaa7654da74d4ac1831b0d79504affd7b1fbe9d6f16ce701288c50";
-            };
-
-            meta = {
-              description = ''A collection of Elixir Stream oriented relief
-                            mechanisms.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/voidlock/relief";
-            };
-          } // packageOverrides)
-      ) {};
-
-    relief = relief_0_0_1;
-
-    relocker_0_0_8 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, exredis_0_2_3 }:
-          buildMix ({
-            name = "relocker";
-            version = "0.0.8";
-            src = fetchHex {
-              pkg = "relocker";
-              version = "0.0.8";
-              sha256 =
-                "e5678d5fe1795384c672a15a80bf91e3007683e5d22bc523eed634635e89bf4b";
-            };
-            beamDeps  = [ exredis_0_2_3 ];
-
-            meta = {
-              description = ''A library for holding a lock in Redis.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/grandCru/relocker";
-            };
-          } // packageOverrides)
-      ) {};
-
-    relocker = relocker_0_0_8;
-
-    reltool_util_1_5_1 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "reltool_util";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "reltool_util";
-              version = "1.5.1";
-              sha256 =
-                "746e16871afdcf85d8a115389193c8d660d0df1d26d6ac700590e0ad252646b1";
-            };
-
-            meta = {
-              description = ''Erlang reltool utility functionality
-                            application'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/reltool_util";
-            };
-          } // packageOverrides)
-      ) {};
-
-    reltool_util = reltool_util_1_5_1;
-
-    relx_3_18_0 = callPackage
-      (
-        {
-          buildRebar3,
-          packageOverrides ? {},
-          fetchHex,
-          providers_1_6_0,
-          getopt_0_8_2,
-          erlware_commons_0_19_0,
-          cf_0_2_1,
-          bbmustache_1_0_4
-        }:
-          buildRebar3 ({
-            name = "relx";
-            version = "3.18.0";
-            src = fetchHex {
-              pkg = "relx";
-              version = "3.18.0";
-              sha256 =
-                "e76e0446b8d1b113f2b7dcc713f032ccdf1dbda33d76edfeb19c2b6b686dcad7";
-            };
-
-            beamDeps  = [
-                          providers_1_6_0
-                          getopt_0_8_2
-                          erlware_commons_0_19_0
-                          cf_0_2_1
-                          bbmustache_1_0_4
-                        ];
-
-            meta = {
-              description = ''Release assembler for Erlang/OTP Releases'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/erlware/relx";
-            };
-          } // packageOverrides)
-      ) {};
-
-    relx = relx_3_18_0;
-
-    relx_3_3_2 = callPackage
-      (
-        {
-          buildRebar3,
-          packageOverrides ? {},
-          fetchHex,
-          providers_1_4_1,
-          getopt_0_8_2,
-          erlware_commons_0_15_0,
-          bbmustache_1_0_3
-        }:
-          buildRebar3 ({
-            name = "relx";
-            version = "3.3.2";
-            src = fetchHex {
-              pkg = "relx";
-              version = "3.3.2";
-              sha256 =
-                "4c97df0ceb82890b3612b9c30e8d865e3d738fc69186bc94da0f75f619f7195a";
-            };
-
-            beamDeps  = [
-                          providers_1_4_1
-                          getopt_0_8_2
-                          erlware_commons_0_15_0
-                          bbmustache_1_0_3
-                        ];
-
-            meta = {
-              description = ''Release assembler for Erlang/OTP Releases'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/erlware/relx";
-            };
-          } // packageOverrides)
-      ) {};
-
-    relx_3_5_0 = callPackage
-      (
-        {
-          buildRebar3,
-          packageOverrides ? {},
-          fetchHex,
-          providers_1_4_1,
-          getopt_0_8_2,
-          erlware_commons_0_15_0,
-          bbmustache_1_0_3
-        }:
-          buildRebar3 ({
-            name = "relx";
-            version = "3.5.0";
-            src = fetchHex {
-              pkg = "relx";
-              version = "3.5.0";
-              sha256 =
-                "a8cbf529702024f56d03d43349a5aafac55a6aa1b2ecf7bd3e8cc61e72a858a1";
-            };
-
-            beamDeps  = [
-                          providers_1_4_1
-                          getopt_0_8_2
-                          erlware_commons_0_15_0
-                          bbmustache_1_0_3
-                        ];
-
-            meta = {
-              description = ''Release assembler for Erlang/OTP Releases'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/erlware/relx";
-            };
-          } // packageOverrides)
-      ) {};
-
-    remix_0_0_2 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "remix";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "remix";
-              version = "0.0.2";
-              sha256 =
-                "5f5555646ed4fca83fab8620735150aa0bc408c5a17a70d28cfa7086bc6f497c";
-            };
-
-            meta = {
-              description = ''Recompiles mix projects on any change to the lib
-                            directory.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/AgilionApps/remix";
-            };
-          } // packageOverrides)
-      ) {};
-
-    remix = remix_0_0_2;
-
-    remodel_0_0_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "remodel";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "remodel";
-              version = "0.0.1";
-              sha256 =
-                "f88edf81e99f7474792e71f5ab61155d1a031484565badebb8a15b0fe15b5207";
-            };
-
-            meta = {
-              longDescription = ''Remodel is an Elixir presenter package used
-                                to transform data structures. This is especially
-                                useful when a desired representation doesn`t
-                                match the schema defined within the database.
-                                '';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/stavro/remodel";
-            };
-          } // packageOverrides)
-      ) {};
-
-    remodel = remodel_0_0_1;
-
-    repoquery_0_0_2 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "repoquery";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "repoquery";
-              version = "0.0.2";
-              sha256 =
-                "6b379793fae7cf8ff696feaeff9bf06d58ad66a9cbadfc8a769291c54814c922";
-            };
-
-            meta = {
-              description = ''An Elixir interface for the `repoquery` cli
-                            tool.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rentpath/repoquery";
-            };
-          } // packageOverrides)
-      ) {};
-
-    repoquery = repoquery_0_0_2;
-
-    reprise_0_5_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "reprise";
-            version = "0.5.0";
-            src = fetchHex {
-              pkg = "reprise";
-              version = "0.5.0";
-              sha256 =
-                "9db9fe973d2ac318a079409a75a18a8c2b5b1554db05f3611e81f555103ed9ed";
-            };
-
-            meta = {
-              longDescription = ''Reprise reloads your modules after they`ve
-                                been recompiled. This is an intentionally
-                                simplified reloader when compared to the other
-                                ones, like exreloader or Mochiweb reloader. It
-                                aims to do one thing well. Only the beam files
-                                which were created under your mix project are
-                                scanned for changes. Deps are also excluded from
-                                checking and reloading. It doesn`t try to
-                                compile changed sources -- this task is better
-                                left to some shell tools like inotify.'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/herenowcoder/reprise";
-            };
-          } // packageOverrides)
-      ) {};
-
-    reprise = reprise_0_5_0;
-
-    resin_0_4_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
-          buildMix ({
-            name = "resin";
-            version = "0.4.1";
-            src = fetchHex {
-              pkg = "resin";
-              version = "0.4.1";
-              sha256 =
-                "c6bdfd13e91cbc289df91440e216b91aa590a7dafe59958b0197cedd8cfef792";
-            };
-            beamDeps  = [ plug_1_1_3 ];
-
-            meta = {
-              description = ''Pour resin in your plug pipeline to add
-                            (configurable) enterpriseyness!'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Frost/resin";
-            };
-          } // packageOverrides)
-      ) {};
-
-    resin = resin_0_4_1;
-
-    rest_1_5_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "rest";
-            version = "1.5.0";
-            src = fetchHex {
-              pkg = "rest";
-              version = "1.5.0";
-              sha256 =
-                "d99f75ef949eae41e28f707f9e1b6ea5fa07cba57c5365b5466ed357e8f78b07";
-            };
-
-            meta = {
-              description = ''REST erlang interface generator'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/synrc/rest";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rest = rest_1_5_0;
-
-    reup_0_1_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "reup";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "reup";
-              version = "0.1.0";
-              sha256 =
-                "949a672190119f8b24160167e3685fdd5397474f98dc875ccfd31378ebd68506";
-            };
-
-            buildPlugins  = [ rebar3_hex ];
-
-
-            meta = {
-              description = ''dev watcher that auto compiles and reloads
-                            modules'';
-              license = stdenv.lib.licenses.apsl20;
-            };
-          } // packageOverrides)
-      ) {};
-
-    reup = reup_0_1_0;
-
-    revision_plate_ex_0_1_0 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          plug_1_1_3,
-          cowboy_1_0_4
-        }:
-          buildMix ({
-            name = "revision_plate_ex";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "revision_plate_ex";
-              version = "0.1.0";
-              sha256 =
-                "6c88a514ae5b36999fd52c01cc3ea746f8ba9c7900b47f4758a65c197b8aed71";
-            };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
-
-            meta = {
-              longDescription = ''Plug application and middleware that serves
-                                endpoint returns application`s REVISION'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/KazuCocoa/revision_plate_ex";
-            };
-          } // packageOverrides)
-      ) {};
-
-    revision_plate_ex = revision_plate_ex_0_1_0;
-
-    rfc3339_0_9_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "rfc3339";
-            version = "0.9.0";
-            src = fetchHex {
-              pkg = "rfc3339";
-              version = "0.9.0";
-              sha256 =
-                "182314de35c9f4180b22eb5f22916d8d7a799c1109a060c752970273a9332ad6";
-            };
-
-            meta = {
-              description = ''an rfc3339 parser and formatter'';
-              license = with stdenv.lib.licenses; [ asl20 mit ];
-              homepage = "https://github.com/talentdeficit/rfc3339";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rfc3339 = rfc3339_0_9_0;
-
-    riak_dt_2_1_1 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "riak_dt";
-            version = "2.1.1";
-            src = fetchHex {
-              pkg = "riak_dt";
-              version = "2.1.1";
-              sha256 =
-                "b5ab9e1d579ec3129cbea4b1977261aa2c5ad634321f87ace83bb32b99f65396";
-            };
-
-            meta = {
-              description = ''riak CTDT datatypes'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/basho/riak_dt";
-            };
-          } // packageOverrides)
-      ) {};
-
-    riak_dt = riak_dt_2_1_1;
-
-    riak_sysmon_2_1_2 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex, lager_3_0_2 }:
-          buildRebar3 ({
-            name = "riak_sysmon";
-            version = "2.1.2";
-            src = fetchHex {
-              pkg = "riak_sysmon";
-              version = "2.1.2";
-              sha256 =
-                "a467f7a24fbdeac5b23baf0269758236458fabf8b498e9c551e61c5238e6f97c";
-            };
-
-            beamDeps  = [ lager_3_0_2 ];
-
-            meta = {
-              description = ''Rate-limiting system_monitor event handler'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/basho/riak_sysmon";
-            };
-          } // packageOverrides)
-      ) {};
-
-    riak_sysmon = riak_sysmon_2_1_2;
-
-    rollex_0_4_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, sfmt_0_12_7 }:
-          buildMix ({
-            name = "rollex";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "rollex";
-              version = "0.4.0";
-              sha256 =
-                "53410bbd7687ff751b51b9737965bff1ba9c3d0673af65752f4ae3be0de1b44c";
-            };
-            beamDeps  = [ sfmt_0_12_7 ];
-
-            meta = {
-              description = ''Elixir library using a Pratt Parser algorithm to
-                            calculate dice rolls.'';
-              license = stdenv.lib.licenses.mit;
-            };
-          } // packageOverrides)
-      ) {};
-
-    rollex = rollex_0_4_0;
-
-    roman_numerals_1_0_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "roman_numerals";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "roman_numerals";
-              version = "1.0.1";
-              sha256 =
-                "5e9dcfcb645c1ca937ddc0170805028596fbf4936d0119131350d7de95b7c6a1";
-            };
-
-            meta = {
-              description = ''Convert numbers to Roman numerals and back.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/lpil/roman-numerals";
-            };
-          } // packageOverrides)
-      ) {};
-
-    roman_numerals = roman_numerals_1_0_1;
-
-    romanex_0_1_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "romanex";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "romanex";
-              version = "0.1.0";
-              sha256 =
-                "b1f769bbf638d14247c70be8b944cfa76a84a00ef690e9cba26032ae03e33a89";
-            };
-
-            meta = {
-              description = ''Encode, Decode, and Validate Roman Numerals.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/itsgreggreg/romanex";
-            };
-          } // packageOverrides)
-      ) {};
-
-    romanex = romanex_0_1_0;
-
-    romeo_0_4_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, connection_1_0_2 }:
-          buildMix ({
-            name = "romeo";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "romeo";
-              version = "0.4.0";
-              sha256 =
-                "38f1fe4ddeab5865de68dff196cf18b86d7ba3b8bb49c2753f1d04b145f248d4";
-            };
-            beamDeps  = [ connection_1_0_2 ];
-
-            meta = {
-              description = ''An XMPP Client for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/scrogson/romeo";
-            };
-          } // packageOverrides)
-      ) {};
-
-    romeo = romeo_0_4_0;
-
-    rop_0_5_3 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "rop";
-            version = "0.5.3";
-            src = fetchHex {
-              pkg = "rop";
-              version = "0.5.3";
-              sha256 =
-                "3b8c37802c530eecc7714c175fe36486bb45157519cc7498ac487f6590f396e8";
-            };
-
-            meta = {
-              description = ''Some convenient macros to enable
-                            railsway-oriented programming in Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ruby2elixir/rop";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rop = rop_0_5_3;
-
-    rotor_0_2_2 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "rotor";
-            version = "0.2.2";
-            src = fetchHex {
-              pkg = "rotor";
-              version = "0.2.2";
-              sha256 =
-                "82de479c2cb6d26299916209d2945d1b39cf820f38279485ea5d5a8c494cb281";
-            };
-
-            meta = {
-              longDescription = ''Rotor is a build system for Elixir projects.
-                                Use it to compile things, run commands or do
-                                anything when files change. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/HashNuke/rotor";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rotor = rotor_0_2_2;
-
-    rquote_0_0_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "rquote";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "rquote";
-              version = "0.0.1";
-              sha256 =
-                "54e1cba92716a4176d89e20d841dbc3a1227ef2fd9f7ddc5711a900877912354";
-            };
-
-            meta = {
-              description = ''Library and CLI for generating random price
-                            quotes '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/stocks29/rquote";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rquote = rquote_0_0_1;
-
-    rsa_0_0_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "rsa";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "rsa";
-              version = "0.0.1";
-              sha256 =
-                "6351a45a5a58285c41d611ec32b37ee486d7dacd119d7ef90ada844c44e95596";
-            };
-
-            meta = {
-              description = ''Erlang public_key cryptography wrapper'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/trapped/elixir-rsa";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rsa = rsa_0_0_1;
-
-    rubix_0_0_2 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "rubix";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "rubix";
-              version = "0.0.2";
-              sha256 =
-                "b9083f7c8981fc162bfda5c8aa9855f79298905eb8e3b4a4089134614b2a8199";
-            };
-
-            meta = {
-              description = ''A very simple (and barely-functioning) Ruby
-                            runner for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/YellowApple/Rubix";
-            };
-          } // packageOverrides)
-      ) {};
-
-    rubix = rubix_0_0_2;
-
-    russian_0_1_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "russian";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "russian";
-              version = "0.1.0";
-              sha256 =
-                "ebacf93bb9f653f749f787d65629ed2bd830dec295fb785f44738c120e9fde9a";
-            };
-
-            meta = {
-              description = ''Transliterate a string with russian characters'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Kr00lIX/russian_elixir";
-            };
-          } // packageOverrides)
-      ) {};
-
-    russian = russian_0_1_0;
-
-    safetybox_0_1_2 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          earmark_0_2_1,
-          cryptex_0_0_1
-        }:
-          buildMix ({
-            name = "safetybox";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "safetybox";
-              version = "0.1.2";
-              sha256 =
-                "7785f6f8f53082af331a3dd44d9a1dd759d7c7981f3b6924482c81370b8cc706";
-            };
-            beamDeps  = [ earmark_0_2_1 cryptex_0_0_1 ];
-
-            meta = {
-              description = ''A set of helper functions for security oriented
-                            operations, like encrypt. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/aforward/safetybox";
-            };
-          } // packageOverrides)
-      ) {};
-
-    safetybox = safetybox_0_1_2;
-
-    salsa20_0_3_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "salsa20";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "salsa20";
-              version = "0.3.0";
-              sha256 =
-                "4b2c2fc873c5443443220966f8c87e73d3d99725cd99cb93f6d752ce3cf3c335";
-            };
-
-            meta = {
-              description = ''Salsa20 symmetric stream cipher'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mwmiller/salsa20_ex";
-            };
-          } // packageOverrides)
-      ) {};
-
-    salsa20 = salsa20_0_3_0;
-
-    sap_0_0_2 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          plug_1_1_3,
-          control_0_0_4
-        }:
-          buildMix ({
-            name = "sap";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "sap";
-              version = "0.0.2";
-              sha256 =
-                "63f2db3cbbb753eac51177783463fb364dd560745bf5e4e8ba10a237e557903c";
-            };
-            beamDeps  = [ plug_1_1_3 control_0_0_4 ];
-
-            meta = {
-              longDescription = ''Sap is a toolkit for Plug applications to
-                                accept and respond to HTTP requests by using a
-                                decision tree built with combinators.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/slogsdon/sap";
-            };
-          } // packageOverrides)
-      ) {};
-
-    sap = sap_0_0_2;
-
-    sasl_ex_0_1_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "sasl_ex";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "sasl_ex";
-              version = "0.1.0";
-              sha256 =
-                "ce7f244817f6264738d5432d9b734921b9fdfe4ca2351a890ed678eb6fbaad3e";
-            };
-
-            meta = {
-              longDescription = ''A lib for decoding bytes in the format of the
-                                SASL protocol into an Elixir struct.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/elbow-jason/sasl_ex";
-            };
-          } // packageOverrides)
-      ) {};
-
-    sasl_ex = sasl_ex_0_1_0;
-
-    sbroker_0_7_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "sbroker";
-            version = "0.7.0";
-            src = fetchHex {
-              pkg = "sbroker";
-              version = "0.7.0";
-              sha256 =
-                "5bc0bfd79896fd5b92072a71fa4a1e120f4110f2cf9562a0b9dd2fcfe9e5cfd2";
-            };
-
-            meta = {
-              description = ''Process broker for dispatching with backpressure
-                            and load shedding'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/fishcakez/sbroker";
-            };
-          } // packageOverrides)
-      ) {};
-
-    sbroker = sbroker_0_7_0;
-
-    scaffold_0_0_5 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          gitex_0_1_0,
-          configparser_ex_0_2_1
-        }:
-          buildMix ({
-            name = "scaffold";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "scaffold";
-              version = "0.0.5";
-              sha256 =
-                "fad499b712a576bc9d0f4842494baf9ec8d4c388f99c14f74654b1dbd158945c";
-            };
-            beamDeps  = [ gitex_0_1_0 configparser_ex_0_2_1 ];
-
-            meta = {
-              description = ''A mix task for creating new projects based on
-                            templates fetched from a Git-repo.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/gausby/scaffold";
-            };
-          } // packageOverrides)
-      ) {};
-
-    scaffold = scaffold_0_0_5;
-
-    schedule_0_1_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "schedule";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "schedule";
-              version = "0.1.0";
-              sha256 =
-                "0b9b9440fe5e6d4a0cad34a170d3ec3251e06c42610f1c4106d93949b845db73";
-            };
-
-            meta = {
-              description = ''Basic operations with intervals for Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/dvele55/schedule";
-            };
-          } // packageOverrides)
-      ) {};
-
-    schedule = schedule_0_1_0;
-
-    schizo_0_0_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "schizo";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "schizo";
-              version = "0.0.1";
-              sha256 =
-                "278d738fe6d3d1455dd24e0450a95f4191b8ce63b7059a1b74e7bad86c47746d";
-            };
-
-            meta = {
-              description = ''Transform every other word in a sentence with
-                            some transformers.'';
-              license = stdenv.lib.licenses.unlicense;
-              homepage = "https://github.com/teerawat1992/Schizo";
-            };
-          } // packageOverrides)
-      ) {};
-
-    schizo = schizo_0_0_1;
-
-    seat_json_0_0_18 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "seat_json";
-            version = "0.0.18";
-            src = fetchHex {
-              pkg = "seat_json";
-              version = "0.0.18";
-              sha256 =
-                "d0e7339fb24e156e53aa4cc733dda90d1c3bfa5f5fc38b7e293b690e7289c516";
-            };
-
-            meta = {
-              description = ''Simple Elixir Api Testing lib'';
-
-            };
-          } // packageOverrides)
-      ) {};
-
-    seat_json = seat_json_0_0_18;
-
-    secure_random_0_1_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "secure_random";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "secure_random";
-              version = "0.1.1";
-              sha256 =
-                "55fa172d9f606bbf43a775f5b34b0866c8bbf242acf7e1ff1eafec2c07fdcc53";
-            };
-
-            meta = {
-              description = ''A convienance library based on Ruy`s
-                            SecureRandom'';
-              license = stdenv.lib.licenses.asl20;
-              homepage =
-                "https://github.com/patricksrobertson/secure_random.ex";
-            };
-          } // packageOverrides)
-      ) {};
-
-    secure_random_0_2_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "secure_random";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "secure_random";
-              version = "0.2.0";
-              sha256 =
-                "d17b17f5b25e38359838ae61165d18724084796fcbdf3c18f09ee5876892c5a0";
-            };
-
-            meta = {
-              description = ''A convienance library based on Ruy`s
-                            SecureRandom'';
-              license = stdenv.lib.licenses.asl20;
-              homepage =
-                "https://github.com/patricksrobertson/secure_random.ex";
-            };
-          } // packageOverrides)
-      ) {};
-
-    secure_random = secure_random_0_2_0;
-
-    segment_0_1_0 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          poison_1_3_1,
-          httpotion_2_2_2
-        }:
-          buildMix ({
-            name = "segment";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "segment";
-              version = "0.1.0";
-              sha256 =
-                "1747bf7a3f8d524d28890ce4499ef30a635f91c826d62e2b95711061faf02423";
-            };
-            beamDeps  = [ poison_1_3_1 httpotion_2_2_2 ];
-
-            meta = {
-              description = ''analytics_elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/stueccles/analytics-elixir";
-            };
-          } // packageOverrides)
-      ) {};
-
-    segment = segment_0_1_0;
-
-    semver_0_1_2 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "semver";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "semver";
-              version = "0.1.2";
-              sha256 =
-                "6e8150b94b1d5cbe3c31986a46cdc57c9af6f71f3747900280b2da7c0466a993";
-            };
-
-            meta = {
-              description = ''Utilities for working with semver.org-compliant
-                            version strings'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/lee-dohm/semver";
-            };
-          } // packageOverrides)
-      ) {};
-
-    semver = semver_0_1_2;
-
-    sentient_0_0_2 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
-          buildMix ({
-            name = "sentient";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "sentient";
-              version = "0.0.2";
-              sha256 =
-                "fb752b01c2eb4a729cbe8b8301acca5bcb75a242f12819b6a56f3be3c877c3ec";
-            };
-            beamDeps  = [ poison_1_5_2 ];
-
-            meta = {
-              description = ''Simple sentiment analysis based on the AFINN-111
-                            wordlist'';
-
-            };
-          } // packageOverrides)
-      ) {};
-
-    sentient = sentient_0_0_2;
-
-    setup_1_7_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "setup";
-            version = "1.7.0";
-            src = fetchHex {
-              pkg = "setup";
-              version = "1.7.0";
-              sha256 =
-                "50d9cd7862d15812d2fd96a688bd70d6b7df88bbbf42cab9f010bb0fd5c91baa";
-            };
-
-            meta = {
-              description = ''Generic setup application for Erlang-based
-                            systems'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/uwiger/setup";
-            };
-          } // packageOverrides)
-      ) {};
-
-    setup = setup_1_7_0;
-
-    sfmt_0_12_7 = callPackage
-      (
-        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
-          buildErlangMk ({
-            name = "sfmt";
-            version = "0.12.7";
-            src = fetchHex {
-              pkg = "sfmt";
-              version = "0.12.7";
-              sha256 =
-                "4e295f5053b4a525c00b990cd88b38e492716e7e0c62abf0c626d9fea0ba800e";
-            };
-
-            meta = {
-              description = ''SIMD-oriented Fast Mersenne Twister (SFMT) for
-                            Erlang.'';
-              license = stdenv.lib.licenses.bsd2;
-              homepage = "https://github.com/jj1bdx/sfmt-erlang/";
-            };
-          } // packageOverrides)
-      ) {};
-
-    sfmt_0_13_0 = callPackage
-      (
-        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
-          buildErlangMk ({
-            name = "sfmt";
-            version = "0.13.0";
-            src = fetchHex {
-              pkg = "sfmt";
-              version = "0.13.0";
-              sha256 =
-                "aaacd4824f2b3e439d360bcce6079863da1e7f564014602e9e7815f8740b6358";
-            };
-
-            meta = {
-              description = ''SIMD-oriented Fast Mersenne Twister (SFMT) for
-                            Erlang.'';
-              license = stdenv.lib.licenses.bsd2;
-              homepage = "https://github.com/jj1bdx/sfmt-erlang/";
-            };
-          } // packageOverrides)
-      ) {};
-
-    sfmt = sfmt_0_13_0;
-
-    sfsobject_0_0_3 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "sfsobject";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "sfsobject";
-              version = "0.0.3";
-              sha256 =
-                "fa30bf41d426d7dc899bd038ca44daf32c93e55452cfd0dc141eb6ded6d85f3c";
-            };
-
-            meta = {
-              description = ''Encode/decode SFSObjects'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/splattael/sfsobject";
-            };
-          } // packageOverrides)
-      ) {};
-
-    sfsobject = sfsobject_0_0_3;
-
-    sh_1_1_2 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "sh";
-            version = "1.1.2";
-            src = fetchHex {
-              pkg = "sh";
-              version = "1.1.2";
-              sha256 =
-                "78ec787a58d546ae915073978e9ad21a7b3e6187fb5b9c93922e6435542ae4c5";
-            };
-
-            meta = {
-              description = ''Run programs as functions in Elixir'';
-              license = stdenv.lib.licenses.unlicense;
-              homepage = "https://github.com/devinus/sh";
-            };
-          } // packageOverrides)
-      ) {};
-
-    sh = sh_1_1_2;
-
-    shameless_plug_1_0_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
-          buildMix ({
-            name = "shameless_plug";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "shameless_plug";
-              version = "1.0.0";
-              sha256 =
-                "65c8af34d1853e85c8412d6ca15fd39354668c09c124cbc8e35cffea59d3a617";
-            };
-            beamDeps  = [ plug_1_1_3 ];
-
-            meta = {
-              description = ''A novelty Plug to remove the word \"shame\" from
-                            the page body.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/henrik/shameless_plug";
-            };
-          } // packageOverrides)
-      ) {};
-
-    shameless_plug = shameless_plug_1_0_0;
-
-    shape_0_0_2 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "shape";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "shape";
-              version = "0.0.2";
-              sha256 =
-                "c2e990b68f3423110109bf7e6bbebe8c10307bb28778ebcf9f7d6e0b8dc854f2";
-            };
-
-            meta = {
-              description = ''A data validation library for Elixir based on
-                            Prismatoc Scheme'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/prio/shape";
-            };
-          } // packageOverrides)
-      ) {};
-
-    shape = shape_0_0_2;
-
-    short_maps_0_1_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "short_maps";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "short_maps";
-              version = "0.1.1";
-              sha256 =
-                "852170b9be988f51b7b8a920097238ab0847433c417a4bc3bea6cef3b013b2b8";
-            };
-
-            meta = {
-              description = ''Implementation of a ~m sigil for ES6-like maps in
-                            Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/whatyouhide/short_maps";
-            };
-          } // packageOverrides)
-      ) {};
-
-    short_maps = short_maps_0_1_1;
-
-    shotgun_0_2_2 = callPackage
-      (
-        {
-          buildErlangMk, packageOverrides ? {}, fetchHex, gun_1_0_0_pre_1
-        }:
-          buildErlangMk ({
-            name = "shotgun";
-            version = "0.2.2";
-            src = fetchHex {
-              pkg = "shotgun";
-              version = "0.2.2";
-              sha256 =
-                "d2993953cff0c82eb47744206ae171a141deeff84539fe2f58068e3909ae066c";
-            };
-            beamDeps  = [ gun_1_0_0_pre_1 ];
-
-            meta = {
-              description = ''better than just a gun'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/inaka/shotgun";
-            };
-          } // packageOverrides)
-      ) {};
-
-    shotgun_0_2_3 = callPackage
-      (
-        {
-          buildErlangMk,
-          packageOverrides ? {},
-          fetchHex,
-          gun_1_0_0_pre_1,
-          cowlib_1_0_2
-        }:
-          buildErlangMk ({
-            name = "shotgun";
-            version = "0.2.3";
-            src = fetchHex {
-              pkg = "shotgun";
-              version = "0.2.3";
-              sha256 =
-                "7b40dcf0faebf698fea541db5f6338f555d0c9c828493e9953d1748d9e5280b5";
-            };
-            beamDeps  = [ gun_1_0_0_pre_1 cowlib_1_0_2 ];
-
-            meta = {
-              description = ''better than just a gun'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/inaka/shotgun";
-            };
-          } // packageOverrides)
-      ) {};
-
-    shotgun = shotgun_0_2_3;
-
-    shouldi_0_3_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "shouldi";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "shouldi";
-              version = "0.3.0";
-              sha256 =
-                "1cc3706e7a7ce4e37f9893b3b49f1dc586f861ffd194f8170f118eaa324017d7";
-            };
-
-            meta = {
-              description = ''Elixir testing libraries with support for nested
-                            contexts'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/batate/shouldi";
-            };
-          } // packageOverrides)
-      ) {};
-
-    shouldi = shouldi_0_3_0;
-
-    shove_0_0_1 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          poolboy_1_5_1,
-          poison_1_5_2
-        }:
-          buildMix ({
-            name = "shove";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "shove";
-              version = "0.0.1";
-              sha256 =
-                "48c7db56f6df92c8cd50ff5cfc73ce12d843e257991af6c3d4762f8af50bd87f";
-            };
-            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 ];
-
-            meta = {
-              description = ''Push notifications for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bratsche/shove";
-            };
-          } // packageOverrides)
-      ) {};
-
-    shove = shove_0_0_1;
-
-    shrivel_0_0_3 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "shrivel";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "shrivel";
-              version = "0.0.3";
-              sha256 =
-                "c2a4874eed97044fe2bfa5e871f188a191b4042e72a6156cfd50c7c0d8296dbf";
-            };
-
-            meta = {
-              description = ''URL shortener'';
-
-              homepage = "https://github.com/Qeaql/shrivel";
-            };
-          } // packageOverrides)
-      ) {};
-
-    shrivel = shrivel_0_0_3;
-
-    sidejob_2_0_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "sidejob";
-            version = "2.0.0";
-            src = fetchHex {
-              pkg = "sidejob";
-              version = "2.0.0";
-              sha256 =
-                "19fea24060a1d0d37e78480fbd79d6b95e07f445aad725f7124a23194641c743";
-            };
-
-            meta = {
-              longDescription = ''sidejob is an Erlang library that implements
-                                a parallel, capacity-limited request pool. In
-                                sidejob, these pools are called resources. A
-                                resource is managed by multiple gen_server like
-                                processes which can be sent calls and casts
-                                using sidejob:call or sidejob:cast respectively.
-                                This library was originally written to support
-                                process bounding in Riak using the
-                                sidejob_supervisor behavior. In Riak, this is
-                                used to limit the number of concurrent get/put
-                                FSMs that can be active, failing client requests
-                                with {error, overload} if the limit is ever hit.
-                                The purpose being to provide a fail-safe
-                                mechanism during extreme overload scenarios. '';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/basho/sidejob";
-            };
-          } // packageOverrides)
-      ) {};
-
-    sidejob = sidejob_2_0_0;
-
-    sideshow_0_0_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "sideshow";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "sideshow";
-              version = "0.0.1";
-              sha256 =
-                "b1816b137826a6c5da5d19b0d52f1f0a1263756e1598ece8cd31be95a74e1a85";
-            };
-
-            meta = {
-              description = ''Background jobs OTP style'';
-              license = stdenv.lib.licenses.gpl3;
-              homepage = "https://github.com/pavlos/sideshow";
-            };
-          } // packageOverrides)
-      ) {};
-
-    sideshow = sideshow_0_0_1;
-
-    sidetask_1_1_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, sidejob_2_0_0 }:
-          buildMix ({
-            name = "sidetask";
-            version = "1.1.0";
-            src = fetchHex {
-              pkg = "sidetask";
-              version = "1.1.0";
-              sha256 =
-                "acf9f1620c003a13942cf607e360cfbfe57a3b5dcef1471653f4168891446d54";
-            };
-            beamDeps  = [ sidejob_2_0_0 ];
-
-            meta = {
-              longDescription = ''SideTask is an alternative to Elixir`s
-                                Task.Supervisor that uses Basho`s sidejob
-                                library for better parallelism and to support
-                                capacity limiting of Tasks. SideTask provides an
-                                API similar to Task.Supervisor, with the
-                                addition that all calls that start a new task
-                                require a sidejob resource as argument and can
-                                return `{:error, :overload}`. Convenience
-                                functions for adding and deleting sidejob
-                                resources are provided.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/MSch/sidetask";
-            };
-          } // packageOverrides)
-      ) {};
-
-    sidetask = sidetask_1_1_0;
-
-    signaturex_1_0_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "signaturex";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "signaturex";
-              version = "1.0.1";
-              sha256 =
-                "a8cb1b527026288dcb8d72a351e784c00cbd6e08964109595f08d85f41f022cc";
-            };
-
-            meta = {
-              description = ''Simple key/secret based authentication for
-                            APIs'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edgurgel/signaturex";
-            };
-          } // packageOverrides)
-      ) {};
-
-    signaturex = signaturex_1_0_1;
-
-    simetric_0_1_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "simetric";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "simetric";
-              version = "0.1.0";
-              sha256 =
-                "5a69a4b65670a0af0dba7e775b56e6995f2e599771ea360e87e28fd5b7eab3a9";
-            };
-
-            meta = {
-              longDescription = ''The library provides facilities to perform
-                                approximate string matching and measurement of
-                                string similarity/distance.'';
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/lexmag/simetric";
-            };
-          } // packageOverrides)
-      ) {};
-
-    simetric = simetric_0_1_0;
-
-    simple_agent_0_0_7 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "simple_agent";
-            version = "0.0.7";
-            src = fetchHex {
-              pkg = "simple_agent";
-              version = "0.0.7";
-              sha256 =
-                "23532eed173ab8e1a980095c5a1352e41d9f2a149005ed21b9d4f67859603ffe";
-            };
-
-            meta = {
-              description = ''A simplification/abstraction layer for the Agent
-                            module.'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/TheFirstAvenger/elixir-simple_agent.git";
-            };
-          } // packageOverrides)
-      ) {};
-
-    simple_agent = simple_agent_0_0_7;
-
-    simple_bar_0_0_7 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "simple_bar";
-            version = "0.0.7";
-            src = fetchHex {
-              pkg = "simple_bar";
-              version = "0.0.7";
-              sha256 =
-                "68fca76dee6fb1073e613e3498121b6a50739a2786f35d826309c55f55735ae1";
-            };
-
-            meta = {
-              description = ''The simplest cli progress bar'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jeffreybaird/simple_bar";
-            };
-          } // packageOverrides)
-      ) {};
-
-    simple_bar = simple_bar_0_0_7;
-
-    simple_secrets_1_0_0 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          pkcs7_1_0_2,
-          msgpax_0_8_2
-        }:
-          buildMix ({
-            name = "simple_secrets";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "simple_secrets";
-              version = "1.0.0";
-              sha256 =
-                "797c98d49250fb343ed9a98411db641a3e5ae3344433f0a46d22dfec98bce11f";
-            };
-            beamDeps  = [ pkcs7_1_0_2 msgpax_0_8_2 ];
-
-            meta = {
-              description = ''A simple, opinionated library for encrypting
-                            small packets of data securely.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/camshaft/simple_secrets_ex";
-            };
-          } // packageOverrides)
-      ) {};
-
-    simple_secrets = simple_secrets_1_0_0;
-
-    simplex_0_4_0 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          timex_1_0_2,
-          sweet_xml_0_6_1,
-          poison_1_5_2,
-          ibrowse_4_2_2,
-          httpotion_2_2_2
-        }:
-          buildMix ({
-            name = "simplex";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "simplex";
-              version = "0.4.0";
-              sha256 =
-                "43dfdc62aa2c4919464615b5acc4f03b028b3b9875fa72c128563e7d794ba2a2";
-            };
-            beamDeps  = [
-                          timex_1_0_2
-                          sweet_xml_0_6_1
-                          poison_1_5_2
-                          ibrowse_4_2_2
-                          httpotion_2_2_2
-                        ];
-
-            meta = {
-              description = ''An Elixir library for interacting with the Amazon
-                            SimpleDB API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/adamkittelson/simplex";
-            };
-          } // packageOverrides)
-      ) {};
-
-    simplex = simplex_0_4_0;
-
-    simpre_0_1_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "simpre";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "simpre";
-              version = "0.1.0";
-              sha256 =
-                "db0a48789360d2a683ea3a8605c2fb0134eb9fb63f07c0069be78906cdf5fb94";
-            };
-
-            meta = {
-              description = ''Simple Process Registry'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/yuce/simpre.git";
-            };
-          } // packageOverrides)
-      ) {};
-
-    simpre = simpre_0_1_0;
-
-    skills_0_0_1 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "skills";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "skills";
-              version = "0.0.1";
-              sha256 =
-                "3845188cae5b6f43a8a9488a57831be8259ca83131ac0a1adfd24fbe846eb30f";
-            };
-
-            meta = {
-              description = ''A skill-based ranking algorithms library for
-                            Elixir. Includes Elo and TrueSkill.'';
-              license = stdenv.lib.licenses.mpl20;
-              homepage = "https://github.com/folz/skills.ex";
-            };
-          } // packageOverrides)
-      ) {};
-
-    skills = skills_0_0_1;
-
-    slim_fast_0_10_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "slim_fast";
-            version = "0.10.0";
-            src = fetchHex {
-              pkg = "slim_fast";
-              version = "0.10.0";
-              sha256 =
-                "aae7eb1573c1ee98f5fa11098d758b80b35f4d67e6e5f81135ae4d66cb571c44";
-            };
-
-            meta = {
-              description = ''An Elixir library for rendering slim
-                            templates.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/doomspork/slim_fast";
-            };
-          } // packageOverrides)
-      ) {};
-
-    slim_fast = slim_fast_0_10_0;
-
-    slime_0_12_2 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "slime";
-            version = "0.12.2";
-            src = fetchHex {
-              pkg = "slime";
-              version = "0.12.2";
-              sha256 =
-                "389ed56ef536f25e29a99979ff1a3402ce21a0d40fcc49be93e44dcde11b9633";
-            };
-
-            meta = {
-              description = ''An Elixir library for rendering Slim-like
-                            templates.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/slime-lang/slime";
-            };
-          } // packageOverrides)
-      ) {};
-
-    slime = slime_0_12_2;
-
-    slugerl_1_0_0 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "slugerl";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "slugerl";
-              version = "1.0.0";
-              sha256 =
-                "5a06364270afb773b32a7a4e05cf9cb4ccf904faedb2825d7336f3065e4f791b";
-            };
-
-            buildPlugins  = [ rebar3_hex ];
-
-
-            meta = {
-              description = ''slugify'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/thraxil/slugerl";
-            };
-          } // packageOverrides)
-      ) {};
-
-    slugerl = slugerl_1_0_0;
-
-    slugger_0_1_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "slugger";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "slugger";
-              version = "0.1.0";
-              sha256 =
-                "c74ef1f09acd6952591d89ab6747b337aaec9624e57623ca3a7b9e2cf536a8a3";
-            };
-
-            meta = {
-              longDescription = ''The library Slugger can generate slugs from
-                                given strings that can be used in URLs or file
-                                names.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/h4cc/slugger";
-            };
-          } // packageOverrides)
-      ) {};
-
-    slugger = slugger_0_1_0;
-
-    smurf_0_1_3 = callPackage
-      (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "smurf";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "smurf";
-              version = "0.1.3";
-              sha256 =
-                "5ed8e18ec8eea0647e7e938ce15cc76e59497d0a259cea15124520a48f0d6be6";
-            };
-
-            meta = {
-              description = ''SMF interfacing library for erlang'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/smurf";
-            };
-          } // packageOverrides)
-      ) {};
-
-    smurf = smurf_0_1_3;
-
-    sorted_set_1_1_0 = callPackage
-      (
-        {
-          buildMix, packageOverrides ? {}, fetchHex, red_black_tree_1_2_0
-        }:
-          buildMix ({
-            name = "sorted_set";
-            version = "1.1.0";
-            src = fetchHex {
-              pkg = "sorted_set";
-              version = "1.1.0";
-              sha256 =
-                "2c2c119554e02d8c813fd9511a8417b20f8efd3c27fa4ab722ba733140fb9a46";
-            };
-            beamDeps  = [ red_black_tree_1_2_0 ];
-
-            meta = {
-              description = ''SortedSet implementation for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/SenecaSystems/sorted_set";
-            };
-          } // packageOverrides)
-      ) {};
-
-    sorted_set = sorted_set_1_1_0;
-
-    spaceapi_0_1_2 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
-          buildMix ({
-            name = "spaceapi";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "spaceapi";
-              version = "0.1.2";
-              sha256 =
-                "2d9f7da251e3d6dfd33248173622166afb6ecb28dc6286191ab178d85117584d";
-            };
-            beamDeps  = [ poison_2_1_0 ];
-
-            meta = {
-              description = ''A small Elixir package for parsing the Space
-                            API'';
-              license = with stdenv.lib.licenses; [ mit gpl3 ];
-              homepage = "https://github.com/geistesk/spaceapi";
-            };
-          } // packageOverrides)
-      ) {};
-
-    spaceapi = spaceapi_0_1_2;
-
-    spacesaving_0_0_3 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          earmark_0_2_1,
-          dialyze_0_2_1
-        }:
-          buildMix ({
-            name = "spacesaving";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "spacesaving";
-              version = "0.0.3";
-              sha256 =
-                "e13f6ceb1adaad447f12eab1cfc5668a2ab4784393c67b4c8cde815533cd43f8";
-            };
-            beamDeps  = [ earmark_0_2_1 dialyze_0_2_1 ];
-
-            meta = {
-              description = ''stream count distinct element estimation using
-                            the \"space saving\" algorithm.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rozap/spacesaving";
-            };
-          } // packageOverrides)
-      ) {};
-
-    spacesaving = spacesaving_0_0_3;
-
-    sparkpost_0_1_0 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          poison_1_5_2,
-          httpotion_2_2_2
-        }:
-          buildMix ({
-            name = "sparkpost";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "sparkpost";
-              version = "0.1.0";
-              sha256 =
-                "704fa320132235db00c4b40b6990e63ec3c2581d681d86c0765ef930c88a2694";
-            };
-            beamDeps  = [ poison_1_5_2 httpotion_2_2_2 ];
-
-            meta = {
-              description = ''The official Elixir package for the SparkPost
-                            API'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/SparkPost/elixir-sparkpost";
-            };
-          } // packageOverrides)
-      ) {};
-
-    sparkpost = sparkpost_0_1_0;
-
     spell_0_1_0 = callPackage
       (
         {
@@ -26095,6 +33422,30 @@ let
 
     spell = spell_0_1_0;
 
+    spex_0_1_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "spex";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "spex";
+              version = "0.1.2";
+              sha256 =
+                "102a1a74e19cd68c843ba45ac8580f44b5b8e4cc572e206e143cab56f369fb93";
+            };
+
+            meta = {
+              description = ''Validate your Elixir values against value-based
+                            specs'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/codegram/spex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    spex = spex_0_1_2;
+
     spf_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -26141,6 +33492,37 @@ let
 
     spherical = spherical_0_0_1;
 
+    spotify_ex_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          plug_1_1_5,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "spotify_ex";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "spotify_ex";
+              version = "0.0.4";
+              sha256 =
+                "f2e8647410096d34d9baecf8d9622896214320641ed72c11c711f9a463e4a961";
+            };
+            beamDeps  = [ poison_1_5_2 plug_1_1_5 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An Elixir wrapper for Spotify API O-Auth.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://www.github.com/jsncmgs1/spotify_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    spotify_ex = spotify_ex_0_0_4;
+
     spout_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -26165,6 +33547,125 @@ let
 
     spout = spout_0_0_1;
 
+    spreedly_0_1_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "spreedly";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "spreedly";
+              version = "0.1.2";
+              sha256 =
+                "b5c770da8627fb1a3a570ffeec1a15e9ee1d643383f26018855ac028471e1329";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A wrapper for the Spreedly API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/duff/spreedly-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    spreedly = spreedly_0_1_2;
+
+    sqlcx_1_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          esqlcipher_1_0_0,
+          decimal_1_1_2
+        }:
+          buildMix ({
+            name = "sqlcx";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "sqlcx";
+              version = "1.1.0";
+              sha256 =
+                "203c9b39da2e359322c9d83bb64d2559dd26e0f22a03d493bfc817120c394e8d";
+            };
+            beamDeps  = [ esqlcipher_1_0_0 decimal_1_1_2 ];
+
+            meta = {
+              description = ''A thin Elixir wrapper around esqlcipher'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/FelixKiunke/sqlcx";
+            };
+          } // packageOverrides)
+      ) {};
+
+    sqlcx = sqlcx_1_1_0;
+
+    sqlitex_0_8_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          pipe_0_0_2,
+          esqlite_0_2_2,
+          decimal_1_1_2
+        }:
+          buildMix ({
+            name = "sqlitex";
+            version = "0.8.3";
+            src = fetchHex {
+              pkg = "sqlitex";
+              version = "0.8.3";
+              sha256 =
+                "44daaeb135178165d0a6cd6754e4af05e56e5d2943c0b1108df7df718745ec0f";
+            };
+            beamDeps  = [ pipe_0_0_2 esqlite_0_2_2 decimal_1_1_2 ];
+
+            meta = {
+              description = ''A thin Elixir wrapper around esqlite'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mmmries/sqlitex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    sqlitex_1_0_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          esqlite_0_2_2,
+          decimal_1_1_2
+        }:
+          buildMix ({
+            name = "sqlitex";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "sqlitex";
+              version = "1.0.0";
+              sha256 =
+                "cbd7310e900841aa2dc6071b497330e730de1cd9618003006e0af48afb24d5f8";
+            };
+            beamDeps  = [ esqlite_0_2_2 decimal_1_1_2 ];
+
+            meta = {
+              description = ''A thin Elixir wrapper around esqlite'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mmmries/sqlitex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    sqlitex = sqlitex_1_0_0;
+
     sshex_2_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -26188,6 +33689,52 @@ let
 
     sshex = sshex_2_1_0;
 
+    ssl_verify_fun_1_1_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "ssl_verify_fun";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "ssl_verify_fun";
+              version = "1.1.0";
+              sha256 =
+                "6c0e0d857fdb031ba67b0a791202bee116bea2313db7b649839000847591ba1e";
+            };
+
+            meta = {
+              description = ''SSL verification functions for Erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/deadtrickster/ssl_verify_fun.erl";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ssl_verify_fun = ssl_verify_fun_1_1_0;
+
+    stache_0_2_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "stache";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "stache";
+              version = "0.2.1";
+              sha256 =
+                "475e80a2b6e713a75d0a085b067489e2fc1606751aab47413e12a33cf2ae4712";
+            };
+
+            meta = {
+              description = ''Mustache templates in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cwbriones/stache";
+            };
+          } // packageOverrides)
+      ) {};
+
+    stache = stache_0_2_1;
+
     stackd_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -26256,6 +33803,30 @@ let
 
     stathat = stathat_0_0_3;
 
+    statistics_0_4_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "statistics";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "statistics";
+              version = "0.4.1";
+              sha256 =
+                "726d8791e9bafb08b3ceeb5b08df6664f29a73a0e6ac0db835500b686a153bd5";
+            };
+
+            meta = {
+              description = ''Functions for descriptive statistics and common
+                            distributions'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/msharp/elixir-statistics";
+            };
+          } // packageOverrides)
+      ) {};
+
+    statistics = statistics_0_4_1;
+
     statix_0_7_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -26313,6 +33884,37 @@ let
 
     std_json_io = std_json_io_0_1_0;
 
+    steamex_0_0_5 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          sweet_xml_0_6_1,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "steamex";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "steamex";
+              version = "0.0.5";
+              sha256 =
+                "4a290c432c0480cf372fece76cc4f09e231261fda64ef5027e8855e16aa5a2f6";
+            };
+            beamDeps  = [ sweet_xml_0_6_1 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Steam API and Auth (with Phoenix/Plug
+                            integration) for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/antipax/steamex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    steamex = steamex_0_0_5;
+
     stemex_0_1_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -26364,6 +33966,66 @@ let
 
     stillir = stillir_1_0_0;
 
+    stockastic_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          exjsx_3_2_0
+        }:
+          buildMix ({
+            name = "stockastic";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "stockastic";
+              version = "0.0.2";
+              sha256 =
+                "f180915a21d4aa4a64f660696b77c5788334d4bae2639a58814565af0d75ca56";
+            };
+            beamDeps  = [ httpoison_0_8_3 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Simple Elixir wrapper for the Stockfighter API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/shanewilton/stockastic";
+            };
+          } // packageOverrides)
+      ) {};
+
+    stockastic = stockastic_0_0_2;
+
+    stockfighter_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "stockfighter";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "stockfighter";
+              version = "0.0.1";
+              sha256 =
+                "d72726cf055068e2b62ef9091ec17ab9292b60bc7f4a7306c17cad6d022a3bd7";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''a simple wrapper of stockfighter http api'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lerencao/stockfighter";
+            };
+          } // packageOverrides)
+      ) {};
+
+    stockfighter = stockfighter_0_0_1;
+
     stopwatch_0_0_7 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
@@ -26434,6 +34096,29 @@ let
 
     stream_weaver = stream_weaver_0_0_2;
 
+    stream_x_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "stream_x";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "stream_x";
+              version = "0.0.1";
+              sha256 =
+                "68832e9ac5542ca7763e5ea8493f2f775b84d79995fd63eda608ef6f786d1395";
+            };
+
+            meta = {
+              description = ''Extra Elixir Stream utilities'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/koyeung/stream_x";
+            };
+          } // packageOverrides)
+      ) {};
+
+    stream_x = stream_x_0_0_1;
+
     strftimerl_0_1_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -26481,6 +34166,58 @@ let
 
     strict_comparison = strict_comparison_0_0_1;
 
+    strinx_0_2_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "strinx";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "strinx";
+              version = "0.2.1";
+              sha256 =
+                "b3a083b3c0f28d35d283cb5e50b03798840e401eb723d44d8e9137735a3798e7";
+            };
+
+            meta = {
+              longDescription = ''Some string transformation functions for
+                                Elixir. Heavily inspired by ActiveSupport`s
+                                String extensions (Ruby).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/asaaki/strinx.ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    strinx = strinx_0_2_1;
+
+    stripex_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, gateway_0_0_6 }:
+          buildMix ({
+            name = "stripex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "stripex";
+              version = "0.1.0";
+              sha256 =
+                "49959c78e677d3e30edd808cce7a013a7120f337705d0e2fd646c000d9b30853";
+            };
+            beamDeps  = [ gateway_0_0_6 ];
+
+            meta = {
+              longDescription = ''A much more ruby-stripe-like wrapper around
+                                Stripe`s API (built with Poison). Full
+                                documentation can be found at
+                                https://stripe.com/docs/api'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/foxnewsnetwork/stripex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    stripex = stripex_0_1_0;
+
     struct_fields_0_3_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -26505,6 +34242,54 @@ let
 
     struct_fields = struct_fields_0_3_0;
 
+    styledown_0_0_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, execjs_1_1_3 }:
+          buildMix ({
+            name = "styledown";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "styledown";
+              version = "0.0.3";
+              sha256 =
+                "8dc31569257a9d5fe3eb67ca87d0cd29f6d14c4a62191262b41a28fc9bca18fc";
+            };
+            beamDeps  = [ execjs_1_1_3 ];
+
+            meta = {
+              description = ''Elixir integration of Styledown'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/styledown/styledown_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    styledown = styledown_0_0_3;
+
+    supervisor3_1_1_1 = callPackage
+      (
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
+            name = "supervisor3";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "supervisor3";
+              version = "1.1.1";
+              sha256 =
+                "0d17df36f524f7420d7e1afb0d65054ffdfcd5438de63597d6ab626deb38f94c";
+            };
+
+            meta = {
+              description = ''A copy of supervisor.erl from the R16B Erlang/OTP
+                            with modifications'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/klarna/supervisor3";
+            };
+          } // packageOverrides)
+      ) {};
+
+    supervisor3 = supervisor3_1_1_1;
+
     supool_1_5_1 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -26528,6 +34313,30 @@ let
 
     supool = supool_1_5_1;
 
+    swapi_1_0_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
+          buildMix ({
+            name = "swapi";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "swapi";
+              version = "1.0.0";
+              sha256 =
+                "55b40ddd97d632b027463aefccb8d6fa9ffa77f224a25af5565bbaecff5c7a3c";
+            };
+            beamDeps  = [ httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An Elixir wrapper for the Star Wars API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/twhitacre/swapi.ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    swapi = swapi_1_0_0;
+
     sweet_xml_0_5_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -26574,53 +34383,17 @@ let
 
     sweet_xml = sweet_xml_0_6_1;
 
-    switchboard_0_3_2 = callPackage
-      (
-        {
-          buildRebar3,
-          packageOverrides ? {},
-          fetchHex,
-          lager_3_0_2,
-          jsx_2_8_0,
-          gproc_0_5_0,
-          cowboy_1_0_4
-        }:
-          buildRebar3 ({
-            name = "switchboard";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "switchboard";
-              version = "0.3.2";
-              sha256 =
-                "0b1debb284cd63e5220dc56462dafebd1418579bb40a5b8e51dfdf1f50bfbeb3";
-            };
-
-            buildPlugins  = [ rebar3_hex ];
-
-            beamDeps  = [ lager_3_0_2 jsx_2_8_0 gproc_0_5_0 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''Conduct monitoring and operations across email
-                            accounts'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/thusfresh/switchboard";
-            };
-          } // packageOverrides)
-      ) {};
-
-    switchboard = switchboard_0_3_2;
-
-    syn_1_2_1 = callPackage
+    syn_1_4_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
           buildRebar3 ({
             name = "syn";
-            version = "1.2.1";
+            version = "1.4.0";
             src = fetchHex {
               pkg = "syn";
-              version = "1.2.1";
+              version = "1.4.0";
               sha256 =
-                "a21864a00c39f6753cde0269c979c5260dc9bf1991ca0d5c9635ebec499d6f61";
+                "cec944ba1768a5142ba496bc84b62ebeab68e8ddd2c8e3263c95f89660275d9c";
             };
 
             meta = {
@@ -26632,7 +34405,7 @@ let
           } // packageOverrides)
       ) {};
 
-    syn = syn_1_2_1;
+    syn = syn_1_4_0;
 
     syn_osc_0_1_0 = callPackage
       (
@@ -26658,6 +34431,29 @@ let
 
     syn_osc = syn_osc_0_1_0;
 
+    syntactic_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "syntactic";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "syntactic";
+              version = "0.0.2";
+              sha256 =
+                "20adf1f265ebb17ab79d53355b7854c751cee68c73f8a66baca7035da06f65db";
+            };
+
+            meta = {
+              description = ''A collection of Elixir syntactic sugars.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hzamani/elixir-syntactic";
+            };
+          } // packageOverrides)
+      ) {};
+
+    syntactic = syntactic_0_0_2;
+
     synthex_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -26706,17 +34502,17 @@ let
 
     system_env_loader = system_env_loader_0_1_0;
 
-    table_0_0_4 = callPackage
+    table_0_0_5 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "table";
-            version = "0.0.4";
+            version = "0.0.5";
             src = fetchHex {
               pkg = "table";
-              version = "0.0.4";
+              version = "0.0.5";
               sha256 =
-                "9962976cb40b4cd517a03c572ced492185e9642bb224e29942f9b7671e31c55a";
+                "8d1f3ac55512f92eeba1345842278ee6f89d2a4f19be0e272a5f32a958f066d5";
             };
 
             meta = {
@@ -26727,7 +34523,7 @@ let
           } // packageOverrides)
       ) {};
 
-    table = table_0_0_4;
+    table = table_0_0_5;
 
     table_rex_0_4_0 = callPackage
       (
@@ -26798,17 +34594,17 @@ let
 
     tabula = tabula_2_0_1;
 
-    tachometer_0_1_0 = callPackage
+    tachometer_0_1_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "tachometer";
-            version = "0.1.0";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "tachometer";
-              version = "0.1.0";
+              version = "0.1.1";
               sha256 =
-                "5b2624c593280fc7a4621b264688509ba76ca3450a70ae0cfff43183604f903c";
+                "ead8f6a964b79df0b2948a59c72ec0e2b319bb7684079e7170fa191c78481a42";
             };
 
             meta = {
@@ -26819,7 +34615,29 @@ let
           } // packageOverrides)
       ) {};
 
-    tachometer = tachometer_0_1_0;
+    tachometer_0_2_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, watcher_1_0_0 }:
+          buildMix ({
+            name = "tachometer";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "tachometer";
+              version = "0.2.0";
+              sha256 =
+                "de5e0bda346e31130f33ca118cdd4afccd0ba6728c571ccae35f65d3020074aa";
+            };
+            beamDeps  = [ watcher_1_0_0 ];
+
+            meta = {
+              description = ''Scheduler instrumentation for BEAM in Elixir'';
+              license = stdenv.lib.licenses.gpl3;
+              homepage = "https://github.com/pavlos/tachometer";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tachometer = tachometer_0_2_0;
 
     tail_1_0_1 = callPackage
       (
@@ -26846,6 +34664,29 @@ let
 
     tail = tail_1_0_1;
 
+    tally_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "tally";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "tally";
+              version = "0.0.1";
+              sha256 =
+                "cd9e07c47f5ce6f01a33a98552aa028e4f9a4c0ec35a2cb16178a9bf37117a36";
+            };
+
+            meta = {
+              description = ''A reporting library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/boudra/tally";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tally = tally_0_0_1;
+
     tane_0_3_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -26869,17 +34710,48 @@ let
 
     tane = tane_0_3_1;
 
-    tap_0_1_0 = callPackage
+    tanuki_0_2_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "tanuki";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "tanuki";
+              version = "0.2.0";
+              sha256 =
+                "f499d6bcb80fc29f2d0b68d16d8309cb25589583b1f4d0eb23cbc4fe5afbab8c";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''GitLab API wrapper in Elixir, named after GitLabs
+                            mascot'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ZJvandeWeg/Tanuki";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tanuki = tanuki_0_2_0;
+
+    tap_0_1_4 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "tap";
-            version = "0.1.0";
+            version = "0.1.4";
             src = fetchHex {
               pkg = "tap";
-              version = "0.1.0";
+              version = "0.1.4";
               sha256 =
-                "6016e69aafb18d75cb82ec30c2e09660eccf5cbd439b6a6d81a68b0825f13172";
+                "573cba12e7152f6e577fd485e9f0d834bdf1ea60229123bbfbaefcfd91879218";
             };
 
             meta = {
@@ -26890,7 +34762,7 @@ let
           } // packageOverrides)
       ) {};
 
-    tap = tap_0_1_0;
+    tap = tap_0_1_4;
 
     tau_0_0_6 = callPackage
       (
@@ -26915,9 +34787,40 @@ let
 
     tau = tau_0_0_6;
 
+    taxon_search_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpotion_2_2_2
+        }:
+          buildMix ({
+            name = "taxon_search";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "taxon_search";
+              version = "0.0.1";
+              sha256 =
+                "eb185015a4f238e8a540f60d187edb28b19e643526e595f4cb0e4b553bdf1a6f";
+            };
+            beamDeps  = [ poison_2_1_0 httpotion_2_2_2 ];
+
+            meta = {
+              description = ''TaxonSearch is a tool for looking up species
+                            names in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/annejohnson/taxon_search";
+            };
+          } // packageOverrides)
+      ) {};
+
+    taxon_search = taxon_search_0_0_1;
+
     tds_0_5_4 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_1 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_2 }:
           buildMix ({
             name = "tds";
             version = "0.5.4";
@@ -26927,7 +34830,7 @@ let
               sha256 =
                 "110eb8d8a58d0d5fe629bfe75dacb56fa14bde441d2baffbfa2bb0c65ee66cba";
             };
-            beamDeps  = [ decimal_1_1_1 ];
+            beamDeps  = [ decimal_1_1_2 ];
 
             meta = {
               description = ''MSSQL / TDS Driver for Ecto.'';
@@ -26962,21 +34865,19 @@ let
 
     tea_crypto = tea_crypto_1_0_0;
 
-    teacup_0_3_2 = callPackage
+    teacup_0_3_4 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex, simpre_0_1_0 }:
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
           buildRebar3 ({
             name = "teacup";
-            version = "0.3.2";
+            version = "0.3.4";
             src = fetchHex {
               pkg = "teacup";
-              version = "0.3.2";
+              version = "0.3.4";
               sha256 =
-                "53d616e19d858524e34cf113f0f418c5631db4ee01430f7b3d19afcf9beb68b1";
+                "59495d566e810f481ec22b263e8bf0ed90efea9c9272e4980e36d921cd6ab5f9";
             };
 
-            beamDeps  = [ simpre_0_1_0 ];
-
             meta = {
               description = ''Simple TCP client library for Erlang'';
               license = stdenv.lib.licenses.mit;
@@ -26984,29 +34885,29 @@ let
           } // packageOverrides)
       ) {};
 
-    teacup = teacup_0_3_2;
+    teacup = teacup_0_3_4;
 
-    teacup_nats_0_3_1 = callPackage
+    teacup_nats_0_4_0 = callPackage
       (
         {
           buildRebar3,
           packageOverrides ? {},
           fetchHex,
-          teacup_0_3_2,
+          teacup_0_3_4,
           nats_msg_0_4_1,
           jsx_2_8_0
         }:
           buildRebar3 ({
             name = "teacup_nats";
-            version = "0.3.1";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "teacup_nats";
-              version = "0.3.1";
+              version = "0.4.0";
               sha256 =
-                "5ffd0732ca26931784c8c9fc713545ef02449a8ae9208e3c8b079623a36044c9";
+                "f0f891f8f9b384517380d643ecf2121a9e383fd05416997778597c5647a9dd6f";
             };
 
-            beamDeps  = [ teacup_0_3_2 nats_msg_0_4_1 jsx_2_8_0 ];
+            beamDeps  = [ teacup_0_3_4 nats_msg_0_4_1 jsx_2_8_0 ];
 
             meta = {
               description = ''Teacup based NATS Client for Erlang'';
@@ -27016,19 +34917,19 @@ let
           } // packageOverrides)
       ) {};
 
-    teacup_nats = teacup_nats_0_3_1;
+    teacup_nats = teacup_nats_0_4_0;
 
-    teamcity_exunit_formatter_0_2_0 = callPackage
+    teamcity_exunit_formatter_0_3_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "teamcity_exunit_formatter";
-            version = "0.2.0";
+            version = "0.3.0";
             src = fetchHex {
               pkg = "teamcity_exunit_formatter";
-              version = "0.2.0";
+              version = "0.3.0";
               sha256 =
-                "894a7791c21537bef8438bfe8706b2612e7248f1e316af0ba8c0a0d95c19f0dc";
+                "0d209ca85fcd3d8112be29288988ce6329b2b2e7c10cd7deab636508716de82f";
             };
 
             meta = {
@@ -27041,7 +34942,31 @@ let
           } // packageOverrides)
       ) {};
 
-    teamcity_exunit_formatter = teamcity_exunit_formatter_0_2_0;
+    teamcity_exunit_formatter = teamcity_exunit_formatter_0_3_0;
+
+    telegram_0_0_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
+            name = "telegram";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "telegram";
+              version = "0.0.3";
+              sha256 =
+                "ad7b74cec90ade9090a9056aa69c055398fd3f60352b50c732849f06c503287d";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              description = ''Simple module for parsing Telegram bot updates'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/col/telegram";
+            };
+          } // packageOverrides)
+      ) {};
+
+    telegram = telegram_0_0_3;
 
     telehashname_0_0_2 = callPackage
       (
@@ -27119,6 +35044,54 @@ let
 
     temp = temp_0_4_0;
 
+    tempdir_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "tempdir";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "tempdir";
+              version = "0.0.1";
+              sha256 =
+                "fa658ebbdbddfa729b8276652949d20ac2fbb4eff0261a61fb5f9c96fc943ffd";
+            };
+
+            meta = {
+              description = ''Simple Elixir Library for creating self-cleaning
+                            tmp directories'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/andrewvy/tempdir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tempdir = tempdir_0_0_1;
+
+    tempfile_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "tempfile";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "tempfile";
+              version = "0.1.0";
+              sha256 =
+                "e6e505207616d1bb77e85ac4b4d9a11437ed1eb58eb06e99c582498602a9a45b";
+            };
+
+            meta = {
+              description = ''Auto cleaning and randomly named temporary
+                            files'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sorentwo/tempfile";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tempfile = tempfile_0_1_0;
+
     temporary_env_1_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -27143,6 +35116,66 @@ let
 
     temporary_env = temporary_env_1_0_1;
 
+    tentabucket_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          exjsx_3_2_0
+        }:
+          buildMix ({
+            name = "tentabucket";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "tentabucket";
+              version = "0.0.1";
+              sha256 =
+                "5784dad17f973efcc3c4ea7672927095864d58af1f830614e4c8f06c63d4822d";
+            };
+            beamDeps  = [ httpoison_0_8_3 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Simple Bitbucket API client library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/duksis/tentabucket";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tentabucket = tentabucket_0_0_1;
+
+    tentacat_0_5_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          exjsx_3_2_0
+        }:
+          buildMix ({
+            name = "tentacat";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "tentacat";
+              version = "0.5.1";
+              sha256 =
+                "eabbffa3f2529848bb44ecdd1c140fdd06fb382a9c76a5f3ed018b87c2691946";
+            };
+            beamDeps  = [ httpoison_0_8_3 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Simple Elixir wrapper for the GitHub API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/tentacat";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tentacat = tentacat_0_5_1;
+
     term_table_0_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -27261,17 +35294,17 @@ let
 
     tfidf = tfidf_0_1_2;
 
-    the_fuzz_0_2_2 = callPackage
+    the_fuzz_0_3_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "the_fuzz";
-            version = "0.2.2";
+            version = "0.3.0";
             src = fetchHex {
               pkg = "the_fuzz";
-              version = "0.2.2";
+              version = "0.3.0";
               sha256 =
-                "fe851aee08b2e09b6e5cc5acb08c48691f7ac27f52d8400ad55bb045e1f350c5";
+                "f959818716b25f2c535648e9dc6dc8558c6b9fce5f337e1fcf11f913178087b8";
             };
 
             meta = {
@@ -27289,19 +35322,19 @@ let
           } // packageOverrides)
       ) {};
 
-    the_fuzz = the_fuzz_0_2_2;
+    the_fuzz = the_fuzz_0_3_0;
 
-    thermex_0_0_2 = callPackage
+    thermex_0_1_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "thermex";
-            version = "0.0.2";
+            version = "0.1.0";
             src = fetchHex {
               pkg = "thermex";
-              version = "0.0.2";
+              version = "0.1.0";
               sha256 =
-                "10ac274c919012c31539ecd7c4b2b27ba413af46c4dad86029203dc84b956ec3";
+                "0fd2767f5fd6a73ab57d65f5797a84675341d923b5a4c10652223c4969846656";
             };
 
             meta = {
@@ -27312,32 +35345,129 @@ let
           } // packageOverrides)
       ) {};
 
-    thermex = thermex_0_0_2;
+    thermex = thermex_0_1_0;
 
-    thrift_1_2_0 = callPackage
+    thoth_0_0_5 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "thoth";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "thoth";
+              version = "0.0.5";
+              sha256 =
+                "2712b42e23e730ec8e9a226e1d9f86fb003d60e7b44b0674c9d44132a0fc3a83";
+            };
+
+            meta = {
+              description = ''An Elixir digraph inspired local Graph DB'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/oakfang/thoth";
+            };
+          } // packageOverrides)
+      ) {};
+
+    thoth = thoth_0_0_5;
+
+    thrash_0_1_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "thrash";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "thrash";
+              version = "0.1.0";
+              sha256 =
+                "cebcabe309682f04d030f24f71498579fd16f688965cc5e29262a660082953e7";
+            };
+
+            meta = {
+              description = ''Fast serializer/deserializer for Apache Thrift`s
+                            binary protocol.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dantswain/thrash";
+            };
+          } // packageOverrides)
+      ) {};
+
+    thrash = thrash_0_1_0;
+
+    thrift_1_2_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "thrift";
-            version = "1.2.0";
+            version = "1.2.1";
             src = fetchHex {
               pkg = "thrift";
-              version = "1.2.0";
+              version = "1.2.1";
               sha256 =
-                "c16a8192125b8067ff4e8d0391ae8d59e3428176ebda381b01db782dab8177e7";
+                "52dbe7126498efa96039b0b7689a96295af244cb6203f891f1b4b10c1f7f539d";
             };
 
             meta = {
               longDescription = ''A collection of utilities for working with
-                                Thrift in Elixir. Provides a copy of the Erlang
-                                Thrift runtime.'';
+                                Thrift in Elixir. Provides a copy of the Apache
+                                Thrift Erlang runtime.'';
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/pinterest/elixir-thrift";
             };
           } // packageOverrides)
       ) {};
 
-    thrift = thrift_1_2_0;
+    thrift = thrift_1_2_1;
+
+    tiled_map_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
+            name = "tiled_map";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "tiled_map";
+              version = "0.0.1";
+              sha256 =
+                "c285c5293bb97d0e526c1cab14cdcf4b17dd12a76e2a0d707f1b71a4fcf9501e";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              description = ''Basic parsing of JSON Map Format from Tiled map
+                            editor'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kentdahl/tiled_map";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tiled_map = tiled_map_0_0_1;
+
+    time_ago_words_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_2_1_6 }:
+          buildMix ({
+            name = "time_ago_words";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "time_ago_words";
+              version = "0.0.2";
+              sha256 =
+                "8cf37434618123ce09ebbba90f9b86eca0fdfdce6cd2887b2a03e5d171515f50";
+            };
+            beamDeps  = [ timex_2_1_6 ];
+
+            meta = {
+              longDescription = ''A simple function to return the approximate
+                                difference between two times using words.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/midwire/time_ago_words";
+            };
+          } // packageOverrides)
+      ) {};
+
+    time_ago_words = time_ago_words_0_0_2;
 
     time_distance_0_0_1 = callPackage
       (
@@ -27392,67 +35522,32 @@ let
 
     time_seer = time_seer_0_0_6;
 
-    timex_1_0_0_rc4 = callPackage
+    timex_0_19_5 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          tzdata_0_1_201603,
-          combine_0_7_0
+          tzdata_0_5_8,
+          combine_0_8_0
         }:
           buildMix ({
             name = "timex";
-            version = "1.0.0-rc4";
+            version = "0.19.5";
             src = fetchHex {
               pkg = "timex";
-              version = "1.0.0-rc4";
+              version = "0.19.5";
               sha256 =
-                "3da1356901fe205455404c83d2ea7804b63ed47e3a2cdb428545e568e05d6885";
+                "be1985ab99a6aebc3672b1d82b27e409c9a7af4658f3cc5900fa8754e159b02c";
             };
-            beamDeps  = [ tzdata_0_1_201603 combine_0_7_0 ];
+            beamDeps  = [ tzdata_0_5_8 combine_0_8_0 ];
 
             meta = {
-              longDescription = ''A comprehensive date/time library for Elixir
-                                Fully timezone-aware, using the Olson Timezone
-                                database - Supports local-timezone lookups -
-                                Supports POSIX-style timezones - Supports
-                                lookups of any Olson tzdata timezones - Supports
-                                arbitrary shifts across time and through
-                                timezones, including ambiguous time periods,
-                                non-existent time periods, and leaps. Provides
-                                both Date and DateTime types, for use depending
-                                on your needs, with an AmbiguousDateTime type
-                                for handling those DateTime values which fall on
-                                an ambigouos timezone period. Extendable via
-                                Convertable and Comparable protocols, so you can
-                                use Timex with your own types! Locale-aware,
-                                currently only supports \"ru\" and \"en\", but
-                                more will be added over time. Provides a broad
-                                array of date/time helper functions -
-                                shifting/adding/subtracting - diffing -
-                                comparing/before?/after?/between? - conversions
-                                - get day of week, week of year, ISO dates, and
-                                names for each - get the beginning or ending of
-                                a given week - get the beginning or ending of a
-                                year, quarter, week, or month - get days in a
-                                given month - normalization Provides a broad
-                                array of time-specific helpers - convert to and
-                                from units: weeks, days, hours, seconds, ms, and
-                                microseconds - measure execution time -
-                                diff/compare - to/from 12/24 hour clock times -
-                                add/subtract Safe date/time string formatting
-                                and parsing - Informative parser errors -
-                                Supports strftime, as well as an easier to read
-                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
-                                Supports many formats out of the box: ISO8601
-                                basic and extended, RFC822, RFC1123, RFC3339,
-                                ANSIC, UNIX - Relative time formatter (i.e. \"2
-                                years from now\") Extendable - Protocols for
-                                core modules like the parser tokenizer - Easy to
-                                wrap to add extra functionality Can be used with
-                                Phoenix and Ecto when used with timex_ecto
-                                package'';
+              longDescription = ''Timex is a rich, comprehensive Date/Time
+                                library for Elixir projects, with full timezone
+                                support via the :tzdata package. If you need to
+                                manipulate dates, times, datetimes, timestamps,
+                                etc., then Timex is for you!'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitwalker/timex";
             };
@@ -27465,8 +35560,8 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          tzdata_0_1_201603,
-          combine_0_7_0
+          tzdata_0_0_1,
+          combine_0_8_0
         }:
           buildMix ({
             name = "timex";
@@ -27477,154 +35572,59 @@ let
               sha256 =
                 "cbc359d21b5e2e694ab437e614bb4198af5be1031da4969dfd7ddf1b56064c88";
             };
-            beamDeps  = [ tzdata_0_1_201603 combine_0_7_0 ];
+            beamDeps  = [ tzdata_0_0_1 combine_0_8_0 ];
 
             meta = {
-              longDescription = ''A comprehensive date/time library for Elixir
-                                Fully timezone-aware, using the Olson Timezone
-                                database - Supports local-timezone lookups -
-                                Supports POSIX-style timezones - Supports
-                                lookups of any Olson tzdata timezones - Supports
-                                arbitrary shifts across time and through
-                                timezones, including ambiguous time periods,
-                                non-existent time periods, and leaps. Provides
-                                both Date and DateTime types, for use depending
-                                on your needs, with an AmbiguousDateTime type
-                                for handling those DateTime values which fall on
-                                an ambigouos timezone period. Extendable via
-                                Convertable and Comparable protocols, so you can
-                                use Timex with your own types! Locale-aware,
-                                currently only supports \"ru\" and \"en\", but
-                                more will be added over time. Provides a broad
-                                array of date/time helper functions -
-                                shifting/adding/subtracting - diffing -
-                                comparing/before?/after?/between? - conversions
-                                - get day of week, week of year, ISO dates, and
-                                names for each - get the beginning or ending of
-                                a given week - get the beginning or ending of a
-                                year, quarter, week, or month - get days in a
-                                given month - normalization Provides a broad
-                                array of time-specific helpers - convert to and
-                                from units: weeks, days, hours, seconds, ms, and
-                                microseconds - measure execution time -
-                                diff/compare - to/from 12/24 hour clock times -
-                                add/subtract Safe date/time string formatting
-                                and parsing - Informative parser errors -
-                                Supports strftime, as well as an easier to read
-                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
-                                Supports many formats out of the box: ISO8601
-                                basic and extended, RFC822, RFC1123, RFC3339,
-                                ANSIC, UNIX - Relative time formatter (i.e. \"2
-                                years from now\") Extendable - Protocols for
-                                core modules like the parser tokenizer - Easy to
-                                wrap to add extra functionality Can be used with
-                                Phoenix and Ecto when used with timex_ecto
-                                package'';
+              longDescription = ''Timex is a rich, comprehensive Date/Time
+                                library for Elixir projects, with full timezone
+                                support via the :tzdata package. If you need to
+                                manipulate dates, times, datetimes, timestamps,
+                                etc., then Timex is for you!'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitwalker/timex";
             };
           } // packageOverrides)
       ) {};
 
-    timex_2_1_3 = callPackage
+    timex_2_1_6 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          tzdata_0_1_201603,
-          gettext_0_10_0,
-          combine_0_7_0
+          gettext_0_11_0,
+          combine_0_8_0,
+          tzdata_0_0_1
         }:
           buildMix ({
             name = "timex";
-            version = "2.1.3";
+            version = "2.1.6";
             src = fetchHex {
               pkg = "timex";
-              version = "2.1.3";
+              version = "2.1.6";
               sha256 =
-                "d39de4fc4ca4ceb08841f4ea362a5d3e6c07d6300b77d18581b0c034a8c8ac60";
+                "c0e3b74beb0734f0602eed0de5bbcce984fc435f258c974bde4169a407330d12";
             };
-            beamDeps  = [ tzdata_0_1_201603 gettext_0_10_0 combine_0_7_0 ];
+            beamDeps  = [ gettext_0_11_0 combine_0_8_0 tzdata_0_0_1 ];
 
             meta = {
-              longDescription = ''A comprehensive date/time library for Elixir
-                                Fully timezone-aware, using the Olson Timezone
-                                database - Supports local-timezone lookups -
-                                Supports POSIX-style timezones - Supports
-                                lookups of any Olson tzdata timezones - Supports
-                                arbitrary shifts across time and through
-                                timezones, including ambiguous time periods,
-                                non-existent time periods, and leaps. Provides
-                                both Date and DateTime types, for use depending
-                                on your needs, with an AmbiguousDateTime type
-                                for handling those DateTime values which fall on
-                                an ambigouos timezone period. Extendable via
-                                Convertable and Comparable protocols, so you can
-                                use Timex with your own types! Locale-aware,
-                                currently only supports \"ru\" and \"en\", but
-                                more will be added over time. Provides a broad
-                                array of date/time helper functions -
-                                shifting/adding/subtracting - diffing -
-                                comparing/before?/after?/between? - conversions
-                                - get day of week, week of year, ISO dates, and
-                                names for each - get the beginning or ending of
-                                a given week - get the beginning or ending of a
-                                year, quarter, week, or month - get days in a
-                                given month - normalization Provides a broad
-                                array of time-specific helpers - convert to and
-                                from units: weeks, days, hours, seconds, ms, and
-                                microseconds - measure execution time -
-                                diff/compare - to/from 12/24 hour clock times -
-                                add/subtract Safe date/time string formatting
-                                and parsing - Informative parser errors -
-                                Supports strftime, as well as an easier to read
-                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
-                                Supports many formats out of the box: ISO8601
-                                basic and extended, RFC822, RFC1123, RFC3339,
-                                ANSIC, UNIX - Relative time formatter (i.e. \"2
-                                years from now\") Extendable - Protocols for
-                                core modules like the parser tokenizer - Easy to
-                                wrap to add extra functionality Can be used with
-                                Phoenix and Ecto when used with timex_ecto
-                                package'';
+              longDescription = ''Timex is a rich, comprehensive Date/Time
+                                library for Elixir projects, with full timezone
+                                support via the :tzdata package. If you need to
+                                manipulate dates, times, datetimes, timestamps,
+                                etc., then Timex is for you!'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitwalker/timex";
             };
           } // packageOverrides)
       ) {};
 
-    timex = timex_2_1_3;
-
-    timex_interval_0_6_0 = callPackage
-      (
-        {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_0_rc4 }:
-          buildMix ({
-            name = "timex_interval";
-            version = "0.6.0";
-            src = fetchHex {
-              pkg = "timex_interval";
-              version = "0.6.0";
-              sha256 =
-                "c2d932e892cb15dacabafdc456040208c285c6d00087f688282d6693a6bbb04e";
-            };
-            beamDeps  = [ timex_1_0_0_rc4 ];
-
-            meta = {
-              description = ''A date/time interval library for Elixir projects,
-                            based on Timex.'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/atabary/timex-interval";
-            };
-          } // packageOverrides)
-      ) {};
-
-    timex_interval = timex_interval_0_6_0;
+    timex = timex_2_1_6;
 
     tinymt_0_3_1 = callPackage
       (
-        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
-          buildErlangMk ({
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "tinymt";
             version = "0.3.1";
             src = fetchHex {
@@ -27644,17 +35644,40 @@ let
 
     tinymt = tinymt_0_3_1;
 
-    tirexs_0_8_0_beta5 = callPackage
+    tipo_0_0_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "tipo";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "tipo";
+              version = "0.0.3";
+              sha256 =
+                "3feeb200a1806b41afe6404b09493fb98a140ab0c642c2c0328c96cbf9cf66c8";
+            };
+
+            meta = {
+              description = ''Type checking for primitive elixir data types'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jwaterfaucett/tipo";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tipo = tipo_0_0_3;
+
+    tirexs_0_8_0_beta6 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, exjsx_3_2_0 }:
           buildMix ({
             name = "tirexs";
-            version = "0.8.0-beta5";
+            version = "0.8.0-beta6";
             src = fetchHex {
               pkg = "tirexs";
-              version = "0.8.0-beta5";
+              version = "0.8.0-beta6";
               sha256 =
-                "5aec67541a1361aca21e6849c78755727596a6e93e2ad90d53add537892d399c";
+                "eee9deb8bb020f482ac9e6e77505819931b2db1050e7b999643bf9ca73beab15";
             };
             beamDeps  = [ exjsx_3_2_0 ];
 
@@ -27667,7 +35690,30 @@ let
           } // packageOverrides)
       ) {};
 
-    tirexs = tirexs_0_8_0_beta5;
+    tirexs_0_8_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, exjsx_3_2_0 }:
+          buildMix ({
+            name = "tirexs";
+            version = "0.8.2";
+            src = fetchHex {
+              pkg = "tirexs";
+              version = "0.8.2";
+              sha256 =
+                "0412e42030723f179579987bb9f6281cb0dc0db95134296058e2e95554a5b198";
+            };
+            beamDeps  = [ exjsx_3_2_0 ];
+
+            meta = {
+              description = ''An Elixir flavored DSL for building JSON based
+                            queries to Elasticsearch engine'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/Zatvobor/tirexs";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tirexs = tirexs_0_8_2;
 
     tlv_0_1_0 = callPackage
       (
@@ -27692,6 +35738,33 @@ let
 
     tlv = tlv_0_1_0;
 
+    tmdb_0_0_6 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_4_0,
+          httpoison_0_8_3,
+          exjsx_3_1_0
+        }:
+          buildMix ({
+            name = "tmdb";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "tmdb";
+              version = "0.0.6";
+              sha256 =
+                "4cbad6ffa556a0eeecb22c3960d47451e918313e5651808439f039403dd38d3a";
+            };
+            beamDeps  = [ poison_1_4_0 httpoison_0_8_3 exjsx_3_1_0 ];
+
+            meta = {    };
+          } // packageOverrides)
+      ) {};
+
+    tmdb = tmdb_0_0_6;
+
     todo_1_2_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -27715,14 +35788,103 @@ let
 
     todo = todo_1_2_0;
 
+    togglex_0_2_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "togglex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "togglex";
+              version = "0.2.0";
+              sha256 =
+                "725b4299c5aad1c87900e667d6a01c88ba18f8e545283f31d2f726745c174e30";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Simple Elixir wrapper for the Toggl API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/diacode/togglex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    togglex = togglex_0_2_0;
+
+    toglx_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          togglex_0_2_0,
+          configparser_ex_0_2_1,
+          argument_parser_0_1_3
+        }:
+          buildMix ({
+            name = "toglx";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "toglx";
+              version = "0.0.1";
+              sha256 =
+                "e6952e6955f5d61d479254a9b4a99831c4d73237e6fc8b39eeea6e4277979ba5";
+            };
+            beamDeps  = [
+                          togglex_0_2_0
+                          configparser_ex_0_2_1
+                          argument_parser_0_1_3
+                        ];
+
+            meta = {
+              description = ''Toggl(ex) time tracking client'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/kennyballou/toglx";
+            };
+          } // packageOverrides)
+      ) {};
+
+    toglx = toglx_0_0_1;
+
+    tonic_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "tonic";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "tonic";
+              version = "0.0.1";
+              sha256 =
+                "a94df1788fe102a001ec565846cf8b15d0eacc2e1644bf21c8c510b8294d24a6";
+            };
+
+            meta = {
+              description = ''A DSL for conveniently loading binary
+                            data/files.'';
+              license = stdenv.lib.licenses.bsd2;
+              homepage = "https://github.com/ScrimpyCat/Tonic";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tonic = tonic_0_0_1;
+
     toniq_1_0_5 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          uuid_1_1_3,
-          exredis_0_2_3
+          uuid_1_1_4,
+          exredis_0_2_4
         }:
           buildMix ({
             name = "toniq";
@@ -27733,7 +35895,7 @@ let
               sha256 =
                 "aa67c43131393872d82d53b9a8bf4a3d5b97c52a6588d53aaa61c29828e0664a";
             };
-            beamDeps  = [ uuid_1_1_3 exredis_0_2_3 ];
+            beamDeps  = [ uuid_1_1_4 exredis_0_2_4 ];
 
             meta = {
               longDescription = ''Simple and reliable background job processing
@@ -27772,17 +35934,17 @@ let
 
     towel = towel_0_2_1;
 
-    tqdm_0_0_1 = callPackage
+    tqdm_0_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "tqdm";
-            version = "0.0.1";
+            version = "0.0.2";
             src = fetchHex {
               pkg = "tqdm";
-              version = "0.0.1";
+              version = "0.0.2";
               sha256 =
-                "70636f54515581abefb88020a5393b87a64186b7fa4a59a50e52854f999319bc";
+                "2791905b98c0d3371ebf98fd7185d0af58ca8d2911182d908b970afab0b8801d";
             };
 
             meta = {
@@ -27795,7 +35957,31 @@ let
           } // packageOverrides)
       ) {};
 
-    tqdm = tqdm_0_0_1;
+    tqdm = tqdm_0_0_2;
+
+    tracing_helper_0_0_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "tracing_helper";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "tracing_helper";
+              version = "0.0.3";
+              sha256 =
+                "a1d22c5901ed688acab63c0195aba2826f774a8d7e7f1b882878b715cd4688fb";
+            };
+
+            meta = {
+              description = ''TracingHelper is a helper module with predefined
+                            tracing functions'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/andrzejsliwa/tracing_helper";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tracing_helper = tracing_helper_0_0_3;
 
     trackline_0_0_1 = callPackage
       (
@@ -27806,7 +35992,7 @@ let
           timex_1_0_2,
           exml_0_1_0,
           exmerl_0_1_1,
-          erlsom_1_2_1,
+          erlsom_1_4_1,
           apex_0_3_7
         }:
           buildMix ({
@@ -27822,7 +36008,7 @@ let
                           timex_1_0_2
                           exml_0_1_0
                           exmerl_0_1_1
-                          erlsom_1_2_1
+                          erlsom_1_4_1
                           apex_0_3_7
                         ];
 
@@ -27836,6 +36022,39 @@ let
 
     trackline = trackline_0_0_1;
 
+    trackstar_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          erlsom_1_4_1
+        }:
+          buildMix ({
+            name = "trackstar";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "trackstar";
+              version = "0.0.1";
+              sha256 =
+                "04a7634755da273b640737c8bef015f5ef4360524940fa763c3100e13db47cd4";
+            };
+            beamDeps  = [ poison_2_1_0 erlsom_1_4_1 ];
+
+            meta = {
+              longDescription = ''Trackstar is a GPX parser. Specify the path
+                                to a GPX file and it will output a GeoJSON of
+                                the track as a LineString. It currently works
+                                with Strava-exported GPX files.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/andydangerous/trackstar";
+            };
+          } // packageOverrides)
+      ) {};
+
+    trackstar = trackstar_0_0_1;
+
     tradie_0_0_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -27868,7 +36087,7 @@ let
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
+          plug_1_1_5,
           cowboy_1_0_4
         }:
           buildMix ({
@@ -27880,7 +36099,7 @@ let
               sha256 =
                 "16e2485b7069c8e025460d183d4711d9c5bbf46ae532dde859cc6623d12bfc71";
             };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_5 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''An elixir plug to support legacy APIs that
@@ -27927,17 +36146,77 @@ let
 
     transducer = transducer_0_1_0;
 
-    trie_1_5_0 = callPackage
+    travis_ex_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "travis_ex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "travis_ex";
+              version = "0.0.2";
+              sha256 =
+                "80589ec01596dfc1e02cef61ce0adc3c9b73977b56a528e214c37af079efa10a";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Travis-ci API client library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/duksis/travis_ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    travis_ex = travis_ex_0_0_2;
+
+    trello_1_3_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "trello";
+            version = "1.3.0";
+            src = fetchHex {
+              pkg = "trello";
+              version = "1.3.0";
+              sha256 =
+                "776d6514b766a9290b102bf8682dd13d1b63b1cab68fd73880a6da3b81014cd6";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Trello wrapper for elixir api'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mikaak/trello-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    trello = trello_1_3_0;
+
+    trie_1_4_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
           buildRebar3 ({
             name = "trie";
-            version = "1.5.0";
+            version = "1.4.0";
             src = fetchHex {
               pkg = "trie";
-              version = "1.5.0";
+              version = "1.4.0";
               sha256 =
-                "613981536e33f58d92e44bd31801376f71deee0e57c63372fe8ab5fbbc37f7dc";
+                "befef786527fd17678716f9dc86a064a11811e7087094967204715804a23ea4b";
             };
 
             meta = {
@@ -28034,6 +36313,127 @@ let
 
     tsuru = tsuru_1_4_0;
 
+    tubex_0_0_7 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "tubex";
+            version = "0.0.7";
+            src = fetchHex {
+              pkg = "tubex";
+              version = "0.0.7";
+              sha256 =
+                "8b34ade3d0484ee5ebb1155c16454d545284d0c215bf999a206cbcc198acea83";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir wrapper of YouTube Data API v3'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yoavlt/tubex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tubex = tubex_0_0_7;
+
+    tunnerl_0_2_2 = callPackage
+      (
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          ranch_1_2_1,
+          lager_3_0_2
+        }:
+          buildRebar3 ({
+            name = "tunnerl";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "tunnerl";
+              version = "0.2.2";
+              sha256 =
+                "8b630b43d77f5c92901d6a1909be7ce3c8cd5668fa05263e2fcdf73b00d63bd0";
+            };
+
+            beamDeps  = [ ranch_1_2_1 lager_3_0_2 ];
+
+            meta = {
+              description = ''SOCKS4 and SOCKS5 proxy server'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/surik/tunnerl";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tunnerl = tunnerl_0_2_2;
+
+    tvdb_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "tvdb";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "tvdb";
+              version = "0.0.1";
+              sha256 =
+                "627d0ce97938039748960550abe9bebe1f55be39701f85e85ff9f2b6e4af9f00";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Wrapper for TVDb API'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/markman123/tvdb";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tvdb = tvdb_0_0_1;
+
+    twilex_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "twilex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "twilex";
+              version = "0.0.2";
+              sha256 =
+                "b032ee0327c90a9a0545756d771778129d6ded10dfade86b2c8dd1eb80fb56de";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A Twilio client for elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hisea/twilex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    twilex = twilex_0_0_2;
+
     type_0_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -28057,6 +36457,59 @@ let
 
     type = type_0_0_2;
 
+    typeformx_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "typeformx";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "typeformx";
+              version = "0.0.1";
+              sha256 =
+                "8f6f1613f53f8c5012eb6d05276f5d305bdb9d4b0e94926680b536d0e1d94a62";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An Elixir client library for the Typeform API
+                            (typeform.io)'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/netflakes/TypeformX";
+            };
+          } // packageOverrides)
+      ) {};
+
+    typeformx = typeformx_0_0_1;
+
+    tzdata_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "tzdata";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "tzdata";
+              version = "0.0.1";
+              sha256 =
+                "67020b94ec70faceef822dc5bffea0361c4fc9d812c8872c4edb6a2084b16b25";
+            };
+
+            meta = {
+              description = ''Tzdata is a parser and library for the tz
+                            database.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lau/tzdata";
+            };
+          } // packageOverrides)
+      ) {};
+
     tzdata_0_1_201603 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -28079,17 +36532,69 @@ let
           } // packageOverrides)
       ) {};
 
-    ua_inspector_0_11_0 = callPackage
+    tzdata_0_5_8 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, hackney_1_6_0 }:
+          buildMix ({
+            name = "tzdata";
+            version = "0.5.8";
+            src = fetchHex {
+              pkg = "tzdata";
+              version = "0.5.8";
+              sha256 =
+                "218ab89e51fb297f1e4bf512e9e551b8214d361e61b7683179da303ba5be8c60";
+            };
+            beamDeps  = [ hackney_1_6_0 ];
+
+            meta = {
+              description = ''Tzdata is a parser and library for the tz
+                            database.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lau/tzdata";
+            };
+          } // packageOverrides)
+      ) {};
+
+    tzdata = tzdata_0_5_8;
+
+    ua_classifier_1_0_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "ua_classifier";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "ua_classifier";
+              version = "1.0.0";
+              sha256 =
+                "59c3b3ed96a10fe05e91202a3ca983b40215c41dde0733fe6dd8a6841b6e315d";
+            };
+            compilePorts = true;
+            buildPlugins  = [ pc ];
+
+
+            meta = {
+              description = ''Erlang User Agent Classifier - NIF for
+                            WeatherChannel dClass'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/zotonic/ua_classifier";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ua_classifier = ua_classifier_1_0_0;
+
+    ua_inspector_0_11_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex, poolboy_1_5_1 }:
           buildMix ({
             name = "ua_inspector";
-            version = "0.11.0";
+            version = "0.11.1";
             src = fetchHex {
               pkg = "ua_inspector";
-              version = "0.11.0";
+              version = "0.11.1";
               sha256 =
-                "ddc05b1293962317caab370610131e950a697a62ac7d041c885e5540dba1cf72";
+                "943787d2a766ed8fd50e30f6787c9775304bd1215ffbdb5fe0b445153af8d02b";
             };
             beamDeps  = [ poolboy_1_5_1 ];
 
@@ -28101,7 +36606,7 @@ let
           } // packageOverrides)
       ) {};
 
-    ua_inspector = ua_inspector_0_11_0;
+    ua_inspector = ua_inspector_0_11_1;
 
     uber_0_1_0 = callPackage
       (
@@ -28152,7 +36657,7 @@ let
 
     ueberauth_0_2_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "ueberauth";
             version = "0.2.0";
@@ -28162,7 +36667,7 @@ let
               sha256 =
                 "d6ee9cfe96be0e2b4005cb482b8e29c20ae0d6f7332ea9f686397c4ab20bf4de";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               description = ''An Elixir Authentication System for Plug-based
@@ -28182,7 +36687,7 @@ let
           packageOverrides ? {},
           fetchHex,
           ueberauth_0_2_0,
-          plug_1_1_3
+          plug_1_1_5
         }:
           buildMix ({
             name = "ueberauth_identity";
@@ -28193,7 +36698,7 @@ let
               sha256 =
                 "ebbb4d7fe6c94053486a32794ab2a561f004f01fd1099c7e0a69901dc32c51ca";
             };
-            beamDeps  = [ ueberauth_0_2_0 plug_1_1_3 ];
+            beamDeps  = [ ueberauth_0_2_0 plug_1_1_5 ];
 
             meta = {
               description = ''An Ueberauth strategy for basic
@@ -28206,30 +36711,36 @@ let
 
     ueberauth_identity = ueberauth_identity_0_2_3;
 
-    ui_0_1_1 = callPackage
+    ueberauth_twitter_0_2_2 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "ui";
-            version = "0.1.1";
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          ueberauth_0_2_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "ueberauth_twitter";
+            version = "0.2.2";
             src = fetchHex {
-              pkg = "ui";
-              version = "0.1.1";
+              pkg = "ueberauth_twitter";
+              version = "0.2.2";
               sha256 =
-                "492da59ca39055c0dfc794a2ebd564adb9ed635402c7b46659981f32aa9d94c1";
+                "911a227b8290e8d65cee8d45015477d4ea51dbcf637c8a41ff88b34fcc5ab65a";
             };
-
-            buildPlugins  = [ rebar3_hex ];
-
+            beamDeps  = [ ueberauth_0_2_0 httpoison_0_8_3 ];
 
             meta = {
-              description = ''An OTP application'';
-
+              description = ''An Uberauth strategy for Twitter
+                            authentication.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ueberauth/ueberauth_twitter";
             };
           } // packageOverrides)
       ) {};
 
-    ui = ui_0_1_1;
+    ueberauth_twitter = ueberauth_twitter_0_2_2;
 
     uk_postcode_0_3_0 = callPackage
       (
@@ -28256,28 +36767,36 @@ let
 
     uk_postcode = uk_postcode_0_3_0;
 
-    ulitos_0_3_0 = callPackage
+    unicode_0_0_1 = callPackage
       (
-        {  buildRebar3, packageOverrides ? {}, fetchHex }:
-          buildRebar3 ({
-            name = "ulitos";
-            version = "0.3.0";
+        {  buildMix, packageOverrides ? {}, fetchHex, earmark_0_2_1 }:
+          buildMix ({
+            name = "unicode";
+            version = "0.0.1";
             src = fetchHex {
-              pkg = "ulitos";
-              version = "0.3.0";
+              pkg = "unicode";
+              version = "0.0.1";
               sha256 =
-                "385f5fdc4cb2ea9f2ae3abcdec3f8dcbb120095f9d50acfd4ee58ecef18429d3";
+                "646bd8c3c9967a26b14aaa167e1bd08451d9db885d2736046b5fe5ada04bd2d6";
             };
+            beamDeps  = [ earmark_0_2_1 ];
 
             meta = {
-              description = ''Erlang common utils'';
-
-              homepage = "https://github.com/palkan/ulitos";
+              longDescription = ''The _Unicode_ package provides functionality
+                                to check properties of unicode codepoints,
+                                graphemes and strings. This is often useful when
+                                checking or validating the contents of strings
+                                in situations where using Regular Expressions is
+                                not necessary and/or too slow. The Unicode
+                                package is based on Version 8.0.0 of the Unicode
+                                standard.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/Qqwy/elixir-unicode";
             };
           } // packageOverrides)
       ) {};
 
-    ulitos = ulitos_0_3_0;
+    unicode = unicode_0_0_1;
 
     unit_fun_0_5_1 = callPackage
       (
@@ -28326,6 +36845,66 @@ let
 
     units = units_1_0_0;
 
+    untappd_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          exjsx_3_2_0
+        }:
+          buildMix ({
+            name = "untappd";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "untappd";
+              version = "0.0.1";
+              sha256 =
+                "f4560612cd78002202234660cf248f004c91ade8c10dc87ad136eb5d8f49d66a";
+            };
+            beamDeps  = [ httpoison_0_8_3 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Elixir wrapper for the Untappd API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nimi/untappd";
+            };
+          } // packageOverrides)
+      ) {};
+
+    untappd = untappd_0_0_1;
+
+    until_then_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, calendar_0_14_2 }:
+          buildMix ({
+            name = "until_then";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "until_then";
+              version = "0.0.1";
+              sha256 =
+                "9bc5c61346d18a770efc25e5f3cb55c9cb68fe2d7ff179964ac8b314d779c111";
+            };
+            beamDeps  = [ calendar_0_14_2 ];
+
+            meta = {
+              longDescription = ''This library tells you how many milliseconds
+                                to the next occurrence of a scheduled event.
+                                This is very convenient to combine with
+                                `:timer.sleep/1` or `Process.send_after/3` as a
+                                means of repeatedly invoking some code on a
+                                schedule and not having those invocations
+                                drift.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/NoRedInk/until_then";
+            };
+          } // packageOverrides)
+      ) {};
+
+    until_then = until_then_0_0_1;
+
     uri_0_1_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -28372,17 +36951,114 @@ let
 
     urilib = urilib_0_1_1;
 
-    uuid_1_0_0 = callPackage
+    url_tincture_0_0_6 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
+            name = "url_tincture";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "url_tincture";
+              version = "0.0.6";
+              sha256 =
+                "00a00bfca54cea1f5d9b340c90d9ed52ad86fe7bc8b657f3cc27c7404c33c1f5";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              description = ''A package to reduce extended forms of URLs to a
+                            canonical reference'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/craigwaterman/url_tincture";
+            };
+          } // packageOverrides)
+      ) {};
+
+    url_tincture = url_tincture_0_0_6;
+
+    url_unroller_0_0_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
+          buildMix ({
+            name = "url_unroller";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "url_unroller";
+              version = "0.0.3";
+              sha256 =
+                "65a46b7335060111bdc5ad164548361f3c7ff5a39ff9493a9109dd20b98498b9";
+            };
+            beamDeps  = [ httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A simple url unroller/unshortener'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/semanticart/url_unroller";
+            };
+          } // packageOverrides)
+      ) {};
+
+    url_unroller = url_unroller_0_0_3;
+
+    usefulness_0_0_6 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "usefulness";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "usefulness";
+              version = "0.0.6";
+              sha256 =
+                "993b6d5ef4a8c4a4c254c92c49290f245ea34f071a9acd100abd654b381ec238";
+            };
+
+            meta = {
+              description = ''Useful things'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/b-filip/usefulness";
+            };
+          } // packageOverrides)
+      ) {};
+
+    usefulness = usefulness_0_0_6;
+
+    user_agent_parser_1_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "user_agent_parser";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "user_agent_parser";
+              version = "1.0.1";
+              sha256 =
+                "ba049dfe5d9c611a0ba3ac13c9ef0d17ea49e8bdfab68c54e7415423f32aa74f";
+            };
+
+            meta = {
+              longDescription = ''A simple Elixir package for parsing user
+                                agent strings with the help of BrowserScope`s UA
+                                database'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/romul/uap-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    user_agent_parser = user_agent_parser_1_0_1;
+
+    uuid_0_1_5 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "uuid";
-            version = "1.0.0";
+            version = "0.1.5";
             src = fetchHex {
               pkg = "uuid";
-              version = "1.0.0";
+              version = "0.1.5";
               sha256 =
-                "ff0a92c21c23935a944a5c5608c1c5af8d629ff5e11593001434d21efcb343b4";
+                "5cfb91972f5cacb0bcb2f00414d5747dd575d84b864c96f668ab3b729cc08422";
             };
 
             meta = {
@@ -28393,17 +37069,17 @@ let
           } // packageOverrides)
       ) {};
 
-    uuid_1_1_3 = callPackage
+    uuid_1_1_4 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "uuid";
-            version = "1.1.3";
+            version = "1.1.4";
             src = fetchHex {
               pkg = "uuid";
-              version = "1.1.3";
+              version = "1.1.4";
               sha256 =
-                "dab67ed70fc162595e63b84c38904fb2ea1779909b46a5f61753ba7ddbe9877b";
+                "55ceed2fe12062e3e0bf19baa118d0ac64eb6edd79f242aaaf090236f09965f0";
             };
 
             meta = {
@@ -28414,7 +37090,7 @@ let
           } // packageOverrides)
       ) {};
 
-    uuid = uuid_1_1_3;
+    uuid = uuid_1_1_4;
 
     vagrant_0_0_1 = callPackage
       (
@@ -28462,17 +37138,17 @@ let
 
     varpool = varpool_1_5_1;
 
-    vector_0_1_0 = callPackage
+    vector_0_3_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "vector";
-            version = "0.1.0";
+            version = "0.3.0";
             src = fetchHex {
               pkg = "vector";
-              version = "0.1.0";
+              version = "0.3.0";
               sha256 =
-                "2399175b7daa136a15ddbaeeb007de0b903fd21979aec1afa2ead92d37033870";
+                "e1f7645d090d58c9efc63046be1ade8b7a431c6428460c3290d6eb6da85cba45";
             };
 
             meta = {
@@ -28484,33 +37160,34 @@ let
           } // packageOverrides)
       ) {};
 
-    vector_0_2_1 = callPackage
+    vector = vector_0_3_0;
+
+    verhoeff_0_1_2 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex }:
-          buildMix ({
-            name = "vector";
-            version = "0.2.1";
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "verhoeff";
+            version = "0.1.2";
             src = fetchHex {
-              pkg = "vector";
-              version = "0.2.1";
+              pkg = "verhoeff";
+              version = "0.1.2";
               sha256 =
-                "20c7d2b83aae6da37c53e7d3139096b4dcfbd289a57b38a07dfb570a1c6e38fb";
+                "1110f266fb3e2b69c7ba29cdae13e583f32af99e6a24843cefa04690c529e8f9";
             };
 
             meta = {
-              longDescription = ''Library of common vector functions for use in
-                                geometric or graphical calculations.'';
+              description = ''The Verhoeff algorithm implementation'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/pkinney/vector_ex";
+              homepage = "https://github.com/mururu/verhoeff";
             };
           } // packageOverrides)
       ) {};
 
-    vector = vector_0_2_1;
+    verhoeff = verhoeff_0_1_2;
 
     verify_origin_0_1_0 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "verify_origin";
             version = "0.1.0";
@@ -28520,7 +37197,7 @@ let
               sha256 =
                 "90834033676cb0ca632f208f489f6eb92ae94323fe7243efba577e1deb031167";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               description = ''A library for using Origin header checking to
@@ -28533,46 +37210,6 @@ let
 
     verify_origin = verify_origin_0_1_0;
 
-    verk_0_9_11 = callPackage
-      (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          watcher_1_0_0,
-          timex_1_0_2,
-          redix_0_3_6,
-          poolboy_1_5_1,
-          poison_1_5_2
-        }:
-          buildMix ({
-            name = "verk";
-            version = "0.9.11";
-            src = fetchHex {
-              pkg = "verk";
-              version = "0.9.11";
-              sha256 =
-                "79183e0e79a106f0712bd291ac1c81124a497d4e1aef0f9db6672ec5b6190b49";
-            };
-            beamDeps  = [
-                          watcher_1_0_0
-                          timex_1_0_2
-                          redix_0_3_6
-                          poolboy_1_5_1
-                          poison_1_5_2
-                        ];
-
-            meta = {
-              description = ''Verk is a job processing system backed by
-                            Redis.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edgurgel/verk";
-            };
-          } // packageOverrides)
-      ) {};
-
-    verk = verk_0_9_11;
-
     vex_0_5_5 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -28597,47 +37234,101 @@ let
 
     vex = vex_0_5_5;
 
-    voorhees_0_1_1 = callPackage
+    viktor_0_1_1 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
           poison_2_1_0,
-          ex_doc_0_11_4
+          httpoison_0_8_3
         }:
           buildMix ({
-            name = "voorhees";
+            name = "viktor";
             version = "0.1.1";
             src = fetchHex {
-              pkg = "voorhees";
+              pkg = "viktor";
               version = "0.1.1";
               sha256 =
-                "0cacff8371280ede205633691a60604f1c3d771508f9b7ffa83d523526326112";
+                "9796d7174806bae878082d53befc1efcd1a374715650afc9956ed63f648227fe";
             };
-            beamDeps  = [ poison_2_1_0 ex_doc_0_11_4 ];
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
 
             meta = {
-              description = ''A library for validating JSON responses'';
+              description = ''Client API wrapper for League of Legends API.'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/danmcclain/voorhees";
+              homepage = "https://github.com/josephyi/viktor";
             };
           } // packageOverrides)
       ) {};
 
-    voorhees = voorhees_0_1_1;
+    viktor = viktor_0_1_1;
 
-    voxpop_0_0_1 = callPackage
+    virus_total_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          jsx_2_8_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "virus_total";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "virus_total";
+              version = "0.0.1";
+              sha256 =
+                "bed3680d17c98f978a90f5b443b6e269ee0a3f2239d2262502d8d10ee042ebfa";
+            };
+            beamDeps  = [ jsx_2_8_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir OTP application for the VirusTotal Public
+                            API v2.0'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dtykocki/virus_total";
+            };
+          } // packageOverrides)
+      ) {};
+
+    virus_total = virus_total_0_0_1;
+
+    vmstats_2_0_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "vmstats";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "vmstats";
+              version = "2.0.0";
+              sha256 =
+                "5cfac88ae597762dc38fcec0b56012ca7a2fbfcc00936326f63f5ddca4da0b53";
+            };
+
+            meta = {
+              description = ''Tiny application to gather VM statistics'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/ferd/vmstats";
+            };
+          } // packageOverrides)
+      ) {};
+
+    vmstats = vmstats_2_0_0;
+
+    voxpop_0_0_2 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "voxpop";
-            version = "0.0.1";
+            version = "0.0.2";
             src = fetchHex {
               pkg = "voxpop";
-              version = "0.0.1";
+              version = "0.0.2";
               sha256 =
-                "85a410b1df2de5852ce491c653d29781b1db2845f8d2e51d9809f7ebbe90a6c9";
+                "74e3a74fb71aea428eeaea9c4b1e6705568070a014e7bc1d158be1000e3e8c88";
             };
 
             meta = {
@@ -28649,7 +37340,44 @@ let
           } // packageOverrides)
       ) {};
 
-    voxpop = voxpop_0_0_1;
+    voxpop = voxpop_0_0_2;
+
+    wallaby_0_5_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          poison_2_1_0,
+          httpoison_0_8_3,
+          dialyze_0_2_1
+        }:
+          buildMix ({
+            name = "wallaby";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "wallaby";
+              version = "0.5.0";
+              sha256 =
+                "0ff4debbefb06e76affa7dfb09072898e744471e8e0b41e7b665382969015265";
+            };
+            beamDeps  = [
+                          poolboy_1_5_1
+                          poison_2_1_0
+                          httpoison_0_8_3
+                          dialyze_0_2_1
+                        ];
+
+            meta = {
+              description = ''Concurrent feature tests for elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keathley/wallaby";
+            };
+          } // packageOverrides)
+      ) {};
+
+    wallaby = wallaby_0_5_0;
 
     watcher_1_0_0 = callPackage
       (
@@ -28674,6 +37402,71 @@ let
 
     watcher = watcher_1_0_0;
 
+    weather_report_0_2_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          trie_1_5_1,
+          sweet_xml_0_6_1,
+          httpoison_0_8_3,
+          feeder_2_0_0
+        }:
+          buildMix ({
+            name = "weather_report";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "weather_report";
+              version = "0.2.0";
+              sha256 =
+                "d052a6b7d2a6c5a7e2c310f8a0be2fe70ee1a62ef2b0b89e1a804016c6fbeed5";
+            };
+            beamDeps  = [
+                          trie_1_5_1
+                          sweet_xml_0_6_1
+                          httpoison_0_8_3
+                          feeder_2_0_0
+                        ];
+
+            meta = {
+              longDescription = ''Get weather forecasts from the National
+                                Oceanic and Atmospheric Administration! As the
+                                NOAA is a United States government agency, only
+                                forecasts in the US are supported.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sschneider1207/weather_report";
+            };
+          } // packageOverrides)
+      ) {};
+
+    weather_report = weather_report_0_2_0;
+
+    web_push_encryption_0_1_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
+          buildMix ({
+            name = "web_push_encryption";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "web_push_encryption";
+              version = "0.1.1";
+              sha256 =
+                "64f3c28f0ab40d3f1366285a8d9166b44959be56525f0a32db0a33d7cfb3feb2";
+            };
+            beamDeps  = [ httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Web push encryption lilbrary'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/tuvistavie/elixir-web-push-encryption";
+            };
+          } // packageOverrides)
+      ) {};
+
+    web_push_encryption = web_push_encryption_0_1_1;
+
     web_socket_0_0_1 = callPackage
       (
         {
@@ -28735,6 +37528,67 @@ let
 
     webassembly = webassembly_0_6_1;
 
+    webmentions_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpotion_2_2_2,
+          floki_0_7_2
+        }:
+          buildMix ({
+            name = "webmentions";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "webmentions";
+              version = "0.1.0";
+              sha256 =
+                "5409b9237578fd67601b77c601093ab599a1bc507a6e1457a853c20e516c3d81";
+            };
+            beamDeps  = [ httpotion_2_2_2 floki_0_7_2 ];
+
+            meta = {
+              description = ''A Webmentions
+                            (https://indiewebcamp.com/Webmention) module for
+                            Elixir'';
+              license = stdenv.lib.licenses.agpl3;
+              homepage = "https://github.com/ckruse/webmentions-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    webmentions = webmentions_0_1_0;
+
+    webpay_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "webpay";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "webpay";
+              version = "0.0.4";
+              sha256 =
+                "abab40fc7fda25a55d3a3dce4327d3f322df378432a9ed5e7c43e553989f467e";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir Webpay API wrapper'';
+
+            };
+          } // packageOverrides)
+      ) {};
+
+    webpay = webpay_0_0_4;
+
     websocket_client_1_1_0 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -28760,7 +37614,7 @@ let
 
     wechat_check_signature_0_0_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "wechat_check_signature";
             version = "0.0.1";
@@ -28770,7 +37624,7 @@ let
               sha256 =
                 "5c5bb053c15082e12ad6da485fc4f711efa9198107368a42456aeafcf870caec";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               description = ''An Elixir Plug for checking wechat signature.'';
@@ -28782,9 +37636,42 @@ let
 
     wechat_check_signature = wechat_check_signature_0_0_1;
 
+    wechat_mp_auth_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          mimetype_parser_0_1_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "wechat_mp_auth";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "wechat_mp_auth";
+              version = "0.0.2";
+              sha256 =
+                "da88ac42f476eb8bb594cc702bd2e085c93adf6ebd7bf245e507cacf77e78ab9";
+            };
+            beamDeps  = [ poison_2_1_0 mimetype_parser_0_1_2 httpoison_0_8_3
+                      ];
+
+            meta = {
+              description = ''An Elixir WeChat Media Platform Authentication
+                            Client Library.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/he9qi/wechat_mp_auth";
+            };
+          } // packageOverrides)
+      ) {};
+
+    wechat_mp_auth = wechat_mp_auth_0_0_2;
+
     wechatex_0_0_1 = callPackage
       (
-        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
           buildMix ({
             name = "wechatex";
             version = "0.0.1";
@@ -28794,7 +37681,7 @@ let
               sha256 =
                 "211971a79d38326dbf5e603ee00165708eb17670f2a84e54df929191c6fef81c";
             };
-            beamDeps  = [ plug_1_1_3 ];
+            beamDeps  = [ plug_1_1_5 ];
 
             meta = {
               description = ''Wechat plugins for Elixir.'';
@@ -28806,17 +37693,47 @@ let
 
     wechatex = wechatex_0_0_1;
 
-    white_bread_2_5_0 = callPackage
+    what3words_1_0_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "what3words";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "what3words";
+              version = "1.0.0";
+              sha256 =
+                "a704976567fd49cc6450eb0de10a7a39acb49b8db5b9ea7b9d9c1491b7453bf7";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Wrapper for the What3Words API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lucidstack/w3w-elixir-wrapper";
+            };
+          } // packageOverrides)
+      ) {};
+
+    what3words = what3words_1_0_0;
+
+    white_bread_2_7_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "white_bread";
-            version = "2.5.0";
+            version = "2.7.0";
             src = fetchHex {
               pkg = "white_bread";
-              version = "2.5.0";
+              version = "2.7.0";
               sha256 =
-                "0256755080fadfbd45285ace5279147a6f8af3df2ae89eed70b5072471f21360";
+                "8938204a78b9081a2c097cb1c39e19037356f4d71a011897b1d51d728ba15946";
             };
 
             meta = {
@@ -28829,7 +37746,30 @@ let
           } // packageOverrides)
       ) {};
 
-    white_bread = white_bread_2_5_0;
+    white_bread = white_bread_2_7_0;
+
+    whois_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "whois";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "whois";
+              version = "0.0.1";
+              sha256 =
+                "71c21201c0bcf9934503a21e693e380fcf0e91d29728492dce182b15ff686636";
+            };
+
+            meta = {
+              description = ''Pure Elixir WHOIS client and parser.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/utkarshkukreti/whois.ex";
+            };
+          } // packageOverrides)
+      ) {};
+
+    whois = whois_0_0_1;
 
     witchcraft_0_4_2 = callPackage
       (
@@ -28885,6 +37825,87 @@ let
 
     wizard = wizard_0_1_0;
 
+    wizardry_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_5,
+          comeonin_1_6_0
+        }:
+          buildMix ({
+            name = "wizardry";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "wizardry";
+              version = "0.0.1";
+              sha256 =
+                "4a85b8c3e5813dee20aa0d5503811568743644883723c9b226436616c9a779a3";
+            };
+            beamDeps  = [ plug_1_1_5 comeonin_1_6_0 ];
+
+            meta = {
+              description = ''Simple, low-level user account framework for
+                            Phoenix Framework'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/knrz/wizardry";
+            };
+          } // packageOverrides)
+      ) {};
+
+    wizardry = wizardry_0_0_1;
+
+    woolly_0_1_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "woolly";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "woolly";
+              version = "0.1.2";
+              sha256 =
+                "34677dae0bcca0c66fd611d6528e1d0532247e0ad9478a4b469476058308b40d";
+            };
+
+            meta = {
+              longDescription = ''Woolly is the text mining and natural
+                                language toolkit for the Elixir programming
+                                language.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pjhampton/Woolly";
+            };
+          } // packageOverrides)
+      ) {};
+
+    woolly = woolly_0_1_2;
+
+    word_smith_0_1_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "word_smith";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "word_smith";
+              version = "0.1.2";
+              sha256 =
+                "481e643c5d26f113235ee577ea9b11c2c639228e0573670329c4385ee6d4cb32";
+            };
+
+            meta = {
+              longDescription = ''General text utility library to help with
+                                string manipulation not found in the standard
+                                Elixir library.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/benfalk/word_smith";
+            };
+          } // packageOverrides)
+      ) {};
+
+    word_smith = word_smith_0_1_2;
+
     work_queue_0_0_3 = callPackage
       (
         {
@@ -28933,7 +37954,28 @@ let
           } // packageOverrides)
       ) {};
 
-    worker_pool = worker_pool_1_0_4;
+    worker_pool_2_0_0 = callPackage
+      (
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
+            name = "worker_pool";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "worker_pool";
+              version = "2.0.0";
+              sha256 =
+                "915d3a1276d3c00c1438ae49785ff974f7b36772d5a13ad6a2c487e7c005f272";
+            };
+
+            meta = {
+              description = ''Erlang Worker Pool'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/inaka/worker_pool";
+            };
+          } // packageOverrides)
+      ) {};
+
+    worker_pool = worker_pool_2_0_0;
 
     workex_0_10_0 = callPackage
       (
@@ -29010,71 +38052,309 @@ let
 
     world_json = world_json_0_1_6;
 
-    xlsx_parser_0_0_4 = callPackage
+    wpa_supplicant_0_2_0 = callPackage
       (
-        {
-          buildMix,
-          packageOverrides ? {},
-          fetchHex,
-          timex_1_0_2,
-          sweet_xml_0_5_1,
-          simple_agent_0_0_7
-        }:
+        {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
-            name = "xlsx_parser";
-            version = "0.0.4";
+            name = "wpa_supplicant";
+            version = "0.2.0";
             src = fetchHex {
-              pkg = "xlsx_parser";
-              version = "0.0.4";
+              pkg = "wpa_supplicant";
+              version = "0.2.0";
               sha256 =
-                "53d86e1142483421d5c1fe769f69980560a6809ca37a13c3dcd4c49fee46a831";
+                "40c86728b254dd9a9a96d862049a85ccf8b8ce9d1fe27985fe5d7c7a32c56bb6";
             };
-            beamDeps  = [ timex_1_0_2 sweet_xml_0_5_1 simple_agent_0_0_7 ];
 
             meta = {
-              longDescription = ''Simple parsing of xlsx spreadsheet data. Data
-                                can be retrieved or written to csv.'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/TheFirstAvenger/elixir-xlsx_parser.git";
+              longDescription = ''Elixir interface to the wpa_supplicant
+                                daemon. The wpa_supplicant provides application
+                                support for scanning for access points, managing
+                                Wi-Fi connections, and handling all of the
+                                security and other parameters associated with
+                                Wi-Fi.'';
+              license = with stdenv.lib.licenses; [ asl20 free ];
+              homepage = "https://github.com/fhunleth/wpa_supplicant.ex";
             };
           } // packageOverrides)
       ) {};
 
-    xlsx_parser = xlsx_parser_0_0_4;
+    wpa_supplicant = wpa_supplicant_0_2_0;
 
-    xlsxir_0_0_2 = callPackage
+    ws_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "ws";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ws";
+              version = "0.0.1";
+              sha256 =
+                "31185c57989f16c4d337974cf1896bb8da452b4f08258a48583cce211fbcf316";
+            };
+
+            meta = {
+              description = ''An RFC 6455 WebSocket implementation.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ws = ws_0_0_1;
+
+    wx_utils_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "wx_utils";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "wx_utils";
+              version = "0.0.2";
+              sha256 =
+                "78bb6d423327e7cf41446a35741fe079fb138a4671d0a01e70223f6219afc3d4";
+            };
+
+            meta = {
+              description = ''All of the erlang wx macros exposed as normal
+                            functions.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sschneider1207/wx_utils";
+            };
+          } // packageOverrides)
+      ) {};
+
+    wx_utils = wx_utils_0_0_2;
+
+    wykop_api_0_0_4 = callPackage
       (
         {
           buildMix,
           packageOverrides ? {},
           fetchHex,
-          sweet_xml_0_6_1,
-          ex_doc_0_11_4,
-          earmark_0_2_1
+          poison_1_5_2,
+          httpoison_0_8_3
         }:
           buildMix ({
-            name = "xlsxir";
-            version = "0.0.2";
+            name = "wykop_api";
+            version = "0.0.4";
             src = fetchHex {
-              pkg = "xlsxir";
-              version = "0.0.2";
+              pkg = "wykop_api";
+              version = "0.0.4";
               sha256 =
-                "7019d6c58f87543fcccc463cec5132d7a2343f5ef2ffdbb77095b694646e6ab0";
+                "0c2acade581168e5cdf3d1dbde53183bc1c49882c8ba8793e045f20d5a9a26d0";
             };
-            beamDeps  = [ sweet_xml_0_6_1 ex_doc_0_11_4 earmark_0_2_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
 
             meta = {
-              longDescription = ''Parses Microsoft Excel worksheets (currently
-                                only .xlsx format) and returns the data in
-                                either a list or a map.'';
+              description = ''Library for Wykop API.'';
+              license = stdenv.lib.licenses.cc0;
+              homepage = "https://github.com/remiq/wykop_api_elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    wykop_api = wykop_api_0_0_4;
+
+    xain_0_5_3 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "xain";
+            version = "0.5.3";
+            src = fetchHex {
+              pkg = "xain";
+              version = "0.5.3";
+              sha256 =
+                "c71c2b8180b317a361b4691cf6e9e72d1cf2ad00f7e31f5f5e72d79489eb6e24";
+            };
+
+            meta = {
+              description = ''An html DSL package.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/smpallen99/xain";
+            };
+          } // packageOverrides)
+      ) {};
+
+    xain = xain_0_5_3;
+
+    xe_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          floki_0_8_1
+        }:
+          buildMix ({
+            name = "xe";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "xe";
+              version = "0.0.1";
+              sha256 =
+                "53d693612db1343c36a7bbe6286c23f7ccfdbd44500c2a38970743238d230a77";
+            };
+            beamDeps  = [ httpoison_0_8_3 floki_0_8_1 ];
+
+            meta = {
+              description = ''Real time conversion for currencies'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/paulodiniz/xe";
+            };
+          } // packageOverrides)
+      ) {};
+
+    xe = xe_0_0_1;
+
+    xepcache_1_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, depcache_1_2_2 }:
+          buildMix ({
+            name = "xepcache";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "xepcache";
+              version = "1.0.1";
+              sha256 =
+                "b163b26145c2ab3f37ec004dc24ca49c53c1c7b50529c068e94cfcfd78ec62dd";
+            };
+            beamDeps  = [ depcache_1_2_2 ];
+
+            meta = {
+              longDescription = ''A wrapper around Erlang`s depcache, an
+                                in-memory caching server. depcache bases its
+                                caching around ETS but can also switch to using
+                                the in-process dictionary for maintaining a
+                                process-local cache. Convenient functions are
+                                provided for getting/setting cache values, with
+                                ttl and cache key dependencies, as well as a
+                                memo function for caching the result of function
+                                executions.'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/arjan/xepcache";
+            };
+          } // packageOverrides)
+      ) {};
+
+    xepcache = xepcache_1_0_1;
+
+    xfighter_0_2_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "xfighter";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "xfighter";
+              version = "0.2.1";
+              sha256 =
+                "67bb43379cd89b4b95f65f02ad5421719723d262fdbe7e399fb82ac7f3b490a8";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''An API wrapper for the programming game
+                            Stockfighter.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitchef/xfighter";
+            };
+          } // packageOverrides)
+      ) {};
+
+    xfighter = xfighter_0_2_1;
+
+    xjs_0_1_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
+            name = "xjs";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "xjs";
+              version = "0.1.1";
+              sha256 =
+                "51f93b5008fb73ad6d9320bc97892cd861171852a59408b02823b03fe8c1b751";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              description = ''elixir syntax, javascript semantics'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/aaron-lebo/xjs";
+            };
+          } // packageOverrides)
+      ) {};
+
+    xjs = xjs_0_1_1;
+
+    xkcd_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "xkcd";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "xkcd";
+              version = "0.0.1";
+              sha256 =
+                "1c757360b9c5ff3d098e9c04874ed273289ea890e4d87e7dd99164633fe061b5";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''Uses the XKCD JSON API to retrieve the
+                                random, specific and the latest XKCD comic.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/notdevinclark/xkcd";
+            };
+          } // packageOverrides)
+      ) {};
+
+    xkcd = xkcd_0_0_1;
+
+    xlsxir_1_3_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, erlsom_1_4_1 }:
+          buildMix ({
+            name = "xlsxir";
+            version = "1.3.0";
+            src = fetchHex {
+              pkg = "xlsxir";
+              version = "1.3.0";
+              sha256 =
+                "8c5985daeafaa388b63dde1f9827d650c5c964a0d4c1a91aba9ff8463c6d7833";
+            };
+            beamDeps  = [ erlsom_1_4_1 ];
+
+            meta = {
+              longDescription = ''Xlsx file parser. Supports large files,
+                                multiple worksheets and ISO 8601 date formats.
+                                Data is extracted to an Erlang Term Storage
+                                (ETS) table and is accessed through various
+                                functions. Tested with Excel and LibreOffice.'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/kennellroxco/xlsxir";
             };
           } // packageOverrides)
       ) {};
 
-    xlsxir = xlsxir_0_0_2;
+    xlsxir = xlsxir_1_3_0;
 
     xml_builder_0_0_8 = callPackage
       (
@@ -29099,6 +38379,31 @@ let
 
     xml_builder = xml_builder_0_0_8;
 
+    xml_to_keyword_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "xml_to_keyword";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "xml_to_keyword";
+              version = "0.0.1";
+              sha256 =
+                "64433848f0ed0ad8f26f1c6e1a6509a6fbaf017701577bd8122bfbb6ee277e97";
+            };
+
+            meta = {
+              longDescription = ''This is an Elixir package that can convert
+                                xml into Elixir`s Keyword List, which is
+                                compilable with XmlBuilder
+                                (joshnuss/xml_builder) package'';
+              license = stdenv.lib.licenses.free;
+            };
+          } // packageOverrides)
+      ) {};
+
+    xml_to_keyword = xml_to_keyword_0_0_1;
+
     xmlrpc_0_9_1 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -29123,33 +38428,62 @@ let
           } // packageOverrides)
       ) {};
 
-    xmlrpc = xmlrpc_0_9_1;
-
-    xref_runner_0_2_5 = callPackage
+    xmlrpc_1_0_0 = callPackage
       (
-        {
-          buildErlangMk, packageOverrides ? {}, fetchHex, getopt_0_8_2
-        }:
-          buildErlangMk ({
-            name = "xref_runner";
-            version = "0.2.5";
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "xmlrpc";
+            version = "1.0.0";
             src = fetchHex {
-              pkg = "xref_runner";
-              version = "0.2.5";
+              pkg = "xmlrpc";
+              version = "1.0.0";
               sha256 =
-                "12ca46c02789b0b2755284dedeb73aac0d9a3120c28c992040feb86766ee2c9a";
+                "8b7dc690a64df7e72d192e9211a20084079933272c14c3e9c158eb101025a7ec";
             };
-            beamDeps  = [ getopt_0_8_2 ];
 
             meta = {
-              description = ''Xref Runner'';
+              longDescription = ''XML-RPC encoder/decder for Elixir. Supports
+                                all valid datatypes. Input (ie untrusted) is
+                                parsed with erlsom against an xml-schema for
+                                security.'';
               license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/inaka/xref_runner";
+              homepage = "https://github.com/ewildgoose/elixir-xml_rpc";
             };
           } // packageOverrides)
       ) {};
 
-    xref_runner = xref_runner_0_2_5;
+    xmlrpc = xmlrpc_1_0_0;
+
+    xoauth2_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          mock_0_1_3,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "xoauth2";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "xoauth2";
+              version = "0.0.3";
+              sha256 =
+                "4a43a0bca1707b579c6a141524666006dd25ed2efdc19aee5d6eeedf6efc3418";
+            };
+            beamDeps  = [ poison_1_5_2 mock_0_1_3 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''A simple XOAuth2 module for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/craigp/elixir_xoauth2";
+            };
+          } // packageOverrides)
+      ) {};
+
+    xoauth2 = xoauth2_0_0_3;
 
     xxhash_0_2_0 = callPackage
       (
@@ -29174,6 +38508,61 @@ let
 
     xxhash = xxhash_0_2_0;
 
+    y_process_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "y_process";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "y_process";
+              version = "0.0.1";
+              sha256 =
+                "3329d3fbe253d605b1f7a91a601c672ff4bc0e7b8c960871d82c964e92372bcb";
+            };
+
+            meta = {
+              description = ''GenServer wrapper behaviour for pubsub between
+                            processes.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gmtprime/y_process";
+            };
+          } // packageOverrides)
+      ) {};
+
+    y_process = y_process_0_0_1;
+
+    yahoo_fx_0_2_0 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          time_seer_0_0_6,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "yahoo_fx";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "yahoo_fx";
+              version = "0.2.0";
+              sha256 =
+                "e06b6986c483cad62081e19fba3089f3eab4a4f1e1cc06cd17aa45d34dd14913";
+            };
+            beamDeps  = [ time_seer_0_0_6 httpoison_0_8_3 ];
+
+            meta = {
+              longDescription = ''YahooFx is an Elixir library for getting
+                                currency exchange rates from Yahoo Finance'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lau/yahoo_fx";
+            };
+          } // packageOverrides)
+      ) {};
+
+    yahoo_fx = yahoo_fx_0_2_0;
+
     yaml_elixir_1_0_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
@@ -29196,7 +38585,53 @@ let
           } // packageOverrides)
       ) {};
 
-    yaml_elixir = yaml_elixir_1_0_0;
+    yaml_elixir_1_2_0 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "yaml_elixir";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "yaml_elixir";
+              version = "1.2.0";
+              sha256 =
+                "7827069a57fc1d830c3025acbb9611f4cd51ee139e8e75de85d0c4e835df4c16";
+            };
+
+            meta = {
+              description = ''Yaml parser for Elixir based on native Erlang
+                            implementation.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KamilLelonek/yaml-elixir";
+            };
+          } // packageOverrides)
+      ) {};
+
+    yaml_elixir = yaml_elixir_1_2_0;
+
+    yaml_encoder_0_0_2 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "yaml_encoder";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "yaml_encoder";
+              version = "0.0.2";
+              sha256 =
+                "ff3713e793daed297bca7252651deafd15c5f2f353a4ab03bf3f13a71fcb60a6";
+            };
+
+            meta = {
+              description = ''Simple module to encode data to YAML. Not ready
+                            for production, still WIP.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pilu/yaml_encoder";
+            };
+          } // packageOverrides)
+      ) {};
+
+    yaml_encoder = yaml_encoder_0_0_2;
 
     yes_msg_0_1_0 = callPackage
       (
@@ -29221,6 +38656,62 @@ let
 
     yes_msg = yes_msg_0_1_0;
 
+    yocingo_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpoison_0_8_3,
+          exjsx_3_2_0,
+          earmark_0_2_1
+        }:
+          buildMix ({
+            name = "yocingo";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "yocingo";
+              version = "0.0.3";
+              sha256 =
+                "e222ea0050a5678568d463f8ae7cf7ccd8efba4dfee1637eb0e52c1a1c7809f1";
+            };
+            beamDeps  = [ httpoison_0_8_3 exjsx_3_2_0 earmark_0_2_1 ];
+
+            meta = {
+              longDescription = ''This is a full Telegram Bot API. With this
+                                module you can create your own Telegram Bot.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Yawolf/yocingo";
+            };
+          } // packageOverrides)
+      ) {};
+
+    yocingo = yocingo_0_0_3;
+
+    ytx_0_0_5 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex, rapidax_0_0_3 }:
+          buildMix ({
+            name = "ytx";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "ytx";
+              version = "0.0.5";
+              sha256 =
+                "a30877517201e1c964627782345273fa7ae2157591d1ae6f5663333f370db6f6";
+            };
+            beamDeps  = [ rapidax_0_0_3 ];
+
+            meta = {
+              description = ''Youtube API Client for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/victorlcampos/ytx";
+            };
+          } // packageOverrides)
+      ) {};
+
+    ytx = ytx_0_0_5;
+
     yubico_0_1_4 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
@@ -29292,17 +38783,17 @@ let
 
     yyid = yyid_0_1_2;
 
-    zarex_0_2_0 = callPackage
+    zarex_0_3_0 = callPackage
       (
         {  buildMix, packageOverrides ? {}, fetchHex }:
           buildMix ({
             name = "zarex";
-            version = "0.2.0";
+            version = "0.3.0";
             src = fetchHex {
               pkg = "zarex";
-              version = "0.2.0";
+              version = "0.3.0";
               sha256 =
-                "2e7d632116b1ec750ab2bd86e4936cc6f84a467c98a9507b4b3cf828f1edc1e1";
+                "b4c59af6ccc9c0ffea797920a7f66cdaaa498cda83e4bc4c077ff09cb3b21961";
             };
 
             meta = {
@@ -29313,7 +38804,7 @@ let
           } // packageOverrides)
       ) {};
 
-    zarex = zarex_0_2_0;
+    zarex = zarex_0_3_0;
 
     zbase32_1_0_0 = callPackage
       (
@@ -29375,28 +38866,84 @@ let
 
     zigzag = zigzag_0_0_1;
 
-    zipper_0_2_0 = callPackage
+    zip_stream_0_1_0 = callPackage
       (
-        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
-          buildErlangMk ({
-            name = "zipper";
-            version = "0.2.0";
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "zip_stream";
+            version = "0.1.0";
             src = fetchHex {
-              pkg = "zipper";
-              version = "0.2.0";
+              pkg = "zip_stream";
+              version = "0.1.0";
               sha256 =
-                "8f5a9271cebd535ff9bf9fd6829a36b3031d16c71b2ae6712e171f117520c023";
+                "a712e24d5fe74e3761c74f3e05cb03df0aa9440f3edee957445f9c9be73c9a4e";
             };
 
             meta = {
-              description = ''Generic Zipper Implementation for Erlang'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/inaka/zipper";
+              longDescription = ''Library to read zip file in a stream. Zip
+                                file binary stream -> stream of {:new_file,name}
+                                or uncompressed_bin Erlang zlib library only
+                                allows deflate decompress stream. But Erlang zip
+                                library does not allow content streaming.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/zip_stream";
             };
           } // packageOverrides)
       ) {};
 
-    zipper = zipper_0_2_0;
+    zip_stream = zip_stream_0_1_0;
+
+    zipcloudx_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_3
+        }:
+          buildMix ({
+            name = "zipcloudx";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "zipcloudx";
+              version = "0.0.2";
+              sha256 =
+                "1e474ec0229b6dd1404c34fbd2a851d136d9549d5ecccbd01d017baac64b264e";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_3 ];
+
+            meta = {
+              description = ''Elixir zipcloud API wrapper'';
+
+            };
+          } // packageOverrides)
+      ) {};
+
+    zipcloudx = zipcloudx_0_0_2;
+
+    zipflow_0_0_1 = callPackage
+      (
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
+            name = "zipflow";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "zipflow";
+              version = "0.0.1";
+              sha256 =
+                "1b6e43e3a40529e41fbbb47d27470a3842834be066b676b68f5b0bfed68c8f39";
+            };
+
+            meta = {
+              description = ''stream zip archives while building them'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://github.com/dgvncsz0f/zipflow";
+            };
+          } // packageOverrides)
+      ) {};
+
+    zipflow = zipflow_0_0_1;
 
     zipper_tree_0_1_1 = callPackage
       (
@@ -29422,17 +38969,17 @@ let
 
     zipper_tree = zipper_tree_0_1_1;
 
-    zlist_1_0_1 = callPackage
+    zlist_1_0_3 = callPackage
       (
         {  buildRebar3, packageOverrides ? {}, fetchHex }:
           buildRebar3 ({
             name = "zlist";
-            version = "1.0.1";
+            version = "1.0.3";
             src = fetchHex {
               pkg = "zlist";
-              version = "1.0.1";
+              version = "1.0.3";
               sha256 =
-                "d63b2ef3328f9b4b3ad827663db3d3b878311d08973c2abc202a66ad55c8a78c";
+                "c5ed3928628cfc9041afb6b1ee3d73d5c85473e6d3ce0f4cb6b1fcb20a207b89";
             };
 
             meta = {
@@ -29443,7 +38990,7 @@ let
           } // packageOverrides)
       ) {};
 
-    zlist = zlist_1_0_1;
+    zlist = zlist_1_0_3;
 
   };
 in stdenv.lib.fix' (stdenv.lib.extends overrides packages)
\ No newline at end of file

From d56850dd49eddf1a934f017333d406acd806abec Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Wed, 15 Jun 2016 16:22:03 +0200
Subject: [PATCH 347/436] e2tools: init -> 0.0.16

---
 pkgs/tools/filesystems/e2tools/default.nix | 25 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/filesystems/e2tools/default.nix

diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/tools/filesystems/e2tools/default.nix
new file mode 100644
index 000000000000..dcaad81a5a3f
--- /dev/null
+++ b/pkgs/tools/filesystems/e2tools/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, e2fsprogs }:
+
+stdenv.mkDerivation rec {
+  pname = "e2tools";
+  version = "0.0.16";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${name}.tar.gz";
+    sha256 = "16wlc54abqz06dpipjdkw58bncpkxlj5f55lkzy07k3cg0bqwg2f";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ e2fsprogs ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://home.earthlink.net/~k_sheff/sw/e2tools/;
+    description = "Utilities to read/write/manipulate files in an ext2/ext3 filesystem";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.leenaars ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab4f3d099d54..0376ddc535b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1369,6 +1369,8 @@ in
 
   dvtm = callPackage ../tools/misc/dvtm { };
 
+  e2tools = callPackage ../tools/filesystems/e2tools { };
+
   e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { };
 
   easyrsa = callPackage ../tools/networking/easyrsa { };

From 1a55add4ca363ba2099dcd8edf47684d212903da Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Wed, 15 Jun 2016 16:24:21 +0200
Subject: [PATCH 348/436] enable the tests only for python older than 3.5

---
 pkgs/development/python-modules/pycuda/default.nix | 3 +++
 pkgs/top-level/python-packages.nix                 | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index df507f9b6ad0..c8be20bbe0a9 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -11,6 +11,7 @@
 , python
 , mkDerivation
 , stdenv
+, pythonOlder
 }:
 let
   compyte = import ./compyte.nix {
@@ -44,6 +45,8 @@ buildPythonPackage rec {
     ln -s ${compyte} $out/${python.sitePackages}/pycuda/compyte 
   '';
 
+  doCheck = pythonOlder "3.5";
+
   propagatedBuildInputs = [
     numpy
     pytools
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2411dcd105e0..b75b896d6b26 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7511,6 +7511,7 @@ in modules // {
   pycuda = callPackage ../development/python-modules/pycuda rec {
     cudatoolkit = pkgs.cudatoolkit75;
     inherit (pkgs.stdenv) mkDerivation;
+    inherit pythonOlder;
   };
 
   python-axolotl = buildPythonPackage rec {
@@ -7795,6 +7796,8 @@ in modules // {
       sha256 = "0g5w1cira1bl9f2ji11cbr9daj947nrfydydymjp4bbxbpl2jnaq";
     };
 
+    doCheck = pythonOlder "3.5";
+
     buildInputs = with self; [
       decorator
       appdirs

From 8d3df9f6c4a89dbcbb69c51cb861128d66f532e4 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Wed, 15 Jun 2016 10:54:59 -0400
Subject: [PATCH 349/436] git: 2.8.3 -> 2.9.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 665954a4c5c6..8b7db0f84554 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "2.8.3";
+  version = "2.9.0";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "14dafk7rz8cy2z5b92yf009qf4pc70s0viwq7hxsgd4898knr3kx";
+    sha256 = "02dl8yvvl7m4zy39s0xmqr958ah7krvkv94lmx4vz3wl95wsj7zl";
   };
 
   patches = [

From 3868cad8325ceffd4a6afe1037107043bc34c878 Mon Sep 17 00:00:00 2001
From: YPares <yves.pares@gmail.com>
Date: Wed, 15 Jun 2016 17:08:41 +0200
Subject: [PATCH 350/436] haskell: generic-stack-builder sets an env var

generic-stack-builder was not setting STACK_PLATFORM_VARIANT="nix".
This is required by stack when handling its haskell packages database
snapshot. Stack must keep separated packages built with its own GHC
and those built with GHC from Nixpkgs.
---
 pkgs/development/haskell-modules/generic-stack-builder.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 07421b1d14f8..09bd38ccc933 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation (args // {
     optional stdenv.isLinux glibcLocales ++
     [ ghc pkgconfig ];
 
+  STACK_PLATFORM_VARIANT="nix";
   STACK_IN_NIX_SHELL=1;
   STACK_IN_NIX_EXTRA_ARGS =
     concatMap (pkg: ["--extra-lib-dirs=${pkg}/lib"

From cfce8f9b36dc9a72cc0f74baa3e0eb4dd37f022d Mon Sep 17 00:00:00 2001
From: Eitan Mosenkis <eitan@mosenkis.net>
Date: Wed, 15 Jun 2016 21:27:04 +0300
Subject: [PATCH 351/436] platformio: 2.8.6 -> 2.10.3

---
 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 949079917469..552fe0d03641 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16483,13 +16483,13 @@ in modules // {
 
   platformio =  buildPythonPackage rec {
     name = "platformio-${version}";
-    version="2.8.6";
+    version="2.10.3";
 
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/p/platformio/platformio-${version}.tar.gz";
-      sha256 = "1l8jcwf8flmx8xcsvly2my8al8nzjr67h3mg5c9wvdr7a42q7dil";
+      url = "https://pypi.python.org/packages/b7/a3/1d3a9d7bae91df1b607e0f31549ec3e0006f29484cc6a1431b3fe3c5b02e/platformio-2.10.3.tar.gz";
+      sha256 = "f3a646871f9baed05f336a32576edaab90abf0737d8adb54f2acb7bcad42a65f";
      };
 
      propagatedBuildInputs = with self; [ click_5 requests2 bottle pyserial lockfile colorama];

From bfec40d4163700c84167368e185b997292b19053 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Wed, 15 Jun 2016 16:53:07 +0200
Subject: [PATCH 352/436] eot-utilities: init -> 1.1

---
 pkgs/tools/misc/eot-utilities/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/misc/eot-utilities/default.nix

diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix
new file mode 100644
index 000000000000..922bd529fb8e
--- /dev/null
+++ b/pkgs/tools/misc/eot-utilities/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  pname = "eot_utilities";
+  version = "1.1";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://www.w3.org/Tools/eot-utils/eot-utilities-${version}.tar.gz";
+    sha256 = "0cb41riabss23hgfg7vxhky09d6zqwjy1nxdvr3l2bh5qzd4kvaf";
+  };
+
+  buildInputs = [ pkgconfig ];
+
+  meta = {
+    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 ];
+    platforms = with stdenv.lib.platforms; linux; 
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab4f3d099d54..77e26694a72e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1416,6 +1416,8 @@ in
 
   entr = callPackage ../tools/misc/entr { };
 
+  eot_utilities = callPackage ../tools/misc/eot-utilities { };
+
   eplot = callPackage ../tools/graphics/eplot { };
 
   ethtool = callPackage ../tools/misc/ethtool { };

From 9ff91371d040941c347b95dc7ea081a9c6aa4d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 15 Jun 2016 22:54:35 +0200
Subject: [PATCH 353/436] nix-prefetch-git: fix bash evaluation order
 dependency

---
 pkgs/build-support/fetchgit/nix-prefetch-git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index a15c1850d822..9b330d821f85 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -68,7 +68,7 @@ for arg; do
             --builder) builder=true;;
             --help) usage; exit;;
             *)
-                argi=$((argi++))
+                : $((++argi))
                 case $argi in
                     1) url=$arg;;
                     2) rev=$arg;;

From 84873b15ab83967a2a45f1390717be659b04dc1a Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Wed, 15 Jun 2016 22:42:01 +0200
Subject: [PATCH 354/436] cutee: init -> 0.4.2

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

diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix
new file mode 100644
index 000000000000..eb19283caeaf
--- /dev/null
+++ b/pkgs/development/libraries/cutee/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "cutee";
+  version = "0.4.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url    = "http://www.codesink.org/download/${pname}-${version}.tar.gz";
+    sha256 = "18bzvhzx8k24mpcim5669n3wg9hd0sfsxj8zjpbr24hywrlppgc2";
+  };
+
+  buildFlags = "cutee";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp cutee $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "C++ Unit Testing Easy Environment";
+    homepage    = http://codesink.org/cutee_unit_testing.html;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ leenaars];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8148ccc178a2..d27e0cf6c73a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6823,6 +6823,8 @@ in
 
   cryptopp = callPackage ../development/libraries/crypto++ { };
 
+  cutee = callPackage ../development/libraries/cutee { };
+
   cwiid = callPackage ../development/libraries/cwiid { };
 
   cyrus_sasl = callPackage ../development/libraries/cyrus-sasl {

From 7e21290079930c8c1ec174ff6c786187796cc188 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 15 Jun 2016 23:04:48 +0200
Subject: [PATCH 355/436] perl-W3C-LinkChecker: fix build

Build failed due to missing `docdev` result, fixed by setting explicit
`outputs` field. Also add license and clean up run-time dependencies.
---
 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 1fcdf8d4e09a..a0bfd0188e7b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13924,14 +13924,14 @@ let self = _self // overrides; _self = with self; {
     name = "W3C-LinkChecker-4.81";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SC/SCOP/${name}.tar.gz";
-      sha256 = "0rbaqvv8ql0db4am1nh7ybig3a4kmckgdm7445xww7fr40dzcfb2";
+      sha256 = "6239f61b20d91dce7b21e4d4f626ab93a8f1e2f207da5015590d508cf6c66a65";
     };
-    propagatedBuildInputs = [
-      LWP ConfigGeneral NetIP TermReadKey Perl5lib
-      CryptSSLeay CSSDOM LWPProtocolHttps ];
+    outputs = [ "out" ];
+    propagatedBuildInputs = [ CGI CSSDOM ConfigGeneral CryptSSLeay EncodeLocale HTMLParser HTTPCookies HTTPMessage LWP LWPProtocolHttps NetHTTP NetIP TermReadKey URI ];
     meta = {
       homepage = http://validator.w3.org/checklink;
       description = "A tool to check links and anchors in Web pages or full Web sites";
+      license = stdenv.lib.licenses.w3c;
     };
   };
 

From 9bbac1f4eac3a880607d3ba6990fcb00fd031611 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 15 Jun 2016 23:15:52 +0200
Subject: [PATCH 356/436] perl-HTTP-Message: 6.06 -> 6.11

---
 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 a0bfd0188e7b..c29f60d346cd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6269,11 +6269,11 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ModuleBuild ];
   };
 
-  HTTPMessage = buildPerlPackage {
-    name = "HTTP-Message-6.06";
+  HTTPMessage = buildPerlPackage rec {
+    name = "HTTP-Message-6.11";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Message-6.06.tar.gz;
-      sha256 = "0qxdrcak97azjvqyx1anpb2ky6vp6vc37x0wcfjdqfajkh09fzh8";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "e7b368077ae6a188d99920411d8f52a8e5acfb39574d4f5c24f46fd22533d81b";
     };
     propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ];
     meta = {

From 26ef210da2fcf39388fbc34e00c217d506159a88 Mon Sep 17 00:00:00 2001
From: Luis Pedro Coelho <luis@luispedro.org>
Date: Wed, 15 Jun 2016 19:30:12 +0200
Subject: [PATCH 357/436] shiboken: add support for Python 3.5

Development upstream is stalled, but this is a trivial patch.
---
 pkgs/development/python-modules/pyside/shiboken.nix  |  3 ++-
 .../python-modules/pyside/shiboken_py35.patch        | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/pyside/shiboken_py35.patch

diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix
index 549b6275a8ce..80b2325cbf43 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }:
 
 # Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77
-if isPy35 then throw "shiboken not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "${python.libPrefix}-pyside-shiboken-${version}";
   version = "1.2.4";
 
@@ -19,6 +19,7 @@ if isPy35 then throw "shiboken not supported for interpreter ${python.executable
     substituteInPlace generator/CMakeLists.txt --replace \
       \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
   '';
+  patches = if isPy35 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
new file mode 100644
index 000000000000..5642ddc594d1
--- /dev/null
+++ b/pkgs/development/python-modules/pyside/shiboken_py35.patch
@@ -0,0 +1,12 @@
+diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs.cmake
+--- a/cmake/Modules/FindPython3Libs.cmake
++++ b/cmake/Modules/FindPython3Libs.cmake
+@@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks)
+ # Search for the python framework on Apple.
+ # 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)
+   IF(_CURRENT_VERSION GREATER 3.1)
+       SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "")
+   ELSE()

From 996a2b54c4d155381de4aa4f8c06a4d83a2e5c11 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 15 Jun 2016 22:41:29 +0100
Subject: [PATCH 358/436] gx-go: init at 20160611

---
 pkgs/tools/package-management/gx/deps.json    |  9 +++++++
 .../package-management/gx/go/default.nix      | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/package-management/gx/go/default.nix

diff --git a/pkgs/tools/package-management/gx/deps.json b/pkgs/tools/package-management/gx/deps.json
index 781557b6a4f6..3dd8e8f6ab31 100644
--- a/pkgs/tools/package-management/gx/deps.json
+++ b/pkgs/tools/package-management/gx/deps.json
@@ -125,6 +125,15 @@
       "sha256": "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw"
     }
   },
+  {
+    "goPackagePath": "github.com/kr/fs",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/kr/fs",
+      "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b",
+      "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"
+    }
+  },
   {
     "goPackagePath": "github.com/mitchellh/go-homedir",
     "fetch": {
diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix
new file mode 100644
index 000000000000..195dafe3d711
--- /dev/null
+++ b/pkgs/tools/package-management/gx/go/default.nix
@@ -0,0 +1,27 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchgit
+, gx
+}:
+
+buildGoPackage rec {
+  name = "gx-go-${version}";
+  version = "20160611-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "639fc0be1a153c59d8946904cceecf0b66ab2944";
+
+  goPackagePath = "github.com/whyrusleeping/gx-go";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/whyrusleeping/gx-go";
+    sha256 = "0qxp7gqrx1rhcbqvp4jdb3gj1dlj200bdc4gq8pfklc8fcz1lc6l";
+  };
+
+  goDeps = ../deps.json;
+
+  extraSrcs = [
+    {
+      goPackagePath = gx.goPackagePath;
+      src = gx.src;
+    }
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c240e48be71d..4e5bc84e7a47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1830,6 +1830,7 @@ in
   };
 
   gx = callPackage ../tools/package-management/gx { };
+  gx-go = callPackage ../tools/package-management/gx/go { };
 
   sbsigntool = callPackage ../tools/security/sbsigntool { };
 

From 41d523a8bc91767a47cdcede69037a3989cbf5aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 15 Jun 2016 23:55:57 +0200
Subject: [PATCH 359/436] gnome-breeze: init

---
 pkgs/misc/themes/gnome-breeze/default.nix | 24 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/misc/themes/gnome-breeze/default.nix

diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/misc/themes/gnome-breeze/default.nix
new file mode 100644
index 000000000000..ac0fb2cfee7d
--- /dev/null
+++ b/pkgs/misc/themes/gnome-breeze/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation {
+  name = "gnome-breeze";
+  src = fetchgit {
+    url = "https://github.com/dirruk1/gnome-breeze";
+    sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm";
+    rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221";
+  };
+  installPhase = ''
+    mkdir -p $out/share/themes
+    cp -r Breeze* $out/share/themes
+  '';
+
+  meta = {
+    description = "A GTK theme built to match KDE's breeze theme";
+    homepage = "https://github.com/dirruk1/gnome-breeze";
+    license = stdenv.lib.licenses.lgpl2;
+    maintainers = with stdenv.lib.maintainers; [ bennofs ];
+    platforms = stdenv.lib.platforms.all;
+    hydraPlatforms = [];
+    preferLocalBuild = true;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8148ccc178a2..e816b0c33779 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16563,6 +16563,8 @@ in
     x11Support = true;
   });
 
+  gnome-breeze = callPackage ../misc/themes/gnome-breeze { };
+
   gnuk = callPackage ../misc/gnuk { };
   gnuk-unstable = lowPrio (callPackage ../misc/gnuk/unstable.nix { });
   gnuk-git = lowPrio (callPackage ../misc/gnuk/git.nix { });

From bc41a7d55139c12acc9fc9005183963bfedf145d Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Thu, 16 Jun 2016 00:03:07 +0200
Subject: [PATCH 360/436] switch to the default versions of numpy and scipy in
 libgpuarray-cuda

---
 .../python-modules/libgpuarray/cuda/default.nix          | 9 +--------
 pkgs/top-level/python-packages.nix                       | 3 +--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/libgpuarray/cuda/default.nix b/pkgs/development/python-modules/libgpuarray/cuda/default.nix
index 6934d9bfe6f4..91dfb9b625b9 100644
--- a/pkgs/development/python-modules/libgpuarray/cuda/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/cuda/default.nix
@@ -18,14 +18,7 @@
 , python
 , cudatoolkit
 , nvidia_x11
-, setuptools
 }: 
-let
-  scipy_numpy = scipy.override (let inherit numpy; in {
-    passthru = { blas = numpy.blas; };
-    propagatedBuildInputs = [ numpy.blas numpy ] ++ [ python setuptools ];
-  });
-in
 buildPythonPackage rec {
   name = "libgpuarray-cuda-${version}";
   version = "-9998.0"; 
@@ -104,7 +97,7 @@ EOF
 
   propagatedBuildInputs = [
     numpy
-    scipy_numpy
+    scipy
     nose
     six
     Mako
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 13154ea57e3c..47677113ae92 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11891,8 +11891,7 @@ in modules // {
   });
 
   libgpuarray-cuda = callPackage ../development/python-modules/libgpuarray/cuda/default.nix rec {
-    numpy = self.numpy_1_10;
-    inherit (self) scipy;
+    inherit (self) numpy scipy;
     inherit (pkgs.linuxPackages) nvidia_x11;
     cudatoolkit = pkgs.cudatoolkit75;
     clblas = pkgs.clblas-cuda;

From 519673e7145ea1e54afc54bc501b53bab226c94b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 16 Jun 2016 00:18:41 +0200
Subject: [PATCH 361/436] wpa_supplicant: start after wireless interfaces

wpa_supplicant fails to start if the wireless interfaces aren't ready yet,
so we need to add a system ordering directive here to start wpa_supplicant
after the interfaces are ready. Note that Requires= is not enough since
it does not imply ordering.
---
 nixos/modules/services/networking/wpa_supplicant.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 53648aef1e04..8d22c10d3f78 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -129,7 +129,7 @@ in {
       in {
         description = "WPA Supplicant";
 
-        after = [ "network-interfaces.target" ];
+        after = [ "network-interfaces.target" ] ++ lib.concatMap deviceUnit ifaces;
         requires = lib.concatMap deviceUnit ifaces;
         wantedBy = [ "network.target" ];
 

From d624b02e1eff21580b93970f03459fe0246600bb Mon Sep 17 00:00:00 2001
From: Nahum Shalman <nshalman@omniti.com>
Date: Wed, 15 Jun 2016 14:39:43 +0000
Subject: [PATCH 362/436] Add new package "shfmt"

---
 pkgs/tools/text/shfmt/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/text/shfmt/default.nix

diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
new file mode 100644
index 000000000000..1c6dede0c54c
--- /dev/null
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "shfmt-${version}";
+  version = "2016-06-15";
+  rev = "233b276a55cdd4aaa4625893255382993bbb0533";
+
+  goPackagePath = "github.com/mvdan/sh";
+
+  src = fetchFromGitHub {
+    owner = "mvdan";
+    repo = "sh";
+    inherit rev;
+    sha256 = "09rq99gw2g6az6dmdg82nql8zp3c3mrqavqwvx76dirabzjhsbj6";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mvdan/sh;
+    description = "A shell parser and formatter";
+    longDescription = ''
+      shfmt formats shell programs. It can use tabs or any number of spaces to indent.
+      You can feed it standard input, any number of files or any number of directories to recurse into.
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4560172e4e0b..9a82e37158e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14102,6 +14102,8 @@ in
     gtk = gtk3;
   };
 
+  shfmt = callPackage ../tools/text/shfmt { };
+
   shutter = callPackage ../applications/graphics/shutter { };
 
   simple-scan = callPackage ../applications/graphics/simple-scan { };

From 68689f4d8e1623578ae6ec4283c8914df2985b05 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Wed, 15 Jun 2016 17:59:01 -0400
Subject: [PATCH 363/436] hiera-eyaml: init at 2.1.0

---
 pkgs/tools/system/hiera-eyaml/Gemfile      |  3 +++
 pkgs/tools/system/hiera-eyaml/Gemfile.lock | 17 +++++++++++++
 pkgs/tools/system/hiera-eyaml/default.nix  | 28 ++++++++++++++++++++++
 pkgs/tools/system/hiera-eyaml/gemset.nix   | 26 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 5 files changed, 76 insertions(+)
 create mode 100644 pkgs/tools/system/hiera-eyaml/Gemfile
 create mode 100644 pkgs/tools/system/hiera-eyaml/Gemfile.lock
 create mode 100644 pkgs/tools/system/hiera-eyaml/default.nix
 create mode 100644 pkgs/tools/system/hiera-eyaml/gemset.nix

diff --git a/pkgs/tools/system/hiera-eyaml/Gemfile b/pkgs/tools/system/hiera-eyaml/Gemfile
new file mode 100644
index 000000000000..18c7cde2a086
--- /dev/null
+++ b/pkgs/tools/system/hiera-eyaml/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'hiera-eyaml', '2.1.0'
diff --git a/pkgs/tools/system/hiera-eyaml/Gemfile.lock b/pkgs/tools/system/hiera-eyaml/Gemfile.lock
new file mode 100644
index 000000000000..a6d1c1f872e9
--- /dev/null
+++ b/pkgs/tools/system/hiera-eyaml/Gemfile.lock
@@ -0,0 +1,17 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    hiera-eyaml (2.1.0)
+      highline (~> 1.6.19)
+      trollop (~> 2.0)
+    highline (1.6.21)
+    trollop (2.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  hiera-eyaml (= 2.1.0)
+
+BUNDLED WITH
+   1.11.2
diff --git a/pkgs/tools/system/hiera-eyaml/default.nix b/pkgs/tools/system/hiera-eyaml/default.nix
new file mode 100644
index 000000000000..615a66f86551
--- /dev/null
+++ b/pkgs/tools/system/hiera-eyaml/default.nix
@@ -0,0 +1,28 @@
+{ lib, bundlerEnv, stdenv }:
+
+let
+  name = "hiera-eyaml-${env.gems.hiera-eyaml.version}";
+
+  env = bundlerEnv {
+    inherit name;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+
+in stdenv.mkDerivation {
+  inherit name;
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    ln -s ${env}/bin/eyaml $out/bin/eyaml
+  '';
+
+  meta = with lib; {
+    description = "Per-value asymmetric encryption of sensitive data for Hiera";
+    homepage = https://github.com/TomPoulton/hiera-eyaml;
+    license = licenses.mit;
+    maintainers = [ maintainers.benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/system/hiera-eyaml/gemset.nix b/pkgs/tools/system/hiera-eyaml/gemset.nix
new file mode 100644
index 000000000000..ab6d5307ebb8
--- /dev/null
+++ b/pkgs/tools/system/hiera-eyaml/gemset.nix
@@ -0,0 +1,26 @@
+{
+  hiera-eyaml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1h25pfv89macjf3sjdrx7slhlq1af4zybai42ci3gj02b6hli4a6";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  highline = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
+      type = "gem";
+    };
+    version = "1.6.21";
+  };
+  trollop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
+      type = "gem";
+    };
+    version = "2.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 8148ccc178a2..81967507f8be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1933,6 +1933,8 @@ in
 
   hevea = callPackage ../tools/typesetting/hevea { };
 
+  hiera-eyaml = callPackage ../tools/system/hiera-eyaml { };
+
   hfsprogs = callPackage ../tools/filesystems/hfsprogs { };
 
   highlight = callPackage ../tools/text/highlight {

From 098e8500d4b00066813f0c9dbbd49eadb87b8030 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Wed, 15 Jun 2016 20:47:54 -0400
Subject: [PATCH 364/436] riemann-dash: Wrap to keep bundler and sass out of
 user env

---
 .../monitoring/riemann-dash/default.nix       | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/monitoring/riemann-dash/default.nix b/pkgs/servers/monitoring/riemann-dash/default.nix
index 1afcd81d9be0..32f543fbf2f1 100644
--- a/pkgs/servers/monitoring/riemann-dash/default.nix
+++ b/pkgs/servers/monitoring/riemann-dash/default.nix
@@ -1,8 +1,26 @@
-{ bundlerEnv }:
+{ bundlerEnv, lib, stdenv }:
 
-bundlerEnv {
-  name = "riemann-dash-0.2.9";
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+let
+  name = "riemann-dash-${env.gems.riemann-dash.version}";
+
+  env = bundlerEnv {
+    inherit name;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+
+in stdenv.mkDerivation {
+  inherit name;
+  buildCommand = ''
+    mkdir -p $out/bin
+    ln -s ${env}/bin/riemann-dash $out/bin/riemann-dash
+  '';
+
+  meta = with lib; {
+    description = "A javascript, websockets-powered dashboard for Riemann";
+    homepage = https://github.com/riemann/riemann-dash;
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
 }

From b6c6763dab660265bd033faf6adb4c05cbc49360 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Wed, 15 Jun 2016 20:52:41 -0400
Subject: [PATCH 365/436] riemann-dash: 0.2.11 -> 0.2.12

---
 pkgs/servers/monitoring/riemann-dash/Gemfile  |  2 +-
 .../monitoring/riemann-dash/Gemfile.lock      | 17 ++--
 .../monitoring/riemann-dash/gemset.nix        | 87 +++++++++----------
 3 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile b/pkgs/servers/monitoring/riemann-dash/Gemfile
index 6b770b708185..aecd1b9508c9 100644
--- a/pkgs/servers/monitoring/riemann-dash/Gemfile
+++ b/pkgs/servers/monitoring/riemann-dash/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem "riemann-dash", "0.2.11"
+gem "riemann-dash", "0.2.12"
diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
index a5445b953c47..1bfd80a897d3 100644
--- a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
+++ b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
@@ -3,25 +3,28 @@ GEM
   specs:
     erubis (2.7.0)
     multi_json (1.3.6)
-    rack (1.6.1)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
-    riemann-dash (0.2.11)
+    riemann-dash (0.2.12)
       erubis (>= 2.7.0)
       multi_json (= 1.3.6)
       sass (>= 3.1.14)
       sinatra (~> 1.4.5)
       webrick (~> 1.3.1)
-    sass (3.4.14)
-    sinatra (1.4.6)
-      rack (~> 1.4)
+    sass (3.4.22)
+    sinatra (1.4.7)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    tilt (2.0.1)
+    tilt (2.0.5)
     webrick (1.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  riemann-dash (= 0.2.11)
+  riemann-dash (= 0.2.12)
+
+BUNDLED WITH
+   1.11.2
diff --git a/pkgs/servers/monitoring/riemann-dash/gemset.nix b/pkgs/servers/monitoring/riemann-dash/gemset.nix
index b98fd452f1af..8a4d3ba58cb1 100644
--- a/pkgs/servers/monitoring/riemann-dash/gemset.nix
+++ b/pkgs/servers/monitoring/riemann-dash/gemset.nix
@@ -1,80 +1,71 @@
 {
-  "erubis" = {
-    version = "2.7.0";
+  erubis = {
     source = {
-      type = "gem";
       sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
-    };
-  };
-  "multi_json" = {
-    version = "1.3.6";
-    source = {
       type = "gem";
+    };
+    version = "2.7.0";
+  };
+  multi_json = {
+    source = {
       sha256 = "0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr";
-    };
-  };
-  "rack" = {
-    version = "1.6.1";
-    source = {
       type = "gem";
-      sha256 = "0f73v6phkwczl1sfv0wgdwsnlsg364bhialbnfkg2dnxhh57l0gl";
     };
+    version = "1.3.6";
   };
-  "rack-protection" = {
-    version = "1.5.3";
+  rack = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
       type = "gem";
+    };
+    version = "1.6.4";
+  };
+  rack-protection = {
+    dependencies = ["rack"];
+    source = {
       sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "riemann-dash" = {
-    version = "0.2.11";
-    source = {
       type = "gem";
-      sha256 = "1vzb75hf1xy7ssil7fp9z7z51vh79ba22x56ific7f1kcb21lzk7";
     };
-    dependencies = [
-      "erubis"
-      "multi_json"
-      "sass"
-      "sinatra"
-      "webrick"
-    ];
+    version = "1.5.3";
   };
-  "sass" = {
-    version = "3.4.14";
+  riemann-dash = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y2vh9vcl21b6k2wqgz1y8bbcrl07r43s6q2vkgp35z1b28xcszy";
       type = "gem";
-      sha256 = "0x2mg6pid87s4ddvv6xnxfzwgy72pjmkm461pav92ngqnngx2ggk";
     };
+    version = "0.2.12";
   };
-  "sinatra" = {
-    version = "1.4.6";
+  sass = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy";
       type = "gem";
-      sha256 = "1hhmwqc81ram7lfwwziv0z70jh92sj1m7h7s9fr0cn2xq8mmn8l7";
     };
-    dependencies = [
-      "rack"
-      "rack-protection"
-      "tilt"
-    ];
+    version = "3.4.22";
   };
-  "tilt" = {
-    version = "2.0.1";
+  sinatra = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp";
       type = "gem";
-      sha256 = "1qc1k2r6whnb006m10751dyz3168cq72vj8mgp5m2hpys8n6xp3k";
     };
+    version = "1.4.7";
   };
-  "webrick" = {
-    version = "1.3.1";
+  tilt = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf";
       type = "gem";
+    };
+    version = "2.0.5";
+  };
+  webrick = {
+    source = {
       sha256 = "0s42mxihcl2bx0h9q0v2syl70qndydfkl39a06h9il17p895ya8g";
+      type = "gem";
     };
+    version = "1.3.1";
   };
 }
\ No newline at end of file

From e97e6061f7ab111d2fd8938bb2381c83cc20c65a Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Wed, 15 Jun 2016 20:47:12 -0700
Subject: [PATCH 366/436] gdb: 7.11 -> 7.11.1

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

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 472bb4de58b9..a98561c560b0 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -12,7 +12,7 @@
 
 let
 
-  basename = "gdb-7.11";
+  basename = "gdb-7.11.1";
 
   # Whether (cross-)building for GNU/Hurd.  This is an approximation since
   # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.xz";
-    sha256 = "1hg5kwwdvi9b9nxzxfjnx8fx3gip75fqyvkp82xpf3b3rcb42hvs";
+    sha256 = "0w7wi1llznlqdqk2lmzygz2xylb2c9mh580s9i0rypkmwfj6s8g9";
   };
 
   nativeBuildInputs = [ pkgconfig texinfo perl ]

From de67e77e3f9140c1c35d7775ec19ae6bb772b1b0 Mon Sep 17 00:00:00 2001
From: Ruslan Babayev <ruslan@babayev.com>
Date: Thu, 9 Jun 2016 19:45:46 -0700
Subject: [PATCH 367/436] odp-dpdk: init at 1.8.0.0

Signed-off-by: Ruslan Babayev <ruslan@babayev.com>
---
 pkgs/os-specific/linux/odp-dpdk/default.nix | 40 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/os-specific/linux/odp-dpdk/default.nix

diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix
new file mode 100644
index 000000000000..85a6675ee907
--- /dev/null
+++ b/pkgs/os-specific/linux/odp-dpdk/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchgit, autoreconfHook, openssl, libpcap, dpdk, bash }:
+
+stdenv.mkDerivation rec {
+  name = "odp-dpdk-${version}";
+  version = "1.8.0.0";
+
+  src = fetchgit {
+    url = "https://git.linaro.org/lng/odp-dpdk.git";
+    rev = "438a207a39bad213cdc03929452a8199caef5d8c";
+    sha256 = "0k4g5zbirbfdcgqz0nbn9san66y178qnigyvrr2apj3apzjjy7zv";
+  };
+
+  nativeBuildInputs = [ autoreconfHook bash ];
+  buildInputs = [ stdenv openssl dpdk libpcap ];
+
+  RTE_SDK = "${dpdk}";
+  RTE_TARGET = "x86_64-native-linuxapp-gcc";
+
+  patchPhase = ''
+    substituteInPlace scripts/git_hash.sh --replace /bin/bash /bin/sh
+    echo -n ${version} > .scmversion
+  '';
+
+  dontDisableStatic = true;
+
+  configureFlags = [
+    "--with-platform=linux-dpdk"
+    "--disable-shared"
+    "--disable-shared-dpdk"
+    "--with-sdk-install-path=${dpdk}/${RTE_TARGET}"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Open Data Plane optimized for DPDK";
+    homepage = http://www.opendataplane.org;
+    license = licenses.bsd3;
+    platforms =  [ "x86_64-linux" ];
+    maintainers = [ maintainers.abuibrahim ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9f1acce76ba..f3a02a3e2833 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10867,6 +10867,8 @@ in
 
     pktgen = callPackage ../os-specific/linux/pktgen { };
 
+    odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };
+
     e1000e = callPackage ../os-specific/linux/e1000e {};
 
     v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { };

From 9f2699fd303095ca76724c804b0d91c662da11b0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 16 Jun 2016 11:16:30 +0200
Subject: [PATCH 368/436] Python: fix the wheel package

---
 pkgs/development/python-modules/generic/catch_conflicts.py | 2 +-
 pkgs/top-level/python-packages.nix                         | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/generic/catch_conflicts.py b/pkgs/development/python-modules/generic/catch_conflicts.py
index 35512bb44d35..bb82900c65a9 100644
--- a/pkgs/development/python-modules/generic/catch_conflicts.py
+++ b/pkgs/development/python-modules/generic/catch_conflicts.py
@@ -9,7 +9,7 @@ for f in sys.path:
     for req in pkg_resources.find_distributions(f):
         if req not in packages[req.project_name]:
             # some exceptions inside buildPythonPackage
-            if req.project_name in ['setuptools', 'pip']:
+            if req.project_name in ['setuptools', 'pip', 'wheel']:
                 continue
             packages[req.project_name].append(req)
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8da5f111b7c2..176a975d5bf8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23607,6 +23607,9 @@ in modules // {
 
     propagatedBuildInputs = with self; [ jsonschema ];
 
+    # We add this flag to ignore the copy installed by bootstrapped-pip
+    installFlags = [ "--ignore-installed" ];
+
     meta = {
       description = "A built-package format for Python";
       license = with licenses; [ mit ];

From e86e407ce95bb28e78593dc1a8b4999512f34367 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Thu, 16 Jun 2016 11:43:21 +0200
Subject: [PATCH 369/436] gemconfig: typhoeus needs curl

---
 pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 580efc2278ec..95b5033cc9d2 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -153,6 +153,10 @@ in
     ];
   };
 
+  typhoeus = attrs: {
+    buildInputs = [ curl ];
+  };
+
   tzinfo = attrs: {
     dontBuild = false;
     postPatch = ''

From 5b7c6a11b5d50b8f28f74da828eda07bef806fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 16 Jun 2016 11:18:16 +0100
Subject: [PATCH 370/436] travis-ci: remount only on linux

---
 maintainers/scripts/travis-nox-review-pr.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index a366ac435bd1..092fc0cd9d07 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -13,10 +13,6 @@ if [[ $1 == nix ]]; then
     sudo mkdir /etc/nix
     sudo sh -c 'echo "build-max-jobs = 4" > /etc/nix/nix.conf'
 
-    # Nix builds in /tmp and we need exec support
-    sudo mount
-    sudo mount -o remount,exec /run
-
     # Verify evaluation
     echo "=== Verifying that nixpkgs evaluates..."
     nix-env -f. -qa --json >/dev/null
@@ -30,6 +26,11 @@ elif [[ $1 == build ]]; then
     if [[ $TRAVIS_OS_NAME == "osx" ]]; then
         echo "Skipping NixOS things on darwin"
     else
+        # Nix builds in /tmp and we need exec support
+        sudo mount -o remount,exec /run
+        sudo mount -o remount,exec /run/user
+        sudo mount
+
         echo "=== Checking NixOS options"
         nix-build nixos/release.nix -A options --show-trace
 

From 3ea80681813553bae50d5c411869f94d2ca29373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 16 Jun 2016 11:49:19 +0100
Subject: [PATCH 371/436] buildPythonPackage: be able to disable package
 conflict check

---
 doc/languages-frameworks/python.md                  | 1 +
 pkgs/development/python-modules/generic/default.nix | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 50acc7f28f78..809e51460848 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -532,6 +532,7 @@ All parameters from `mkDerivation` function are still supported.
 * `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
 * `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"].
 * `format`: Format of the source. Options are `setup` for when the source has a `setup.py` and `setuptools` is used to build a wheel, and `wheel` in case the source is already a binary wheel. The default value is `setup`.
+* `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
 
 #### `buildPythonApplication` function
 
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 7221bac320c9..38d74e082445 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -42,6 +42,9 @@
 # Additional flags to pass to "pip install".
 , installFlags ? []
 
+# Raise an error if two packages are installed with the same name
+, catchConflicts ? true
+
 , format ? "setup"
 
 , ... } @ attrs:
@@ -141,7 +144,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
 
   postFixup = attrs.postFixup or ''
     wrapPythonPrograms
-
+  '' + lib.optionalString catchConflicts ''
     # check if we have two packages with the same name in closure and fail
     # this shouldn't happen, something went wrong with dependencies specs
     ${python.interpreter} ${./catch_conflicts.py}

From 7a6ec0a0ee34ef8a19a0cc755cae40a780c1d7cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Jun 2016 15:37:25 +0200
Subject: [PATCH 372/436] texlive: add xindy binary

Fixes #16207.
---
 .../tools/typesetting/tex/texlive-new/bin.nix | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive-new/bin.nix b/pkgs/tools/typesetting/tex/texlive-new/bin.nix
index f833cc2f82b1..403bea2783d8 100644
--- a/pkgs/tools/typesetting/tex/texlive-new/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive-new/bin.nix
@@ -1,10 +1,10 @@
 { stdenv, lib, fetchurl
-, config
+, texlive
 , zlib, bzip2, ncurses, libpng, flex, bison, libX11, libICE, xproto
 , freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext
 , xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig
 , poppler, libpaper, graphite2, lesstif, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr
-, xpdf, cairo, pixman, xorg
+, xpdf, cairo, pixman, xorg, clisp
 , makeWrapper
 }:
 
@@ -247,5 +247,35 @@ xdvi = stdenv.mkDerivation {
 };
 
 
+xindy = stdenv.mkDerivation {
+  name = "texlive-xindy.bin-${version}";
+
+  inherit (common) src;
+  prePatch = "cd utils/xindy";
+  # hardcode clisp location
+  postPatch = ''
+    substituteInPlace xindy-?.?.?/user-commands/xindy.in \
+      --replace "our \$clisp = ( \$is_windows ? 'clisp.exe' : 'clisp' ) ;" \
+                "our \$clisp = '$(type -P clisp)';"
+  '';
+
+  nativeBuildInputs = [
+    pkgconfig perl
+    (texlive.combine { inherit (texlive) scheme-basic cyrillic ec; })
+  ];
+  buildInputs = [ clisp ];
+
+  configureFlags = [ "--with-clisp-runtime=system" "--disable-xindy-docs" ];
+
+  preInstall = ''mkdir -p "$out/bin" '';
+  # fixup various file-location errors of: lib/xindy/{xindy.mem,modules/}
+  postInstall = ''
+    mkdir -p "$out/lib/xindy"
+    mv "$out"/{bin/xindy.mem,lib/xindy/}
+    ln -s ../../share/texmf-dist/xindy/modules "$out/lib/xindy/"
+  '';
+};
+
+
 } # un-indented
 

From c802f5663995ec6a7b266d36ef75093fbe06646b Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 16 Jun 2016 21:24:38 +0900
Subject: [PATCH 373/436] flashplayer: 11.2.202.621 -> 11.2.202.626

---
 .../browsers/mozilla-plugins/flashplayer-11/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 959348fa65e5..f9c978b2cd87 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -70,11 +70,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "11.2.202.621";
+  version = "11.2.202.626";
 
   src = fetchurl {
     url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip";
-    sha256 = "0xv7pzna4pfmi9bjwfbr0kf92xvdgpirm97kks4kphwngf3bzrm0";
+    sha256 = "1c7ffr1kjmdq5rcx3xzgkd4wg1c8b3zkb1ysmnjiicfm423xr9h7";
   };
 
   nativeBuildInputs = [ unzip ];

From 875fd5af739bbf0c29bd8d1b271dbd8b806981e7 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 16 Jun 2016 14:28:24 +0200
Subject: [PATCH 374/436] grsecurity: 4.5.7-201606110914 -> 4.5.7-201606142010

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index a5a78845d8ae..09280cd9063c 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -94,8 +94,8 @@ rec {
 
   grsecurity_testing = grsecPatch
     { kver   = "4.5.7";
-      grrev  = "201606110914";
-      sha256 = "17gvqp5dqqw190wvprbq1x7i8g6b0l2gsdp4l61v2p3by9n5wsk6";
+      grrev  = "201606142010";
+      sha256 = "00lg4zlxxcl9a27vxl4c4cv6adsdvl00kkbl6s97523vsvsvy1q0";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From c7016de72c0c40f0ae77694c377052e639e2e2a4 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 17 May 2016 12:12:57 +0200
Subject: [PATCH 375/436] mimetic: init at 0.9.8

Closes #16258
---
 .../development/libraries/mimetic/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/mimetic/default.nix

diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix
new file mode 100644
index 000000000000..fc48c85f23c7
--- /dev/null
+++ b/pkgs/development/libraries/mimetic/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cutee }:
+
+stdenv.mkDerivation rec {
+  pname = "mimetic";
+  version = "0.9.8";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url    = "http://www.codesink.org/download/${pname}-${version}.tar.gz";
+    sha256 = "003715lvj4nx23arn1s9ss6hgc2yblkwfy5h94li6pjz2a6xc1rs";
+  };
+
+  buildInputs = [ cutee ];
+
+  meta = with stdenv.lib; {
+    description = "MIME handling library";
+    homepage    = http://codesink.org/mimetic_mime_library.html;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ leenaars];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d24d0c28c0b3..3b3f3e5cfcb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2429,6 +2429,8 @@ in
 
   mimeo = callPackage ../tools/misc/mimeo { };
 
+  mimetic = callPackage ../development/libraries/mimetic { };
+
   minissdpd = callPackage ../tools/networking/minissdpd { };
 
   miniupnpc = callPackage ../tools/networking/miniupnpc { };

From d20a8ddea8ba2e5062734716611de142402e1bd1 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Mon, 13 Jun 2016 20:26:36 +0000
Subject: [PATCH 376/436] nix-serve: set PATH

joachifm: also set `dontBuild = true`; `false` doesn't make any sense if
the intent is to skip the build phase.

Closes #16221
---
 .../package-management/nix-serve/default.nix  | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index 3a20fdc0fac3..9ad3fb12436e 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -1,23 +1,28 @@
-{ lib, stdenv, fetchFromGitHub, perl, nix, perlPackages }:
+{ stdenv, fetchFromGitHub,
+  bzip2, nix, perl, perlPackages,
+}:
 
-let rev = "7e09caa2a7a435aeb2cd5446aa590d6f9ae1699d"; in
+with stdenv.lib;
+
+let
+  rev = "7e09caa2a7a435aeb2cd5446aa590d6f9ae1699d";
+  sha256 = "0mjzsiknln3isdri9004wwjjjpak5fj8ncizyncf5jv7g4m4q1pj";
+in
 
 stdenv.mkDerivation rec {
-  name = "nix-serve-0.2-${lib.substring 0 7 rev}";
+  name = "nix-serve-0.2-${substring 0 7 rev}";
 
   src = fetchFromGitHub {
     owner = "edolstra";
     repo = "nix-serve";
-    inherit rev;
-    sha256 = "0mjzsiknln3isdri9004wwjjjpak5fj8ncizyncf5jv7g4m4q1pj";
+    inherit rev sha256;
   };
 
-  buildInputs = [ perl nix ]
+  buildInputs = [ bzip2 perl nix ]
     ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]);
 
-  dontBuild = false;
+  dontBuild = true;
 
-  # FIXME: unfortunate cut&paste.
   installPhase = ''
     mkdir -p $out/libexec/nix-serve
     cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi
@@ -25,7 +30,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cat > $out/bin/nix-serve <<EOF
     #! ${stdenv.shell}
-    PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@"
+    PATH=${makeBinPath [ bzip2 nix ]}:\$PATH PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@"
     EOF
     chmod +x $out/bin/nix-serve
   '';

From b60b7eeaab9d97e3c52da28e77993df51028b15d Mon Sep 17 00:00:00 2001
From: Franz Thoma <franz.thoma@tngtech.com>
Date: Mon, 30 May 2016 23:32:44 +0200
Subject: [PATCH 377/436] i3-gaps: init at 4.12

---
 lib/maintainers.nix                           |  1 +
 pkgs/applications/window-managers/i3/gaps.nix | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/window-managers/i3/gaps.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f561972c9300..c6a10610354d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -131,6 +131,7 @@
   falsifian = "James Cook <james.cook@utoronto.ca>";
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
   fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
+  fmthoma = "Franz Thoma <f.m.thoma@googlemail.com>";
   forkk = "Andrew Okin <forkk@forkk.net>";
   fornever = "Friedrich von Never <friedrich@fornever.me>";
   fpletz = "Franz Pletz <fpletz@fnordicwalking.de>";
diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
new file mode 100644
index 000000000000..fa03bc47d9ed
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -0,0 +1,44 @@
+{ fetchurl, stdenv, i3 }:
+
+i3.overrideDerivation (super : rec {
+
+  name = "i3-gaps-${version}";
+  version = "4.12";
+  releaseDate = "2016-03-06";
+
+  src = fetchurl {
+    url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
+    sha256 = "1i9l993cak85fcw12zgrb5cpspmjixr3yf8naa4zb8589mg4rb8s";
+  };
+
+  postUnpack = ''
+      echo -n "${version} (${releaseDate}, branch \\\"gaps-next\\\")" > ./i3-${version}/I3_VERSION
+      echo -n "${version}" > ./i3-${version}/VERSION
+  '';
+
+  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
+  '';
+
+}) // {
+
+  meta = with stdenv.lib; {
+    description = "A fork of the i3 tiling window manager with some additional features";
+    homepage    = "https://github.com/Airblader/i3";
+    maintainers = with maintainers; [ fmthoma ];
+    license     = licenses.bsd3;
+    platforms   = platforms.all;
+
+    longDescription = ''
+      Fork of i3wm, 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. This fork adds a few features such as gaps between 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 3b3f3e5cfcb5..cc99ee6c9a28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13026,6 +13026,8 @@ in
     xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
   };
 
+  i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { };
+
   i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };
 
   i3cat = callPackage ../tools/misc/i3cat { };

From 688d7cd3a6708182d8937413a6f0509af3f6ba74 Mon Sep 17 00:00:00 2001
From: Franz Thoma <franz.thoma@tngtech.com>
Date: Mon, 30 May 2016 23:33:15 +0200
Subject: [PATCH 378/436] i3-gaps: add as window manager

Closes #15917
---
 .../services/x11/window-managers/i3.nix       | 62 ++++++++++---------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix
index 2e2e10cc33b0..aea0a8986786 100644
--- a/nixos/modules/services/x11/window-managers/i3.nix
+++ b/nixos/modules/services/x11/window-managers/i3.nix
@@ -3,37 +3,43 @@
 with lib;
 
 let
-  cfg = config.services.xserver.windowManager.i3;
+  wmCfg = config.services.xserver.windowManager;
+
+  i3option = name: {
+    enable = mkEnableOption name;
+    configFile = mkOption {
+      default = null;
+      type = types.nullOr types.path;
+      description = ''
+        Path to the i3 configuration file.
+        If left at the default value, $HOME/.i3/config will be used.
+      '';
+    };
+  };
+
+  i3config = name: pkg: cfg: {
+    services.xserver.windowManager.session = [{
+      inherit name;
+      start = ''
+        ${pkg}/bin/i3 ${optionalString (cfg.configFile != null)
+          "-c \"${cfg.configFile}\""
+        } &
+        waitPID=$!
+      '';
+    }];
+    environment.systemPackages = [ pkg ];
+  };
+
 in
 
 {
-  options = {
-    services.xserver.windowManager.i3 = {
-      enable = mkEnableOption "i3";
-
-      configFile = mkOption {
-        default = null;
-        type = types.nullOr types.path;
-        description = ''
-          Path to the i3 configuration file.
-          If left at the default value, $HOME/.i3/config will be used.
-        '';
-      };
-    };
+  options.services.xserver.windowManager = {
+    i3 = i3option "i3";
+    i3-gaps = i3option "i3-gaps";
   };
 
-  config = mkIf cfg.enable {
-    services.xserver.windowManager = {
-      session = [{
-        name = "i3";
-        start = ''
-          ${pkgs.i3}/bin/i3 ${optionalString (cfg.configFile != null)
-            "-c \"${cfg.configFile}\""
-          } &
-          waitPID=$!
-        '';
-      }];
-    };
-    environment.systemPackages = with pkgs; [ i3 ];
-  };
+  config = mkMerge [
+    (mkIf wmCfg.i3.enable (i3config "i3" pkgs.i3 wmCfg.i3))
+    (mkIf wmCfg.i3-gaps.enable (i3config "i3-gaps" pkgs.i3-gaps wmCfg.i3-gaps))
+  ];
 }

From 8cbbc73dceddfc4ef7081aac91302aa7a424d29f Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Mon, 13 Jun 2016 09:23:27 +0200
Subject: [PATCH 379/436] vim_configurable: googlecode -> github

Vim is now hosted on github instead of googlecode.
---
 pkgs/applications/editors/vim/configurable.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 2a80f5d42ad7..b46ac7d40d5e 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -1,6 +1,6 @@
 # TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
 # but I have gvim with python support now :) - Marc
-args@{pkgs, source ? "default", fetchurl, fetchhg, stdenv, ncurses, pkgconfig, gettext
+args@{pkgs, source ? "default", fetchurl, fetchFromGitHub, stdenv, ncurses, pkgconfig, gettext
 , composableDerivation, lib, config, glib, gtk, python, perl, tcl, ruby
 , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
 , libICE
@@ -50,10 +50,11 @@ composableDerivation {
       builtins.getAttr source {
       "default" =
         # latest release
-      args.fetchhg {
-            url = "http://vim.googlecode.com/hg/";
-            rev = "v${version}";
-            sha256 = "01m67lvnkz0ad28ifj964zcg63y5hixplbnzas5xarj8vl3pc5a0";
+      args.fetchFromGitHub {
+        owner = "vim";
+        repo = "vim";
+        rev = "v${version}";
+        sha256 = "04hp2gqbbj9h872bgj1g9xcaj5qlg9q45v6by2ch9n105dng9aj3";
       };
 
       "vim-nox" =

From 9b7a53d9cb6991f01444352e0e16b968fa32dbc4 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 12 Jun 2016 22:48:32 +0200
Subject: [PATCH 380/436] cytoscape: init at 3.4.0

Closes #16197
---
 .../science/misc/cytoscape/default.nix        | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/science/misc/cytoscape/default.nix

diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
new file mode 100644
index 000000000000..108a089d9818
--- /dev/null
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "cytoscape-${version}";
+  version = "3.4.0";
+
+  src = fetchurl {
+    url = "http://chianti.ucsd.edu/${name}/${name}.tar.gz";
+    sha256 = "065fsqa01w7j85nljwwc0677lfw112xphnyn1c4hb04166q082p2";
+  };
+
+  buildInputs = [jre makeWrapper];
+
+  installPhase = ''
+    mkdir -pv $out/{share,bin}
+    cp -Rv * $out/share/
+
+    ln -s $out/share/cytoscape.sh $out/bin/cytoscape
+
+    wrapProgram $out/share/gen_vmoptions.sh \
+      --set JAVA_HOME "${jre}" \
+      --set JAVA  "${jre}/bin/java"
+
+    chmod +x $out/bin/cytoscape
+  '';
+
+  meta = {
+    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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4923a8b2659a..0eaeb2c99a5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16386,6 +16386,8 @@ in
     inherit (pkgs.gnome) gtkglext;
   };
 
+  cytoscape = callPackage ../applications/science/misc/cytoscape { };
+
   fityk = callPackage ../applications/science/misc/fityk { };
 
   gravit = callPackage ../applications/science/astronomy/gravit { };

From aa8eba9d9569c61ddec6fdebfa769a7f4ccb9256 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 7 Jun 2016 23:05:52 +0200
Subject: [PATCH 381/436] weka: 3.6.12 -> 3.8.0

Closes #16055
---
 .../science/math/weka/default.nix             | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix
index 3d59898098cb..78ed209b1f6f 100644
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/pkgs/applications/science/math/weka/default.nix
@@ -1,32 +1,34 @@
 { stdenv, fetchurl, jre, unzip }:
 
-stdenv.mkDerivation {
-  name = "weka-3.6.12";
-  
+stdenv.mkDerivation rec {
+  name = "weka-${version}";
+  version = "3.8.0";
+
   src = fetchurl {
-    url = "mirror://sourceforge/weka/weka-3-6-12.zip";
-    sha256 = "0sdhiv1nr5rxgjry05srsnynsydkyny79zvaxdj6dk8m1768qksh";
+    url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip";
+    sha256 = "2586298688059a025e2810b1ffc73f4fb3cf81ebf2183d8d19b0763d33857f61";
   };
 
   buildInputs = [ unzip ];
-  
+
   # The -Xmx1000M comes suggested from their download page:
   # http://www.cs.waikato.ac.nz/ml/weka/downloading.html
   installPhase = ''
     mkdir -pv $out/share/weka $out/bin
     cp -Rv * $out/share/weka
-    
+
     cat > $out/bin/weka << EOF
     #!${stdenv.shell}
     ${jre}/bin/java -Xmx1000M -jar $out/share/weka/weka.jar
     EOF
-    
+
     chmod +x $out/bin/weka
   '';
-  
+
   meta = {
     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];
   };
 }

From 160aeab22d55013e2bc70bae504855261c7cf889 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 29 May 2016 00:53:56 +0100
Subject: [PATCH 382/436] openrw: init at 2016-06-29

Closes #15794
---
 pkgs/games/openrw/default.nix   | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/games/openrw/default.nix

diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix
new file mode 100644
index 000000000000..0c235383acff
--- /dev/null
+++ b/pkgs/games/openrw/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, cmake, sfml, mesa, bullet, glm, libmad, x11 }:
+
+stdenv.mkDerivation rec {
+  version = "2016-06-29";
+  name = "openrw-${version}";
+  src = fetchgit {
+    url = "https://github.com/rwengine/openrw";
+    rev = "46a7254a41d9f6e1eda8d31e742de492abb2540e";
+    sha256 = "16ip9779dy59xcj9src2i4zp8jq2h0h5mb4a7d5cpkhd3xlcpabm";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [ cmake sfml mesa bullet glm libmad x11 ];
+
+  meta = with stdenv.lib; {
+    description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable";
+    homepage = https://github.com/rwengine/openrw;
+    license = licenses.gpl3;
+    longDescription = ''
+      OpenRW is an open source re-implementation of Rockstar Games' Grand Theft
+      Auto III, a classic 3D action game first published in 2001.
+    '';
+    maintainers = with maintainers; [ kragniz ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0eaeb2c99a5d..7e20a8cae894 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15273,6 +15273,8 @@ in
 
   openra = callPackage ../games/openra { lua = lua5_1; };
 
+  openrw = callPackage ../games/openrw { };
+
   openspades = callPackage ../games/openspades {};
 
   openspades-git = lowPrio (callPackage ../games/openspades/git.nix {});

From c05271adf960f1067dba6f24738adaf2074885fa Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 16 Jun 2016 15:51:22 +0200
Subject: [PATCH 383/436] nix-serve: fix meta eval

Introduced in d20a8ddea8ba2e5062734716611de142402e1bd1
---
 pkgs/tools/package-management/nix-serve/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index 9ad3fb12436e..1e3579b197e9 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://github.com/edolstra/nix-serve;
     description = "A utility for sharing a Nix store as a binary cache";
-    maintainers = [ lib.maintainers.eelco ];
-    license = lib.licenses.gpl3;
+    maintainers = [ maintainers.eelco ];
+    license = licenses.gpl3;
     platforms = nix.meta.platforms;
   };
 }

From 0060a0f3df1279e9445828f5d2bc4d8572065159 Mon Sep 17 00:00:00 2001
From: Nahum Shalman <nshalman@omniti.com>
Date: Thu, 16 Jun 2016 10:05:24 -0400
Subject: [PATCH 384/436] shfmt: 2016-06-15 -> 2016-06-16 (#16272)

Among other improvements the author fixed mvdan/sh#13
---
 pkgs/tools/text/shfmt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 1c6dede0c54c..aef12ed97439 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   name = "shfmt-${version}";
-  version = "2016-06-15";
-  rev = "233b276a55cdd4aaa4625893255382993bbb0533";
+  version = "2016-06-16";
+  rev = "8add0072d6abdc892e4617c95e8bba21ebe0beeb";
 
   goPackagePath = "github.com/mvdan/sh";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "mvdan";
     repo = "sh";
     inherit rev;
-    sha256 = "09rq99gw2g6az6dmdg82nql8zp3c3mrqavqwvx76dirabzjhsbj6";
+    sha256 = "1m2lkcw6m5gdqjp17m01d822cj1p04qk6hm9m94ni2x19f16qs8m";
   };
 
   meta = with stdenv.lib; {

From ecd3617d7a955c9cfcfc68a8dd8c1c1138153151 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Thu, 9 Jun 2016 13:44:20 +0100
Subject: [PATCH 385/436] xfce.xfce4-power-manager: add withGtk3 version 1.6.0

test passed: nix-build '<nixos/release.nix>' -A tests.xfce.x86_64-linux

Closes: #8595
---
 .../xfce/core/xfce4-power-manager.nix         | 32 ++++++++++++++-----
 pkgs/desktops/xfce/default.nix                |  1 +
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
index 7695f906d317..c72061e577e8 100644
--- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix
+++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
@@ -1,22 +1,38 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, upower, xfconf
-, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor_icon_theme }:
+{ stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus_glib, upower, xfconf
+, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor_icon_theme
+, withGtk3 ? false, gtk3, libxfce4ui_gtk3, xfce4panel_gtk3 }:
 let
   p_name  = "xfce4-power-manager";
-  ver_maj = "1.4";
-  ver_min = "4";
+  ver_maj = if withGtk3 then "1.6" else "1.4";
+  ver_min = if withGtk3 then "0"   else "4";
 in
 stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "01rvqy1cif4s8lkidb7hhmsz7d9f2fwcwvc51xycaj3qgsmch3n5";
+    sha256 =
+      if withGtk3
+      then "0avzhllpimcn7a6z9aa4jn0zg5ahxr9ks5ldchizycdb0rz1bqxx"
+      else "01rvqy1cif4s8lkidb7hhmsz7d9f2fwcwvc51xycaj3qgsmch3n5";
   };
 
   buildInputs =
-    [ pkgconfig intltool gtk dbus_glib upower xfconf libxfce4ui libxfce4util
-      libnotify xfce4panel hicolor_icon_theme
-    ];
+    [ pkgconfig intltool glib dbus_glib upower xfconf libxfce4util
+      libnotify hicolor_icon_theme
+    ] ++
+    (if withGtk3
+    then [ gtk3 libxfce4ui_gtk3 xfce4panel_gtk3 ]
+    else [ gtk  libxfce4ui      xfce4panel      ]);
+
+  postPatch = lib.optionalString withGtk3 ''
+    substituteInPlace configure --replace gio-2.0 gio-unix-2.0
+  '';
+
+  postConfigure = lib.optionalString withGtk3 ''
+    substituteInPlace src/Makefile      --replace "xfce4_power_manager_CFLAGS = "          "xfce4_power_manager_CFLAGS = \$(GIO_CFLAGS) "
+    substituteInPlace settings/Makefile --replace "xfce4_power_manager_settings_CFLAGS = " "xfce4_power_manager_settings_CFLAGS = \$(GIO_CFLAGS) "
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager;
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 0da2756f877f..fff958de9a07 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -40,6 +40,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   xfce4session    = callPackage ./core/xfce4-session.nix { };
   xfce4settings   = callPackage ./core/xfce4-settings.nix { };
   xfce4_power_manager = callPackage ./core/xfce4-power-manager.nix { };
+  xfce4_power_manager_gtk3 = callPackage ./core/xfce4-power-manager.nix { withGtk3 = true; };
   xfconf          = callPackage ./core/xfconf.nix { };
   xfdesktop       = callPackage ./core/xfdesktop.nix { };
   xfwm4           = callPackage ./core/xfwm4.nix { };

From c5faa7c83d33a736f2e589ba464fd5f57fbd31bb Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 16 Jun 2016 15:45:50 +0000
Subject: [PATCH 386/436] dysnomia: 0.5.1 -> 0.6

---
 pkgs/tools/package-management/disnix/dysnomia/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index e9bb704c7725..77235bca36c9 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null;
 assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);
 
 stdenv.mkDerivation {
-  name = "dysnomia-0.5.1";
+  name = "dysnomia-0.6";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/33508870/download/1/dysnomia-0.5.1.tar.gz;
-    sha256 = "0mrbg0wirixqzx0qw8lg6mklr8npr29ghbj7lq1mygjgzr1hyhzm";
+    url = http://hydra.nixos.org/build/36895408/download/1/dysnomia-0.6.tar.gz;
+    sha256 = "1gg2avj57amxf2qi5zjk0rjyakvy5bqaar2r2151cvjlas1z1alw";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";

From 17b19977cf8b0ac643b126c8b6e20f36fd94c54a Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Thu, 16 Jun 2016 19:49:46 +0300
Subject: [PATCH 387/436] bonnie++: upgrade to 1.97

Also a patch with some OS X specific changes (stolen from Homebrew).
---
 .../filesystems/bonnie/bonnie-homebrew.patch  | 157 ++++++++++++++++++
 pkgs/tools/filesystems/bonnie/default.nix     |  12 +-
 2 files changed, 165 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch

diff --git a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
new file mode 100644
index 000000000000..e4903143f11c
--- /dev/null
+++ b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
@@ -0,0 +1,157 @@
+Copyright 2009-2016 Homebrew contributors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+# Changes included in this patchset:
+# 1) Explicitly use clang/clang++ in Makefile
+# 2) __min() and __max() macros break bon_csv2html.cpp: "redefinition of 'min' as different kind of symbol"
+#    Remove the construct in favor of macro targets min()/max() provided by the library
+#    Files affected: port.h.in port.h duration.cpp bonnie++.cpp
+# 3) Remove the #ifdef _LARGEFILE64_SOURCE macros which not only prohibits the intended functionality of
+#    splitting into 2 GB files for such filesystems but also incorrectly tests for it in the first place.
+#    The ideal fix would be to replace the AC_TRY_RUN() in configure.in if the fail code actually worked.
+#    Files affected: bonnie++.cp
+
+diff --git i/Makefile w/Makefile
+index 4bb5103..8f7ed41 100644
+--- i/Makefile
++++ w/Makefile
+@@ -10,8 +10,8 @@ eprefix=${prefix}
+ #MORE_WARNINGS=-Weffc++
+ WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS)
+ CFLAGS=-O2  -DNDEBUG $(WFLAGS) $(MORECFLAGS)
+-CXX=g++ $(CFLAGS)
+-LINK=g++
++CXX=clang++ $(CFLAGS)
++LINK=clang++
+ THREAD_LFLAGS=-lpthread
+
+ INSTALL=/usr/bin/install -c
+diff --git i/bonnie++.cpp w/bonnie++.cpp
+index 8c5a43a..8a4b3dc 100644
+--- i/bonnie++.cpp
++++ w/bonnie++.cpp
+@@ -73,7 +73,7 @@ public:
+   void set_io_chunk_size(int size)
+     { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; }
+   void set_file_chunk_size(int size)
+-    { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
++    { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
+ 
+   // Return the page-aligned version of the local buffer
+   char *buf() { return m_buf_pa; }
+@@ -138,7 +138,7 @@ CGlobalItems::CGlobalItems(bool *exitFlag)
+  , m_buf(NULL)
+  , m_buf_pa(NULL)
+ {
+-  pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
++  pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
+   SetName(".");
+ }
+ 
+@@ -294,11 +294,7 @@ int main(int argc, char *argv[])
+       {
+         char *sbuf = _strdup(optarg);
+         char *size = strtok(sbuf, ":");
+-#ifdef _LARGEFILE64_SOURCE
+         file_size = size_from_str(size, "gt");
+-#else
+-        file_size = size_from_str(size, "g");
+-#endif
+         size = strtok(NULL, "");
+         if(size)
+         {
+@@ -384,17 +380,8 @@ int main(int argc, char *argv[])
+     if(file_size % 1024 > 512)
+       file_size = file_size + 1024 - (file_size % 1024);
+   }
+-#ifndef _LARGEFILE64_SOURCE
+-  if(file_size == 2048)
+-    file_size = 2047;
+-  if(file_size > 2048)
+-  {
+-    fprintf(stderr, "Large File Support not present, can't do %dM.\n", file_size);
+-    usage();
+-  }
+-#endif
+-  globals.byte_io_size = __min(file_size, globals.byte_io_size);
+-  globals.byte_io_size = __max(0, globals.byte_io_size);
++  globals.byte_io_size = min(file_size, globals.byte_io_size);
++  globals.byte_io_size = max(0, globals.byte_io_size);
+ 
+   if(machine == NULL)
+   {
+@@ -465,14 +452,6 @@ int main(int argc, char *argv[])
+      && (directory_max_size < directory_min_size || directory_max_size < 0
+      || directory_min_size < 0) )
+     usage();
+-#ifndef _LARGEFILE64_SOURCE
+-  if(file_size > (1 << (31 - 20 + globals.io_chunk_bits)) )
+-  {
+-    fprintf(stderr
+-   , "The small chunk size and large IO size make this test impossible in 32bit.\n");
+-    usage();
+-  }
+-#endif
+   if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) )
+   {
+     fprintf(stderr
+diff --git i/duration.cpp w/duration.cpp
+index efa3fd3..f943155 100644
+--- i/duration.cpp
++++ w/duration.cpp
+@@ -38,7 +38,7 @@ double Duration_Base::stop()
+   getTime(&tv);
+   double ret;
+   ret = tv - m_start;
+-  m_max = __max(m_max, ret);
++  m_max = max(m_max, ret);
+   return ret;
+ }
+ 
+diff --git i/port.h w/port.h
+index 8d53622..2e1f112 100644
+--- i/port.h
++++ w/port.h
+@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE;
+ #endif
+ 
+ typedef int FILE_TYPE;
+-#define __min min
+-#define __max max
+ typedef unsigned int UINT;
+ typedef unsigned long ULONG;
+ typedef const char * PCCHAR;
+diff --git i/port.h.in w/port.h.in
+index 69c8f24..8359d72 100644
+--- i/port.h.in
++++ w/port.h.in
+@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE;
+ #endif
+ 
+ typedef int FILE_TYPE;
+-#define __min min
+-#define __max max
+ typedef unsigned int UINT;
+ typedef unsigned long ULONG;
+ typedef const char * PCCHAR;
diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix
index 684a8311a746..fb25446d2e31 100644
--- a/pkgs/tools/filesystems/bonnie/default.nix
+++ b/pkgs/tools/filesystems/bonnie/default.nix
@@ -1,16 +1,20 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "bonnie++-1.03e";
+  name = "bonnie++-1.97";
   src = fetchurl {
-    url = http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz;
-    sha256 = "1jz2l8dz08c7vxvchigisv5a293yz95bw1k81dv6bgrlcq8ncf6b";
+    url = http://www.coker.com.au/bonnie++/experimental/bonnie++-1.97.tgz;
+    sha256 = "10jrqgvacvblyqv38pg5jb9jspyisxaladcrp8k6b2k46xcs1xa4";
   };
+
+  patches = stdenv.lib.optional stdenv.isDarwin ./bonnie-homebrew.patch;
+
   enableParallelBuilding = true;
+
   meta = {
     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;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }

From 0efb130d508392626f55fc1485fcf7631da022de Mon Sep 17 00:00:00 2001
From: Cast <cast@nothing.ch>
Date: Thu, 16 Jun 2016 19:10:20 +0200
Subject: [PATCH 388/436] owncloud: 2.1.1 -> 2.2.1

---
 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 bbbee40a7b45..18d31c220772 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "owncloud-client" + "-" + version;
 
-  version = "2.1.1";
+  version = "2.2.1";
 
   src = fetchurl {
     url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
-    sha256 = "4e7cfeb72ec565392e7968f352c4a7f0ef2988cc577ebdfd668a3887d320b1cb";
+    sha256 = "1wis62jk4y4mbr25y39y6af57pi6vp2mbryazmvn6zgnygf69m3h";
   };
 
   buildInputs =

From 723439564f5a229b0917a6bdddd036dd3a6400ab Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 16 Jun 2016 20:10:39 +0200
Subject: [PATCH 389/436] zstd: 0.6.1 -> 0.7.0

Changes: https://github.com/Cyan4973/zstd/releases/tag/v0.7.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 382ded98e537..34f0d870e1fa 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 = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
-    sha256 = "19pp2sjrv8qwzfc9c1mf0idhkicjhr41fsc9d1fyncc34f9riavl";
+    sha256 = "10n54lv33r90qbwvdvj4hx82g454pg1fhca3phkyh9mncbdvaqma";
     rev = "v${version}";
     repo = "zstd";
     owner = "Cyan4973";

From 87b18083c0ad12b8e89d807f490bd81c96185920 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 16 Jun 2016 20:57:28 +0200
Subject: [PATCH 390/436] pythonPackages.prompt_toolkit: 1.0.0 -> 1.0.1
 Changes:
 https://raw.githubusercontent.com/jonathanslenders/python-prompt-toolkit/master/CHANGELOG

---
 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 9a84f3121af3..014a28791006 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16881,10 +16881,10 @@ in modules // {
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "1.0.0";
+    version = "1.0.1";
 
     src = pkgs.fetchurl {
-      sha256 = "192fyzs0hyq0k7wxxl00jwl334l5hwwmdflhvjqqrlj0dsgfs22i";
+      sha256 = "1r0l5gfxbrxvqgqhybz6vg4zhhzm51888q3xpbajs5l1k04kmmi9";
       url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz";
     };
     checkPhase = ''

From f87c251c98cb9f1c59e7789d3a3d549c262005a0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 16 Jun 2016 09:26:24 -0500
Subject: [PATCH 391/436] kde5.applications: 16.04.1 -> 16.04.2

The generated source hashes are now stored outside the Nixpkgs tree.
---
 .../kde-5/applications-16.04/default.nix      |    8 +-
 .../kde-5/applications-16.04/fetchsrcs.sh     |   56 -
 .../kde-5/applications-16.04/srcs.nix         | 2093 -----------------
 3 files changed, 6 insertions(+), 2151 deletions(-)
 delete mode 100755 pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh
 delete mode 100644 pkgs/desktops/kde-5/applications-16.04/srcs.nix

diff --git a/pkgs/desktops/kde-5/applications-16.04/default.nix b/pkgs/desktops/kde-5/applications-16.04/default.nix
index f9d65ac6d87d..7000c962270c 100644
--- a/pkgs/desktops/kde-5/applications-16.04/default.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/default.nix
@@ -16,10 +16,14 @@
 
 let
 
-  inherit (pkgs) lib stdenv;
+  inherit (pkgs) fetchurl lib stdenv;
 
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
   mirror = "mirror://kde";
+  remotesrcs = fetchurl {
+    url = "https://raw.githubusercontent.com/ttuegel/nixpkgs-kde-qt/580915a460b11820c0b671236255180af5264c0c/applications-srcs.nix";
+    sha256 = "19lwhn468p9v8p97vyy23q5mv0yxs394lsfl41ij3glrxd92s8kf";
+  };
+  srcs = import remotesrcs { inherit (pkgs) fetchurl; inherit mirror; };
 
   packages = self: with self; {
 
diff --git a/pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh b/pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh
deleted file mode 100755
index dc4a4a434b40..000000000000
--- a/pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils findutils gnused nix wget
-
-set -x
-
-# The trailing slash at the end is necessary!
-WGET_ARGS='http://download.kde.org/stable/applications/16.04.1/ -A *.tar.xz'
-
-mkdir tmp; cd tmp
-
-rm -f ../srcs.csv
-
-wget -nH -r -c --no-parent $WGET_ARGS
-
-find . | while read src; do
-    if [[ -f "${src}" ]]; then
-        # Sanitize file name
-        filename=$(basename "$src" | tr '@' '_')
-        nameVersion="${filename%.tar.*}"
-        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
-        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-        echo "$name,$version,$src,$filename" >>../srcs.csv
-    fi
-done
-
-cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-EOF
-
-gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
-    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
-    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
-    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
-    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
-    url="${src:2}"
-    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-    cat >>../srcs.nix <<EOF
-  $name = {
-    version = "$latestVersion";
-    src = fetchurl {
-      url = "\${mirror}/$url";
-      sha256 = "$sha256";
-      name = "$filename";
-    };
-  };
-EOF
-done
-
-echo "}" >>../srcs.nix
-
-rm -f ../srcs.csv
-
-cd ..
diff --git a/pkgs/desktops/kde-5/applications-16.04/srcs.nix b/pkgs/desktops/kde-5/applications-16.04/srcs.nix
deleted file mode 100644
index bf08cda44d5f..000000000000
--- a/pkgs/desktops/kde-5/applications-16.04/srcs.nix
+++ /dev/null
@@ -1,2093 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  akonadi = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/akonadi-16.04.1.tar.xz";
-      sha256 = "1ik65izkcphc2wvb7hf8qw38fdfxd015hba8kv5ksmyydd01c6qf";
-      name = "akonadi-16.04.1.tar.xz";
-    };
-  };
-  akonadi-calendar = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/akonadi-calendar-16.04.1.tar.xz";
-      sha256 = "0v7mhv4sdxnv2kcmkln0dnjw33f9y82h65wigfs7dv017jcy0ija";
-      name = "akonadi-calendar-16.04.1.tar.xz";
-    };
-  };
-  akonadi-search = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/akonadi-search-16.04.1.tar.xz";
-      sha256 = "06gzs0844df0v9x8nmd3ssxg7z2zrdpcfzwjpylis55a93689rxs";
-      name = "akonadi-search-16.04.1.tar.xz";
-    };
-  };
-  analitza = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/analitza-16.04.1.tar.xz";
-      sha256 = "01kakqh021qk9irf6jl0kk4lph4w8q7xb8y7jxc09abl1cbx8p0w";
-      name = "analitza-16.04.1.tar.xz";
-    };
-  };
-  ark = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ark-16.04.1.tar.xz";
-      sha256 = "0qlyl37crqw8rg1wpak0xcmnlwx1n0s8mhsd8xm1rsi2lq11sf64";
-      name = "ark-16.04.1.tar.xz";
-    };
-  };
-  artikulate = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/artikulate-16.04.1.tar.xz";
-      sha256 = "0lpqsf11dw2gcvj51j47cpr3aj9shgnmqgkfd1qsy92d7hp83355";
-      name = "artikulate-16.04.1.tar.xz";
-    };
-  };
-  audiocd-kio = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/audiocd-kio-16.04.1.tar.xz";
-      sha256 = "0s5hx0yzzz1y3a39ibwsspqgdmcw7921bh2fq8k1xpcy4cdkiavx";
-      name = "audiocd-kio-16.04.1.tar.xz";
-    };
-  };
-  baloo-widgets = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/baloo-widgets-16.04.1.tar.xz";
-      sha256 = "1j5c70xi13c7drc2ndlzkz0nznbxlw0rrlgqpp7yxdprlp2x84g4";
-      name = "baloo-widgets-16.04.1.tar.xz";
-    };
-  };
-  blinken = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/blinken-16.04.1.tar.xz";
-      sha256 = "0sj3ih0izm9vgy2k40qh5x9navcg2rhh6sn7nxnwwj9gh16g4q0a";
-      name = "blinken-16.04.1.tar.xz";
-    };
-  };
-  bomber = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/bomber-16.04.1.tar.xz";
-      sha256 = "04flkvlmmsx8l5r4mcsp36b1b4rfbsw1108k7mcfd98bzx8af6r6";
-      name = "bomber-16.04.1.tar.xz";
-    };
-  };
-  bovo = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/bovo-16.04.1.tar.xz";
-      sha256 = "1wynbs4p20awn5ssik36205xswlvpk17x9wmvpf6yhrpwdsyac1l";
-      name = "bovo-16.04.1.tar.xz";
-    };
-  };
-  calendarsupport = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/calendarsupport-16.04.1.tar.xz";
-      sha256 = "0djmr6anfwcvxq6sqg4zwvvjcpak6x16m1wnbfbr2d8b8b2hbv2h";
-      name = "calendarsupport-16.04.1.tar.xz";
-    };
-  };
-  cantor = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/cantor-16.04.1.tar.xz";
-      sha256 = "0296jj14mygx5v0q8byyks87q6gx04w6k2k6gqqfbnalimfrxyh2";
-      name = "cantor-16.04.1.tar.xz";
-    };
-  };
-  cervisia = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/cervisia-16.04.1.tar.xz";
-      sha256 = "1w2qdbdgjmm8gavwg5r9law86s3mayqbwa8y22bika2ffgikb6aw";
-      name = "cervisia-16.04.1.tar.xz";
-    };
-  };
-  dolphin = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/dolphin-16.04.1.tar.xz";
-      sha256 = "19g053y6icazq58zh450qhnxy60j787qgvfaic389czcvbf0rn9i";
-      name = "dolphin-16.04.1.tar.xz";
-    };
-  };
-  dolphin-plugins = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/dolphin-plugins-16.04.1.tar.xz";
-      sha256 = "0kbypywyk7v13bnvsdaa6g7ln3q19v3hsymakxm3gylghn6ii0ac";
-      name = "dolphin-plugins-16.04.1.tar.xz";
-    };
-  };
-  dragon = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/dragon-16.04.1.tar.xz";
-      sha256 = "063ylb10y1v9ml6lgycn5f1qrdda00147s35b3d3vslw8l1xcwj8";
-      name = "dragon-16.04.1.tar.xz";
-    };
-  };
-  eventviews = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/eventviews-16.04.1.tar.xz";
-      sha256 = "1yrlr5xa21vsbl0by706plknzi2mkg9zi9w0702lyvj1y2bm3yw3";
-      name = "eventviews-16.04.1.tar.xz";
-    };
-  };
-  ffmpegthumbs = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ffmpegthumbs-16.04.1.tar.xz";
-      sha256 = "1694bxkmgzb5qsibl3dcc510xz96gjb8mrzdsmi84gbwhrnhaahw";
-      name = "ffmpegthumbs-16.04.1.tar.xz";
-    };
-  };
-  filelight = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/filelight-16.04.1.tar.xz";
-      sha256 = "1gvk9y2iy48c63bgq1d38iix70jz429d0fsgqk9k1h6c5lmywf3w";
-      name = "filelight-16.04.1.tar.xz";
-    };
-  };
-  gpgmepp = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/gpgmepp-16.04.1.tar.xz";
-      sha256 = "09cqnqqwh0lzfcip09pdwa6k0pf4hhl978jiry4dsvjmiymlzhac";
-      name = "gpgmepp-16.04.1.tar.xz";
-    };
-  };
-  granatier = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/granatier-16.04.1.tar.xz";
-      sha256 = "0350v1jkizybicl9qqkjks0sjvnpxc09jzjbz916ya1zakw48m7i";
-      name = "granatier-16.04.1.tar.xz";
-    };
-  };
-  grantleetheme = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/grantleetheme-16.04.1.tar.xz";
-      sha256 = "1205fzj49yi5nw4k28njn52jxzq12lpgdb9dz5f6g3c0zgzxdfbf";
-      name = "grantleetheme-16.04.1.tar.xz";
-    };
-  };
-  gwenview = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/gwenview-16.04.1.tar.xz";
-      sha256 = "1piw2crfhxig5smscz1ch6ifbadma7fylwxa98kp9p0srslmagx7";
-      name = "gwenview-16.04.1.tar.xz";
-    };
-  };
-  incidenceeditor = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/incidenceeditor-16.04.1.tar.xz";
-      sha256 = "16bzxsw09spk75zpgj9q49yvl4302zi78syi0g521gln4jjc730q";
-      name = "incidenceeditor-16.04.1.tar.xz";
-    };
-  };
-  jovie = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/jovie-16.04.1.tar.xz";
-      sha256 = "10d5w5z2fgbfr263m6jvq6li7q3fxr03h4s51j2vspniyy8rq6v8";
-      name = "jovie-16.04.1.tar.xz";
-    };
-  };
-  juk = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/juk-16.04.1.tar.xz";
-      sha256 = "1amxykyc97iw5ldflk9h97jnkm6zm1v48il0sm5xknlhiv7qma0v";
-      name = "juk-16.04.1.tar.xz";
-    };
-  };
-  kaccessible = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kaccessible-16.04.1.tar.xz";
-      sha256 = "0l3xrkgmfnd5pfa9jfx65f1iy4ynrx266ga6if24nkk8mp1l6hqk";
-      name = "kaccessible-16.04.1.tar.xz";
-    };
-  };
-  kaccounts-integration = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kaccounts-integration-16.04.1.tar.xz";
-      sha256 = "02is41d5zchqri8v767rzb6bp2apq8z1wwgqs2v4iaylh49fbnrf";
-      name = "kaccounts-integration-16.04.1.tar.xz";
-    };
-  };
-  kaccounts-providers = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kaccounts-providers-16.04.1.tar.xz";
-      sha256 = "1f3r48kzhnrs6af6zql1gcj5vhzs4kcmp5zj97bkh0kp5d9sqrqk";
-      name = "kaccounts-providers-16.04.1.tar.xz";
-    };
-  };
-  kajongg = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kajongg-16.04.1.tar.xz";
-      sha256 = "0sakgaaq99s1rfrrlpi81rpxrcdyhqpigczsxjw79amm368yw2va";
-      name = "kajongg-16.04.1.tar.xz";
-    };
-  };
-  kalarmcal = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kalarmcal-16.04.1.tar.xz";
-      sha256 = "1qg2hdybcss86l92xnzcgc60rdzgg8cp07rk59lrskipj12fzpp5";
-      name = "kalarmcal-16.04.1.tar.xz";
-    };
-  };
-  kalgebra = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kalgebra-16.04.1.tar.xz";
-      sha256 = "1mbbsi193vwig65xbk4c865xqbs3mxm16x7d8fxdq1j6glwa6l2j";
-      name = "kalgebra-16.04.1.tar.xz";
-    };
-  };
-  kalzium = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kalzium-16.04.1.tar.xz";
-      sha256 = "1rx57fsyc66gpsvzcig6mymhlxc4nf3cjg8bkmq89avhbpkzhzri";
-      name = "kalzium-16.04.1.tar.xz";
-    };
-  };
-  kamera = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kamera-16.04.1.tar.xz";
-      sha256 = "1s6fpzna6pvbqzcvd799r87d92l460b4zws84yik811dfqrcpf3s";
-      name = "kamera-16.04.1.tar.xz";
-    };
-  };
-  kanagram = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kanagram-16.04.1.tar.xz";
-      sha256 = "0y80gpdq17cbiwih3gndhb8qyfa84f305hisgslrdqx39nai0fmf";
-      name = "kanagram-16.04.1.tar.xz";
-    };
-  };
-  kapman = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kapman-16.04.1.tar.xz";
-      sha256 = "0im0gszmsvxfcjmlcpqxc5ik8kr890b7kd83lnydkm50xxmyk9x0";
-      name = "kapman-16.04.1.tar.xz";
-    };
-  };
-  kapptemplate = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kapptemplate-16.04.1.tar.xz";
-      sha256 = "14jq6q1bsmqp7vz7lwi4h7hqc8zyghl2mbyl1yyhv5hbvr00b2w3";
-      name = "kapptemplate-16.04.1.tar.xz";
-    };
-  };
-  kate = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kate-16.04.1.tar.xz";
-      sha256 = "0192dqf22rkr3v5ywxadjx7nmwrih336dxlma3nxprw8ng3ppacm";
-      name = "kate-16.04.1.tar.xz";
-    };
-  };
-  katomic = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/katomic-16.04.1.tar.xz";
-      sha256 = "1flg9kkrv8z49amiay88010aj76s0x6f14w8701zlinl238jrp08";
-      name = "katomic-16.04.1.tar.xz";
-    };
-  };
-  kblackbox = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kblackbox-16.04.1.tar.xz";
-      sha256 = "0a6bdyqla3ip981lpmj81q3wbr6ca2slpwzfs599hadzmrwxmlxw";
-      name = "kblackbox-16.04.1.tar.xz";
-    };
-  };
-  kblocks = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kblocks-16.04.1.tar.xz";
-      sha256 = "00q70ja45g38n3l62iivyi9pzb124cvsiyszsb4b2qcvi3akzabz";
-      name = "kblocks-16.04.1.tar.xz";
-    };
-  };
-  kblog = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kblog-16.04.1.tar.xz";
-      sha256 = "0yib39p27xxbsdwazq5jwb2jaqsnf7c456y4js61hm2qh415nlkk";
-      name = "kblog-16.04.1.tar.xz";
-    };
-  };
-  kbounce = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kbounce-16.04.1.tar.xz";
-      sha256 = "0h615ijxm7rj1m89aaz8g7ikcysv10mm2w4r1x5qdf7ihq1nxn4a";
-      name = "kbounce-16.04.1.tar.xz";
-    };
-  };
-  kbreakout = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kbreakout-16.04.1.tar.xz";
-      sha256 = "18yb93jfy74ybmwd6fp2xca15zgzk0hiqzaan89a0fd02ldd4aw9";
-      name = "kbreakout-16.04.1.tar.xz";
-    };
-  };
-  kbruch = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kbruch-16.04.1.tar.xz";
-      sha256 = "03dm0q0wifz0psj51r3dxgg2qrcpvj207mw036kvqzsxgn6fcdx5";
-      name = "kbruch-16.04.1.tar.xz";
-    };
-  };
-  kcachegrind = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kcachegrind-16.04.1.tar.xz";
-      sha256 = "11f6l8189vnw3brpzgd0vsv3hrra9ha1vdmzfk5haq092rxyw26s";
-      name = "kcachegrind-16.04.1.tar.xz";
-    };
-  };
-  kcalc = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kcalc-16.04.1.tar.xz";
-      sha256 = "1wldinbl4fkgw9idvbdr4gcmnsbjfgfakg2mn9axjs98iis1igyx";
-      name = "kcalc-16.04.1.tar.xz";
-    };
-  };
-  kcalcore = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kcalcore-16.04.1.tar.xz";
-      sha256 = "0cp2pjfg34zg6s83dl5dkgn4ssdj1295vrzkidkcdxj5br1z767s";
-      name = "kcalcore-16.04.1.tar.xz";
-    };
-  };
-  kcalutils = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kcalutils-16.04.1.tar.xz";
-      sha256 = "1hlqpklni83b0vg53b8gpsirnn04q8hvk364kgq532czvkf50lyw";
-      name = "kcalutils-16.04.1.tar.xz";
-    };
-  };
-  kcharselect = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kcharselect-16.04.1.tar.xz";
-      sha256 = "05wb5is2srwy01v88nxbdvkkqw798wr8s1k8s9mwa7l5jsa97rvp";
-      name = "kcharselect-16.04.1.tar.xz";
-    };
-  };
-  kcolorchooser = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kcolorchooser-16.04.1.tar.xz";
-      sha256 = "0d9f8s5lg7j2l6sl4pivl01fmgal42frmx49cp5hhshqfxqc30kv";
-      name = "kcolorchooser-16.04.1.tar.xz";
-    };
-  };
-  kcontacts = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kcontacts-16.04.1.tar.xz";
-      sha256 = "007a02dwj71id5n3jmbj11hwqyfcy6zpygqh061s5symaqpswrw6";
-      name = "kcontacts-16.04.1.tar.xz";
-    };
-  };
-  kcron = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kcron-16.04.1.tar.xz";
-      sha256 = "0rfwg5ywgn242jfm85lvqirdxrazc4yw2nhkhvdylph9ngwqc2bn";
-      name = "kcron-16.04.1.tar.xz";
-    };
-  };
-  kde-baseapps = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-baseapps-16.04.1.tar.xz";
-      sha256 = "10rfn5kc6kdsp9dw0n191h87p7z60vyfq0cal233x722lmzflsjj";
-      name = "kde-baseapps-16.04.1.tar.xz";
-    };
-  };
-  kdebugsettings = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdebugsettings-16.04.1.tar.xz";
-      sha256 = "158p1mnb0mi8ka2nc5bkmz5cw6ki4mh67ry75dxxdgnnnfcqagrc";
-      name = "kdebugsettings-16.04.1.tar.xz";
-    };
-  };
-  kde-dev-scripts = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-dev-scripts-16.04.1.tar.xz";
-      sha256 = "10vxiz1h9lcd133sffrdillq9ssn2b49phmx66ll9c7iawsvgs4q";
-      name = "kde-dev-scripts-16.04.1.tar.xz";
-    };
-  };
-  kde-dev-utils = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-dev-utils-16.04.1.tar.xz";
-      sha256 = "0ybd7kckxyc5an9kn6r31his87mvgc9cbadwd5jm9fh2v4vy8da3";
-      name = "kde-dev-utils-16.04.1.tar.xz";
-    };
-  };
-  kdeedu-data = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdeedu-data-16.04.1.tar.xz";
-      sha256 = "0ns362vz424s4klrk9qllg0qmb41whrhv25xrb27il73nla27cn2";
-      name = "kdeedu-data-16.04.1.tar.xz";
-    };
-  };
-  kdegraphics-mobipocket = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdegraphics-mobipocket-16.04.1.tar.xz";
-      sha256 = "0d4yd4zfkbpm7qixkiiz7lpg66afvdfsz621fby59n9i3nla5b8d";
-      name = "kdegraphics-mobipocket-16.04.1.tar.xz";
-    };
-  };
-  kdegraphics-strigi-analyzer = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdegraphics-strigi-analyzer-16.04.1.tar.xz";
-      sha256 = "01j4ymrvd82xzfpsdl76nr7xjiaji9ki8iv41qkp32frvxj0g48z";
-      name = "kdegraphics-strigi-analyzer-16.04.1.tar.xz";
-    };
-  };
-  kdegraphics-thumbnailers = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdegraphics-thumbnailers-16.04.1.tar.xz";
-      sha256 = "1fqj0kgq9cpq8bv4riwqfbczc6cjfv4s2han7jy267n2lgzi7kpa";
-      name = "kdegraphics-thumbnailers-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-ar = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ar-16.04.1.tar.xz";
-      sha256 = "0in3bzbhdalpyc366sngz2al5ycv5r3a3n1dmxzn5jw4gzr32rbg";
-      name = "kde-l10n-ar-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-ast = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ast-16.04.1.tar.xz";
-      sha256 = "0xn1759ccm9kvvynjf9ndav0q7fg3k20hawdmfisyan6zdsnih7i";
-      name = "kde-l10n-ast-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-bg = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-bg-16.04.1.tar.xz";
-      sha256 = "1fvnlqljp0swx1k1lasy0k8bz4cpj8z0kwrnj5zagpys6bg5dlxh";
-      name = "kde-l10n-bg-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-bs = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-bs-16.04.1.tar.xz";
-      sha256 = "0cvqmh275j92mdc4wwrfpgds4lnzqdd8mzv2w317n7p351nklwfd";
-      name = "kde-l10n-bs-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-ca = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ca-16.04.1.tar.xz";
-      sha256 = "1yzqvd3nvgvxlr49y143hs77pjrr2rb91mc3xyinrqls0awq4j4b";
-      name = "kde-l10n-ca-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-ca_valencia = {
-    version = "ca_valencia-16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ca@valencia-16.04.1.tar.xz";
-      sha256 = "0xv9akrnvlf983qjj9l63h9f0ppk61yi1lrhpp8ba9i57b2z0apy";
-      name = "kde-l10n-ca_valencia-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-cs = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-cs-16.04.1.tar.xz";
-      sha256 = "0ig21rl11m9c73v3vkn3q13zw2xv39ymxdq4hnm96d323pp3lrhp";
-      name = "kde-l10n-cs-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-da = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-da-16.04.1.tar.xz";
-      sha256 = "0m6pgyib8nbmrvqm7asb9dj64552mkadh6wfxqz7k5ylahar82l5";
-      name = "kde-l10n-da-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-de = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-de-16.04.1.tar.xz";
-      sha256 = "1jp6iqlrxpxr3xqibph505p9qn84m3s4sq2bbfk3sb256w1qzh88";
-      name = "kde-l10n-de-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-el = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-el-16.04.1.tar.xz";
-      sha256 = "07m80cyi8nfk1ih05dhj22gg03wjb4zv12ywqamym4pl5k08wgls";
-      name = "kde-l10n-el-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-en_GB = {
-    version = "en_GB-16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-en_GB-16.04.1.tar.xz";
-      sha256 = "0936bai72v2fj84rnd7vr2ljwdy6x33m7iiall69cgkam4c26vyz";
-      name = "kde-l10n-en_GB-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-eo = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-eo-16.04.1.tar.xz";
-      sha256 = "1rrhpfq24cgq0mgawmk5vz0v033gnfa68phlgsa1ynmm42cg6vn9";
-      name = "kde-l10n-eo-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-es = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-es-16.04.1.tar.xz";
-      sha256 = "07rzyhr4hha38vdl30fhb4slan7w4fwryg59vf9fj4pb8x97qisq";
-      name = "kde-l10n-es-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-et = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-et-16.04.1.tar.xz";
-      sha256 = "1nlnsw2z0iq9vxkclkrhkq6k3qzqq7xrg4yl4159fsdfvby11m1d";
-      name = "kde-l10n-et-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-eu = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-eu-16.04.1.tar.xz";
-      sha256 = "0wjjq7gkmlnmwwbkqxpn3ddx335cn0g4443h1m7ddm823mqf5prv";
-      name = "kde-l10n-eu-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-fa = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-fa-16.04.1.tar.xz";
-      sha256 = "1ikjkn8ikp959bzq32r05irxzb37mswhjps4244cgv2wzr79jinh";
-      name = "kde-l10n-fa-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-fi = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-fi-16.04.1.tar.xz";
-      sha256 = "039v26478iqk6z2j9z2mblvl9ypmnl69xp8fybyp8nhlmakmxffp";
-      name = "kde-l10n-fi-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-fr = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-fr-16.04.1.tar.xz";
-      sha256 = "0cmw70kvzi365sj5rlkxjj69h5si8bygyl6c6nia1v9ykdi9yw1q";
-      name = "kde-l10n-fr-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-ga = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ga-16.04.1.tar.xz";
-      sha256 = "0wndnikw0pi4jib6y571zgf38ggk16d66izjwcwxrvminjc6wni1";
-      name = "kde-l10n-ga-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-gl = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-gl-16.04.1.tar.xz";
-      sha256 = "1mmwhb75cpkfz9hp5y0ncv5vga7pv34ybdav30g1m99mjih9ld2j";
-      name = "kde-l10n-gl-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-he = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-he-16.04.1.tar.xz";
-      sha256 = "0jwi0z3mvz8r6cg9b6665qh327yyj7mb22627xavfbp0rb1a2c21";
-      name = "kde-l10n-he-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-hi = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-hi-16.04.1.tar.xz";
-      sha256 = "1rv08lc6804ip81nvwy65zgxdb7q68sfx0v66xyckds9f2q2g9jv";
-      name = "kde-l10n-hi-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-hr = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-hr-16.04.1.tar.xz";
-      sha256 = "1p7qa99x3bmbc41fmnsjbaimkjg89m44yxak7ka516w4r87aai5y";
-      name = "kde-l10n-hr-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-hu = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-hu-16.04.1.tar.xz";
-      sha256 = "0a7pi8w2phn8523vv6zsvgzv6yk7iy4jixc9glxvqn4sy6cy8j1n";
-      name = "kde-l10n-hu-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-ia = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ia-16.04.1.tar.xz";
-      sha256 = "1cxqjrpj2pplwvdc9zg97w3nhhamzpi7a3h504r9i2wvlb76y0s2";
-      name = "kde-l10n-ia-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-id = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-id-16.04.1.tar.xz";
-      sha256 = "17dncrhwxp8glxcgphwfaqhnr8a8s9ad6g6gw6kd3pbd9a4jpi2v";
-      name = "kde-l10n-id-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-is = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-is-16.04.1.tar.xz";
-      sha256 = "0xif4igmrcrngy0r1pbvhwhbj7pax2v7rzrh29j4rhnx3ilsk1gv";
-      name = "kde-l10n-is-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-it = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-it-16.04.1.tar.xz";
-      sha256 = "0frylngivi26x9l9db010knmqpb1w9qixg08w7hkbqwrhic1asif";
-      name = "kde-l10n-it-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-ja = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ja-16.04.1.tar.xz";
-      sha256 = "1hgfismzp69br4g0kdjmb70v6a99yjnv5y2r25d2yfkik0layglf";
-      name = "kde-l10n-ja-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-kk = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-kk-16.04.1.tar.xz";
-      sha256 = "0iqf8sad1fcs8vffvk0h8ch5qs52djfy1lgzzqlhp2n24rmgh478";
-      name = "kde-l10n-kk-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-km = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-km-16.04.1.tar.xz";
-      sha256 = "0c00k11nqsrvw0sy7n2zc0jdrjxd43ajbqpam7153cs00k2ff1im";
-      name = "kde-l10n-km-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-ko = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ko-16.04.1.tar.xz";
-      sha256 = "0z99i1426fd4vxr64m4lssbrpp6gxdqbh7107vbpcscvn5zzjika";
-      name = "kde-l10n-ko-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-lt = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-lt-16.04.1.tar.xz";
-      sha256 = "1qkx6ca7i5d4qlp91j0sspd89jhxw2q468yf4pvkmlv5ry4ahfnd";
-      name = "kde-l10n-lt-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-lv = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-lv-16.04.1.tar.xz";
-      sha256 = "068ka9agb4iwayrm1j4rbs83zznx3cil2ja47id20hwf2diqcjjx";
-      name = "kde-l10n-lv-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-mr = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-mr-16.04.1.tar.xz";
-      sha256 = "0vh6pawbpmnfc7kvrqi9rm4b16zndfwvsy8xny1jjj443i58fyfh";
-      name = "kde-l10n-mr-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-nb = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-nb-16.04.1.tar.xz";
-      sha256 = "0xn35j38fcnb6q1p6wimvr96s3rf4fs8s3jw92qcqa7n7zy866k0";
-      name = "kde-l10n-nb-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-nds = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-nds-16.04.1.tar.xz";
-      sha256 = "0a3wsarls6g12aa2av444rkg7r8x78j7zdy9q46qh3rvsp3habh9";
-      name = "kde-l10n-nds-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-nl = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-nl-16.04.1.tar.xz";
-      sha256 = "161y9417bynvhl6rsl6x1ncrwcgdxrzgivlf9gs9q7bii81ywcli";
-      name = "kde-l10n-nl-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-nn = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-nn-16.04.1.tar.xz";
-      sha256 = "11kh5ld024b7ls1jgm26r7jwacbgddn78cgfg6s5rn8m1v71z3j0";
-      name = "kde-l10n-nn-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-pa = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-pa-16.04.1.tar.xz";
-      sha256 = "052rxwah1q8zpz1ga8lw46hzmj311bqwghrlsy01qx1w1gf0b374";
-      name = "kde-l10n-pa-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-pl = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-pl-16.04.1.tar.xz";
-      sha256 = "1j5claq1dwss2ffmdgxzsf7lnswrkvb6nzzwzs8ffa4kfl35jwks";
-      name = "kde-l10n-pl-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-pt = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-pt-16.04.1.tar.xz";
-      sha256 = "0qjc04kkj3lp5ds0d2p1g6hsq09b4wsf2ppks0kcrv5clgj5vyg5";
-      name = "kde-l10n-pt-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-pt_BR = {
-    version = "pt_BR-16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-pt_BR-16.04.1.tar.xz";
-      sha256 = "1jp0srhqj2yziasbibij6ks11hgi994cvpc9yyn8dadjmpv091r7";
-      name = "kde-l10n-pt_BR-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-ro = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ro-16.04.1.tar.xz";
-      sha256 = "09yixhqh41591kri0c6j79ikn2flcs1hvm0lcil3jfkhsas0j9mg";
-      name = "kde-l10n-ro-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-ru = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ru-16.04.1.tar.xz";
-      sha256 = "1x3rc8hcz8bhfyir02rq92wll0qx4rb5rgjhqwfshrq5x1qmx8g0";
-      name = "kde-l10n-ru-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-sk = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-sk-16.04.1.tar.xz";
-      sha256 = "0qcylh5zj3258pfi0gvxsrvycc1f1b521nn00r664xhlm8akgs5g";
-      name = "kde-l10n-sk-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-sl = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-sl-16.04.1.tar.xz";
-      sha256 = "0m0r4m8anxpmkn76rq3xkxk99xla978qd1106gi5rpadsk6id2ql";
-      name = "kde-l10n-sl-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-sr = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-sr-16.04.1.tar.xz";
-      sha256 = "0k5s1hzdzq7k0fjmslk63bkhz87qj0dkk0i82yyfizinshyb8wiw";
-      name = "kde-l10n-sr-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-sv = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-sv-16.04.1.tar.xz";
-      sha256 = "0i0p610a1vg6l2qh15abbvr1dgiadff0yf6j0xa51iljvjijl44i";
-      name = "kde-l10n-sv-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-tr = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-tr-16.04.1.tar.xz";
-      sha256 = "1py52clbklvkrrydm5jc4sdcf9xqwnfw3b0cn3dj34qs2zfi4d93";
-      name = "kde-l10n-tr-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-ug = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ug-16.04.1.tar.xz";
-      sha256 = "1k57q3zww146sh5rbab48dj4lpkipld2xl2zicspammq21bjy1yy";
-      name = "kde-l10n-ug-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-uk = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-uk-16.04.1.tar.xz";
-      sha256 = "1y6n97287vs2dhavdql50i8nby766b9ragrxbdlxdfmz2m7b0azp";
-      name = "kde-l10n-uk-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-wa = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-wa-16.04.1.tar.xz";
-      sha256 = "097jnd3qrs7p1bym1b2h5672pfm39y4wk5dga18l9gf8vkh6vxx4";
-      name = "kde-l10n-wa-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-zh_CN = {
-    version = "zh_CN-16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-zh_CN-16.04.1.tar.xz";
-      sha256 = "17askly6wn8wm9piskhvr5q7q9cg30bbnn0r4n56rbfpzhjhwwdj";
-      name = "kde-l10n-zh_CN-16.04.1.tar.xz";
-    };
-  };
-  kde-l10n-zh_TW = {
-    version = "zh_TW-16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-zh_TW-16.04.1.tar.xz";
-      sha256 = "11cqq7nba322mgqplll4l7rkpmhxj8n1aswhdib10zifqm9ni121";
-      name = "kde-l10n-zh_TW-16.04.1.tar.xz";
-    };
-  };
-  kdelibs = {
-    version = "4.14.20";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdelibs-4.14.20.tar.xz";
-      sha256 = "1d1wijg8nn5jvprc48pfk9h4i0a39xwidn1g1sq3smk3a0y9nzmp";
-      name = "kdelibs-4.14.20.tar.xz";
-    };
-  };
-  kdenetwork-filesharing = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdenetwork-filesharing-16.04.1.tar.xz";
-      sha256 = "17m9bl01xdxsfhchw1fzmxxnc08pj3062cnzri1d2alg9iwngn63";
-      name = "kdenetwork-filesharing-16.04.1.tar.xz";
-    };
-  };
-  kdenetwork-strigi-analyzers = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdenetwork-strigi-analyzers-16.04.1.tar.xz";
-      sha256 = "0vy3dvrzwzf60smjsp85jyi36j3lkgni2qv5vlpn611bk59wy0kl";
-      name = "kdenetwork-strigi-analyzers-16.04.1.tar.xz";
-    };
-  };
-  kdenlive = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdenlive-16.04.1.tar.xz";
-      sha256 = "1b1sr4pvvcpfp4lgg3y34gnw5ljf4d12np4r7mp7ybzh6nvk3pbj";
-      name = "kdenlive-16.04.1.tar.xz";
-    };
-  };
-  kdepim = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdepim-16.04.1.tar.xz";
-      sha256 = "15p12288yksmr1i3779bz20v499yyqb3srpadbk7nrkywnj9py52";
-      name = "kdepim-16.04.1.tar.xz";
-    };
-  };
-  kdepim-addons = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdepim-addons-16.04.1.tar.xz";
-      sha256 = "09h7pvhw4hknd62cvqk2n7zggixdzaighdy3v4fp7mfb3gkfkccj";
-      name = "kdepim-addons-16.04.1.tar.xz";
-    };
-  };
-  kdepim-apps-libs = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdepim-apps-libs-16.04.1.tar.xz";
-      sha256 = "0yf1gr8zq5cjijmpp82ddi7q8f0lcawmz4kqlc7dri0rjc4y8x3w";
-      name = "kdepim-apps-libs-16.04.1.tar.xz";
-    };
-  };
-  kdepimlibs = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdepimlibs-16.04.1.tar.xz";
-      sha256 = "0ych4xkzx6d1kb6fw3br82h4a3hv2anh0qfd2aawm0fzs9m52afp";
-      name = "kdepimlibs-16.04.1.tar.xz";
-    };
-  };
-  kdepim-runtime = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdepim-runtime-16.04.1.tar.xz";
-      sha256 = "1l4iqhyvvcz3f8zy5gvv5gd6ir39iini2b8zczw70j1frdqiah9p";
-      name = "kdepim-runtime-16.04.1.tar.xz";
-    };
-  };
-  kde-runtime = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kde-runtime-16.04.1.tar.xz";
-      sha256 = "1197w24v37ghhmh36n2g2lzs7k9nvp9y13098c82dbck58xyja1m";
-      name = "kde-runtime-16.04.1.tar.xz";
-    };
-  };
-  kdesdk-kioslaves = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdesdk-kioslaves-16.04.1.tar.xz";
-      sha256 = "11dvh0rk20qx0ckfb1aw2s01h41a3zwgi1n9wsc09qzdyix5f422";
-      name = "kdesdk-kioslaves-16.04.1.tar.xz";
-    };
-  };
-  kdesdk-strigi-analyzers = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdesdk-strigi-analyzers-16.04.1.tar.xz";
-      sha256 = "1vylfy4nsavfxxf36yfmlad02igdqix2jns24fc0nd3z8r8la4k3";
-      name = "kdesdk-strigi-analyzers-16.04.1.tar.xz";
-    };
-  };
-  kdesdk-thumbnailers = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdesdk-thumbnailers-16.04.1.tar.xz";
-      sha256 = "1r6c2almxa92917vi3pdzcqfb93gw4l16k4xbasn10qmn3wmyrvh";
-      name = "kdesdk-thumbnailers-16.04.1.tar.xz";
-    };
-  };
-  kdewebdev = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdewebdev-16.04.1.tar.xz";
-      sha256 = "12jjhbifigvq8r6bn4940wmc50kfbn3v2wzvi2h2nrfpvkq7j4kf";
-      name = "kdewebdev-16.04.1.tar.xz";
-    };
-  };
-  kdf = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdf-16.04.1.tar.xz";
-      sha256 = "0f8vqsn5cjg6hf2djhpdwm7prz36gkr1qlk1s15fnnk850dyq610";
-      name = "kdf-16.04.1.tar.xz";
-    };
-  };
-  kdgantt2 = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdgantt2-16.04.1.tar.xz";
-      sha256 = "0xfgdrycldijyhg9q400s6ajzm3apbyam3g5n2fivsaa6s68hgdh";
-      name = "kdgantt2-16.04.1.tar.xz";
-    };
-  };
-  kdiamond = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kdiamond-16.04.1.tar.xz";
-      sha256 = "1yxy2412xl5gq59s1kpd213vsrhbf20ci528qvz6y9yz3b3safxq";
-      name = "kdiamond-16.04.1.tar.xz";
-    };
-  };
-  kfloppy = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kfloppy-16.04.1.tar.xz";
-      sha256 = "1pgr3kng88cprkp4prhg351k6pnbzqrpw4ihjfcdfa5mqirq64im";
-      name = "kfloppy-16.04.1.tar.xz";
-    };
-  };
-  kfourinline = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kfourinline-16.04.1.tar.xz";
-      sha256 = "0712fcg20jm1dq2slrk3nlgz3rqaw22fzvv2vzk4b763b6ha5xh0";
-      name = "kfourinline-16.04.1.tar.xz";
-    };
-  };
-  kgeography = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kgeography-16.04.1.tar.xz";
-      sha256 = "1cf6jaw25d1z1k7abm268qn86cvwlzvx7m7xkg8a1ipynr0zhgzi";
-      name = "kgeography-16.04.1.tar.xz";
-    };
-  };
-  kget = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kget-16.04.1.tar.xz";
-      sha256 = "1h0fc3w9s8lvcij7agin6gpbgq4i825b8jw9lvra6r4hpmsg4s8g";
-      name = "kget-16.04.1.tar.xz";
-    };
-  };
-  kgoldrunner = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kgoldrunner-16.04.1.tar.xz";
-      sha256 = "18vbyjxli5r2c9lgpvr92aqqprmybk197nff7wd5bk9qaxf0zxgr";
-      name = "kgoldrunner-16.04.1.tar.xz";
-    };
-  };
-  kgpg = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kgpg-16.04.1.tar.xz";
-      sha256 = "0w8ac7352vy2p2n0aribrc93la5hcmcvr4m53x13q29di7czf5qp";
-      name = "kgpg-16.04.1.tar.xz";
-    };
-  };
-  khangman = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/khangman-16.04.1.tar.xz";
-      sha256 = "08hwiprzr12i7dlrza5rfbgpfzx8rpbx62rl6w09fcmr5sv1mbmh";
-      name = "khangman-16.04.1.tar.xz";
-    };
-  };
-  khelpcenter = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/khelpcenter-16.04.1.tar.xz";
-      sha256 = "0h1fg09y95v3q8fx6z3bnjcx99vwc706pm15qkbn80wcyif3hv5n";
-      name = "khelpcenter-16.04.1.tar.xz";
-    };
-  };
-  kholidays = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kholidays-16.04.1.tar.xz";
-      sha256 = "0x7plfjmaa6ca6w35ibrparwrz3q5sydi0ci7cfsra2cizcyh5l8";
-      name = "kholidays-16.04.1.tar.xz";
-    };
-  };
-  kidentitymanagement = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kidentitymanagement-16.04.1.tar.xz";
-      sha256 = "1dbchsr6j0ll7b4mvbv5yw1jyzvs9y68gaylybsqfzdzj9yiq3np";
-      name = "kidentitymanagement-16.04.1.tar.xz";
-    };
-  };
-  kig = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kig-16.04.1.tar.xz";
-      sha256 = "1jwd66accr4xi771chv8a0lm6g6mrcksad3c28b8l0sv39l1jr3n";
-      name = "kig-16.04.1.tar.xz";
-    };
-  };
-  kigo = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kigo-16.04.1.tar.xz";
-      sha256 = "0660qd9h2ifmy13xccy7najna6zag2rziw7xf91hrgmkszzyn8l1";
-      name = "kigo-16.04.1.tar.xz";
-    };
-  };
-  killbots = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/killbots-16.04.1.tar.xz";
-      sha256 = "1gdbk2403jvn2grx42vixlf3bj50a556inicg06qkgg3cf17xypr";
-      name = "killbots-16.04.1.tar.xz";
-    };
-  };
-  kimap = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kimap-16.04.1.tar.xz";
-      sha256 = "1x4s88dk62sdnlidgk3vb706ppn0acfc4iiis4srvjn1sr0xl5yb";
-      name = "kimap-16.04.1.tar.xz";
-    };
-  };
-  kio-extras = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kio-extras-16.04.1.tar.xz";
-      sha256 = "1187p0jzwhr7lixlswjjjlf367rp04pdzjyw7qw1brwj60jqz09m";
-      name = "kio-extras-16.04.1.tar.xz";
-    };
-  };
-  kiriki = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kiriki-16.04.1.tar.xz";
-      sha256 = "028r7hxqyfd029z4cbx3vdzrn9d0s8d06f4p5clx97vr2lrii26v";
-      name = "kiriki-16.04.1.tar.xz";
-    };
-  };
-  kiten = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kiten-16.04.1.tar.xz";
-      sha256 = "18c41dxn2sx64xih37n5v6vjmmw0kwv26na9cd6y5jd70yczcjzj";
-      name = "kiten-16.04.1.tar.xz";
-    };
-  };
-  kjumpingcube = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kjumpingcube-16.04.1.tar.xz";
-      sha256 = "001nvs1cppppsgr6x8vd16fzkgi6axac4k42xw7rpibcbwxvws27";
-      name = "kjumpingcube-16.04.1.tar.xz";
-    };
-  };
-  kldap = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kldap-16.04.1.tar.xz";
-      sha256 = "0r150fg9zhl2gkl9w5dlxlzz3lrg1an690if0l1rpl2kzhrpdpyp";
-      name = "kldap-16.04.1.tar.xz";
-    };
-  };
-  kleopatra = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kleopatra-16.04.1.tar.xz";
-      sha256 = "0p13ff91q6033v16rh114viqhcl383s9fzdxi69wk657kqsn5fsi";
-      name = "kleopatra-16.04.1.tar.xz";
-    };
-  };
-  klettres = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/klettres-16.04.1.tar.xz";
-      sha256 = "0mqplal91q2k9jkr5ksn9lmwncdi4rvrsz1sy3lfpjrwmm74rp24";
-      name = "klettres-16.04.1.tar.xz";
-    };
-  };
-  klickety = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/klickety-16.04.1.tar.xz";
-      sha256 = "1ykrsqwvyw73s6hnkn2k0xw8gs9v7znhzp0fykqcdprix2wb7qzm";
-      name = "klickety-16.04.1.tar.xz";
-    };
-  };
-  klines = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/klines-16.04.1.tar.xz";
-      sha256 = "07dmfnfpp8bg907kyj3jidgyicxgsbs8jmiximdky1n8hmqa6sm3";
-      name = "klines-16.04.1.tar.xz";
-    };
-  };
-  kmag = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kmag-16.04.1.tar.xz";
-      sha256 = "0a89mhr048p7xpl8ah9p236yxx1k1jnbw8ybcgjfw6n0s7xzaf59";
-      name = "kmag-16.04.1.tar.xz";
-    };
-  };
-  kmahjongg = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kmahjongg-16.04.1.tar.xz";
-      sha256 = "10z6rfdhnv19x3sqspgz2wz7dr6yd000vlkg6wr0hsy6kqg7si8b";
-      name = "kmahjongg-16.04.1.tar.xz";
-    };
-  };
-  kmailtransport = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kmailtransport-16.04.1.tar.xz";
-      sha256 = "0h57s0wxc0xfym60i69y6lbh7cchf4clpar9f1b9x461vfcnd432";
-      name = "kmailtransport-16.04.1.tar.xz";
-    };
-  };
-  kmbox = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kmbox-16.04.1.tar.xz";
-      sha256 = "1sm5k1qsn2maa08hyxidrcapfzqwrs5i63wwlpnj8xbgfy61nr5p";
-      name = "kmbox-16.04.1.tar.xz";
-    };
-  };
-  kmime = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kmime-16.04.1.tar.xz";
-      sha256 = "01r267bf6ps5x8q1ia3jv2zi07dbcv120nq9pq3wqixk64gr7gh5";
-      name = "kmime-16.04.1.tar.xz";
-    };
-  };
-  kmines = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kmines-16.04.1.tar.xz";
-      sha256 = "12mfsrx32g46kg3s98xali2lhq1gcydmyn7j0ldgi9ksj4zhvc9p";
-      name = "kmines-16.04.1.tar.xz";
-    };
-  };
-  kmix = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kmix-16.04.1.tar.xz";
-      sha256 = "1k51s1r16zk5qgzyg6y4z24qlabgnnf6s4a5rc4pjwm734yh28g6";
-      name = "kmix-16.04.1.tar.xz";
-    };
-  };
-  kmousetool = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kmousetool-16.04.1.tar.xz";
-      sha256 = "0zn3hxy5p7fq6v617pbxcbbi3zvk3k07dx98d5pjlgzns7jjsmmf";
-      name = "kmousetool-16.04.1.tar.xz";
-    };
-  };
-  kmouth = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kmouth-16.04.1.tar.xz";
-      sha256 = "1pgyc3x2gixlw2zlh293mpisb2asblbamsbv8565pbf0rz0p84xg";
-      name = "kmouth-16.04.1.tar.xz";
-    };
-  };
-  kmplot = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kmplot-16.04.1.tar.xz";
-      sha256 = "1a4i0lj6k8fw8s34vnbiphd1xrfjlk12dbv359gnxjdqalvir9ib";
-      name = "kmplot-16.04.1.tar.xz";
-    };
-  };
-  knavalbattle = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/knavalbattle-16.04.1.tar.xz";
-      sha256 = "1l7x76b0jn1vssxaxvskp62h33sk2b35n60zih36lscgpv0ldq8w";
-      name = "knavalbattle-16.04.1.tar.xz";
-    };
-  };
-  knetwalk = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/knetwalk-16.04.1.tar.xz";
-      sha256 = "1rkarsvmmfi0cax7cy71g0mzcwhjcfpiq8xxdnmsn7gwdwf9mlyd";
-      name = "knetwalk-16.04.1.tar.xz";
-    };
-  };
-  kolf = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kolf-16.04.1.tar.xz";
-      sha256 = "0azkm74br2xpxg3mvnmi61d5a438igw98a5vk0jycc1y0xfbsfzf";
-      name = "kolf-16.04.1.tar.xz";
-    };
-  };
-  kollision = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kollision-16.04.1.tar.xz";
-      sha256 = "0kb5ykaayh26f2nwghdwc5vxnr2ik5b4s9k5x0sbz9p933l1wy9z";
-      name = "kollision-16.04.1.tar.xz";
-    };
-  };
-  kolourpaint = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kolourpaint-16.04.1.tar.xz";
-      sha256 = "1d07yjkxx82czpg57bnzkn5887lhn6rilgyy08zn1739avk589n7";
-      name = "kolourpaint-16.04.1.tar.xz";
-    };
-  };
-  kompare = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kompare-16.04.1.tar.xz";
-      sha256 = "1cysz9qg93jddb20hxgi29c6rm6x3nmi70ji32r8mzpv3r27217n";
-      name = "kompare-16.04.1.tar.xz";
-    };
-  };
-  konquest = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/konquest-16.04.1.tar.xz";
-      sha256 = "1w8axkl0gsvbs7xhmy188xl1h2xkd80w0gdvskykdmcri4mrhldl";
-      name = "konquest-16.04.1.tar.xz";
-    };
-  };
-  konsole = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/konsole-16.04.1.tar.xz";
-      sha256 = "15h38zydnlkchsdjhax15gv6507nqqgql5ykw81fqp2byibxl25s";
-      name = "konsole-16.04.1.tar.xz";
-    };
-  };
-  kontactinterface = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kontactinterface-16.04.1.tar.xz";
-      sha256 = "0qvkrpx9p3hmwqja3iv6n80j1j0b46jvbimfgjs183xlwhqy90l2";
-      name = "kontactinterface-16.04.1.tar.xz";
-    };
-  };
-  kopete = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kopete-16.04.1.tar.xz";
-      sha256 = "1i406hr0r1lfv9awy0fvlg4kh8lljc14hrg9da83nnf07njxb0gh";
-      name = "kopete-16.04.1.tar.xz";
-    };
-  };
-  kpat = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kpat-16.04.1.tar.xz";
-      sha256 = "0axm2390bjj57mkykaw196gycjvcx303l0aq3capv971ailx8mxs";
-      name = "kpat-16.04.1.tar.xz";
-    };
-  };
-  kpimtextedit = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kpimtextedit-16.04.1.tar.xz";
-      sha256 = "0bsviwk4nfy0b632xz29mdl5x9p9c3774l0ghi292rr6891ysz56";
-      name = "kpimtextedit-16.04.1.tar.xz";
-    };
-  };
-  kppp = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kppp-16.04.1.tar.xz";
-      sha256 = "1j86kcxx5wrqv72wqbcn50gysp5ddh2i0b6dbaw2qydhv56h1c50";
-      name = "kppp-16.04.1.tar.xz";
-    };
-  };
-  kqtquickcharts = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kqtquickcharts-16.04.1.tar.xz";
-      sha256 = "0yqw8l6l7k2a50djm64lrcvl8rwkkvjiaa51mwcvj34cqfg8i55k";
-      name = "kqtquickcharts-16.04.1.tar.xz";
-    };
-  };
-  krdc = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/krdc-16.04.1.tar.xz";
-      sha256 = "1zij88q4x48kpww22g4p9dbz9f78s2s50m0bpxcrz5aqdvsijgfq";
-      name = "krdc-16.04.1.tar.xz";
-    };
-  };
-  kremotecontrol = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kremotecontrol-16.04.1.tar.xz";
-      sha256 = "1xxfggy6nx3ncq5h72x1mlnyw7hhi7m15kwfnsg2nhzc86mxg5k5";
-      name = "kremotecontrol-16.04.1.tar.xz";
-    };
-  };
-  kreversi = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kreversi-16.04.1.tar.xz";
-      sha256 = "091m8p6z3xw86pn71zz691s4g11jx83ja06bdcpyjwmmwdz4asmb";
-      name = "kreversi-16.04.1.tar.xz";
-    };
-  };
-  krfb = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/krfb-16.04.1.tar.xz";
-      sha256 = "16xdzczf9jg22crbymsmij4gjzgbijx9sk7vblprhaqls4gnh55q";
-      name = "krfb-16.04.1.tar.xz";
-    };
-  };
-  kross-interpreters = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kross-interpreters-16.04.1.tar.xz";
-      sha256 = "1hz31lkdmkilc2rbfffjx57dwfscr5f4h406346a9qryjk4n466s";
-      name = "kross-interpreters-16.04.1.tar.xz";
-    };
-  };
-  kruler = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kruler-16.04.1.tar.xz";
-      sha256 = "1xjc1k82xvfk3ad4937v663dhn6b4d3r8gp2aqgzbjnms88sqxsm";
-      name = "kruler-16.04.1.tar.xz";
-    };
-  };
-  ksaneplugin = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ksaneplugin-16.04.1.tar.xz";
-      sha256 = "162s931ygfzdiq4l0zcfz75mhm5r4j1mz0730jchfzcpahan3cgl";
-      name = "ksaneplugin-16.04.1.tar.xz";
-    };
-  };
-  kscd = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kscd-16.04.1.tar.xz";
-      sha256 = "1nb5y4q17vg8zy7kzhadhbd0pp1n3z1kgix898is2fhain2har85";
-      name = "kscd-16.04.1.tar.xz";
-    };
-  };
-  kshisen = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kshisen-16.04.1.tar.xz";
-      sha256 = "1cdmawq2z2avl4fkwc9pb7s7m4pqcrm8zhhwkp2gqz8b0vsgz40f";
-      name = "kshisen-16.04.1.tar.xz";
-    };
-  };
-  ksirk = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ksirk-16.04.1.tar.xz";
-      sha256 = "1jmrbmdbpy0cpakzyh3nqaf8alv05v0i70m1a2b5yw7iiy1jjh0l";
-      name = "ksirk-16.04.1.tar.xz";
-    };
-  };
-  ksnakeduel = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ksnakeduel-16.04.1.tar.xz";
-      sha256 = "1l01rwg8lis624jncj07x9cdvp7g6sb4v75yp3bz8a12s14ayl6h";
-      name = "ksnakeduel-16.04.1.tar.xz";
-    };
-  };
-  kspaceduel = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kspaceduel-16.04.1.tar.xz";
-      sha256 = "0bzaq2alfkclk5496g9zf53lih52hray14nfnif49acnccs7g1a3";
-      name = "kspaceduel-16.04.1.tar.xz";
-    };
-  };
-  ksquares = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ksquares-16.04.1.tar.xz";
-      sha256 = "1law2s9wdhpzp1zd1q476afscbaxcdi023n0q9j73w1l8jais2p9";
-      name = "ksquares-16.04.1.tar.xz";
-    };
-  };
-  kstars = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kstars-16.04.1.tar.xz";
-      sha256 = "0sss1d6k89wsjqnywmklnb3ywyws50d1vfz1lfcsmhcgc37w6cm7";
-      name = "kstars-16.04.1.tar.xz";
-    };
-  };
-  ksudoku = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ksudoku-16.04.1.tar.xz";
-      sha256 = "0bb7hv8m68qhjh7z3g7qkcnyn41wacby6kaq0qhrr4x37dx96r3i";
-      name = "ksudoku-16.04.1.tar.xz";
-    };
-  };
-  ksystemlog = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ksystemlog-16.04.1.tar.xz";
-      sha256 = "0ws9vln9gz8r3m1pk1x3fk6b05h1fx070d5ln3g9vxwbkfh3g73d";
-      name = "ksystemlog-16.04.1.tar.xz";
-    };
-  };
-  kteatime = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kteatime-16.04.1.tar.xz";
-      sha256 = "0ap8nc265kylb7idgdbymln6pz4xw3pmgqp1dpqix6pskz64wn7p";
-      name = "kteatime-16.04.1.tar.xz";
-    };
-  };
-  ktimer = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktimer-16.04.1.tar.xz";
-      sha256 = "1kkga4mcgn2zzsardcvk0r4y75ip1kbdiyp9qhpsdsf1r68m7h6i";
-      name = "ktimer-16.04.1.tar.xz";
-    };
-  };
-  ktnef = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktnef-16.04.1.tar.xz";
-      sha256 = "1f0m75n4wxqyjiwr13znk4yhr6852mfns5n5v40yxnjhlvi1zq88";
-      name = "ktnef-16.04.1.tar.xz";
-    };
-  };
-  ktouch = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktouch-16.04.1.tar.xz";
-      sha256 = "1hzri668q3d8q0s8n9362hm53jmrmzbil2am0naa3gkr16nj4rjd";
-      name = "ktouch-16.04.1.tar.xz";
-    };
-  };
-  ktp-accounts-kcm = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktp-accounts-kcm-16.04.1.tar.xz";
-      sha256 = "0q06lk8agqqgs5hlmyl8pmwdcp95zys2psnzm3s6pvs3lyq9zkkd";
-      name = "ktp-accounts-kcm-16.04.1.tar.xz";
-    };
-  };
-  ktp-approver = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktp-approver-16.04.1.tar.xz";
-      sha256 = "0wf24dvvxx9cvhihjgfpp78yymnll1bn1zbwi5lg2by75hqzvvi7";
-      name = "ktp-approver-16.04.1.tar.xz";
-    };
-  };
-  ktp-auth-handler = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktp-auth-handler-16.04.1.tar.xz";
-      sha256 = "1p4jsnvhc6g6r1pdhhbq0b38vhi93v1715naxl5vbdfgk11q72bq";
-      name = "ktp-auth-handler-16.04.1.tar.xz";
-    };
-  };
-  ktp-call-ui = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktp-call-ui-16.04.1.tar.xz";
-      sha256 = "01bly8lbk1mg86vjqfq8vz9ym36w4hz2gsizqs616prpxyrfgk0s";
-      name = "ktp-call-ui-16.04.1.tar.xz";
-    };
-  };
-  ktp-common-internals = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktp-common-internals-16.04.1.tar.xz";
-      sha256 = "0jdmsg1vdvkvx9fb10l0qpwrp5i5w64qfx94231kz4gv1xci0zcb";
-      name = "ktp-common-internals-16.04.1.tar.xz";
-    };
-  };
-  ktp-contact-list = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktp-contact-list-16.04.1.tar.xz";
-      sha256 = "1mjn4if6r7z5smnxac4mr7smh616pd7hm5jmnfgxic9dlvqbxy2x";
-      name = "ktp-contact-list-16.04.1.tar.xz";
-    };
-  };
-  ktp-contact-runner = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktp-contact-runner-16.04.1.tar.xz";
-      sha256 = "08ch3b7pq17ah1xahvbcb8zcizj81vpbqxv0zwmnd55byx3i3nsz";
-      name = "ktp-contact-runner-16.04.1.tar.xz";
-    };
-  };
-  ktp-desktop-applets = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktp-desktop-applets-16.04.1.tar.xz";
-      sha256 = "0n0v3q1x33z1ck1rlj5jhbsywvjlv8hr878bkv0ppgyndcjv4hwx";
-      name = "ktp-desktop-applets-16.04.1.tar.xz";
-    };
-  };
-  ktp-filetransfer-handler = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktp-filetransfer-handler-16.04.1.tar.xz";
-      sha256 = "0d34blakmqp3qc80dpakpsk3xdzncy4q8nfg0jjjw9s5qldw0gjx";
-      name = "ktp-filetransfer-handler-16.04.1.tar.xz";
-    };
-  };
-  ktp-kded-module = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktp-kded-module-16.04.1.tar.xz";
-      sha256 = "19fcc53bwlgdm3gvyiyzp9hdfk9hps5ng9cdqlx1agdx9ap9sbi8";
-      name = "ktp-kded-module-16.04.1.tar.xz";
-    };
-  };
-  ktp-send-file = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktp-send-file-16.04.1.tar.xz";
-      sha256 = "0svm1ij82zgnkczhrhkmzpy2w1p2khv8wzkj4584zwfjafy3y8yj";
-      name = "ktp-send-file-16.04.1.tar.xz";
-    };
-  };
-  ktp-text-ui = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktp-text-ui-16.04.1.tar.xz";
-      sha256 = "1s5kw9yk9m2rj48l5c54m8zsa247hv9ajq9zp2gqrvv3sz7y1bsf";
-      name = "ktp-text-ui-16.04.1.tar.xz";
-    };
-  };
-  ktuberling = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/ktuberling-16.04.1.tar.xz";
-      sha256 = "05p3jiy7cykpxrjlvhnz5jc3x1mqbdyq6i2h15h315sd39wra5bx";
-      name = "ktuberling-16.04.1.tar.xz";
-    };
-  };
-  kturtle = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kturtle-16.04.1.tar.xz";
-      sha256 = "0cs7k2jv9s89sbh0ig2zvm31v906jvwjrjfdw223zl105c99xshr";
-      name = "kturtle-16.04.1.tar.xz";
-    };
-  };
-  kubrick = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kubrick-16.04.1.tar.xz";
-      sha256 = "1pxb357bmh4r4g92zxr3x6w65z9lsd34vkvbg7s250q3a7358y4n";
-      name = "kubrick-16.04.1.tar.xz";
-    };
-  };
-  kuser = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kuser-16.04.1.tar.xz";
-      sha256 = "0b0wjsbj4hin3g4dgijxvm99idzl57i65f1k6hq4mjypnd19ccwv";
-      name = "kuser-16.04.1.tar.xz";
-    };
-  };
-  kwalletmanager = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kwalletmanager-16.04.1.tar.xz";
-      sha256 = "1w6y55zk7gs7fp0qz5zgmmh3mz8d6ii5g948pwg18415x4ydbrx1";
-      name = "kwalletmanager-16.04.1.tar.xz";
-    };
-  };
-  kwordquiz = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/kwordquiz-16.04.1.tar.xz";
-      sha256 = "0v3snpljvc8zf34jpwbchrqsdajd14k3g4jd3xaz9waa62kbc2m7";
-      name = "kwordquiz-16.04.1.tar.xz";
-    };
-  };
-  libgravatar = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libgravatar-16.04.1.tar.xz";
-      sha256 = "0wqp5p16jn2qnsndill5ccfk8nirx5j4iyhjny0ri19lkdkcz010";
-      name = "libgravatar-16.04.1.tar.xz";
-    };
-  };
-  libkcddb = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkcddb-16.04.1.tar.xz";
-      sha256 = "1dpmynbb1cyin8f0hd9r1gn432pzj7lck86nbhz38w0w8x2m6b81";
-      name = "libkcddb-16.04.1.tar.xz";
-    };
-  };
-  libkcompactdisc = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkcompactdisc-16.04.1.tar.xz";
-      sha256 = "15zm5jmybvh8q2sbwx4203yq6lgj6nm9jgqk3yh8ikbh5ml24bfr";
-      name = "libkcompactdisc-16.04.1.tar.xz";
-    };
-  };
-  libkdcraw = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkdcraw-16.04.1.tar.xz";
-      sha256 = "13agxmqqfz38sz0vmqy2rk7xj4bmcffpn84i9a5s1191l13kj0ks";
-      name = "libkdcraw-16.04.1.tar.xz";
-    };
-  };
-  libkdeedu = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkdeedu-16.04.1.tar.xz";
-      sha256 = "1i20ib710cn77y8q9aqwlh4rvyfv8r8w03mwnl45jn27c0rmxmrz";
-      name = "libkdeedu-16.04.1.tar.xz";
-    };
-  };
-  libkdegames = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkdegames-16.04.1.tar.xz";
-      sha256 = "0sx09sm19s8n2imf267sazymwpx1ry68n7ahwj4mczhi3wgvs72w";
-      name = "libkdegames-16.04.1.tar.xz";
-    };
-  };
-  libkdepim = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkdepim-16.04.1.tar.xz";
-      sha256 = "03wks48jzj0p6vvqbf5nq14ipln6lcahsi88d7q082yckgkgbjqr";
-      name = "libkdepim-16.04.1.tar.xz";
-    };
-  };
-  libkeduvocdocument = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkeduvocdocument-16.04.1.tar.xz";
-      sha256 = "0gw0m31aa4px8ag2nh1ysm1bqlhr2b6gzlqxgjipgi4hlaw72nzs";
-      name = "libkeduvocdocument-16.04.1.tar.xz";
-    };
-  };
-  libkexiv2 = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkexiv2-16.04.1.tar.xz";
-      sha256 = "0h0iw9sgmaascv60yzxyap6mrj7jrr2fh1dcbnfvw7162qq2ldyq";
-      name = "libkexiv2-16.04.1.tar.xz";
-    };
-  };
-  libkface = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkface-16.04.1.tar.xz";
-      sha256 = "16bb1mpls2wxmpr5vkaapj140c2dxk4rl6cijw2gym7sm1njy98n";
-      name = "libkface-16.04.1.tar.xz";
-    };
-  };
-  libkgeomap = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkgeomap-16.04.1.tar.xz";
-      sha256 = "0m5cg1pdzldxbv62g2vv048g5dfbkhsjj8zsli1l6arcy38anpwv";
-      name = "libkgeomap-16.04.1.tar.xz";
-    };
-  };
-  libkipi = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkipi-16.04.1.tar.xz";
-      sha256 = "100hrb52ab2b2rgqsbk9d1hz77ch33cn60sy3zc473p8pfgsp1is";
-      name = "libkipi-16.04.1.tar.xz";
-    };
-  };
-  libkleo = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkleo-16.04.1.tar.xz";
-      sha256 = "1s16vhv8p7ir532q122zfwibjzv08dbhbxvg0xz83hz87lyr27mj";
-      name = "libkleo-16.04.1.tar.xz";
-    };
-  };
-  libkmahjongg = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkmahjongg-16.04.1.tar.xz";
-      sha256 = "1zrbbfrzbwlgja8n093g797aiws4nc0icp5fsxv6ryfpxxzzawsv";
-      name = "libkmahjongg-16.04.1.tar.xz";
-    };
-  };
-  libkomparediff2 = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libkomparediff2-16.04.1.tar.xz";
-      sha256 = "0zhx3bsklbj3mwj22x8svqza0z4m4wvj0dysj731kjkmg9i75g8m";
-      name = "libkomparediff2-16.04.1.tar.xz";
-    };
-  };
-  libksane = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libksane-16.04.1.tar.xz";
-      sha256 = "16jpq7ip8pjl9vglm1m5c9gpfy4p50fa2d5dmlxlr67fbjs35831";
-      name = "libksane-16.04.1.tar.xz";
-    };
-  };
-  libksieve = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/libksieve-16.04.1.tar.xz";
-      sha256 = "0hdm4z30czxzdf19gwva03q3zgc3qapb4fawakcrgdr1z9k24jg6";
-      name = "libksieve-16.04.1.tar.xz";
-    };
-  };
-  lokalize = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/lokalize-16.04.1.tar.xz";
-      sha256 = "1h2harrdpx1zdvgw21g9y2q93c9n9g3dansb63j6s8g4kv9skgs0";
-      name = "lokalize-16.04.1.tar.xz";
-    };
-  };
-  lskat = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/lskat-16.04.1.tar.xz";
-      sha256 = "1a6n954sy4yq4f289y2ziv649fbcfbyiinx9w3rffa3mi9lxw690";
-      name = "lskat-16.04.1.tar.xz";
-    };
-  };
-  mailcommon = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/mailcommon-16.04.1.tar.xz";
-      sha256 = "0n3vzgk3iaqja43aidg08yf1g1k78xf5fp02wrsvndi4spad5hv2";
-      name = "mailcommon-16.04.1.tar.xz";
-    };
-  };
-  mailimporter = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/mailimporter-16.04.1.tar.xz";
-      sha256 = "00jgiplwmwdhaq0s4chan21hk6hqkgnfjhvjcn5hv8lsfmdigkkh";
-      name = "mailimporter-16.04.1.tar.xz";
-    };
-  };
-  marble = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/marble-16.04.1.tar.xz";
-      sha256 = "185hcl6fg90blmik72pd32pzkfcaxhv42mmlnwbpwbb4wfxajys7";
-      name = "marble-16.04.1.tar.xz";
-    };
-  };
-  messagelib = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/messagelib-16.04.1.tar.xz";
-      sha256 = "0flphkm18fbma2sb490lhnk4p01cmc4ri90gqb2ys4mfc22x1yy0";
-      name = "messagelib-16.04.1.tar.xz";
-    };
-  };
-  minuet = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/minuet-16.04.1.tar.xz";
-      sha256 = "10s5fqkk98nzd0w22pcwxqqlyy49is72wbhcqsy0hf90j8qyzah5";
-      name = "minuet-16.04.1.tar.xz";
-    };
-  };
-  mplayerthumbs = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/mplayerthumbs-16.04.1.tar.xz";
-      sha256 = "1r7iqlb1ik3k21frwn62552fkdxgl29sf44qc9gxi9q254cnw7nq";
-      name = "mplayerthumbs-16.04.1.tar.xz";
-    };
-  };
-  okteta = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/okteta-16.04.1.tar.xz";
-      sha256 = "066p6iw5ci909pvklx900lawcyjiazl6ch3y8yrys97x498qn7pl";
-      name = "okteta-16.04.1.tar.xz";
-    };
-  };
-  okular = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/okular-16.04.1.tar.xz";
-      sha256 = "11fx4a4bcrl89zi2z2wvfcinmlmq7cfnxga1x35hkk5rc6vyl3vl";
-      name = "okular-16.04.1.tar.xz";
-    };
-  };
-  palapeli = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/palapeli-16.04.1.tar.xz";
-      sha256 = "1iixmx4nrjdbkhwd0wl5zv4bgvss9zkcz2a85790q3x0hcd9fshb";
-      name = "palapeli-16.04.1.tar.xz";
-    };
-  };
-  parley = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/parley-16.04.1.tar.xz";
-      sha256 = "0ynvbfilfh6rw4fw7ajl4nz4j1n5ip1pcf39r4ql1qghdgz3hr9c";
-      name = "parley-16.04.1.tar.xz";
-    };
-  };
-  picmi = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/picmi-16.04.1.tar.xz";
-      sha256 = "18048amjd4l9agnj0d7q4109ik76568065q6dn6p8xbnczvlanqq";
-      name = "picmi-16.04.1.tar.xz";
-    };
-  };
-  pimcommon = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/pimcommon-16.04.1.tar.xz";
-      sha256 = "19lxgzy8a9ixljpjbxgj8gp0l88cs0rgvgyhzdw9b6nm8m0lr79a";
-      name = "pimcommon-16.04.1.tar.xz";
-    };
-  };
-  poxml = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/poxml-16.04.1.tar.xz";
-      sha256 = "14ar7hr35sgfqk8scdbrmnkdfzns1a8pwldn1pz46yssshm0yx6b";
-      name = "poxml-16.04.1.tar.xz";
-    };
-  };
-  print-manager = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/print-manager-16.04.1.tar.xz";
-      sha256 = "0mfafxnvak8svksld0ddrbsrajn7d959dr7arw0j7djj5fbwrind";
-      name = "print-manager-16.04.1.tar.xz";
-    };
-  };
-  rocs = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/rocs-16.04.1.tar.xz";
-      sha256 = "0hb8bahr3gfkc41bqnk4dzw91smk4gi97vvlacirdj3wqps3phjk";
-      name = "rocs-16.04.1.tar.xz";
-    };
-  };
-  signon-kwallet-extension = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/signon-kwallet-extension-16.04.1.tar.xz";
-      sha256 = "0qzgsifx6zscn8wc06wy2gi7xz0hlnvwcpgac85nf1zz7fngjq7i";
-      name = "signon-kwallet-extension-16.04.1.tar.xz";
-    };
-  };
-  spectacle = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/spectacle-16.04.1.tar.xz";
-      sha256 = "1df3hp9swcy00dvfjx34a7z9naz8mpaprxigv87f3jzg9jwbppg6";
-      name = "spectacle-16.04.1.tar.xz";
-    };
-  };
-  step = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/step-16.04.1.tar.xz";
-      sha256 = "0nr4maqy067d4jb25h4akljn2vqg33rdxyb619lzr9sksw04ii5k";
-      name = "step-16.04.1.tar.xz";
-    };
-  };
-  svgpart = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/svgpart-16.04.1.tar.xz";
-      sha256 = "0kklmb4vq6pnf9i088n14zbzg9iz80arl8igb815zdl2bx7yqjjj";
-      name = "svgpart-16.04.1.tar.xz";
-    };
-  };
-  sweeper = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/sweeper-16.04.1.tar.xz";
-      sha256 = "1lhspwgajja6fnd1nm4gnhvyi3ynnx0dicwd8ks81imvkz3kz7yc";
-      name = "sweeper-16.04.1.tar.xz";
-    };
-  };
-  syndication = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/syndication-16.04.1.tar.xz";
-      sha256 = "19pqz7q02axr129wcrwr27lkr4qiv542gck4h2rlj21p9amw46kq";
-      name = "syndication-16.04.1.tar.xz";
-    };
-  };
-  umbrello = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/umbrello-16.04.1.tar.xz";
-      sha256 = "04ql21kl633nxbhjbv2j9wsi7l8pqpp49x737014mz037a58ppvw";
-      name = "umbrello-16.04.1.tar.xz";
-    };
-  };
-  zeroconf-ioslave = {
-    version = "16.04.1";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.04.1/src/zeroconf-ioslave-16.04.1.tar.xz";
-      sha256 = "0pg7q6lh5i0yhjw9qbralzjxg6f38if57s1lk57bvh0gnmj5zj9b";
-      name = "zeroconf-ioslave-16.04.1.tar.xz";
-    };
-  };
-}

From d975d5da8b8b55f8cbf52784fdb4e2909fb5f244 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 16 Jun 2016 09:28:00 -0500
Subject: [PATCH 392/436] kde5.khelpcenter: moved from Plasma 5.6.4 to
 Applications 16.04.2

---
 .../kde-5/applications-16.04/default.nix      |  1 +
 .../kde-5/applications-16.04/khelpcenter.nix  | 20 +++++++++++++++++++
 pkgs/desktops/kde-5/plasma-5.6/default.nix    |  1 -
 .../desktops/kde-5/plasma-5.6/khelpcenter.nix | 20 -------------------
 4 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/khelpcenter.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix

diff --git a/pkgs/desktops/kde-5/applications-16.04/default.nix b/pkgs/desktops/kde-5/applications-16.04/default.nix
index 7000c962270c..e026914f2f04 100644
--- a/pkgs/desktops/kde-5/applications-16.04/default.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/default.nix
@@ -48,6 +48,7 @@ let
     kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
     kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
     kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
+    khelpcenter = callPackage ./khelpcenter.nix {};
     kio-extras = callPackage ./kio-extras.nix {};
     konsole = callPackage ./konsole.nix {};
     libkdcraw = callPackage ./libkdcraw.nix {};
diff --git a/pkgs/desktops/kde-5/applications-16.04/khelpcenter.nix b/pkgs/desktops/kde-5/applications-16.04/khelpcenter.nix
new file mode 100644
index 000000000000..3cdcf22cf754
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/khelpcenter.nix
@@ -0,0 +1,20 @@
+{ kdeApp, extra-cmake-modules, kdoctools, makeQtWrapper
+, grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils
+, kdelibs4support, khtml, kservice
+, xapian
+}:
+
+kdeApp {
+  name = "khelpcenter";
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools makeQtWrapper
+  ];
+  buildInputs = [
+    grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons kinit
+    kcmutils kservice
+    xapian
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/khelpcenter"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/default.nix b/pkgs/desktops/kde-5/plasma-5.6/default.nix
index b0f53eca6f7e..b1076548069d 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/default.nix
@@ -61,7 +61,6 @@ let
     kdecoration = callPackage ./kdecoration.nix {};
     kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
     kgamma5 = callPackage ./kgamma5.nix {};
-    khelpcenter = callPackage ./khelpcenter.nix {};
     khotkeys = callPackage ./khotkeys.nix {};
     kinfocenter = callPackage ./kinfocenter.nix {};
     kmenuedit = callPackage ./kmenuedit.nix {};
diff --git a/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix b/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
deleted file mode 100644
index 3ded239b09b5..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
-, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support
-, khtml, kservice, makeQtWrapper
-}:
-
-plasmaPackage {
-  name = "khelpcenter";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons kinit kcmutils
-    kservice
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/khelpcenter"
-  '';
-}

From cc5adac6f679e15a345a5f057c44f2c743ab0df7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 16 Jun 2016 09:32:18 -0500
Subject: [PATCH 393/436] kde5.plasma: 5.6.4 -> 5.6.5

The generated source hashes are now stored outside the Nixpkgs tree.
---
 pkgs/desktops/kde-5/plasma-5.6/default.nix  |  10 +-
 pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh |  57 ----
 pkgs/desktops/kde-5/plasma-5.6/srcs.nix     | 341 --------------------
 3 files changed, 6 insertions(+), 402 deletions(-)
 delete mode 100755 pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.6/srcs.nix

diff --git a/pkgs/desktops/kde-5/plasma-5.6/default.nix b/pkgs/desktops/kde-5/plasma-5.6/default.nix
index b1076548069d..6872187147ea 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/default.nix
@@ -9,12 +9,14 @@
 
 let
 
-  inherit (pkgs) lib stdenv symlinkJoin;
+  inherit (pkgs) fetchurl lib stdenv symlinkJoin;
 
-  kdeApps = pkgs.kdeApps_15_12;
-
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
   mirror = "mirror://kde";
+  remotesrcs = fetchurl {
+    url = "https://raw.githubusercontent.com/ttuegel/nixpkgs-kde-qt/7bb0608eb5b147fb302f7c37411f9cad32cb6283/plasma-srcs.nix";
+    sha256 = "1zw9s87fj4qqz5dhqm5l1mb0d6r6f6p50q8n6qi7x8i5rd4p4fyl";
+  };
+  srcs = import remotesrcs { inherit (pkgs) fetchurl; inherit mirror; };
 
   packages = self: with self; {
     plasmaPackage = args:
diff --git a/pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh b/pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh
deleted file mode 100755
index adb61ceeab0f..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils findutils gawk gnused nix wget
-
-set -x
-
-# The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/plasma/5.6.4/"
-EXTRA_WGET_ARGS='-A *.tar.xz'
-
-mkdir tmp; cd tmp
-
-rm -f ../srcs.csv
-
-wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
-
-find . | while read src; do
-    if [[ -f "${src}" ]]; then
-        # Sanitize file name
-        filename=$(basename "$src" | tr '@' '_')
-        nameVersion="${filename%.tar.*}"
-        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
-        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-        echo "$name,$version,$src,$filename" >>../srcs.csv
-    fi
-done
-
-cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-EOF
-
-gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
-    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
-    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
-    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
-    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
-    url="${src:2}"
-    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-    cat >>../srcs.nix <<EOF
-  $name = {
-    version = "$latestVersion";
-    src = fetchurl {
-      url = "\${mirror}/$url";
-      sha256 = "$sha256";
-      name = "$filename";
-    };
-  };
-EOF
-done
-
-echo "}" >>../srcs.nix
-
-rm -f ../srcs.csv
-
-cd ..
diff --git a/pkgs/desktops/kde-5/plasma-5.6/srcs.nix b/pkgs/desktops/kde-5/plasma-5.6/srcs.nix
deleted file mode 100644
index 76b5befacdee..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.6/srcs.nix
+++ /dev/null
@@ -1,341 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  bluedevil = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/bluedevil-5.6.4.tar.xz";
-      sha256 = "043damq5pgalrv77rggcwkvhvxkdpmzhq022zga7nvbzv58hygk0";
-      name = "bluedevil-5.6.4.tar.xz";
-    };
-  };
-  breeze = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/breeze-5.6.4.tar.xz";
-      sha256 = "184fkv6wda3g0fcmvnzck1vz7vmiin9zsgi3lycrnhf8bwmdp88x";
-      name = "breeze-5.6.4.tar.xz";
-    };
-  };
-  breeze-grub = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/breeze-grub-5.6.4.tar.xz";
-      sha256 = "0ccc1r7gmfgv5hbd2lvy8qmkmnfsxywax136i0813bjnc3nmvmpy";
-      name = "breeze-grub-5.6.4.tar.xz";
-    };
-  };
-  breeze-gtk = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/breeze-gtk-5.6.4.tar.xz";
-      sha256 = "07y5vpikp2q0knmf86m5hzg8dl7a05zlcmd56mg655b9vijkn7sp";
-      name = "breeze-gtk-5.6.4.tar.xz";
-    };
-  };
-  breeze-plymouth = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/breeze-plymouth-5.6.4.tar.xz";
-      sha256 = "1vdxbl4mkdmac9i1wnnlsfpx35n6qzymjkjm3zmxa5saxdwv6w0f";
-      name = "breeze-plymouth-5.6.4.tar.xz";
-    };
-  };
-  discover = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/discover-5.6.4.tar.xz";
-      sha256 = "0l9rp77hm8gbih7qkr8j1nf37mymysbyjj9nxx3ilgv3dac1x6lb";
-      name = "discover-5.6.4.tar.xz";
-    };
-  };
-  kactivitymanagerd = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kactivitymanagerd-5.6.4.tar.xz";
-      sha256 = "0xpy392w0xcssabblkw3q7gv9ajn1725i0q5lm3xzrl0x0iq3h2z";
-      name = "kactivitymanagerd-5.6.4.tar.xz";
-    };
-  };
-  kde-cli-tools = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kde-cli-tools-5.6.4.tar.xz";
-      sha256 = "1kmhi9jx40s8i8zvim0v9dx66gpg6nvjl88ir0w7r903c4c58kpm";
-      name = "kde-cli-tools-5.6.4.tar.xz";
-    };
-  };
-  kdecoration = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kdecoration-5.6.4.tar.xz";
-      sha256 = "0i84nii940xnd94cch4z7zax3y157mjfngcil34ar0n2lpgya2ap";
-      name = "kdecoration-5.6.4.tar.xz";
-    };
-  };
-  kde-gtk-config = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kde-gtk-config-5.6.4.tar.xz";
-      sha256 = "11798j2024zjpjmpiwj8a9kp3r9lpkahpvkpyxq2pqsvj4rfi55r";
-      name = "kde-gtk-config-5.6.4.tar.xz";
-    };
-  };
-  kdeplasma-addons = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kdeplasma-addons-5.6.4.tar.xz";
-      sha256 = "0h20nq5kkd8gn4x2fysfmzwina6cb98d41c8m7c2vxiw6ycsl5id";
-      name = "kdeplasma-addons-5.6.4.tar.xz";
-    };
-  };
-  kgamma5 = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kgamma5-5.6.4.tar.xz";
-      sha256 = "0zc7rdw52awrasiynd3b6lhizpzh8yj097fplvnni7nq6mxsc3x3";
-      name = "kgamma5-5.6.4.tar.xz";
-    };
-  };
-  khelpcenter = {
-    version = "5.6.4.1";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/khelpcenter-5.6.4.1.tar.xz";
-      sha256 = "14mwy1rv04mp92dfci6ak6dvmaqx2vc0yk0zyp1v6s64jiry658g";
-      name = "khelpcenter-5.6.4.1.tar.xz";
-    };
-  };
-  khotkeys = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/khotkeys-5.6.4.tar.xz";
-      sha256 = "1xkxzganifvcrinj2hwp9927yqzsqp0mawnfbxnpyhas2jj813c5";
-      name = "khotkeys-5.6.4.tar.xz";
-    };
-  };
-  kinfocenter = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kinfocenter-5.6.4.tar.xz";
-      sha256 = "19rkb2rprfyh9i4dn7kz2gf4yxmigq3qdhksffn56g2r77wfp56c";
-      name = "kinfocenter-5.6.4.tar.xz";
-    };
-  };
-  kmenuedit = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kmenuedit-5.6.4.tar.xz";
-      sha256 = "1si5gxlcvdywbzwgw6xnwkx509gbc9jpbw5n1kgzxrya0s0baf0z";
-      name = "kmenuedit-5.6.4.tar.xz";
-    };
-  };
-  kscreen = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kscreen-5.6.4.tar.xz";
-      sha256 = "0h722khwnd41537daz5v1303jz7h2b72x9gdfxbihvb7gxaxq9yj";
-      name = "kscreen-5.6.4.tar.xz";
-    };
-  };
-  kscreenlocker = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kscreenlocker-5.6.4.tar.xz";
-      sha256 = "0anhcpl5r0x17i412imn8q0078dqpxgn1wmjz8xjfn33i2y32k0h";
-      name = "kscreenlocker-5.6.4.tar.xz";
-    };
-  };
-  ksshaskpass = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/ksshaskpass-5.6.4.tar.xz";
-      sha256 = "1qzxj152pq53ach0ddc7adg6dvz250pzd5vaz7w79jbjn9pgkaky";
-      name = "ksshaskpass-5.6.4.tar.xz";
-    };
-  };
-  ksysguard = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/ksysguard-5.6.4.tar.xz";
-      sha256 = "0003w4kad8lvs0hi49qq49sxg8hsqa1b82miw0cmb3r08ivr1pc1";
-      name = "ksysguard-5.6.4.tar.xz";
-    };
-  };
-  kwallet-pam = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kwallet-pam-5.6.4.tar.xz";
-      sha256 = "1yr5nhxrrkz49qn1nd7ql6k1wvilzy1vg40m3x65wk3gbgajq2xj";
-      name = "kwallet-pam-5.6.4.tar.xz";
-    };
-  };
-  kwayland = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kwayland-5.6.4.tar.xz";
-      sha256 = "0limprv5sniscnar6l0q2805nvfiv375r4kdwwlq8r0g7cj1bb6q";
-      name = "kwayland-5.6.4.tar.xz";
-    };
-  };
-  kwayland-integration = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kwayland-integration-5.6.4.tar.xz";
-      sha256 = "1jxl6pmbq33sv09lrs558hpy7n7liz3c0l9mmnsnvam43lmj2mzi";
-      name = "kwayland-integration-5.6.4.tar.xz";
-    };
-  };
-  kwin = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kwin-5.6.4.tar.xz";
-      sha256 = "09869hnck8fas5hkpnn7przdn2hzj8cljpasnzy30nc3h5823rdc";
-      name = "kwin-5.6.4.tar.xz";
-    };
-  };
-  kwrited = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/kwrited-5.6.4.tar.xz";
-      sha256 = "0cgi9ad0kns5z926hbdpg1hrp3pcpjcfpxna248qq7xf9il8cg2q";
-      name = "kwrited-5.6.4.tar.xz";
-    };
-  };
-  libkscreen = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/libkscreen-5.6.4.tar.xz";
-      sha256 = "1rrargaaz39xxn9rgvlgm15c9y4zyvz35h4dv6fz7vrix2cjpqkx";
-      name = "libkscreen-5.6.4.tar.xz";
-    };
-  };
-  libksysguard = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/libksysguard-5.6.4.tar.xz";
-      sha256 = "0acwb9qnrygggywyf5vj7768mp269hmnxz2q0vgn3pwpc68l4xj6";
-      name = "libksysguard-5.6.4.tar.xz";
-    };
-  };
-  milou = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/milou-5.6.4.tar.xz";
-      sha256 = "1j22i98qwc14xbhc2yy0qq100rnddkmkr6q432pfd2cz31l5pvyk";
-      name = "milou-5.6.4.tar.xz";
-    };
-  };
-  oxygen = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/oxygen-5.6.4.tar.xz";
-      sha256 = "0h8ib1b7l1i92vnwhzdxsw8vspx420dk1pw3dg0p550vw411nfm9";
-      name = "oxygen-5.6.4.tar.xz";
-    };
-  };
-  plasma-desktop = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/plasma-desktop-5.6.4.tar.xz";
-      sha256 = "0xj8y2w8qzxih47qmyg31h588i8g2nlyx7rr3qkj8zvllq1fqspw";
-      name = "plasma-desktop-5.6.4.tar.xz";
-    };
-  };
-  plasma-integration = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/plasma-integration-5.6.4.tar.xz";
-      sha256 = "1aqv3agcba6w789mmg0r56afywqkxwcwnvfznaxzzwi33y039x4m";
-      name = "plasma-integration-5.6.4.tar.xz";
-    };
-  };
-  plasma-mediacenter = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/plasma-mediacenter-5.6.4.tar.xz";
-      sha256 = "0w2s6s4azdh3if2w88p5h2p8kw14l7z6h6pddj3m4hyq2nyk5izc";
-      name = "plasma-mediacenter-5.6.4.tar.xz";
-    };
-  };
-  plasma-nm = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/plasma-nm-5.6.4.tar.xz";
-      sha256 = "1g0flz5f8ydbi1an55anw4zz1h2wmf6xq500qs7ww038gk24113v";
-      name = "plasma-nm-5.6.4.tar.xz";
-    };
-  };
-  plasma-pa = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/plasma-pa-5.6.4.tar.xz";
-      sha256 = "0whlqhlnadk20qjmiyhxxsh0g1djmn6hjiqlpya224gjdpg9205s";
-      name = "plasma-pa-5.6.4.tar.xz";
-    };
-  };
-  plasma-sdk = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/plasma-sdk-5.6.4.tar.xz";
-      sha256 = "1x2g1kf40g249n7hcq15k4nxv269lw2v4y49j448gzp4hglfkq4i";
-      name = "plasma-sdk-5.6.4.tar.xz";
-    };
-  };
-  plasma-workspace = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/plasma-workspace-5.6.4.tar.xz";
-      sha256 = "1rrhw13hr8b3088lxjzaks439yi1kx53qxm8iwspnnkx9b88n18v";
-      name = "plasma-workspace-5.6.4.tar.xz";
-    };
-  };
-  plasma-workspace-wallpapers = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/plasma-workspace-wallpapers-5.6.4.tar.xz";
-      sha256 = "1nzzi19jgfprlhiq7kfarv1z4c4p2vcdds75hk304sb2bj0a1fq3";
-      name = "plasma-workspace-wallpapers-5.6.4.tar.xz";
-    };
-  };
-  polkit-kde-agent = {
-    version = "1-5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/polkit-kde-agent-1-5.6.4.tar.xz";
-      sha256 = "07lkhsb9yr4223qxlfkzl54jsl3amdlf9f86cqh1mryk9hqx4p6z";
-      name = "polkit-kde-agent-1-5.6.4.tar.xz";
-    };
-  };
-  powerdevil = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/powerdevil-5.6.4.tar.xz";
-      sha256 = "0yv0wcfs678z1h0lglsky439c8qqiz0m6630sv254xydsdwld1m5";
-      name = "powerdevil-5.6.4.tar.xz";
-    };
-  };
-  sddm-kcm = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/sddm-kcm-5.6.4.tar.xz";
-      sha256 = "05f7xx0ayyq5l15j7cq6rpb9l473lkizcf41yrr0aszrzj45i94v";
-      name = "sddm-kcm-5.6.4.tar.xz";
-    };
-  };
-  systemsettings = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/systemsettings-5.6.4.tar.xz";
-      sha256 = "1i4pqz4whikcvnpprkv9hd435h4akrnmqrjcvq55v3nr8fxd0dlv";
-      name = "systemsettings-5.6.4.tar.xz";
-    };
-  };
-  user-manager = {
-    version = "5.6.4";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.4/user-manager-5.6.4.tar.xz";
-      sha256 = "1p1xxs4hjacdn2kr2v2rx1c7kipkgsf8wp3bvpf9vpg4g384p2rm";
-      name = "user-manager-5.6.4.tar.xz";
-    };
-  };
-}

From cb302c7696a79ee5a281227e09032eaf85ff8a87 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 16 Jun 2016 09:36:32 -0500
Subject: [PATCH 394/436] kde5.frameworks: store generated source hashes
 outside Nixpkgs tree

---
 .../kde-5/frameworks-5.22/default.nix         |   8 +-
 .../kde-5/frameworks-5.22/fetchsrcs.sh        |  57 --
 pkgs/desktops/kde-5/frameworks-5.22/srcs.nix  | 581 ------------------
 3 files changed, 6 insertions(+), 640 deletions(-)
 delete mode 100755 pkgs/desktops/kde-5/frameworks-5.22/fetchsrcs.sh
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.22/srcs.nix

diff --git a/pkgs/desktops/kde-5/frameworks-5.22/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/default.nix
index 8c60c4d8856a..a665e62dba80 100644
--- a/pkgs/desktops/kde-5/frameworks-5.22/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.22/default.nix
@@ -15,10 +15,14 @@
 
 let
 
-  inherit (pkgs) lib makeSetupHook stdenv;
+  inherit (pkgs) fetchurl lib makeSetupHook stdenv;
 
   mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+  remotesrcs = fetchurl {
+    url = "https://raw.githubusercontent.com/ttuegel/nixpkgs-kde-qt/32d38b54ac86ef22ea3e77c2bb5b5adb8438b189/frameworks-srcs.nix";
+    sha256 = "05h21hc5pzj2z3lcmzmihnrc1x3ia3g8gka4aks2jxg6f7dyq0br";
+  };
+  srcs = import remotesrcs { inherit (pkgs) fetchurl; inherit mirror; };
 
   packages = self: with self; {
     kdeFramework = args:
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/fetchsrcs.sh b/pkgs/desktops/kde-5/frameworks-5.22/fetchsrcs.sh
deleted file mode 100755
index 64b3ddf9abc0..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.22/fetchsrcs.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils findutils gnused nix wget
-
-set -x
-
-# The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/frameworks/5.22/"
-EXTRA_WGET_ARGS='-A *.tar.xz'
-
-mkdir tmp; cd tmp
-
-rm -f ../srcs.csv
-
-wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
-
-find . | while read src; do
-    if [[ -f "${src}" ]]; then
-        # Sanitize file name
-        filename=$(basename "$src" | tr '@' '_')
-        nameVersion="${filename%.tar.*}"
-        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
-        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-        echo "$name,$version,$src,$filename" >>../srcs.csv
-    fi
-done
-
-cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-EOF
-
-gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
-    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
-    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
-    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
-    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
-    url="${src:2}"
-    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-    cat >>../srcs.nix <<EOF
-  $name = {
-    version = "$latestVersion";
-    src = fetchurl {
-      url = "\${mirror}/$url";
-      sha256 = "$sha256";
-      name = "$filename";
-    };
-  };
-EOF
-done
-
-echo "}" >>../srcs.nix
-
-rm -f ../srcs.csv
-
-cd ..
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.22/srcs.nix
deleted file mode 100644
index eecb2431f807..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.22/srcs.nix
+++ /dev/null
@@ -1,581 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  attica = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/attica-5.22.0.tar.xz";
-      sha256 = "1i26nwxyrb62icw49znlyz9y670cv7xvibzbdfnnxq9czsalwym7";
-      name = "attica-5.22.0.tar.xz";
-    };
-  };
-  baloo = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/baloo-5.22.0.tar.xz";
-      sha256 = "0h51j41pa8b18jkdna0247z5alqfbvgfzlxc6s6p0c7g7658z0w3";
-      name = "baloo-5.22.0.tar.xz";
-    };
-  };
-  bluez-qt = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/bluez-qt-5.22.0.tar.xz";
-      sha256 = "1lrkkg2f2qjj8cy968l3scdrvi506m5hr9x22d1zn6r12fvq6304";
-      name = "bluez-qt-5.22.0.tar.xz";
-    };
-  };
-  breeze-icons = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/breeze-icons-5.22.0.tar.xz";
-      sha256 = "162698h01cs7116la4jfygn8ka4ffjmnv7nxjl6yhcqrs25nky7l";
-      name = "breeze-icons-5.22.0.tar.xz";
-    };
-  };
-  extra-cmake-modules = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/extra-cmake-modules-5.22.0.tar.xz";
-      sha256 = "042ad7kp2ijp66gvz0q60glk95wj9f0fymrjyw68253rqynf3zj3";
-      name = "extra-cmake-modules-5.22.0.tar.xz";
-    };
-  };
-  frameworkintegration = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/frameworkintegration-5.22.0.tar.xz";
-      sha256 = "0jf9y738r86ss520hqhfll8prrfpha73myj99hbz3sqrix7b0va9";
-      name = "frameworkintegration-5.22.0.tar.xz";
-    };
-  };
-  kactivities = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kactivities-5.22.0.tar.xz";
-      sha256 = "068jhc6lw47hcibvys968m4wa1b278ccy2gas9iymzzys1ccv6kr";
-      name = "kactivities-5.22.0.tar.xz";
-    };
-  };
-  kactivities-stats = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kactivities-stats-5.22.0.tar.xz";
-      sha256 = "1gx5wm337nwbwqb56xvl16vhk47v7a5qpx5hhn7ygpfxkgxh6wiq";
-      name = "kactivities-stats-5.22.0.tar.xz";
-    };
-  };
-  kapidox = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kapidox-5.22.0.tar.xz";
-      sha256 = "0cs133g1rvbcrdvy7zvk5c14p5iwwn0x0m76c2ifal0g8qh0hmd1";
-      name = "kapidox-5.22.0.tar.xz";
-    };
-  };
-  karchive = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/karchive-5.22.0.tar.xz";
-      sha256 = "1ywd38j6jpwj21kdp504gs0pfvlnvg6ak8hjk6a269pkci3dyf91";
-      name = "karchive-5.22.0.tar.xz";
-    };
-  };
-  kauth = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kauth-5.22.0.tar.xz";
-      sha256 = "1c0kp25g57nldh1x5vfq9fypbznc991jrry2lydvb06d3jh44vbn";
-      name = "kauth-5.22.0.tar.xz";
-    };
-  };
-  kbookmarks = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kbookmarks-5.22.0.tar.xz";
-      sha256 = "093rlg8pprjg7ba52dh2z9j2x5ir7s9kjas6ni4fqxxzpp15hh3p";
-      name = "kbookmarks-5.22.0.tar.xz";
-    };
-  };
-  kcmutils = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kcmutils-5.22.0.tar.xz";
-      sha256 = "1s7gw9l2n92rrcdzy9pnwq8na65axd8bkk9nphyhpbxk76zj1gyy";
-      name = "kcmutils-5.22.0.tar.xz";
-    };
-  };
-  kcodecs = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kcodecs-5.22.0.tar.xz";
-      sha256 = "0rlqs8m2ib2kkj679gn74zqqxzsddfcbywpgwlcd6b992i4cad87";
-      name = "kcodecs-5.22.0.tar.xz";
-    };
-  };
-  kcompletion = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kcompletion-5.22.0.tar.xz";
-      sha256 = "07jqjrddigdqsdy2adzari7g626sakilg9d765s75vncv5amrvzy";
-      name = "kcompletion-5.22.0.tar.xz";
-    };
-  };
-  kconfig = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kconfig-5.22.0.tar.xz";
-      sha256 = "0n0dzgba96pkabbvk1cfm34j9jirgbd84xha6adscpxs28506cg0";
-      name = "kconfig-5.22.0.tar.xz";
-    };
-  };
-  kconfigwidgets = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kconfigwidgets-5.22.0.tar.xz";
-      sha256 = "0jr6ygd8c0gap2ay2685wj3fx4scrahzbpaaj4bjhq2s79nvmlyg";
-      name = "kconfigwidgets-5.22.0.tar.xz";
-    };
-  };
-  kcoreaddons = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kcoreaddons-5.22.0.tar.xz";
-      sha256 = "0zzwcw0n9bd3pi3rv7cdwynb67x1bqf1bh3s59hjipf9d412wl15";
-      name = "kcoreaddons-5.22.0.tar.xz";
-    };
-  };
-  kcrash = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kcrash-5.22.0.tar.xz";
-      sha256 = "1r0i9ngk5jypzfhhssjm5b3n5sqli3jhh896r1qwpfcq9w15x7qg";
-      name = "kcrash-5.22.0.tar.xz";
-    };
-  };
-  kdbusaddons = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdbusaddons-5.22.0.tar.xz";
-      sha256 = "0w9spb5i5qi2r5kfgrylpvw6mwjxfhd4j7yslc9jy0q4y8j3f1dk";
-      name = "kdbusaddons-5.22.0.tar.xz";
-    };
-  };
-  kdeclarative = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdeclarative-5.22.0.tar.xz";
-      sha256 = "06n6wqy8dm2hv6dbar453z4rmiyf6f34zak1fhs38sqkfy6syva1";
-      name = "kdeclarative-5.22.0.tar.xz";
-    };
-  };
-  kded = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kded-5.22.0.tar.xz";
-      sha256 = "1zfggr6pmiypw5bnh6hr22agms589hm7hw35nhfhc4r7qd1drf6q";
-      name = "kded-5.22.0.tar.xz";
-    };
-  };
-  kdelibs4support = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/portingAids/kdelibs4support-5.22.0.tar.xz";
-      sha256 = "1mmrr54kkicnz4pjksnrh40md80m18mr5ba2la7kwjxmdyl6znm3";
-      name = "kdelibs4support-5.22.0.tar.xz";
-    };
-  };
-  kdesignerplugin = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdesignerplugin-5.22.0.tar.xz";
-      sha256 = "0cfnmpz845l39qpy5r6pknzm78js81bci9qi0xfnrf8gm3lvjg5l";
-      name = "kdesignerplugin-5.22.0.tar.xz";
-    };
-  };
-  kdesu = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdesu-5.22.0.tar.xz";
-      sha256 = "1jsr9m32dyzvsvsy743h3jih8v4yyr2zf15hh908anbamp7449bd";
-      name = "kdesu-5.22.0.tar.xz";
-    };
-  };
-  kdewebkit = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdewebkit-5.22.0.tar.xz";
-      sha256 = "0rmxa4j3jx7689jcf45fghh7jff16x34xrzrw0clg3fj4w47ik0b";
-      name = "kdewebkit-5.22.0.tar.xz";
-    };
-  };
-  kdnssd = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdnssd-5.22.0.tar.xz";
-      sha256 = "1b0s5gwn51zh2h5w2mzpzjj86qaz6pl7gzqf5q88vpzsiqjg14vp";
-      name = "kdnssd-5.22.0.tar.xz";
-    };
-  };
-  kdoctools = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdoctools-5.22.0.tar.xz";
-      sha256 = "0y4ayms0hyj4nv5flr0a198lb545plfbxkwhqsmzc0c77gagcw5k";
-      name = "kdoctools-5.22.0.tar.xz";
-    };
-  };
-  kemoticons = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kemoticons-5.22.0.tar.xz";
-      sha256 = "1swrpqm441ngmps00hr15pgvw1382zbf2q2ncndj7i30725nfq1g";
-      name = "kemoticons-5.22.0.tar.xz";
-    };
-  };
-  kfilemetadata = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kfilemetadata-5.22.0.tar.xz";
-      sha256 = "0p6s1r2qv5396ghkw79wyf7yf4hzj562yp83wgplwmr6lgh4b2fc";
-      name = "kfilemetadata-5.22.0.tar.xz";
-    };
-  };
-  kglobalaccel = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kglobalaccel-5.22.0.tar.xz";
-      sha256 = "1m1aviz5g0vwk58j0z9jckz4rzns7md7mr3zlqqpvp1r032qc30k";
-      name = "kglobalaccel-5.22.0.tar.xz";
-    };
-  };
-  kguiaddons = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kguiaddons-5.22.0.tar.xz";
-      sha256 = "10chxcvf4hxyfkgprsj7rg4dv788dzqjgsm6m0a4m6qmx12zhckh";
-      name = "kguiaddons-5.22.0.tar.xz";
-    };
-  };
-  khtml = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/portingAids/khtml-5.22.0.tar.xz";
-      sha256 = "1w5q41fjrqqq91j3dvhc9lrrhvrwy1izws6af7srh768gn6yig0m";
-      name = "khtml-5.22.0.tar.xz";
-    };
-  };
-  ki18n = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/ki18n-5.22.0.tar.xz";
-      sha256 = "0881y42h5k8ik6lf7pfsylch1ldksc5m4qm3gvshp8aazic8iyzd";
-      name = "ki18n-5.22.0.tar.xz";
-    };
-  };
-  kiconthemes = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kiconthemes-5.22.0.tar.xz";
-      sha256 = "1bh76f7kpha4c5qs3n8z6g1qah0rsk99yqcz8j1dlss4ws65j9j3";
-      name = "kiconthemes-5.22.0.tar.xz";
-    };
-  };
-  kidletime = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kidletime-5.22.0.tar.xz";
-      sha256 = "0dgw0rin6wz31xdspbjpvcs5x1b163ggqkz2zn73zavbr7f5jypc";
-      name = "kidletime-5.22.0.tar.xz";
-    };
-  };
-  kimageformats = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kimageformats-5.22.0.tar.xz";
-      sha256 = "0g3f73m3yj5iqivcsn83pm32w4l13zbyzz5azgm3jjfhgnd00c18";
-      name = "kimageformats-5.22.0.tar.xz";
-    };
-  };
-  kinit = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kinit-5.22.0.tar.xz";
-      sha256 = "1f71y6gf00p4jkqvpzyjlbnwc4gvjl2h4wi61xhpjz8lrmpsb6ac";
-      name = "kinit-5.22.0.tar.xz";
-    };
-  };
-  kio = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kio-5.22.0.tar.xz";
-      sha256 = "02knylbs9ymb8qm7fkp3dkdqc9cvgw2dwfl4phzl1iax2fx2zkqy";
-      name = "kio-5.22.0.tar.xz";
-    };
-  };
-  kitemmodels = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kitemmodels-5.22.0.tar.xz";
-      sha256 = "03gnglfhpzrc67bi0xdcy4xdhankic5cqnpahp9wwsis12ac6i83";
-      name = "kitemmodels-5.22.0.tar.xz";
-    };
-  };
-  kitemviews = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kitemviews-5.22.0.tar.xz";
-      sha256 = "0nhwg7bmv1c8p6pnbfsz96mq9wbq339ir9yp7kfnhfrg0wqi44ar";
-      name = "kitemviews-5.22.0.tar.xz";
-    };
-  };
-  kjobwidgets = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kjobwidgets-5.22.0.tar.xz";
-      sha256 = "1inqrb0j64b3519qcr0wk9izd4c1zi4kfjc8wa04s2kwxg6z7j1p";
-      name = "kjobwidgets-5.22.0.tar.xz";
-    };
-  };
-  kjs = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/portingAids/kjs-5.22.0.tar.xz";
-      sha256 = "0xqlkhm8r021xd5a25nwp9a4r7cbjkpqkc89fjma8qyvq5785qxw";
-      name = "kjs-5.22.0.tar.xz";
-    };
-  };
-  kjsembed = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/portingAids/kjsembed-5.22.0.tar.xz";
-      sha256 = "0fcc1lm5l8r0lj35r3niliyn8zxr90by2vjc9krzfm4i7kwij7wb";
-      name = "kjsembed-5.22.0.tar.xz";
-    };
-  };
-  kmediaplayer = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/portingAids/kmediaplayer-5.22.0.tar.xz";
-      sha256 = "1pn3fmaixcxba1wl63hblhnpj7jblrala9j3xrj8z2abhhfl5vzy";
-      name = "kmediaplayer-5.22.0.tar.xz";
-    };
-  };
-  knewstuff = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/knewstuff-5.22.0.tar.xz";
-      sha256 = "1gr566k95bg58hpn569kkarmlxk5rp12jcxdp7ksw1j8mp6la7a7";
-      name = "knewstuff-5.22.0.tar.xz";
-    };
-  };
-  knotifications = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/knotifications-5.22.0.tar.xz";
-      sha256 = "0fh6ahfr9pa8643i1ma40h7afnd1jn0m6dw5f9hgndxhwi6h3bps";
-      name = "knotifications-5.22.0.tar.xz";
-    };
-  };
-  knotifyconfig = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/knotifyconfig-5.22.0.tar.xz";
-      sha256 = "0p4g7wv2w6cpjzhlkh7rnzzhwcj86sgz98fl97is1fl65q8f0szr";
-      name = "knotifyconfig-5.22.0.tar.xz";
-    };
-  };
-  kpackage = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kpackage-5.22.0.tar.xz";
-      sha256 = "1nbwjc4n8f2iisdckm5ll3qyls1sq02ia6vmhj4mfm4w44q4s1bk";
-      name = "kpackage-5.22.0.tar.xz";
-    };
-  };
-  kparts = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kparts-5.22.0.tar.xz";
-      sha256 = "091wm2flhqgpqsffdd8nlwbdffvsj7cyd0c46949d9chm64723cg";
-      name = "kparts-5.22.0.tar.xz";
-    };
-  };
-  kpeople = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kpeople-5.22.0.tar.xz";
-      sha256 = "0rbwxzmyaig92vcd26v1yqd13swk15pp0lpvjp6hdpxbhpxijyf7";
-      name = "kpeople-5.22.0.tar.xz";
-    };
-  };
-  kplotting = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kplotting-5.22.0.tar.xz";
-      sha256 = "0ljiyxa2320v937lkqkxx3jc7sg45z4vjl74lxfybwspgs6y5hqk";
-      name = "kplotting-5.22.0.tar.xz";
-    };
-  };
-  kpty = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kpty-5.22.0.tar.xz";
-      sha256 = "12lfwv45d06ksx5xc4hgk075mj2ckkqpc8mksx99f700yvcyk1db";
-      name = "kpty-5.22.0.tar.xz";
-    };
-  };
-  kross = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/portingAids/kross-5.22.0.tar.xz";
-      sha256 = "1ika9ha06vspjn8hy6mv5vi5n7xj7sj45csmjjxcqwhn2wlcdj4l";
-      name = "kross-5.22.0.tar.xz";
-    };
-  };
-  krunner = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/krunner-5.22.0.tar.xz";
-      sha256 = "09jhdy48dciqd8hwxmvjyw547fr48mzns5f0yknsnnb8a47yhrd4";
-      name = "krunner-5.22.0.tar.xz";
-    };
-  };
-  kservice = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kservice-5.22.0.tar.xz";
-      sha256 = "1c5q8cxghbji3imamjbxymcd5cz9a9rapqriy1wmskys3ms3fag9";
-      name = "kservice-5.22.0.tar.xz";
-    };
-  };
-  ktexteditor = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/ktexteditor-5.22.0.tar.xz";
-      sha256 = "1jsa8cfq0245bsris46i3k8f8g7l0sc5jpj4iwkxrl9m0nk5j1v0";
-      name = "ktexteditor-5.22.0.tar.xz";
-    };
-  };
-  ktextwidgets = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/ktextwidgets-5.22.0.tar.xz";
-      sha256 = "01a2vkdpq06libap5g6a90jrcc0phmfd859kilraqyxhbrp9sw5l";
-      name = "ktextwidgets-5.22.0.tar.xz";
-    };
-  };
-  kunitconversion = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kunitconversion-5.22.0.tar.xz";
-      sha256 = "1phbqxddp8ks36nr4982n4bwwx7d6yxll629gpb0ddc4yfsjv48p";
-      name = "kunitconversion-5.22.0.tar.xz";
-    };
-  };
-  kwallet = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kwallet-5.22.0.tar.xz";
-      sha256 = "1i20kp1gkdiwmwy8vf7vd6r89qx6lpxwr6nib35khp93ci9l3838";
-      name = "kwallet-5.22.0.tar.xz";
-    };
-  };
-  kwayland = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kwayland-5.22.0.tar.xz";
-      sha256 = "1jfibqai7vy1vklj19x7z0r4qc0rc7yd5r4wpp98mmdwzpnhlrgy";
-      name = "kwayland-5.22.0.tar.xz";
-    };
-  };
-  kwidgetsaddons = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kwidgetsaddons-5.22.0.tar.xz";
-      sha256 = "1bwmnfa1l3s33nc6b0ryk78gxhrynyd07ffqw7mw211r34pg4c14";
-      name = "kwidgetsaddons-5.22.0.tar.xz";
-    };
-  };
-  kwindowsystem = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kwindowsystem-5.22.0.tar.xz";
-      sha256 = "05jwmjqk03pc2g09rnyb9qh0dfi0c46awbaxgc7i7z4i9swv1k30";
-      name = "kwindowsystem-5.22.0.tar.xz";
-    };
-  };
-  kxmlgui = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kxmlgui-5.22.0.tar.xz";
-      sha256 = "16q222jvnsd6pj49ih44qpks97lcjsamcpjg5x5ysn4a6w5h4mds";
-      name = "kxmlgui-5.22.0.tar.xz";
-    };
-  };
-  kxmlrpcclient = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kxmlrpcclient-5.22.0.tar.xz";
-      sha256 = "00qj4pa7r0ny6pwivq6qqw80v4dsg9lgwd2qdlp9kddi0f8i2p1b";
-      name = "kxmlrpcclient-5.22.0.tar.xz";
-    };
-  };
-  modemmanager-qt = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/modemmanager-qt-5.22.0.tar.xz";
-      sha256 = "1b1gx33vrw7qcvy3zlc01x7wlalx5csfl590gfxlf870i3m7dnhf";
-      name = "modemmanager-qt-5.22.0.tar.xz";
-    };
-  };
-  networkmanager-qt = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/networkmanager-qt-5.22.0.tar.xz";
-      sha256 = "03b710n4107qw9c3p7wdma9fz9vqixrjydfa02f7vgzw1rixmmqq";
-      name = "networkmanager-qt-5.22.0.tar.xz";
-    };
-  };
-  oxygen-icons5 = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/oxygen-icons5-5.22.0.tar.xz";
-      sha256 = "1m3f5wrgahqlzzl3jyfymh6n515fsmsi8ckimvma2d8qqpb0dc2l";
-      name = "oxygen-icons5-5.22.0.tar.xz";
-    };
-  };
-  plasma-framework = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/plasma-framework-5.22.0.tar.xz";
-      sha256 = "1wn7ib030dw8rj5dprl8bzz4c3dv4nlmrfb9wgr6x78w4ac967zc";
-      name = "plasma-framework-5.22.0.tar.xz";
-    };
-  };
-  solid = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/solid-5.22.0.tar.xz";
-      sha256 = "04a7z5g2ylhbj2572wa6w51cs98ddn4d7lfirzawxf0f8d2693w2";
-      name = "solid-5.22.0.tar.xz";
-    };
-  };
-  sonnet = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/sonnet-5.22.0.tar.xz";
-      sha256 = "0y8l3mfa65a59vjj424ga87q3bixx8inicp2jp9zi36p4g7xwww8";
-      name = "sonnet-5.22.0.tar.xz";
-    };
-  };
-  threadweaver = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/threadweaver-5.22.0.tar.xz";
-      sha256 = "1ax58k6nl8za79j99spa2r76m9xz8ih9iflksgpng40wlnkwlp59";
-      name = "threadweaver-5.22.0.tar.xz";
-    };
-  };
-}

From e39f696d0659e5acfd47400a496f2274dc40f5ee Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 16 Jun 2016 09:38:42 -0500
Subject: [PATCH 395/436] qt56: store generated source hashes outside Nixpkgs
 tree

---
 .../libraries/qt-5/5.6/default.nix            |   8 +-
 .../libraries/qt-5/5.6/fetchsrcs.sh           |  47 ----
 pkgs/development/libraries/qt-5/5.6/srcs.nix  | 261 ------------------
 3 files changed, 6 insertions(+), 310 deletions(-)
 delete mode 100755 pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
 delete mode 100644 pkgs/development/libraries/qt-5/5.6/srcs.nix

diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 0d095517c568..b5c5cb6b8ed6 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -23,14 +23,18 @@
 , decryptSslTraffic ? false
 }:
 
-let inherit (pkgs) makeSetupHook makeWrapper stdenv; in
+let inherit (pkgs) fetchurl makeSetupHook makeWrapper stdenv; in
 
 with stdenv.lib;
 
 let
 
   mirror = "http://download.qt.io";
-  srcs = import ./srcs.nix { inherit mirror; inherit (pkgs) fetchurl; };
+  remotesrcs = fetchurl {
+    url = "https://raw.githubusercontent.com/ttuegel/nixpkgs-kde-qt/1fd3645b9d718623998fa114797630d94461f55f/qt-srcs.nix";
+    sha256 = "1idkhkjnyz8x6nczksjcccmmmgg01zclamcxxdv2lwxhsrws2m2l";
+  };
+  srcs = import remotesrcs { inherit (pkgs) fetchurl; inherit mirror; };
 
   qtSubmodule = args:
     let
diff --git a/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh b/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
deleted file mode 100755
index cbedf29ed79d..000000000000
--- a/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils findutils gnused nix wget
-
-set -x
-
-# The trailing slash at the end is necessary!
-RELEASE_URL="http://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/"
-EXTRA_WGET_ARGS='-A *.tar.xz'
-
-mkdir tmp; cd tmp
-
-wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
-
-cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-EOF
-
-workdir=$(pwd)
-
-find . | while read src; do
-    if [[ -f "${src}" ]]; then
-        url="${src:2}"
-        # Sanitize file name
-        filename=$(basename "$src" | tr '@' '_')
-        nameversion="${filename%.tar.*}"
-        name=$(echo "$nameversion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
-        version=$(echo "$nameversion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-        sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-        cat >>../srcs.nix <<EOF
-  $name = {
-    version = "$version";
-    src = fetchurl {
-      url = "\${mirror}/$url";
-      sha256 = "$sha256";
-      name = "$filename";
-    };
-  };
-EOF
-    fi
-done
-
-echo "}" >>../srcs.nix
-
-cd ..
diff --git a/pkgs/development/libraries/qt-5/5.6/srcs.nix b/pkgs/development/libraries/qt-5/5.6/srcs.nix
deleted file mode 100644
index 6f11e4408f77..000000000000
--- a/pkgs/development/libraries/qt-5/5.6/srcs.nix
+++ /dev/null
@@ -1,261 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  qtxmlpatterns = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtxmlpatterns-opensource-src-5.6.1.tar.xz";
-      sha256 = "0q412jv3xbg7v05b8pbahifwx17gzlp96s90akh6zwhpm8i6xx34";
-      name = "qtxmlpatterns-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtx11extras = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtx11extras-opensource-src-5.6.1.tar.xz";
-      sha256 = "0l736qiz8adrnh267xz63hv4sph6nhy90h836qfnnmv3p78ipsz8";
-      name = "qtx11extras-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtwinextras = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwinextras-opensource-src-5.6.1.tar.xz";
-      sha256 = "1db3lcrj8af0z8lnh99lfbwz1cq9il7rr27rk9l38dff65qkssm8";
-      name = "qtwinextras-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtwebview = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebview-opensource-src-5.6.1.tar.xz";
-      sha256 = "0q869wl61vidds551w3z49ysx88xqyn6igbz07zxac7d0gwgwpda";
-      name = "qtwebview-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtwebsockets = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebsockets-opensource-src-5.6.1.tar.xz";
-      sha256 = "0fkj52i4yi6gmq4jfjgdij08cspxspac6mbpf0fknnllimmkl7jm";
-      name = "qtwebsockets-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtwebengine = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebengine-opensource-src-5.6.1.tar.xz";
-      sha256 = "0yv0cflgywsyfn84vv2vc9rwpm8j7hin61rxqjqh498nnl2arw5x";
-      name = "qtwebengine-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtwebchannel = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebchannel-opensource-src-5.6.1.tar.xz";
-      sha256 = "01q80917a1048hdhaii4v50dqs84h16lc9w3v99r9xvspk8vab7q";
-      name = "qtwebchannel-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtwayland = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwayland-opensource-src-5.6.1.tar.xz";
-      sha256 = "1jgghjfrg0wwyfzfwgwhagwxz9k936ylv3w2l9bwlpql8rgm8d11";
-      name = "qtwayland-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qttranslations = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qttranslations-opensource-src-5.6.1.tar.xz";
-      sha256 = "008wyk00mqz116pigm0qq78rvg28v6ykjnjxppkjnk0yd6i2vmb9";
-      name = "qttranslations-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qttools = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qttools-opensource-src-5.6.1.tar.xz";
-      sha256 = "0wbzq60d7lkvlb7b5lqcw87qgy6kyjz1npjavz8f4grdxsaqi8vp";
-      name = "qttools-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtsvg = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtsvg-opensource-src-5.6.1.tar.xz";
-      sha256 = "08ca5g46g75acy27jfnvnalmcias5hxmjp7491v3y4k9y7a4ybpi";
-      name = "qtsvg-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtserialport = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtserialport-opensource-src-5.6.1.tar.xz";
-      sha256 = "1hp63cgqhps6y1k041lzhcb2b0rcpcmszabnn293q5ilbvla4x0b";
-      name = "qtserialport-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtserialbus = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtserialbus-opensource-src-5.6.1.tar.xz";
-      sha256 = "1h683dkvnf2rdgxgisybnp8miqgn2gpi597rgx5zc7qk2k8kyidz";
-      name = "qtserialbus-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtsensors = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtsensors-opensource-src-5.6.1.tar.xz";
-      sha256 = "0bll7ll6s5g8w89knyrc0famjwqyfzwpn512m1f96bf6xwacs967";
-      name = "qtsensors-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtscript = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtscript-opensource-src-5.6.1.tar.xz";
-      sha256 = "17zp5dlfplrnzlw233lzapj55drjqchvayajd02qsggzms3yzchw";
-      name = "qtscript-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtquickcontrols2 = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtquickcontrols2-opensource-src-5.6.1.tar.xz";
-      sha256 = "13zbiv63b76ifpjalx5616nixfwjk48q977bzb1xxj363b7xv85v";
-      name = "qtquickcontrols2-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtquickcontrols = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtquickcontrols-opensource-src-5.6.1.tar.xz";
-      sha256 = "14d68ryn7r7rs7klpldnavcsccvyyg0xhwqkvjlm5wwplv2acah1";
-      name = "qtquickcontrols-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtmultimedia = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtmultimedia-opensource-src-5.6.1.tar.xz";
-      sha256 = "058523c2qra3d8fq46ygcndnkrbwlh316zy28s2cr5pjr5gmnjyj";
-      name = "qtmultimedia-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtmacextras = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtmacextras-opensource-src-5.6.1.tar.xz";
-      sha256 = "147yhv7fb0yaakrffqiw6xz8ycqdc7qsnxvnpr6j8rarw5xmdc73";
-      name = "qtmacextras-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtlocation = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtlocation-opensource-src-5.6.1.tar.xz";
-      sha256 = "0qahs7a2n3l4h0bl8bnwci9mzy1vra3zncnzr40csic9ys67ddfk";
-      name = "qtlocation-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtimageformats = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtimageformats-opensource-src-5.6.1.tar.xz";
-      sha256 = "020v1148433zx4g87z2r8fgff32n0laajxqqsja1l3yzz7jbrwvl";
-      name = "qtimageformats-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtgraphicaleffects = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtgraphicaleffects-opensource-src-5.6.1.tar.xz";
-      sha256 = "1n0i2drfr7fvydgg810dcij8mxnygdpvqcqv7l1a9a1kv9ap3sap";
-      name = "qtgraphicaleffects-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtenginio = {
-    version = "1.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtenginio-opensource-src-1.6.1.tar.xz";
-      sha256 = "1iq4lnz3s6mfdgml61b9lsjisky55bbvsdj72kh003j94mzrc3l5";
-      name = "qtenginio-opensource-src-1.6.1.tar.xz";
-    };
-  };
-  qtdoc = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdoc-opensource-src-5.6.1.tar.xz";
-      sha256 = "0yg7903vk4w3h6jjyanssfcig0s2s660q11sj14nw6gcjs7kfa5z";
-      name = "qtdoc-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtdeclarative-render2d = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdeclarative-render2d-opensource-src-5.6.1.tar.xz";
-      sha256 = "1m08x8x355545r9wgrjl5p26zjhp5q1yh3h25dww8pk25v6cn8dg";
-      name = "qtdeclarative-render2d-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtdeclarative = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdeclarative-opensource-src-5.6.1.tar.xz";
-      sha256 = "1d2217kxk85kpi7ls08b41hqzy26hvch8m4cgzq6km5sqi5zvz0j";
-      name = "qtdeclarative-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtconnectivity = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtconnectivity-opensource-src-5.6.1.tar.xz";
-      sha256 = "06fr9321f52kf0nda9zjjfzp5694hbnx0y0v315iw28mnpvandas";
-      name = "qtconnectivity-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtcanvas3d = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtcanvas3d-opensource-src-5.6.1.tar.xz";
-      sha256 = "0q17hwmj893pk0lhxmibxmgk6h1gy4ksqfi62rkfzcf81bg2q7hr";
-      name = "qtcanvas3d-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtbase = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtbase-opensource-src-5.6.1.tar.xz";
-      sha256 = "0r3jrqymnnxrig4f11xvs33c26f0kzfakbp3kcbdpv795gpc276h";
-      name = "qtbase-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtandroidextras = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtandroidextras-opensource-src-5.6.1.tar.xz";
-      sha256 = "0prkpb57j0s8k36sba47k2bhs3ajf01rdwc7qf5gkvhs991rwckc";
-      name = "qtandroidextras-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qtactiveqt = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtactiveqt-opensource-src-5.6.1.tar.xz";
-      sha256 = "0a2p0w03d04hqg71hlihj9mr6aasvb0h8jfa5rnq8b5rkm8haf4f";
-      name = "qtactiveqt-opensource-src-5.6.1.tar.xz";
-    };
-  };
-  qt3d = {
-    version = "5.6.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qt3d-opensource-src-5.6.1.tar.xz";
-      sha256 = "03d81sls30a20yna6940np15112ciwy5024f8n5imaxicm8h34xd";
-      name = "qt3d-opensource-src-5.6.1.tar.xz";
-    };
-  };
-}

From e612954896f69e54b6d5a8a4dc21ecd64da72853 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 16 Jun 2016 22:46:31 +0200
Subject: [PATCH 396/436] perl-IO-Socket-SSL: 2.020 -> 2.027

---
 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 c29f60d346cd..e42bc841b8b4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6556,13 +6556,13 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;
   };
 
-  IOSocketSSL = buildPerlPackage {
-    name = "IO-Socket-SSL-2.020";
+  IOSocketSSL = buildPerlPackage rec {
+    name = "IO-Socket-SSL-2.027";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.020.tar.gz;
-      sha256 = "1nqjwnyd8iy0whisa352a97ihxw2zc78cmbxa0ccs4547bljr3js";
+      url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz";
+      sha256 = "723517ea71f90105579e7db7a1a2e053bf5c8142a187df8bc1fe3881c3383f67";
     };
-    propagatedBuildInputs = [ URI NetSSLeay ];
+    propagatedBuildInputs = [ NetSSLeay URI ];
     meta = {
       homepage = https://github.com/noxxi/p5-io-socket-ssl;
       description = "Nearly transparent SSL encapsulation for IO::Socket::INET";

From 420b3c37ef65b04ca3a84eda3d952f8b2152cd97 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <alebedev@mirantis.com>
Date: Thu, 16 Jun 2016 23:43:56 +0300
Subject: [PATCH 397/436] git: fix perl shebangs in contrib

There are a lot of scripts in contrib (e.g. `diff-highlight`) that
contain perl shebang line. But `patchShebangs` is unablle to fix this
without explicitly listing `perl` in `buildInputs`.
---
 .../version-management/git-and-tools/git/default.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8b7db0f84554..5849f0ffd6f3 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     done
   '';
 
-  buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv]
+  buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv perl]
     ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
          docbook_xsl docbook_xml_dtd_45 libxslt ]
     ++ stdenv.lib.optionals guiSupport [tcl tk];

From b4315e523f082d305003874703db45c5eda087a7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 16 Jun 2016 21:01:45 +0000
Subject: [PATCH 398/436] disnix: 0.5 -> 0.6

---
 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 bd215b769d41..7ef047aeb260 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.5";
+  name = "disnix-0.6";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/31143411/download/4/disnix-0.5.tar.gz;
-    sha256 = "0v0gbbcspaj67sn8ncrripa5af0m2xykyjjn2n55smz5fwx6d124";
+    url = http://hydra.nixos.org/build/36897417/download/4/disnix-0.6.tar.gz;
+    sha256 = "1i3wxp7zn765gg0sri2jsdabkj0l7aqi8cxp46pyybdf4852d6gd";
   };
   
   buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];

From f4ca43dc5f3a7438619263ee4b8b15f8fff716e2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 15 Jun 2016 15:21:17 -0400
Subject: [PATCH 399/436] cassandra: Add 3.0

---
 pkgs/servers/nosql/cassandra/3.0.nix | 49 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      | 13 ++++----
 2 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/servers/nosql/cassandra/3.0.nix

diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix
new file mode 100644
index 000000000000..050042eac5a0
--- /dev/null
+++ b/pkgs/servers/nosql/cassandra/3.0.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, fetchurl
+, jre
+, python
+, makeWrapper
+, gawk
+, bash
+, getopt
+, procps
+}:
+
+let
+
+  version = "3.0.7";
+  sha256 = "0g4nf9zw3by8api9c8np0ixianmwcldcq2mpkqqirj0zlpiii68d";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "cassandra-${version}";
+
+  src = fetchurl {
+    inherit sha256;
+    url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir $out
+    mv * $out
+
+    for cmd in cassandra nodetool sstableloader sstableupgrade
+      do wrapProgram $out/bin/$cmd \
+        --set JAVA_HOME ${jre} \
+        --prefix PATH : ${stdenv.lib.makeBinPath [ bash getopt gawk procps ]}
+    done
+
+    wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = http://cassandra.apache.org/;
+    description = "A massively scalable open source NoSQL database";
+    platforms = platforms.all;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ nckx rushmorem ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab4f3d099d54..e21168e6ac5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2527,7 +2527,7 @@ in
   netatalk = callPackage ../tools/filesystems/netatalk { };
 
   netcdf = callPackage ../development/libraries/netcdf { };
- 
+
   netcdf-mpi = appendToName "mpi" (netcdf.override {
     hdf5 = hdf5-mpi;
   });
@@ -4491,7 +4491,7 @@ in
   inherit (self.haskellPackages) ghc;
 
   cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install;
-   
+
   stack = haskell.lib.overrideCabal haskellPackages.stack (drv: {
     enableSharedExecutables = false;
     isLibrary = false;
@@ -7514,7 +7514,7 @@ in
   };
   libkrb5 = self.krb5Full.override { type = "lib"; };
 
-  lasso = callPackage ../development/libraries/lasso { };  
+  lasso = callPackage ../development/libraries/lasso { };
 
   LASzip = callPackage ../development/libraries/LASzip { };
 
@@ -9840,7 +9840,8 @@ in
   cassandra_1_2 = callPackage ../servers/nosql/cassandra/1.2.nix { };
   cassandra_2_0 = callPackage ../servers/nosql/cassandra/2.0.nix { };
   cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { };
-  cassandra = self.cassandra_2_1;
+  cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { };
+  cassandra = self.cassandra_3_0;
 
   apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix {
     java = jdk;
@@ -10842,7 +10843,7 @@ in
     batman_adv = callPackage ../os-specific/linux/batman-adv {};
 
     bcc = callPackage ../os-specific/linux/bcc { };
-    
+
     bbswitch = callPackage ../os-specific/linux/bbswitch {};
 
     ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
@@ -16017,7 +16018,7 @@ in
 
   openspecfun = callPackage ../development/libraries/science/math/openspecfun {};
 
-  magma = callPackage ../development/libraries/science/math/magma { };  
+  magma = callPackage ../development/libraries/science/math/magma { };
 
   mathematica = callPackage ../applications/science/math/mathematica { };
   mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { };

From 16bbfe893b25565971ab8a372d30be2f84206583 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 16 Jun 2016 22:16:55 +0000
Subject: [PATCH 400/436] disnixos: 0.4.1 -> 0.5

---
 .../package-management/disnix/disnixos/default.nix     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index bc1472576759..71666f4d9697 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, disnix, socat, pkgconfig, getopt }:
+{ stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.4.1";
+  name = "disnixos-0.5";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/33130082/download/3/disnixos-0.4.1.tar.gz;
-    sha256 = "1r6b73qhz64z7xms6hkmm495yz0114pqa61b2qzlmzmlywhhy15b";
+    url = http://hydra.nixos.org/build/36899006/download/3/disnixos-0.5.tar.gz;
+    sha256 = "0pl3j8kwcz90as5cs0yipfbg555lw3z6xsylk6g2ili878mni1aq";
   };
   
-  buildInputs = [ socat pkgconfig disnix getopt ];
+  buildInputs = [ socat pkgconfig dysnomia disnix getopt ];
   
   dontStrip = true;
   

From f7ab8f80a0c2c5a0e9462adac9a10c770fe88219 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 16 Jun 2016 22:19:41 +0000
Subject: [PATCH 401/436] openjdk: 8u92b14 -> 8u102b04

---
 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 0eb427754b38..c42b39ce91f8 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -18,42 +18,42 @@ let
     else
       throw "openjdk requires i686-linux or x86_64 linux";
 
-  update = "92";
-  build = "14";
+  update = "102";
+  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 = "05ly2v3b6vr3sxa27m7ahlp8w4w1q68rki2dfczrklcdq4l61g0r";
+             sha256 = "1qwpkg169zrgx58iw8kzgr6l6chyh9n7ngkyabdfcp60i0qpga93";
           };
   langtools = fetchurl {
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "1zb7gvj1b1q3pvq5x7ac98k5dk83m7849ngcy1swfwj18g8i4k9p";
+             sha256 = "0nj9h0651ks9rssy58ma2fvnc05viwbfc91a6dxhkr1935bmzh3p";
           };
   hotspot = fetchurl {
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "057qrhm9gbz672qgb85al9p3qvgvbviadppf5a9b8hp5sg322f35";
+             sha256 = "07719n5bxi4yhqisnj77h4w6psih75ja3v7nx7j623ynbb7xjb07";
           };
   corba = fetchurl {
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "0s9h61jw42nbvrw24qaizp7pp063ala37sjgl547zfglhk1dlzi8";
+             sha256 = "0gf1gy4xbzxda8pwm10lh0kbjrh5icz4pxzlbhnkxq44xvl29vd3";
           };
   jdk = fetchurl {
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "0sgyjdmxsrdj8b8y2ri3c70x9l9m777v559cq8rmaz1jpc9lld4s";
+             sha256 = "0k5kzp9r3zny8kg9m6jad3gckf8dshlss5dd5v28njpzcsfrsd2v";
           };
   jaxws = fetchurl {
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "12aajlswn5nkm4nbrdh3jff2sz81wdczrgliwd5lnqfnh73sbbkp";
+             sha256 = "1jw5w88yi59xarvak8rx4951090ri7jihkd17f29j1hbk6fzv052";
           };
   jaxp = fetchurl {
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "133r5wicgva6mklrlnvb09p9izyw0fj281s51kndf3ba3zzggvv3";
+             sha256 = "151fwhz1x947a1bw0wgdrkzqw6hzfrlgn682jrjn8dvyjz7inka4";
           };
   nashorn = fetchurl {
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "1rmk868qg7kgv7f5lhj1b7wdnql0bj2bfqd2lg9ci64418j8x8bn";
+             sha256 = "1vacw1hg1vgz5ydgw1m57bynq0zl5glxpgzznrajnqbwd9yq6rzp";
           };
   openjdk8 = stdenv.mkDerivation {
     name = "openjdk-8u${update}b${build}";

From a34ec656594a01dcddc1e121f23d60b14aed835a Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Tue, 14 Jun 2016 16:37:37 -0700
Subject: [PATCH 402/436] terra: 2016-01-06 -> 2016-06-09

* llvmPackages_35 -> llvmPackages_38
* static llvm no longer needed
* multiple outputs, this generates the following results:
    - out/lib/terra.so
    - bin/bin/terra
    - dev/include/terra/*.h
    - static/lib/libterra.a

Contributed with help from @joachifm
---
 pkgs/development/compilers/terra/default.nix | 47 +++++++++++++-------
 pkgs/top-level/all-packages.nix              |  3 +-
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index 3586e4c32e5f..4bee8ee4f357 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -1,37 +1,52 @@
-{ stdenv, lua, fetchFromGitHub, fetchurl, which, llvm, clang, ncurses }:
+{ stdenv, fetchFromGitHub, fetchurl, which, llvmPackages, ncurses, lua }:
 
-let luajitArchive = "LuaJIT-2.0.4.tar.gz";
-    luajitSrc = fetchurl {
-      url = "http://luajit.org/download/${luajitArchive}";
-      sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2";
-    };
-in stdenv.mkDerivation rec {
+let
+  luajitArchive = "LuaJIT-2.0.4.tar.gz";
+  luajitSrc = fetchurl {
+    url = "http://luajit.org/download/${luajitArchive}";
+    sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2";
+  };
+in
+
+stdenv.mkDerivation rec {
   name = "terra-git-${version}";
-  version = "2016-01-06";
+  version = "2016-06-09";
 
   src = fetchFromGitHub {
     owner = "zdevito";
     repo = "terra";
-    rev = "914cb98b8adcd50b2ec8205ef5d6914d3547e281";
-    sha256 = "1q0dm9gkx2lh2d2sfgly6j5nw32qigmlj3phdvjp26bz99cvxq46";
+    rev = "22696f178be8597af555a296db804dba820638ba";
+    sha256 = "1c2i9ih331304bh31c5gh94fx0qa49rsn70pvczvdfhi8pmcms6g";
   };
 
-  patchPhase = ''
+  outputs = [ "dev" "out" "bin" "static" ];
+
+  postPatch = ''
     substituteInPlace Makefile --replace \
       '-lcurses' '-lncurses'
   '';
 
-  configurePhase = ''
+  preBuild = ''
     mkdir -p build
     cp ${luajitSrc} build/${luajitArchive}
   '';
 
   installPhase = ''
-    mkdir -p $out
-    cp -r "release/"* $out
-  '';
+    mkdir -pv $out/lib
+    cp -v release/lib/terra.so $out/lib
 
-  buildInputs = [ which lua llvm clang ncurses ];
+    mkdir -pv $bin/bin
+    cp -v release/bin/terra $bin/bin
+
+    mkdir -pv $static/lib
+    cp -v release/lib/libterra.a $static/lib
+
+    mkdir -pv $dev/include
+    cp -rv release/include/terra $dev/include
+  ''
+  ;
+
+  buildInputs = with llvmPackages; [ which lua llvm clang-unwrapped ncurses ];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf5d6273b08d..cf8d4e52d15b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5361,8 +5361,7 @@ in
   tbb = callPackage ../development/libraries/tbb { };
 
   terra = callPackage ../development/compilers/terra {
-    llvm = llvmPackages_35.llvm.override { enableSharedLibraries = false; };
-    clang = clang_35;
+    llvmPackages = llvmPackages_38;
     lua = lua5_1;
   };
 

From a20b8c114be5944399e7ad6976dca823d7fc6b92 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 17 Jun 2016 08:16:39 +0200
Subject: [PATCH 403/436] vimPlugins: added deoplete-jedi

---
 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 8a36263ebb6a..8ded4ca98cbd 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -375,6 +375,17 @@ rec {
 
   };
 
+  deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "deoplete-jedi-2016-06-5";
+    src = fetchgit {
+      url = "git://github.com/zchee/deoplete-jedi";
+      rev = "36aec0d7166f9e18e05b45468e161f01909d77ec";
+      sha256 = "0h8vn7r5fkwvbxhqx6xh95iq1klz9ppbax9l3rxlfkp3w67kkj2k";
+    };
+    dependencies = [];
+
+  };
+
   Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "Spacegray-vim-2016-06-04";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 1771a618e143..7069a8021f35 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -22,6 +22,7 @@
 "github:Chiel92/vim-autoformat"
 "github:LnL7/vim-nix"
 "github:Shougo/deoplete.nvim"
+"github:zchee/deoplete-jedi"
 "github:ajh17/Spacegray.vim"
 "github:alvan/vim-closetag"
 "github:ap/vim-css-color"

From fcf72b82ae386bc83fd9a4bd7ed253e22ad30078 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 17 Jun 2016 08:15:32 +0000
Subject: [PATCH 404/436] DisnixWebService: 0.5 -> 0.6

---
 .../package-management/disnix/DisnixWebService/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index a4599cf049f9..7819cc2be776 100644
--- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}:
 
 stdenv.mkDerivation {
-  name = "DisnixWebService-0.5";
+  name = "DisnixWebService-0.6";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/31143438/download/4/DisnixWebService-0.5.tar.bz2;
-    sha256 = "0wddrb9cf62hzfcrnyq5jn2pb8vc0bzfcl5z53aczkij0rbamw7k";
+    url = http://hydra.nixos.org/build/36899117/download/4/DisnixWebService-0.6.tar.bz2;
+    sha256 = "0yvwjnzk1q4y3wj8pi6z3i7akw83ah9xm2v93ni1ri70z5930mdz";
   };
   buildInputs = [ apacheAnt jdk ];
   PREFIX = ''''${env.out}'';

From 98096004ce316969e3b4494d102c1fb172b7e474 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 17 Jun 2016 10:39:09 +0200
Subject: [PATCH 405/436] perl-IO-Socket-SSL: fix default path to SSL certs

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e42bc841b8b4..e44583d1874f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6563,6 +6563,11 @@ let self = _self // overrides; _self = with self; {
       sha256 = "723517ea71f90105579e7db7a1a2e053bf5c8142a187df8bc1fe3881c3383f67";
     };
     propagatedBuildInputs = [ NetSSLeay URI ];
+    # Fix path to default certificate store.
+    postPatch = ''
+      substituteInPlace lib/IO/Socket/SSL.pm \
+        --replace "\$openssldir/cert.pem" "/etc/ssl/certs/ca-certificates.crt"
+    '';
     meta = {
       homepage = https://github.com/noxxi/p5-io-socket-ssl;
       description = "Nearly transparent SSL encapsulation for IO::Socket::INET";

From 8fccaa901192be95f75412f12f54063196b18186 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 17 Jun 2016 09:12:44 +0000
Subject: [PATCH 406/436] disnix-module: split dysnomia's functionality into a
 separate module so that it can be used without Disnix and remove the
 hacky/obsolete avahi publisher

---
 nixos/modules/module-list.nix            |   1 +
 nixos/modules/services/misc/disnix.nix   | 108 ++---------
 nixos/modules/services/misc/dysnomia.nix | 217 +++++++++++++++++++++++
 3 files changed, 233 insertions(+), 93 deletions(-)
 create mode 100644 nixos/modules/services/misc/dysnomia.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a7d81b8568e5..41e245f212dc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -219,6 +219,7 @@
   ./services/misc/confd.nix
   ./services/misc/devmon.nix
   ./services/misc/dictd.nix
+  ./services/misc/dysnomia.nix
   ./services/misc/disnix.nix
   ./services/misc/docker-registry.nix
   ./services/misc/emby.nix
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 218802e0cf00..e5a125ad3245 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -36,49 +36,32 @@ in
         default = false;
         description = "Whether to enable the DisnixWebService interface running on Apache Tomcat";
       };
-
-      publishInfrastructure = {
-        enable = mkOption {
-          default = false;
-          description = "Whether to publish capabilities/properties of this machine in as attributes in the infrastructure option";
-        };
-
-        enableAuthentication = mkOption {
-          default = false;
-          description = "Whether to publish authentication credentials through the infrastructure attribute (not recommended in combination with Avahi)";
-        };
-      };
-
-      infrastructure = mkOption {
-        default = {};
-        description = "List of name value pairs containing properties for the infrastructure model";
-      };
-
-      publishAvahi = mkOption {
-        default = false;
-        description = "Whether to publish capabilities/properties as a Disnix service through Avahi";
+      
+      package = mkOption {
+        type = types.path;
+        description = "The Disnix package";
+        default = pkgs.disnix;
       };
 
     };
 
   };
 
-
   ###### implementation
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.disnix pkgs.dysnomia ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
+    dysnomia.enable = true;
+    
+    environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
 
     services.dbus.enable = true;
     services.dbus.packages = [ pkgs.disnix ];
 
-    services.avahi.enable = cfg.publishAvahi;
-
     services.tomcat.enable = cfg.useWebServiceInterface;
     services.tomcat.extraGroups = [ "disnix" ];
     services.tomcat.javaOpts = "${optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} ";
     services.tomcat.sharedLibs = optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar"
-                                 ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
+      ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
     services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService;
 
     users.extraGroups = singleton
@@ -86,38 +69,6 @@ in
         gid = config.ids.gids.disnix;
       };
 
-    services.disnix.infrastructure =
-      optionalAttrs (cfg.publishInfrastructure.enable)
-      ( { hostname = config.networking.hostName;
-          #targetHost = config.deployment.targetHost;
-          system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system;
-
-          supportedTypes = (import "${pkgs.stdenv.mkDerivation {
-            name = "supportedtypes";
-            buildCommand = ''
-              ( echo -n "[ "
-                cd ${dysnomia}/libexec/dysnomia
-                for i in *
-                do
-                    echo -n "\"$i\" "
-                done
-                echo -n " ]") > $out
-            '';
-          }}");
-        }
-        #// optionalAttrs (cfg.useWebServiceInterface) { targetEPR = "http://${config.deployment.targetHost}:8080/DisnixWebService/services/DisnixWebService"; }
-        // optionalAttrs (config.services.httpd.enable) { documentRoot = config.services.httpd.documentRoot; }
-        // optionalAttrs (config.services.mysql.enable) { mysqlPort = config.services.mysql.port; }
-        // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; }
-        // optionalAttrs (config.services.svnserve.enable) { svnBaseDir = config.services.svnserve.svnBaseDir; }
-        // optionalAttrs (config.services.ejabberd.enable) { ejabberdUser = config.services.ejabberd.user; }
-        // optionalAttrs (cfg.publishInfrastructure.enableAuthentication) (
-          optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = readFile config.services.mysql.rootPassword; })
-        )
-    ;
-
-    services.disnix.publishInfrastructure.enable = cfg.publishAvahi;
-
     systemd.services = {
       disnix = {
         description = "Disnix server";
@@ -133,46 +84,17 @@ in
 
         restartIfChanged = false;
 
-        path = [ pkgs.nix pkgs.disnix dysnomia "/run/current-system/sw" ];
+        path = [ config.nix.package cfg.package config.dysnomia.package "/run/current-system/sw" ];
 
         environment = {
           HOME = "/root";
-        };
-
-        preStart = ''
-          mkdir -p /etc/systemd-mutable/system
-          if [ ! -f /etc/systemd-mutable/system/dysnomia.target ]
-          then
-              ( echo "[Unit]"
-                echo "Description=Services that are activated and deactivated by Dysnomia"
-                echo "After=final.target"
-              ) > /etc/systemd-mutable/system/dysnomia.target
-          fi
-        '';
-
-        script = "disnix-service";
+        }
+        // (if config.environment.variables ? DYSNOMIA_CONTAINERS_PATH then { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; } else {})
+        // (if config.environment.variables ? DYSNOMIA_MODULES_PATH then { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; } else {});
+        
+        serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service";
       };
-    } // optionalAttrs cfg.publishAvahi {
-      disnixAvahi = {
-        description = "Disnix Avahi publisher";
-        wants = [ "avahi-daemon.service" ];
-        wantedBy = [ "multi-user.target" ];
 
-        script = ''
-          ${pkgs.avahi}/bin/avahi-publish-service disnix-${config.networking.hostName} _disnix._tcp 22 \
-            "mem=$(grep 'MemTotal:' /proc/meminfo | sed -e 's/kB//' -e 's/MemTotal://' -e 's/ //g')" \
-            ${concatMapStrings (infrastructureAttrName:
-              let infrastructureAttrValue = getAttr infrastructureAttrName (cfg.infrastructure);
-              in
-              if isInt infrastructureAttrValue then
-              ''${infrastructureAttrName}=${toString infrastructureAttrValue} \
-              ''
-              else
-              ''${infrastructureAttrName}=\"${infrastructureAttrValue}\" \
-              ''
-              ) (attrNames (cfg.infrastructure))}
-        '';
-      };
     };
   };
 }
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix
new file mode 100644
index 000000000000..df44d0a54866
--- /dev/null
+++ b/nixos/modules/services/misc/dysnomia.nix
@@ -0,0 +1,217 @@
+{pkgs, lib, config, ...}:
+
+with lib;
+
+let
+  cfg = config.dysnomia;
+  
+  printProperties = properties:
+    concatMapStrings (propertyName:
+      let
+        property = properties."${propertyName}";
+      in
+      if isList property then "${propertyName}=(${lib.concatMapStrings (elem: "\"${toString elem}\" ") (properties."${propertyName}")})\n"
+      else "${propertyName}=\"${toString property}\"\n"
+    ) (builtins.attrNames properties);
+  
+  properties = pkgs.stdenv.mkDerivation {
+    name = "dysnomia-properties";
+    buildCommand = ''
+      cat > $out << "EOF"
+      ${printProperties cfg.properties}
+      EOF
+    '';
+  };
+  
+  containersDir = pkgs.stdenv.mkDerivation {
+    name = "dysnomia-containers";
+    buildCommand = ''
+      mkdir -p $out
+      cd $out
+      
+      ${concatMapStrings (containerName:
+        let
+          containerProperties = cfg.containers."${containerName}";
+        in
+        ''
+          cat > ${containerName} <<EOF
+          ${printProperties containerProperties}
+          type=${containerName}
+          EOF
+        ''
+      ) (builtins.attrNames cfg.containers)}
+    '';
+  };
+  
+  linkMutableComponents = {containerName}:
+    ''
+      mkdir ${containerName}
+      
+      ${concatMapStrings (componentName:
+        let
+          component = cfg.components."${containerName}"."${componentName}";
+        in
+        "ln -s ${component} ${containerName}/${componentName}\n"
+      ) (builtins.attrNames (cfg.components."${containerName}" or {}))}
+    '';
+  
+  componentsDir = pkgs.stdenv.mkDerivation {
+    name = "dysnomia-components";
+    buildCommand = ''
+      mkdir -p $out
+      cd $out
+      
+      ${concatMapStrings (containerName:
+        let
+          components = cfg.components."${containerName}";
+        in
+        linkMutableComponents { inherit containerName; }
+      ) (builtins.attrNames cfg.components)}
+    '';
+  };
+in
+{
+  options = {
+    dysnomia = {
+      
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable Dysnomia";
+      };
+      
+      enableAuthentication = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to publish privacy-sensitive authentication credentials";
+      };
+      
+      package = mkOption {
+        type = types.path;
+        description = "The Dysnomia package";
+      };
+      
+      properties = mkOption {
+        description = "An attribute set in which each attribute represents a machine property. Optionally, these values can be shell substitutions.";
+        default = {};
+      };
+      
+      containers = mkOption {
+        description = "An attribute set in which each key represents a container and each value an attribute set providing its configuration properties";
+        default = {};
+      };
+      
+      components = mkOption {
+        description = "An atttribute set in which each key represents a container and each value an attribute set in which each key represents a component and each value a derivation constructing its initial state";
+        default = {};
+      };
+      
+      extraContainerProperties = mkOption {
+        description = "An attribute set providing additional container settings in addition to the default properties";
+        default = {};
+      };
+      
+      extraContainerPaths = mkOption {
+        description = "A list of paths containing additional container configurations that are added to the search folders";
+        default = [];
+      };
+      
+      extraModulePaths = mkOption {
+        description = "A list of paths containing additional modules that are added to the search folders";
+        default = [];
+      };
+    };
+  };
+  
+  config = mkIf cfg.enable {
+  
+    environment.etc = {
+      "dysnomia/containers" = {
+        source = containersDir;
+      };
+      "dysnomia/components" = {
+        source = componentsDir;
+      };
+      "dysnomia/properties" = {
+        source = properties;
+      };
+    };
+    
+    environment.variables = {
+      DYSNOMIA_STATEDIR = "/var/state/dysnomia-nixos";
+      DYSNOMIA_CONTAINERS_PATH = "${lib.concatMapStrings (containerPath: "${containerPath}:") cfg.extraContainerPaths}/etc/dysnomia/containers";
+      DYSNOMIA_MODULES_PATH = "${lib.concatMapStrings (modulePath: "${modulePath}:") cfg.extraModulePaths}/etc/dysnomia/modules";
+    };
+    
+    environment.systemPackages = [ cfg.package ];
+    
+    dysnomia.package = pkgs.dysnomia.override (origArgs: {
+      enableApacheWebApplication = config.services.httpd.enable;
+      enableAxis2WebService = config.services.tomcat.axis2.enable;
+      enableEjabberdDump = config.services.ejabberd.enable;
+      enableMySQLDatabase = config.services.mysql.enable;
+      enablePostgreSQLDatabase = config.services.postgresql.enable;
+      enableSubversionRepository = config.services.svnserve.enable;
+      enableTomcatWebApplication = config.services.tomcat.enable;
+      enableMongoDatabase = config.services.mongodb.enable;
+    });
+    
+    dysnomia.properties = {
+      hostname = config.networking.hostName;
+      system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system;
+
+      supportedTypes = (import "${pkgs.stdenv.mkDerivation {
+        name = "supportedtypes";
+        buildCommand = ''
+          ( echo -n "[ "
+            cd ${cfg.package}/libexec/dysnomia
+            for i in *
+            do
+                echo -n "\"$i\" "
+            done
+            echo -n " ]") > $out
+        '';
+      }}");
+    };
+    
+    dysnomia.containers = lib.recursiveUpdate ({
+      process = {};
+      wrapper = {};
+    }
+    // lib.optionalAttrs (config.services.httpd.enable) { apache-webapplication = {
+      documentRoot = config.services.httpd.documentRoot;
+    }; }
+    // lib.optionalAttrs (config.services.tomcat.axis2.enable) { axis2-webservice = {}; }
+    // lib.optionalAttrs (config.services.ejabberd.enable) { ejabberd-dump = {
+      ejabberdUser = config.services.ejabberd.user;
+    }; }
+    // lib.optionalAttrs (config.services.mysql.enable) { mysql-database = {
+        mysqlPort = config.services.mysql.port;
+      } // lib.optionalAttrs cfg.enableAuthentication {
+        mysqlUsername = "root";
+        mysqlPassword = builtins.readFile (config.services.mysql.rootPassword);
+      };
+    }
+    // lib.optionalAttrs (config.services.postgresql.enable && cfg.enableAuthentication) { postgresql-database = {
+      postgresqlUsername = "root";
+    }; }
+    // lib.optionalAttrs (config.services.tomcat.enable) { tomcat-webapplication = {
+      tomcatPort = 8080;
+    }; }
+    // lib.optionalAttrs (config.services.mongodb.enable) { mongo-database = {}; }
+    // lib.optionalAttrs (config.services.svnserve.enable) { subversion-repository = {
+      svnBaseDir = config.services.svnserve.svnBaseDir;
+    }; }) cfg.extraContainerProperties;
+
+    system.activationScripts.dysnomia = ''
+      mkdir -p /etc/systemd-mutable/system
+      if [ ! -f /etc/systemd-mutable/system/dysnomia.target ]
+      then
+          ( echo "[Unit]"
+            echo "Description=Services that are activated and deactivated by Dysnomia"
+            echo "After=final.target"
+          ) > /etc/systemd-mutable/system/dysnomia.target
+      fi
+    '';
+  };
+}

From 95b896228dfd560b76ed149ed80e12f15c60bd2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 17 Jun 2016 11:45:58 +0200
Subject: [PATCH 407/436] gvolicon: c04cafb -> 31cf770

---
 pkgs/tools/audio/gvolicon/default.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index c00efecc0b35..87741cf0ac07 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg }:
+{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:
 
 stdenv.mkDerivation {
   name = "gvolicon-2014-04-28";
   src = fetchgit {
     url = "https://github.com/Unia/gvolicon";
-    rev = "c04cafb88124e1e5edc61dd52f76bf13381d5167";
-    sha256 = "31cf770dca0d216e3108b258b4c150cbeb3b127002d53fd6ddddfcf9e3e293aa";
+    rev = "0d65a396ba11f519d5785c37fec3e9a816217a07";
+    sha256 = "1sr9wyy7w898vq63yd003yp3k66hd4vm8b0qsm9zvmwmpiz4wvln";
   };
 
-  buildInputs = [ pkgconfig makeWrapper alsaLib gnome3.gtk ];
-  propagatedBuildInputs = [ gnome3.defaultIconTheme gdk_pixbuf librsvg ];
-  installPhase = ''
-    make install PREFIX=$out
-    wrapProgram "$out/bin/gvolicon" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gvolicon:$XDG_ICON_DIRS"
-    '';
+  buildInputs = [
+    pkgconfig makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.defaultIconTheme
+    librsvg wrapGAppsHook
+  ];
+
+  makeFlags="PREFIX=$(out)";
 
   meta = {
     description = "A simple and lightweight volume icon that sits in your system tray";

From bec28d748c854abda373ca38831f4e77bc276fc1 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 17 Jun 2016 11:06:48 +0100
Subject: [PATCH 408/436] Remove unecessary branching on old nix versions

All these builtins are available since 1.10 or earlier (1.10 being the
lib/minver.nix)
---
 lib/lists.nix              | 78 ++++++--------------------------------
 lib/strings.nix            |  6 +--
 pkgs/top-level/default.nix |  4 +-
 3 files changed, 15 insertions(+), 73 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 40475e7655d3..c810c8c2f5fc 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -68,18 +68,7 @@ rec {
        imap (i: v: "${v}-${toString i}") ["a" "b"]
        => [ "a-1" "b-2" ]
   */
-  imap =
-    if builtins ? genList then
-      f: list: genList (n: f (n + 1) (elemAt list n)) (length list)
-    else
-      f: list:
-      let
-        len = length list;
-        imap' = n:
-          if n == len
-            then []
-            else [ (f (n + 1) (elemAt list n)) ] ++ imap' (n + 1);
-      in imap' 0;
+  imap = f: list: genList (n: f (n + 1) (elemAt list n)) (length list);
 
   /* Map and concatenate the result.
 
@@ -216,17 +205,11 @@ rec {
        range 3 2
        => [ ]
   */
-  range =
-    if builtins ? genList then
-      first: last:
-        if first > last
-        then []
-        else genList (n: first + n) (last - first + 1)
+  range = first: last:
+    if first > last then
+      []
     else
-      first: last:
-        if last < first
-        then []
-        else [first] ++ range (first + 1) last;
+      genList (n: first + n) (last - first + 1);
 
   /* Splits the elements of a list in two lists, `right' and
      `wrong', depending on the evaluation of a predicate.
@@ -250,19 +233,9 @@ rec {
        zipListsWith (a: b: a + b) ["h" "l"] ["e" "o"]
        => ["he" "lo"]
   */
-  zipListsWith =
-    if builtins ? genList then
-      f: fst: snd: genList (n: f (elemAt fst n) (elemAt snd n)) (min (length fst) (length snd))
-    else
-      f: fst: snd:
-      let
-        len = min (length fst) (length snd);
-        zipListsWith' = n:
-          if n != len then
-            [ (f (elemAt fst n) (elemAt snd n)) ]
-            ++ zipListsWith' (n + 1)
-          else [];
-      in zipListsWith' 0;
+  zipListsWith = f: fst: snd:
+    genList
+      (n: f (elemAt fst n) (elemAt snd n)) (min (length fst) (length snd));
 
   /* Merges two lists of the same size together. If the sizes aren't the same
      the merging stops at the shortest.
@@ -280,11 +253,8 @@ rec {
        reverseList [ "b" "o" "j" ]
        => [ "j" "o" "b" ]
   */
-  reverseList =
-    if builtins ? genList then
-      xs: let l = length xs; in genList (n: elemAt xs (l - n - 1)) l
-    else
-      fold (e: acc: acc ++ [ e ]) [];
+  reverseList = xs:
+    let l = length xs; in genList (n: elemAt xs (l - n - 1)) l;
 
   /* Sort a list based on a comparator function which compares two
      elements and returns true if the first argument is strictly below
@@ -320,19 +290,7 @@ rec {
        take 2 [ ]
        => [ ]
   */
-  take =
-    if builtins ? genList then
-      count: sublist 0 count
-    else
-      count: list:
-        let
-          len = length list;
-          take' = n:
-            if n == len || n == count
-              then []
-            else
-              [ (elemAt list n) ] ++ take' (n + 1);
-        in take' 0;
+  take = count: sublist 0 count;
 
   /* Remove the first (at most) N elements of a list.
 
@@ -342,19 +300,7 @@ rec {
        drop 2 [ ]
        => [ ]
   */
-  drop =
-    if builtins ? genList then
-      count: list: sublist count (length list) list
-    else
-      count: list:
-        let
-          len = length list;
-          drop' = n:
-            if n == -1 || n < count
-              then []
-            else
-              drop' (n - 1) ++ [ (elemAt list n) ];
-        in drop' (len - 1);
+  drop = count: list: sublist count (length list) list;
 
   /* Return a list consisting of at most ‘count’ elements of ‘list’,
      starting at index ‘start’.
diff --git a/lib/strings.nix b/lib/strings.nix
index 9e9bdd6e1535..7109bd4ec6e1 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -16,11 +16,7 @@ rec {
        concatStrings ["foo" "bar"]
        => "foobar"
   */
-  concatStrings =
-    if builtins ? concatStringsSep then
-      builtins.concatStringsSep ""
-    else
-      lib.foldl' (x: y: x + y) "";
+  concatStrings = builtins.concatStringsSep "";
 
   /* Map a function over a list and concatenate the resulting strings.
 
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 4de75c2ed57e..22964195ed6a 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -45,9 +45,9 @@ let
   config =
     let
       toPath = builtins.toPath;
-      getEnv = x: if builtins ? getEnv then builtins.getEnv x else "";
+      getEnv = builtins.getEnv;
       pathExists = name:
-        builtins ? pathExists && builtins.pathExists (toPath name);
+        builtins.pathExists (toPath name);
 
       configFile = getEnv "NIXPKGS_CONFIG";
       homeDir = getEnv "HOME";

From 552388f8dfd185e603b2cf8888d6ef54696bbbd5 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <alebedev@mirantis.com>
Date: Fri, 17 Jun 2016 13:34:17 +0300
Subject: [PATCH 409/436] diff-so-fancy: init at 0.9.3

Script was mentioned at GitHub blog -
https://github.com/blog/2188-git-2-9-has-been-released :)
---
 .../git-and-tools/default.nix                 |  2 +
 .../git-and-tools/diff-so-fancy/default.nix   | 49 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 0732b0d7329f..1aafb0aa99a8 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -23,6 +23,8 @@ rec {
 
   darcsToGit = callPackage ./darcs-to-git { };
 
+  diff-so-fancy = callPackage ./diff-so-fancy { };
+
   git = appendToName "minimal" gitBase;
 
   # The full-featured Git.
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
new file mode 100644
index 000000000000..b29b1f90b5c3
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@@ -0,0 +1,49 @@
+{stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}:
+
+stdenv.mkDerivation rec {
+  name = "diff-so-fancy-${version}";
+  version = "0.9.3";
+
+  # perl is needed here so patchShebangs can do its job
+  buildInputs = [perl makeWrapper];
+
+  src = fetchFromGitHub {
+    owner = "so-fancy";
+    repo = "diff-so-fancy";
+    rev = "v${version}";
+    sha256 = "0b5k54h3l4z81p6f7n14g2r5vz7qdyyrbql0z7rwhb7sw7s7zrgx";
+  };
+
+  buildPhase = null;
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib/diff-so-fancy
+
+    # diff-so-fancy executable searches for it's library relative to
+    # 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 lib $out/lib/diff-so-fancy
+    ln -s $out/lib/diff-so-fancy/diff-so-fancy $out/bin
+
+    # ncurses is needed for `tput`
+    wrapProgram $out/lib/diff-so-fancy/diff-so-fancy \
+      --prefix PATH : "${git}/share/git/contrib/diff-highlight" \
+      --prefix PATH : "${git}/bin" \
+      --prefix PATH : "${coreutils}/bin" \
+      --prefix PATH : "${ncurses.out}/bin"
+  '';
+
+  meta = {
+    homepage = https://github.com/so-fancy/diff-so-fancy;
+    description = "Good-looking diffs filter for git";
+    license = stdenv.lib.licenses.mit;
+
+    longDescription = ''
+      diff-so-fancy builds on the good-lookin' output of git contrib's
+      diff-highlight to upgrade your diffs' appearances.
+    '';
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

From 2efdaa948d2fcbcd37f952bb1a18c65316d5010a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 17 Jun 2016 13:13:05 +0200
Subject: [PATCH 410/436] xmonad-wrapper: link man pages of xmonadEnv

This fixes #16282.
---
 pkgs/applications/window-managers/xmonad/wrapper.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix
index e8dc0b1fdac7..7804137d7cf4 100644
--- a/pkgs/applications/window-managers/xmonad/wrapper.nix
+++ b/pkgs/applications/window-managers/xmonad/wrapper.nix
@@ -8,7 +8,8 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ makeWrapper ];
 
   buildCommand = ''
-    mkdir -p $out/bin
+    mkdir -p $out/bin $out/share
+    cp -r ${xmonadEnv}/share/man $out/share/man
     makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \
       --set NIX_GHC "${xmonadEnv}/bin/ghc" \
       --set XMONAD_XMESSAGE "${xmessage}/bin/xmessage"

From 03e3ef6234ff6ff4bc02f70c7c44c0a06249d14e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 17 Jun 2016 13:18:26 +0200
Subject: [PATCH 411/436] xmonad-wrapper: link man pages instead of copying

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

diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix
index 7804137d7cf4..6f3d463adb28 100644
--- a/pkgs/applications/window-managers/xmonad/wrapper.nix
+++ b/pkgs/applications/window-managers/xmonad/wrapper.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation {
 
   buildCommand = ''
     mkdir -p $out/bin $out/share
-    cp -r ${xmonadEnv}/share/man $out/share/man
+    ln -s ${xmonadEnv}/share/man $out/share/man
     makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \
       --set NIX_GHC "${xmonadEnv}/bin/ghc" \
       --set XMONAD_XMESSAGE "${xmessage}/bin/xmessage"

From a2b19f46608b53d03b61adf4f2e7c2c136e3184a Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 17 Jun 2016 15:12:28 +0200
Subject: [PATCH 412/436] libinput: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index f997d8270ca9..b04c146636d2 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -15,11 +15,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-1.3.1";
+  name = "libinput-1.3.2";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "1adcc82746ywwymr9b3mvr2vq539hvp1zxks6s7p2p1rjcynbzyd";
+    sha256 = "10x1jbz0kjww8ynndqxc4gkmammilwaxm1mf20ahz75mh43j6087";
   };
 
   outputs = [ "dev" "out" ];

From 592dcbc4bfbdd98ee2f22bdea1b895db337cb770 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 17 Jun 2016 09:47:16 -0500
Subject: [PATCH 413/436] Fix evaluation error in Qt/KDE packages

For now, the source hashes will continue to be stored in the Nixpkgs
tree. The package update instructions are updated.
---
 maintainers/scripts/fetch-kde-qt.sh           |   49 +
 .../scripts/generate-kde-applications.sh      |    3 +
 .../scripts/generate-kde-frameworks.sh        |    3 +
 maintainers/scripts/generate-kde-plasma.sh    |    3 +
 maintainers/scripts/generate-qt.sh            |    3 +
 .../kde-5/applications-16.04/default.nix      |   35 +-
 .../kde-5/applications-16.04/srcs.nix         | 2093 +++++++++++++++++
 .../kde-5/frameworks-5.22/default.nix         |   34 +-
 pkgs/desktops/kde-5/frameworks-5.22/srcs.nix  |  581 +++++
 pkgs/desktops/kde-5/plasma-5.6/default.nix    |   28 +-
 pkgs/desktops/kde-5/plasma-5.6/srcs.nix       |  333 +++
 .../libraries/qt-5/5.6/default.nix            |   28 +-
 pkgs/development/libraries/qt-5/5.6/srcs.nix  |  261 ++
 13 files changed, 3388 insertions(+), 66 deletions(-)
 create mode 100755 maintainers/scripts/fetch-kde-qt.sh
 create mode 100755 maintainers/scripts/generate-kde-applications.sh
 create mode 100755 maintainers/scripts/generate-kde-frameworks.sh
 create mode 100755 maintainers/scripts/generate-kde-plasma.sh
 create mode 100755 maintainers/scripts/generate-qt.sh
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/srcs.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.22/srcs.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/srcs.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/srcs.nix

diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh
new file mode 100755
index 000000000000..c88d8729acea
--- /dev/null
+++ b/maintainers/scripts/fetch-kde-qt.sh
@@ -0,0 +1,49 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p coreutils findutils gnused nix wget
+
+tmp=$(mktemp -d)
+pushd $tmp >/dev/null
+wget -nH -r -c --no-parent "$@" >/dev/null
+
+csv=$(mktemp)
+find . -type f | while read src; do
+    # Sanitize file name
+    filename=$(basename "$src" | tr '@' '_')
+    nameVersion="${filename%.tar.*}"
+    name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
+    version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
+    echo "$name,$version,$src,$filename" >>$csv
+done
+
+cat <<EOF
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+EOF
+
+gawk -F , "{ print \$1 }" $csv | sort | uniq | while read name; do
+    versions=$(gawk -F , "/^$name,/ { print \$2 }" $csv)
+    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
+    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" $csv)
+    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" $csv)
+    url="${src:2}"
+    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
+    cat <<EOF
+  $name = {
+    version = "$latestVersion";
+    src = fetchurl {
+      url = "\${mirror}/$url";
+      sha256 = "$sha256";
+      name = "$filename";
+    };
+  };
+EOF
+done
+
+echo "}"
+
+popd >/dev/null
+rm -fr $tmp >/dev/null
+
+rm -f $csv >/dev/null
diff --git a/maintainers/scripts/generate-kde-applications.sh b/maintainers/scripts/generate-kde-applications.sh
new file mode 100755
index 000000000000..525abcc3c2dd
--- /dev/null
+++ b/maintainers/scripts/generate-kde-applications.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./fetch-kde-qt.sh http://download.kde.org/stable/applications/16.04.2/ -A '*.tar.xz'
diff --git a/maintainers/scripts/generate-kde-frameworks.sh b/maintainers/scripts/generate-kde-frameworks.sh
new file mode 100755
index 000000000000..aa693ced704d
--- /dev/null
+++ b/maintainers/scripts/generate-kde-frameworks.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./fetch-kde-qt.sh http://download.kde.org/stable/frameworks/5.22/ -A '*.tar.xz'
diff --git a/maintainers/scripts/generate-kde-plasma.sh b/maintainers/scripts/generate-kde-plasma.sh
new file mode 100755
index 000000000000..fa804758f09b
--- /dev/null
+++ b/maintainers/scripts/generate-kde-plasma.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./fetch-kde-qt.sh http://download.kde.org/stable/plasma/5.6.5/ -A '*.tar.xz'
diff --git a/maintainers/scripts/generate-qt.sh b/maintainers/scripts/generate-qt.sh
new file mode 100755
index 000000000000..61691520696f
--- /dev/null
+++ b/maintainers/scripts/generate-qt.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./fetch-kde-qt.sh http://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/ -A '*.tar.xz'
diff --git a/pkgs/desktops/kde-5/applications-16.04/default.nix b/pkgs/desktops/kde-5/applications-16.04/default.nix
index e026914f2f04..5c01c12d9029 100644
--- a/pkgs/desktops/kde-5/applications-16.04/default.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/default.nix
@@ -1,29 +1,26 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
-#     releases updates that include only the changed packages; in this case,
-#     multiple URLs can be provided and the results will be merged.
-#  2. Run ./manifest.sh and ./dependencies.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions.
+/*
+
+# Updates
+
+Before a major version update, make a copy of this directory. (We like to
+keep the old version around for a short time after major updates.)
+
+1. Update the URL in <nixpkgs/maintainers/scripts/generate-kde-applications.sh>.
+2. From the top of the Nixpkgs tree, run
+   `./maintainers/scripts/generate-kde-applications.sh > pkgs/desktops/kde-5/applications-$VERSION/srcs.nix'.
+3. Check that the new packages build correctly.
+4. Commit the changes and open a pull request.
+
+*/
 
 { pkgs, debug ? false }:
 
 let
 
-  inherit (pkgs) fetchurl lib stdenv;
+  inherit (pkgs) lib stdenv;
 
   mirror = "mirror://kde";
-  remotesrcs = fetchurl {
-    url = "https://raw.githubusercontent.com/ttuegel/nixpkgs-kde-qt/580915a460b11820c0b671236255180af5264c0c/applications-srcs.nix";
-    sha256 = "19lwhn468p9v8p97vyy23q5mv0yxs394lsfl41ij3glrxd92s8kf";
-  };
-  srcs = import remotesrcs { inherit (pkgs) fetchurl; inherit mirror; };
+  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
 
   packages = self: with self; {
 
diff --git a/pkgs/desktops/kde-5/applications-16.04/srcs.nix b/pkgs/desktops/kde-5/applications-16.04/srcs.nix
new file mode 100644
index 000000000000..6193253e96d4
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/srcs.nix
@@ -0,0 +1,2093 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  akonadi = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/akonadi-16.04.2.tar.xz";
+      sha256 = "0k28dyfpnnnsx6i7cvx1ahmcac1kc2bgzzwqk7mpcwpsmjm0s66v";
+      name = "akonadi-16.04.2.tar.xz";
+    };
+  };
+  akonadi-calendar = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/akonadi-calendar-16.04.2.tar.xz";
+      sha256 = "0fmq28b1smins3hvhg64rysjqwvqb38x6ybppz3hzqsq6mdmnc7a";
+      name = "akonadi-calendar-16.04.2.tar.xz";
+    };
+  };
+  akonadi-search = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/akonadi-search-16.04.2.tar.xz";
+      sha256 = "03j7vmccsyr6glc1q2da6znlrkpcvqywzqrb2ychnfmrgjc0xnh4";
+      name = "akonadi-search-16.04.2.tar.xz";
+    };
+  };
+  analitza = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/analitza-16.04.2.tar.xz";
+      sha256 = "16b1fqkiznds6lv09wcc13n9g8q1a9x6d0k2f7qcd075riq8qp9h";
+      name = "analitza-16.04.2.tar.xz";
+    };
+  };
+  ark = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ark-16.04.2.tar.xz";
+      sha256 = "02mfwhn5cqxf3a55bm6ij6vmmkyfhacv4apn16bcq458yckjxmhg";
+      name = "ark-16.04.2.tar.xz";
+    };
+  };
+  artikulate = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/artikulate-16.04.2.tar.xz";
+      sha256 = "0xil6a2vkji91fhwl9r4cifgg1rf0jp0wzqrqavcb22amfx5j1qn";
+      name = "artikulate-16.04.2.tar.xz";
+    };
+  };
+  audiocd-kio = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/audiocd-kio-16.04.2.tar.xz";
+      sha256 = "1f7im7qzaz6rk8va6fhn3h5zwq0vfh4mfn01j1kc92kz7g7303k8";
+      name = "audiocd-kio-16.04.2.tar.xz";
+    };
+  };
+  baloo-widgets = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/baloo-widgets-16.04.2.tar.xz";
+      sha256 = "0hff48c51vsdqkvha5s0aw4sml9gkk3g241dv91qavg513mcs6ns";
+      name = "baloo-widgets-16.04.2.tar.xz";
+    };
+  };
+  blinken = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/blinken-16.04.2.tar.xz";
+      sha256 = "016vk89axs0bvn4hsdmvx0cks9f87x3czrdn6n01cvzlspgl23sg";
+      name = "blinken-16.04.2.tar.xz";
+    };
+  };
+  bomber = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/bomber-16.04.2.tar.xz";
+      sha256 = "0rzqgydpqaynnfbgajka7hkb0gj360i0chy0q7brha1cilglz9f6";
+      name = "bomber-16.04.2.tar.xz";
+    };
+  };
+  bovo = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/bovo-16.04.2.tar.xz";
+      sha256 = "0iiwqna6h2y698cq7llf6djq5l0bvhg1yxlj3mqkjafgq2542dq5";
+      name = "bovo-16.04.2.tar.xz";
+    };
+  };
+  calendarsupport = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/calendarsupport-16.04.2.tar.xz";
+      sha256 = "14g5cwj92hkkjpcs2glgimimkcrkl49wckrjnnymmkmj53qf85bs";
+      name = "calendarsupport-16.04.2.tar.xz";
+    };
+  };
+  cantor = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/cantor-16.04.2.tar.xz";
+      sha256 = "0l2hkpinh4vxgrfs2vjjpp2995q4c89fa8hwf0d92ri3smrfmmrp";
+      name = "cantor-16.04.2.tar.xz";
+    };
+  };
+  cervisia = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/cervisia-16.04.2.tar.xz";
+      sha256 = "07wbwydq532jhz5xrd6n92r94fxbvlll3mg0hlz2rizc008ni2z4";
+      name = "cervisia-16.04.2.tar.xz";
+    };
+  };
+  dolphin = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/dolphin-16.04.2.tar.xz";
+      sha256 = "0fs53lxknzzqxrghdb4ba5swrhxfgisqdc69fm7znsjqzpk4l7v2";
+      name = "dolphin-16.04.2.tar.xz";
+    };
+  };
+  dolphin-plugins = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/dolphin-plugins-16.04.2.tar.xz";
+      sha256 = "078aqhfybyr6k5s716pwjr94rlv1iklq1l2fapyjqfd92ffxnb9c";
+      name = "dolphin-plugins-16.04.2.tar.xz";
+    };
+  };
+  dragon = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/dragon-16.04.2.tar.xz";
+      sha256 = "160qj3ka3wqs35v01769jijfxc08vlzlbgr99z7acnicv3s2p4j4";
+      name = "dragon-16.04.2.tar.xz";
+    };
+  };
+  eventviews = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/eventviews-16.04.2.tar.xz";
+      sha256 = "1m6kj8y310kxgw3nkrn4wvgnziqx7igbjyd3jq1459issfiv89ay";
+      name = "eventviews-16.04.2.tar.xz";
+    };
+  };
+  ffmpegthumbs = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ffmpegthumbs-16.04.2.tar.xz";
+      sha256 = "0l0fgnq25j3xbnxl78pl03gr4rx8lndy7254487yqh6gcq9ir4q0";
+      name = "ffmpegthumbs-16.04.2.tar.xz";
+    };
+  };
+  filelight = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/filelight-16.04.2.tar.xz";
+      sha256 = "0rl2rc7p92bawzyfplnfmg020yvjrdslk3vr3fn37zriaq8nsdx3";
+      name = "filelight-16.04.2.tar.xz";
+    };
+  };
+  gpgmepp = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/gpgmepp-16.04.2.tar.xz";
+      sha256 = "0p3szvx59hrfwg81nf3bwxy2wyan0y8ahri70icq4dq6wr1qswg8";
+      name = "gpgmepp-16.04.2.tar.xz";
+    };
+  };
+  granatier = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/granatier-16.04.2.tar.xz";
+      sha256 = "131q61zc78mw26bg3z0fn61iw5jp656lizlh3bq2kw76n6gcar3q";
+      name = "granatier-16.04.2.tar.xz";
+    };
+  };
+  grantleetheme = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/grantleetheme-16.04.2.tar.xz";
+      sha256 = "1glwcs4j19pbfsqq79krq8v62h8pdmm327jhsiwcbxzxmnl30r5p";
+      name = "grantleetheme-16.04.2.tar.xz";
+    };
+  };
+  gwenview = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/gwenview-16.04.2.tar.xz";
+      sha256 = "1p1wfdgyl94mis8zvwqd32sk2wfwycz6ppsznaksvxjrzwlyxbl0";
+      name = "gwenview-16.04.2.tar.xz";
+    };
+  };
+  incidenceeditor = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/incidenceeditor-16.04.2.tar.xz";
+      sha256 = "1q9vy4l1ysxjnjdgq78gy5sj35z4wxjx379l1jspcdq2ibnqisl0";
+      name = "incidenceeditor-16.04.2.tar.xz";
+    };
+  };
+  jovie = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/jovie-16.04.2.tar.xz";
+      sha256 = "02jslqk8yi54s8qhz796aj7z00h6swhpzqp28idh0fc9hzn5slpm";
+      name = "jovie-16.04.2.tar.xz";
+    };
+  };
+  juk = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/juk-16.04.2.tar.xz";
+      sha256 = "05f3nj3ch4cjglj9xs0j580xks5xsa1wf94kw3vz5qsswsi3h93v";
+      name = "juk-16.04.2.tar.xz";
+    };
+  };
+  kaccessible = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kaccessible-16.04.2.tar.xz";
+      sha256 = "12ffbhc8wgqb0qcr03s9dch0s13dxa3fgs18vinjqswmsrg7f99a";
+      name = "kaccessible-16.04.2.tar.xz";
+    };
+  };
+  kaccounts-integration = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kaccounts-integration-16.04.2.tar.xz";
+      sha256 = "0l9hlk4a3ryrjhppyp0l0qygfgqxf3m5977cybyzmsnf8yj0aqg7";
+      name = "kaccounts-integration-16.04.2.tar.xz";
+    };
+  };
+  kaccounts-providers = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kaccounts-providers-16.04.2.tar.xz";
+      sha256 = "1kldqkxvaw0782yixig6dsr5r9ybpqf043qdzw5hm5rdrzssr4j0";
+      name = "kaccounts-providers-16.04.2.tar.xz";
+    };
+  };
+  kajongg = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kajongg-16.04.2.tar.xz";
+      sha256 = "0g1fmy7m9a8n0z6p1dgdyinv6yfkp91jxji5vm7yrlkkas7l0x0v";
+      name = "kajongg-16.04.2.tar.xz";
+    };
+  };
+  kalarmcal = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kalarmcal-16.04.2.tar.xz";
+      sha256 = "1y3bhphg4lb9dayycp2xpdvzmk8n47qlz6cxxasyr8kc32v6i1a7";
+      name = "kalarmcal-16.04.2.tar.xz";
+    };
+  };
+  kalgebra = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kalgebra-16.04.2.tar.xz";
+      sha256 = "02xh19igwwdvmw233flvvwjh01kph314z88vd4fzkczn000nqfax";
+      name = "kalgebra-16.04.2.tar.xz";
+    };
+  };
+  kalzium = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kalzium-16.04.2.tar.xz";
+      sha256 = "18q6mbdc40my0xk2n28fmjvcyqv46jckqslkgr183yhy0aqbdgh0";
+      name = "kalzium-16.04.2.tar.xz";
+    };
+  };
+  kamera = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kamera-16.04.2.tar.xz";
+      sha256 = "1ix30y9hvh1dn4xvgmg1y70bj2xdvkl5x5jwhppccb1ck2jlmp7g";
+      name = "kamera-16.04.2.tar.xz";
+    };
+  };
+  kanagram = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kanagram-16.04.2.tar.xz";
+      sha256 = "17d9jw9fj1x3v6l6q2n3z5b92gpvg8fydbpinym9wzjrixpcqx1q";
+      name = "kanagram-16.04.2.tar.xz";
+    };
+  };
+  kapman = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kapman-16.04.2.tar.xz";
+      sha256 = "0bi4mvashs5y5wr9fi8rmmq4f3ww9qixh850ar778dwdf11cy9vc";
+      name = "kapman-16.04.2.tar.xz";
+    };
+  };
+  kapptemplate = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kapptemplate-16.04.2.tar.xz";
+      sha256 = "0xs8bfknfa38fhn1jnk7xxmlsgrwnvbg78fjpq8mfnjlzi9xf55c";
+      name = "kapptemplate-16.04.2.tar.xz";
+    };
+  };
+  kate = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kate-16.04.2.tar.xz";
+      sha256 = "04b89mp11jbi6dpwmq9g7j9c4favykbxbsc34li7cisr1d8nfxyv";
+      name = "kate-16.04.2.tar.xz";
+    };
+  };
+  katomic = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/katomic-16.04.2.tar.xz";
+      sha256 = "0vj41ad41bw7dy94i7aw74211r45p703ajh8kgk32zv1157h30va";
+      name = "katomic-16.04.2.tar.xz";
+    };
+  };
+  kblackbox = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kblackbox-16.04.2.tar.xz";
+      sha256 = "1ad9px5d4z0c9ap4cl7jxvh6scid965d2phspcvhy68yc4pxk161";
+      name = "kblackbox-16.04.2.tar.xz";
+    };
+  };
+  kblocks = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kblocks-16.04.2.tar.xz";
+      sha256 = "1iyymacvzi8acbq0vlhcw0zdykkafjj674s997mz7pzbb5q7rli3";
+      name = "kblocks-16.04.2.tar.xz";
+    };
+  };
+  kblog = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kblog-16.04.2.tar.xz";
+      sha256 = "0ljc22dhvjb2j0qz6h693h8sxixjsd01lgrx9g0r1qi9zy55kdk0";
+      name = "kblog-16.04.2.tar.xz";
+    };
+  };
+  kbounce = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kbounce-16.04.2.tar.xz";
+      sha256 = "19jj1abv0831zkql1khd1n6yp9gwd6znf3x4w0c1yijnhr91aja5";
+      name = "kbounce-16.04.2.tar.xz";
+    };
+  };
+  kbreakout = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kbreakout-16.04.2.tar.xz";
+      sha256 = "1czfnzndwf2g796nc7pn4wvkm1gfzizjf92inni16f7s1mqka420";
+      name = "kbreakout-16.04.2.tar.xz";
+    };
+  };
+  kbruch = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kbruch-16.04.2.tar.xz";
+      sha256 = "1dbaympl6kf96zc93p5jawb0w77rcjhj8akrsbwrhvkzz3a9nfvh";
+      name = "kbruch-16.04.2.tar.xz";
+    };
+  };
+  kcachegrind = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kcachegrind-16.04.2.tar.xz";
+      sha256 = "105pr1njfj8r4i9lcgd2h3f2k1np19ajjvlykxa8ibim99nhj062";
+      name = "kcachegrind-16.04.2.tar.xz";
+    };
+  };
+  kcalc = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kcalc-16.04.2.tar.xz";
+      sha256 = "1pgsbyffij6iil0bgpvxfb1wdikj90n2q0ykazahclnraqc3swl6";
+      name = "kcalc-16.04.2.tar.xz";
+    };
+  };
+  kcalcore = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kcalcore-16.04.2.tar.xz";
+      sha256 = "18w11kyyrchzdcqff2w4bzbspbaak513kqvkas87ainzp29zqs1p";
+      name = "kcalcore-16.04.2.tar.xz";
+    };
+  };
+  kcalutils = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kcalutils-16.04.2.tar.xz";
+      sha256 = "17c6c5ybyb9asvn3r5bq03hbpkbb5hifvhqlimgbr54ldrm5k950";
+      name = "kcalutils-16.04.2.tar.xz";
+    };
+  };
+  kcharselect = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kcharselect-16.04.2.tar.xz";
+      sha256 = "0qwks9l6ihzfbfcricy3zmpbdq0hlc5hal6zsb3b3j2pcrb95x4l";
+      name = "kcharselect-16.04.2.tar.xz";
+    };
+  };
+  kcolorchooser = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kcolorchooser-16.04.2.tar.xz";
+      sha256 = "0809rjs7z711fc07bmm95psy80h0knz579dzk9jbphrnj8irmbqk";
+      name = "kcolorchooser-16.04.2.tar.xz";
+    };
+  };
+  kcontacts = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kcontacts-16.04.2.tar.xz";
+      sha256 = "1gdbwq5vqgcn2xpl0q676awvc7k8w7fqh5wvmq6s4qdc2i1knlxn";
+      name = "kcontacts-16.04.2.tar.xz";
+    };
+  };
+  kcron = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kcron-16.04.2.tar.xz";
+      sha256 = "0qmw74c292mbpj683znr3ax1m6mkdyprgw3ql2xc0bl65vxspl00";
+      name = "kcron-16.04.2.tar.xz";
+    };
+  };
+  kde-baseapps = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-baseapps-16.04.2.tar.xz";
+      sha256 = "1rcwxjvr8b4gdd71dab56057g1z136hpcik15qavxvzk0218n3b4";
+      name = "kde-baseapps-16.04.2.tar.xz";
+    };
+  };
+  kdebugsettings = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdebugsettings-16.04.2.tar.xz";
+      sha256 = "0sk1marscwq8r032824igyingk25sk6xhzx8y131b592mwjqaabc";
+      name = "kdebugsettings-16.04.2.tar.xz";
+    };
+  };
+  kde-dev-scripts = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-dev-scripts-16.04.2.tar.xz";
+      sha256 = "0xj9l7sv83ccqi1makxdw20kzwpjfk0gdmagbg8wxr0zrmmzwrzk";
+      name = "kde-dev-scripts-16.04.2.tar.xz";
+    };
+  };
+  kde-dev-utils = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-dev-utils-16.04.2.tar.xz";
+      sha256 = "1n0m28w29pjmacpyrb0rian3zc8fi829x0pmf1j0k43lfp6m5f6m";
+      name = "kde-dev-utils-16.04.2.tar.xz";
+    };
+  };
+  kdeedu-data = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdeedu-data-16.04.2.tar.xz";
+      sha256 = "0kpax6ydfzqr4nh5bf7yxij1cfj0vjwpj2s7l0nxg3a3hw1m91xr";
+      name = "kdeedu-data-16.04.2.tar.xz";
+    };
+  };
+  kdegraphics-mobipocket = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdegraphics-mobipocket-16.04.2.tar.xz";
+      sha256 = "1vs68j28i0p0l7lzq9dyjbbx8h8vf5q6lcp624xcnfbhhgczcwjx";
+      name = "kdegraphics-mobipocket-16.04.2.tar.xz";
+    };
+  };
+  kdegraphics-strigi-analyzer = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdegraphics-strigi-analyzer-16.04.2.tar.xz";
+      sha256 = "05xjbjfx7gid3vhw56x6vl2xq577dj1lamqjfjwia0a1y8k2jcci";
+      name = "kdegraphics-strigi-analyzer-16.04.2.tar.xz";
+    };
+  };
+  kdegraphics-thumbnailers = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdegraphics-thumbnailers-16.04.2.tar.xz";
+      sha256 = "1w8zy6zir0yxy1189kbww70sxgb1qcdr3hx4564ac5mnsqi6yyna";
+      name = "kdegraphics-thumbnailers-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-ar = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-ar-16.04.2.tar.xz";
+      sha256 = "12zg36ghyirgazrk19iyk1lcxs3wb92a1bawvgpfz5k8lr8b063s";
+      name = "kde-l10n-ar-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-ast = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-ast-16.04.2.tar.xz";
+      sha256 = "08ca94pln9ylhdlmf6gm4h0k9ggyiz760jrpl27j62940nkzw462";
+      name = "kde-l10n-ast-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-bg = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-bg-16.04.2.tar.xz";
+      sha256 = "15gxgi9p61xva4js94dc7nn27lsfcaalbbas41j6zyvzkychvfdc";
+      name = "kde-l10n-bg-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-bs = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-bs-16.04.2.tar.xz";
+      sha256 = "0441gcmwvgrwwdzb7zgbdm2mfc630znylhzkn80nrjryr0g7m75m";
+      name = "kde-l10n-bs-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-ca = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-ca-16.04.2.tar.xz";
+      sha256 = "059n0ycci6nxsmh2sn8j3npd4h64v2bs0phw7yg990vdnzxfrxxh";
+      name = "kde-l10n-ca-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-ca_valencia = {
+    version = "ca_valencia-16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-ca@valencia-16.04.2.tar.xz";
+      sha256 = "0xzhkirfhkd1gm93mw2xi529qlyyljs8vxd36bq2df63a45bjzpa";
+      name = "kde-l10n-ca_valencia-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-cs = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-cs-16.04.2.tar.xz";
+      sha256 = "18nfigrna4kpmpiiyasqirh57jf46l6y1vms97m12jkbx4awdxjn";
+      name = "kde-l10n-cs-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-da = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-da-16.04.2.tar.xz";
+      sha256 = "0rz5i9q1jhcdh2fa1rh0zw751wwividy3q2z5ijs4ir5yn2qygph";
+      name = "kde-l10n-da-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-de = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-de-16.04.2.tar.xz";
+      sha256 = "1vqb1q1jg3lz9qgv4zx1s4gyg3w3zllj92n50pqxzcbfdwajhwp6";
+      name = "kde-l10n-de-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-el = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-el-16.04.2.tar.xz";
+      sha256 = "159s1pl21n2pl3ppjgmshz0a374ic3dsrkkwsjnpvi20hhblvzl9";
+      name = "kde-l10n-el-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-en_GB = {
+    version = "en_GB-16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-en_GB-16.04.2.tar.xz";
+      sha256 = "0y6y0f6w1fjdh0ppirdlpw1ywa8mqffwqhyczy0bnws3pbravpii";
+      name = "kde-l10n-en_GB-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-eo = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-eo-16.04.2.tar.xz";
+      sha256 = "1g4giais33yj061ikzxf26s6ahhczyg4kdaq54f58lj2sy86x86f";
+      name = "kde-l10n-eo-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-es = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-es-16.04.2.tar.xz";
+      sha256 = "0r33v69axgb283zypb9bck2xy3x02d36230qiyvghnpw0kbhxr60";
+      name = "kde-l10n-es-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-et = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-et-16.04.2.tar.xz";
+      sha256 = "0676ddhr7gvkr0a319yz4hx3macqfcaal4gbzcggnfxl639j65ab";
+      name = "kde-l10n-et-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-eu = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-eu-16.04.2.tar.xz";
+      sha256 = "1af71wkzsr6whmqxjbicz6vs94miw0nz23ifsh45bnlbjdmkrfk7";
+      name = "kde-l10n-eu-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-fa = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-fa-16.04.2.tar.xz";
+      sha256 = "0cpslb17x7k1xjcrp35wp54xmbka0k8z3qwwz20x7bbv9hdind5k";
+      name = "kde-l10n-fa-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-fi = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-fi-16.04.2.tar.xz";
+      sha256 = "0x952d7yhm2dgj5pqm6spiwmnfphqarny5w27fpywi7fs9dnan9f";
+      name = "kde-l10n-fi-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-fr = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-fr-16.04.2.tar.xz";
+      sha256 = "1ay2rn9ki077sml0cjbyhca6f1rmdpmsrq0drrsh5qbn3z0ija73";
+      name = "kde-l10n-fr-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-ga = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-ga-16.04.2.tar.xz";
+      sha256 = "16vn7nmjfp9bgmr41z71800zsgq4x19lay48ls2fgvgpjk6m3m66";
+      name = "kde-l10n-ga-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-gl = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-gl-16.04.2.tar.xz";
+      sha256 = "1hsl3mn7wsgl40wnbyd3ilqp0cdivj9alg4wxmdlz33ybw58apvy";
+      name = "kde-l10n-gl-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-he = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-he-16.04.2.tar.xz";
+      sha256 = "03ifbz9id9dhq04hi2z9zkmbp7aijdkfhrv242k4fvrj2ri0zj2z";
+      name = "kde-l10n-he-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-hi = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-hi-16.04.2.tar.xz";
+      sha256 = "1iwlgg632dfzw7nhn892cnk28q4qwd4iirwsbz6lzfh8bpnibna5";
+      name = "kde-l10n-hi-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-hr = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-hr-16.04.2.tar.xz";
+      sha256 = "1b77mmd50mq7gfxkxjpifsdb6q1m5d7l9cg6w4l1l1mdmkh60nxn";
+      name = "kde-l10n-hr-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-hu = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-hu-16.04.2.tar.xz";
+      sha256 = "10338x2r4w8cbr4hkpyia444zgr475p780i3z2317wr7iwq7sfja";
+      name = "kde-l10n-hu-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-ia = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-ia-16.04.2.tar.xz";
+      sha256 = "109w8nz412fmvld9ban5g2dcaziiq1bjbwh37r3fm4fqbf3c29kz";
+      name = "kde-l10n-ia-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-id = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-id-16.04.2.tar.xz";
+      sha256 = "1z6gbv4ipdr1qqanlpa9v3xcb8xq4a5gvbq1g0xibgs1mykn441j";
+      name = "kde-l10n-id-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-is = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-is-16.04.2.tar.xz";
+      sha256 = "07r6g2i4f76ag5f60hnn0602q4c3qzpz2fz9wggrdn9wq3mfagda";
+      name = "kde-l10n-is-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-it = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-it-16.04.2.tar.xz";
+      sha256 = "0gnjd7crlffjnpnci38d3p9d7j62yknm1swjb15pkrrph7ga31x9";
+      name = "kde-l10n-it-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-ja = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-ja-16.04.2.tar.xz";
+      sha256 = "1ciij3r7lxmpghv6wvc1i0dhdbzq92r54c6sl8jrpwc301a3si0v";
+      name = "kde-l10n-ja-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-kk = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-kk-16.04.2.tar.xz";
+      sha256 = "0qqyl7zndccnh6z49r1x61y6s7ycpq158yp1wy686q7b84zf47wx";
+      name = "kde-l10n-kk-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-km = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-km-16.04.2.tar.xz";
+      sha256 = "0p6cgbngbx72cz3qzmbwcn237f0ibnvk55vzdiiwysdlg4zq4nnj";
+      name = "kde-l10n-km-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-ko = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-ko-16.04.2.tar.xz";
+      sha256 = "0rqsxfq42gxz5ygfsnfsymz0vf0bgk0dwnwcaczv0frjg1mxg8pb";
+      name = "kde-l10n-ko-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-lt = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-lt-16.04.2.tar.xz";
+      sha256 = "0x4mqy1m6ybzf70amkzq8c6jzb2idyqpd3d9cqmx56aibs1bmnr3";
+      name = "kde-l10n-lt-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-lv = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-lv-16.04.2.tar.xz";
+      sha256 = "1w5ry4br8dzb0vwr9vqd6z4ns89zpjwmr8md4vwp59nc80x4583k";
+      name = "kde-l10n-lv-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-mr = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-mr-16.04.2.tar.xz";
+      sha256 = "1bj7adx1h66l6pwcnb17vkhv1iarslbsk73nsxcvkz53sw1l7mrh";
+      name = "kde-l10n-mr-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-nb = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-nb-16.04.2.tar.xz";
+      sha256 = "100zma2jp7gfqjc8xzzqqjcvqqqn0g7baiv4r2l24m0cx37m3ndf";
+      name = "kde-l10n-nb-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-nds = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-nds-16.04.2.tar.xz";
+      sha256 = "1v8qwjhrjyyjqhbdiznqbhvvb2vg7in1zsjyzjwyimqkm2qca8nh";
+      name = "kde-l10n-nds-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-nl = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-nl-16.04.2.tar.xz";
+      sha256 = "1djdvm3nklssgqnz9xgi3sc0vvjrfi0fnpjbyc87r2vg7q33iccq";
+      name = "kde-l10n-nl-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-nn = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-nn-16.04.2.tar.xz";
+      sha256 = "0lbk48q8j3clpv867hfpj5qxzxizmx3x6rz87c3qn09kg1nng93z";
+      name = "kde-l10n-nn-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-pa = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-pa-16.04.2.tar.xz";
+      sha256 = "129p7x37yx1f3q0n5x7brnkrisnfj7x1m92mnqqmjlsf47na4l97";
+      name = "kde-l10n-pa-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-pl = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-pl-16.04.2.tar.xz";
+      sha256 = "0dp3rn1vh4q1ks7165zdjn4avyplg5kg2nbkqg8jcm8702v0f674";
+      name = "kde-l10n-pl-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-pt = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-pt-16.04.2.tar.xz";
+      sha256 = "1irk84qzsxa0s6q7jwq3qzc76vkx4i3gd3ymmrw40376n1c2wiv8";
+      name = "kde-l10n-pt-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-pt_BR = {
+    version = "pt_BR-16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-pt_BR-16.04.2.tar.xz";
+      sha256 = "1f7r17zm4bq32xypccmgkaj80hyjrc4dvqd2gkk04pq8kqv22924";
+      name = "kde-l10n-pt_BR-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-ro = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-ro-16.04.2.tar.xz";
+      sha256 = "172z2vzlldk2g7a65r9dvbsspxszha1m9q2qkzaq9hciklgznr64";
+      name = "kde-l10n-ro-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-ru = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-ru-16.04.2.tar.xz";
+      sha256 = "060s0gcy1mv7wqmk33ambqcn7dd589vvccjxkwvbqwsn0lsjykyb";
+      name = "kde-l10n-ru-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-sk = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-sk-16.04.2.tar.xz";
+      sha256 = "1353kldi2gvhrnb3dpyhnf3lbj22jcd5ri5ar5j7bq4v2jzb36nl";
+      name = "kde-l10n-sk-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-sl = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-sl-16.04.2.tar.xz";
+      sha256 = "1ibwa1884l4w5z7ys62pqs359c8aa0m9w5chn6l3p55qlkzvf007";
+      name = "kde-l10n-sl-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-sr = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-sr-16.04.2.tar.xz";
+      sha256 = "0zs31gr7lz7fcvcv106aj2ilbkjcd5mqbfvpj6zqkrmjcyi8j6a8";
+      name = "kde-l10n-sr-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-sv = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-sv-16.04.2.tar.xz";
+      sha256 = "16h8gvzd52zah3643jxaab1aik93b31hbv07z2mipdpdl2fzl039";
+      name = "kde-l10n-sv-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-tr = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-tr-16.04.2.tar.xz";
+      sha256 = "0mysq61p6ph4wrrjkd0nrq6w6mxcsg0q9infrp5sgpaqqds58yia";
+      name = "kde-l10n-tr-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-ug = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-ug-16.04.2.tar.xz";
+      sha256 = "198f8fk0pw79z7n0b7q5vpsmwfjg2a6l1vwl9qab5a97bcwq4l4d";
+      name = "kde-l10n-ug-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-uk = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-uk-16.04.2.tar.xz";
+      sha256 = "18wjsab7dv9li5p6k087h9w3kf9rr5hy08yms1wd3wn2gg566nbi";
+      name = "kde-l10n-uk-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-wa = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-wa-16.04.2.tar.xz";
+      sha256 = "1qmrkhf9lfccsvj966pv045i0z56642l7jzd0ry4n0ifngancvqp";
+      name = "kde-l10n-wa-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-zh_CN = {
+    version = "zh_CN-16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-zh_CN-16.04.2.tar.xz";
+      sha256 = "1vcbjl49721gnbg03f07azwr30hv7y0szaagp1kxw8npa1yk9dn2";
+      name = "kde-l10n-zh_CN-16.04.2.tar.xz";
+    };
+  };
+  kde-l10n-zh_TW = {
+    version = "zh_TW-16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-l10n/kde-l10n-zh_TW-16.04.2.tar.xz";
+      sha256 = "1i8ax0cn59plqiq6sd1x0svjq2w37dr2x616q730hjygkks306ik";
+      name = "kde-l10n-zh_TW-16.04.2.tar.xz";
+    };
+  };
+  kdelibs = {
+    version = "4.14.21";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdelibs-4.14.21.tar.xz";
+      sha256 = "0hi2rdx3z3xiqbyi1hx04ls88irl30x8as1c9c07zrd4d1qpazs8";
+      name = "kdelibs-4.14.21.tar.xz";
+    };
+  };
+  kdenetwork-filesharing = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdenetwork-filesharing-16.04.2.tar.xz";
+      sha256 = "026g1m7ch8vy8ckqc9j4aapp8s7c4v59jdj4qx5z8jy7n27645z2";
+      name = "kdenetwork-filesharing-16.04.2.tar.xz";
+    };
+  };
+  kdenetwork-strigi-analyzers = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdenetwork-strigi-analyzers-16.04.2.tar.xz";
+      sha256 = "03jcl9ibhlqlijkps8ab95prp9bqswi82pd79j2dcqgldy681zm9";
+      name = "kdenetwork-strigi-analyzers-16.04.2.tar.xz";
+    };
+  };
+  kdenlive = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdenlive-16.04.2.tar.xz";
+      sha256 = "00pn2szyiny137j3kvymcdh28cjpbw5k65ziiljaiw0q6a558ibj";
+      name = "kdenlive-16.04.2.tar.xz";
+    };
+  };
+  kdepim = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdepim-16.04.2.tar.xz";
+      sha256 = "1vvgblkdz9v5cv01saaph8mxhf7pc1lg9z8aasisx6m14131wdqj";
+      name = "kdepim-16.04.2.tar.xz";
+    };
+  };
+  kdepim-addons = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdepim-addons-16.04.2.tar.xz";
+      sha256 = "185cp7ld9yjap74xknn9cq0j3ch6l0gpkxgyxr1ngfdvmbwswyrs";
+      name = "kdepim-addons-16.04.2.tar.xz";
+    };
+  };
+  kdepim-apps-libs = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdepim-apps-libs-16.04.2.tar.xz";
+      sha256 = "1f5mq58zxa9zpif4f8b72w762l8di5gx9zxlpzc62k80z6z5hc3d";
+      name = "kdepim-apps-libs-16.04.2.tar.xz";
+    };
+  };
+  kdepimlibs = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdepimlibs-16.04.2.tar.xz";
+      sha256 = "11rdb7558b7lvawqvanvdbvq9kmapngmid1fzx0ai5xza7miiplc";
+      name = "kdepimlibs-16.04.2.tar.xz";
+    };
+  };
+  kdepim-runtime = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdepim-runtime-16.04.2.tar.xz";
+      sha256 = "0rf2axz23lzk4g8686brs8hswj3f0is08vvhcx7y960g7yikm2r2";
+      name = "kdepim-runtime-16.04.2.tar.xz";
+    };
+  };
+  kde-runtime = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kde-runtime-16.04.2.tar.xz";
+      sha256 = "070m7x0b97073pnqcy6bcl1yj6zh9vd855638sd8xpxjvqfsf5b9";
+      name = "kde-runtime-16.04.2.tar.xz";
+    };
+  };
+  kdesdk-kioslaves = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdesdk-kioslaves-16.04.2.tar.xz";
+      sha256 = "0fnr1rqzwlpmgikj3if5xqgnazf5rbnyw69b8lsxxvbs7fy23xmi";
+      name = "kdesdk-kioslaves-16.04.2.tar.xz";
+    };
+  };
+  kdesdk-strigi-analyzers = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdesdk-strigi-analyzers-16.04.2.tar.xz";
+      sha256 = "0jj1zr044pqn45zndlkdywnjyvm6qyiiaxxhq6vfmi6b54rxdfv3";
+      name = "kdesdk-strigi-analyzers-16.04.2.tar.xz";
+    };
+  };
+  kdesdk-thumbnailers = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdesdk-thumbnailers-16.04.2.tar.xz";
+      sha256 = "02w5a8q6yn550iwsnjnika9kxpk5ap84d3bij02rym6as36hhdji";
+      name = "kdesdk-thumbnailers-16.04.2.tar.xz";
+    };
+  };
+  kdewebdev = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdewebdev-16.04.2.tar.xz";
+      sha256 = "1hx51mr6lv9mfx35cf24rp7hn47pwbsnjk4qsb7hlv0049jvidgp";
+      name = "kdewebdev-16.04.2.tar.xz";
+    };
+  };
+  kdf = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdf-16.04.2.tar.xz";
+      sha256 = "191xzqrdbv38xcxpzr5h24a33l3w8pvjrpymilwbjyjf621h649l";
+      name = "kdf-16.04.2.tar.xz";
+    };
+  };
+  kdgantt2 = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdgantt2-16.04.2.tar.xz";
+      sha256 = "12xj5sqf1l4i7sakpa5845hdmxb62gbj08irg7dq55wxk6jz1a0r";
+      name = "kdgantt2-16.04.2.tar.xz";
+    };
+  };
+  kdiamond = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kdiamond-16.04.2.tar.xz";
+      sha256 = "0vyyj4ab2avbwy998skr5728221by5l730q2lx9n886wig6w4r34";
+      name = "kdiamond-16.04.2.tar.xz";
+    };
+  };
+  kfloppy = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kfloppy-16.04.2.tar.xz";
+      sha256 = "0dp921jpwrdq892dgi5axij822zkfkmclr94g5sbpv223gx2ds3p";
+      name = "kfloppy-16.04.2.tar.xz";
+    };
+  };
+  kfourinline = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kfourinline-16.04.2.tar.xz";
+      sha256 = "0dxxi36pp4k0brv7x2aqycs26kpjgrsydqn2rw0k25gka5msrsm2";
+      name = "kfourinline-16.04.2.tar.xz";
+    };
+  };
+  kgeography = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kgeography-16.04.2.tar.xz";
+      sha256 = "1rmwcv0pa043k12l64pa8wg1iq2iyv07h04mvj99957856qyzkcj";
+      name = "kgeography-16.04.2.tar.xz";
+    };
+  };
+  kget = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kget-16.04.2.tar.xz";
+      sha256 = "0mgjpl15m9pihprksy1bbzydp0vbkklkcjd04hfsd0nq0g5dxkpx";
+      name = "kget-16.04.2.tar.xz";
+    };
+  };
+  kgoldrunner = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kgoldrunner-16.04.2.tar.xz";
+      sha256 = "0ijby2k9ggsqcwrhbwy4w0jazvmy68j5k1hcw1p7vq15s5j2rp1k";
+      name = "kgoldrunner-16.04.2.tar.xz";
+    };
+  };
+  kgpg = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kgpg-16.04.2.tar.xz";
+      sha256 = "1hqnk5xik1v89d8q2z6y6yp844z9h8v9lc689kszv9prwswg1xj8";
+      name = "kgpg-16.04.2.tar.xz";
+    };
+  };
+  khangman = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/khangman-16.04.2.tar.xz";
+      sha256 = "12hhvkd6zqj1s5kn0yw8fk8mpwnxhgsapwn702hcvfz1lxkd9qy4";
+      name = "khangman-16.04.2.tar.xz";
+    };
+  };
+  khelpcenter = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/khelpcenter-16.04.2.tar.xz";
+      sha256 = "06ph45mfadhb12bdcp2rgbvfsq9n2s6wdl5x3fy0hpy58w6yy4cd";
+      name = "khelpcenter-16.04.2.tar.xz";
+    };
+  };
+  kholidays = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kholidays-16.04.2.tar.xz";
+      sha256 = "1ha5yhjyfblh6j1wfx05433cclgnch8maic495ica014lcdb9ff0";
+      name = "kholidays-16.04.2.tar.xz";
+    };
+  };
+  kidentitymanagement = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kidentitymanagement-16.04.2.tar.xz";
+      sha256 = "0g3cw81c0549237qlhrx0bna5avnsryniq3gccwy862lsgj92nhv";
+      name = "kidentitymanagement-16.04.2.tar.xz";
+    };
+  };
+  kig = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kig-16.04.2.tar.xz";
+      sha256 = "07zqs1sbj6vfjfckvf5d4dw43cnc84bivrv3qldlg77k99z0x0wa";
+      name = "kig-16.04.2.tar.xz";
+    };
+  };
+  kigo = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kigo-16.04.2.tar.xz";
+      sha256 = "057nfhngiwf5cfn8xaysii26b4b16105hw1a98kgf8aynyasrd19";
+      name = "kigo-16.04.2.tar.xz";
+    };
+  };
+  killbots = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/killbots-16.04.2.tar.xz";
+      sha256 = "0k9psr5w4nbfymldr6x8i5mc91fxzgv4khygfw6bi0w1zdlbp7s3";
+      name = "killbots-16.04.2.tar.xz";
+    };
+  };
+  kimap = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kimap-16.04.2.tar.xz";
+      sha256 = "0i4hfbm2ch71fj52fc08p0rmsqx8r9hw8ia1r2nipv8wl33a099x";
+      name = "kimap-16.04.2.tar.xz";
+    };
+  };
+  kio-extras = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kio-extras-16.04.2.tar.xz";
+      sha256 = "1qi580d3aqhkh80sj7vphchsl7xfcjbc100cg81b7rdwpa4qv0aq";
+      name = "kio-extras-16.04.2.tar.xz";
+    };
+  };
+  kiriki = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kiriki-16.04.2.tar.xz";
+      sha256 = "0pq5ai3f27fn7hh3ni0s99ja94nmrlcy3vhvl4h0f94q16lwwhvf";
+      name = "kiriki-16.04.2.tar.xz";
+    };
+  };
+  kiten = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kiten-16.04.2.tar.xz";
+      sha256 = "1bxvf01k75yhahq97199q6cf3xcjdc92kn8wr628k3wd6xnqcn0a";
+      name = "kiten-16.04.2.tar.xz";
+    };
+  };
+  kjumpingcube = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kjumpingcube-16.04.2.tar.xz";
+      sha256 = "115nd7z983cdhcrw3fknha4ham9avjx9vy278xijkqh5m9b5xczj";
+      name = "kjumpingcube-16.04.2.tar.xz";
+    };
+  };
+  kldap = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kldap-16.04.2.tar.xz";
+      sha256 = "198y963y9ydd4gav5f7fdnarf7kmbpjafqw19z3r22hmqikbc1gq";
+      name = "kldap-16.04.2.tar.xz";
+    };
+  };
+  kleopatra = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kleopatra-16.04.2.tar.xz";
+      sha256 = "064rc6nrgpkvxjxzmavs7f28dczv6szqnx78say0zxa34azl88vh";
+      name = "kleopatra-16.04.2.tar.xz";
+    };
+  };
+  klettres = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/klettres-16.04.2.tar.xz";
+      sha256 = "1fy41zw1rc9ggsy04q9qscwz3yn58nsj8xjhr7iwvhk2qhhzyw1v";
+      name = "klettres-16.04.2.tar.xz";
+    };
+  };
+  klickety = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/klickety-16.04.2.tar.xz";
+      sha256 = "0rz89s4fwbf1qm52ca17y2r9xsfb406xwjbz9mfyil1x80cyahdm";
+      name = "klickety-16.04.2.tar.xz";
+    };
+  };
+  klines = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/klines-16.04.2.tar.xz";
+      sha256 = "1djhxqvjcqlv4bagcg03k7dngygn8ywqwhhjsc0ql6a1nbrfkh1q";
+      name = "klines-16.04.2.tar.xz";
+    };
+  };
+  kmag = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kmag-16.04.2.tar.xz";
+      sha256 = "0m7502q0n76cs009giac90sgf8hhza3c8zf5ypb7aydnixcvligs";
+      name = "kmag-16.04.2.tar.xz";
+    };
+  };
+  kmahjongg = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kmahjongg-16.04.2.tar.xz";
+      sha256 = "09b336jfw7zafzpiddxadvf0h7ch2l5ksdzz1salhqqnqxg271mn";
+      name = "kmahjongg-16.04.2.tar.xz";
+    };
+  };
+  kmailtransport = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kmailtransport-16.04.2.tar.xz";
+      sha256 = "1dz3w9gxc14bkdp1h05ppw6c3m29kw9ky9c5ajvi6gckynjkg0dz";
+      name = "kmailtransport-16.04.2.tar.xz";
+    };
+  };
+  kmbox = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kmbox-16.04.2.tar.xz";
+      sha256 = "1mkwv695bzjszrpsv8bpjlid4f933jnkf7vc1l8wlamik88y5i7x";
+      name = "kmbox-16.04.2.tar.xz";
+    };
+  };
+  kmime = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kmime-16.04.2.tar.xz";
+      sha256 = "0h1a43yi7nzj6s3j5v6v9dp5r2qbbhdamnl2d8jpqkl5hnxf0mlq";
+      name = "kmime-16.04.2.tar.xz";
+    };
+  };
+  kmines = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kmines-16.04.2.tar.xz";
+      sha256 = "1c4yp6zsva1dyr34cprxmy11iq3p3xxz7j8g8bl35qp95l8cwwhl";
+      name = "kmines-16.04.2.tar.xz";
+    };
+  };
+  kmix = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kmix-16.04.2.tar.xz";
+      sha256 = "092l0myv9dhx534j96qwqy1gddzc64r15wnansifnn0miv1rsnmb";
+      name = "kmix-16.04.2.tar.xz";
+    };
+  };
+  kmousetool = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kmousetool-16.04.2.tar.xz";
+      sha256 = "0r4wv17l2xm85nncxz7fagfp7z0fi5hbhc28bqnaggc4yz3jbh7d";
+      name = "kmousetool-16.04.2.tar.xz";
+    };
+  };
+  kmouth = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kmouth-16.04.2.tar.xz";
+      sha256 = "0xfv9hd8cdszvllwd56qwcg8x3fcz4d64zhf4mi2f3v47a9wrir4";
+      name = "kmouth-16.04.2.tar.xz";
+    };
+  };
+  kmplot = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kmplot-16.04.2.tar.xz";
+      sha256 = "0bvxgj34llgpk6gv9wv1infb782z6fgigcpiv00xqlr7pgkhsns2";
+      name = "kmplot-16.04.2.tar.xz";
+    };
+  };
+  knavalbattle = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/knavalbattle-16.04.2.tar.xz";
+      sha256 = "0abwxqy82xrhyfixxj3rivkflj5dkrc82131hmjd35c1lcabh4aw";
+      name = "knavalbattle-16.04.2.tar.xz";
+    };
+  };
+  knetwalk = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/knetwalk-16.04.2.tar.xz";
+      sha256 = "13399nqhja4wlf3d8zy6ia7ayjsb8kyrmjx6dsw1hdbpgfdj29w0";
+      name = "knetwalk-16.04.2.tar.xz";
+    };
+  };
+  kolf = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kolf-16.04.2.tar.xz";
+      sha256 = "0h5a20pra3ip6a3cf5kivpbyky5fkhzknkx80dcwi36g4q9qryyh";
+      name = "kolf-16.04.2.tar.xz";
+    };
+  };
+  kollision = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kollision-16.04.2.tar.xz";
+      sha256 = "09xc2mgipw4a8cmgdqs5mr9r144wjkn2656nidvdxwhizm05k5ib";
+      name = "kollision-16.04.2.tar.xz";
+    };
+  };
+  kolourpaint = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kolourpaint-16.04.2.tar.xz";
+      sha256 = "0ffnfzmsds5n60w2b7x43q64bvws8z1hs9m80jh4xcz3p2ybkwlg";
+      name = "kolourpaint-16.04.2.tar.xz";
+    };
+  };
+  kompare = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kompare-16.04.2.tar.xz";
+      sha256 = "09xjws4kb66r6m65srsjx37dvhyj6ifj5yixb77njfkcf140060p";
+      name = "kompare-16.04.2.tar.xz";
+    };
+  };
+  konquest = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/konquest-16.04.2.tar.xz";
+      sha256 = "1b81z9z7rcbm75phpc7rz5s2159b6f98g3kkry7b1hlh51qajd3v";
+      name = "konquest-16.04.2.tar.xz";
+    };
+  };
+  konsole = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/konsole-16.04.2.tar.xz";
+      sha256 = "1pp7xfh472vwk4nnhcga73zkb4bxqnmk70dxnn0kxj6z55igrp19";
+      name = "konsole-16.04.2.tar.xz";
+    };
+  };
+  kontactinterface = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kontactinterface-16.04.2.tar.xz";
+      sha256 = "1yax2bwxhr15pqwy63ki5zriz01l5phvbx2f9whpbccmpbsd3yyh";
+      name = "kontactinterface-16.04.2.tar.xz";
+    };
+  };
+  kopete = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kopete-16.04.2.tar.xz";
+      sha256 = "16j3j6z0irmqrm4cgm9vwa5nd4rixyirn0hpi2kanzy6m8j623nf";
+      name = "kopete-16.04.2.tar.xz";
+    };
+  };
+  kpat = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kpat-16.04.2.tar.xz";
+      sha256 = "1qmcnx0zmks37fzr6chx409frb08g61cx0rn2gwad57f3id3dh2m";
+      name = "kpat-16.04.2.tar.xz";
+    };
+  };
+  kpimtextedit = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kpimtextedit-16.04.2.tar.xz";
+      sha256 = "0r36knm4w4micchjibiika373z9lzqkzhc7pfa38zwpd529wxfk4";
+      name = "kpimtextedit-16.04.2.tar.xz";
+    };
+  };
+  kppp = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kppp-16.04.2.tar.xz";
+      sha256 = "14p07ph8kc1wlfzf8lbmqhpv5iix392fc81y56bc48ba28czsmp6";
+      name = "kppp-16.04.2.tar.xz";
+    };
+  };
+  kqtquickcharts = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kqtquickcharts-16.04.2.tar.xz";
+      sha256 = "1bdkv3jpvacliz8120cch415jwlg65gd3xyz5ixkynxzkmilj3kx";
+      name = "kqtquickcharts-16.04.2.tar.xz";
+    };
+  };
+  krdc = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/krdc-16.04.2.tar.xz";
+      sha256 = "1qn7mci4mschz8a94na6xakl982hrj0g4ccw1hfrhlzyxa7hfx74";
+      name = "krdc-16.04.2.tar.xz";
+    };
+  };
+  kremotecontrol = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kremotecontrol-16.04.2.tar.xz";
+      sha256 = "1z37qmmp688mn9kiprmnl2zdira60as1bsfn0zy24jnnkskvr3ga";
+      name = "kremotecontrol-16.04.2.tar.xz";
+    };
+  };
+  kreversi = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kreversi-16.04.2.tar.xz";
+      sha256 = "1b7aqv33qkx18g9bkcna0z7027c4j2kwx6naldhgq3dxgg22gi6k";
+      name = "kreversi-16.04.2.tar.xz";
+    };
+  };
+  krfb = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/krfb-16.04.2.tar.xz";
+      sha256 = "11arv0h0sgnk21lmw9mzj43cijchljpwy09ifii9a8xxn0cczf5x";
+      name = "krfb-16.04.2.tar.xz";
+    };
+  };
+  kross-interpreters = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kross-interpreters-16.04.2.tar.xz";
+      sha256 = "1z8sv8vyfi1nx70f72qx5xgaxa8qklm1a1nq0p5x4jl22gf981qz";
+      name = "kross-interpreters-16.04.2.tar.xz";
+    };
+  };
+  kruler = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kruler-16.04.2.tar.xz";
+      sha256 = "12gm8zy0233djdgfn2clsyamlc5q013pblyv70f5z0j8s2a8293h";
+      name = "kruler-16.04.2.tar.xz";
+    };
+  };
+  ksaneplugin = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ksaneplugin-16.04.2.tar.xz";
+      sha256 = "0y5yvr09g9x9k8lswpjbhkd6fnbw80dajrjjsjws5rfvi388ps7c";
+      name = "ksaneplugin-16.04.2.tar.xz";
+    };
+  };
+  kscd = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kscd-16.04.2.tar.xz";
+      sha256 = "0k2q1fqrbpsbjlzyk1az1pyd76dqqwmmdandj7c6aqbl332dca5g";
+      name = "kscd-16.04.2.tar.xz";
+    };
+  };
+  kshisen = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kshisen-16.04.2.tar.xz";
+      sha256 = "1wl7bv18jvwy44hxa3ys3aaxw0hx68vk3b3vwr381729c0njxzrl";
+      name = "kshisen-16.04.2.tar.xz";
+    };
+  };
+  ksirk = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ksirk-16.04.2.tar.xz";
+      sha256 = "17j2k8gnx0fh5v6592wfkcl5lbz2fgjv0na423gjij6rvvnb1xxs";
+      name = "ksirk-16.04.2.tar.xz";
+    };
+  };
+  ksnakeduel = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ksnakeduel-16.04.2.tar.xz";
+      sha256 = "1v0pnkkzk1j2cgkf58vk3ly9yvxyqq2y9xvfnpzv939f8sl10qa7";
+      name = "ksnakeduel-16.04.2.tar.xz";
+    };
+  };
+  kspaceduel = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kspaceduel-16.04.2.tar.xz";
+      sha256 = "0jspmg7gkjawb50mlafxcaimqm3xp4gpw7a2dm895z8f6lhp0q4q";
+      name = "kspaceduel-16.04.2.tar.xz";
+    };
+  };
+  ksquares = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ksquares-16.04.2.tar.xz";
+      sha256 = "0l0s978551ziw79sck2fji474pgynvx4ny87f3faplz6adpvclmd";
+      name = "ksquares-16.04.2.tar.xz";
+    };
+  };
+  kstars = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kstars-16.04.2.tar.xz";
+      sha256 = "1v29ky6id80wgkhj23vb4c1a905zi8xkwyx1fjdqm0b0783p5w0f";
+      name = "kstars-16.04.2.tar.xz";
+    };
+  };
+  ksudoku = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ksudoku-16.04.2.tar.xz";
+      sha256 = "0ymxjcbjd0dpsjl3jjr4bxj3xbhkpv1zr9mf2fxjpnfz3js9zf7q";
+      name = "ksudoku-16.04.2.tar.xz";
+    };
+  };
+  ksystemlog = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ksystemlog-16.04.2.tar.xz";
+      sha256 = "0i74xfhfmyxp2i94fdivlf3z38mak78j8yy8by652143g0gz61nz";
+      name = "ksystemlog-16.04.2.tar.xz";
+    };
+  };
+  kteatime = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kteatime-16.04.2.tar.xz";
+      sha256 = "1y7ih9ii3hk91pbyp7bwgiy8g6hb3bsnjc5a6nlghc3d79zvq77y";
+      name = "kteatime-16.04.2.tar.xz";
+    };
+  };
+  ktimer = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktimer-16.04.2.tar.xz";
+      sha256 = "06isrcpcbr9n7lhrqv9ahvms8vqz2azw0p6v29sihwskcw933yf0";
+      name = "ktimer-16.04.2.tar.xz";
+    };
+  };
+  ktnef = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktnef-16.04.2.tar.xz";
+      sha256 = "1picfgmy9m3rfzp2hwgz7npijrb0x8w1zyy7gz4q37g3577gjm79";
+      name = "ktnef-16.04.2.tar.xz";
+    };
+  };
+  ktouch = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktouch-16.04.2.tar.xz";
+      sha256 = "1jcgg5fxnn4fsv2gjiwijd2k9rw2ljffvw5dqg0pwkmikp7f4pmd";
+      name = "ktouch-16.04.2.tar.xz";
+    };
+  };
+  ktp-accounts-kcm = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktp-accounts-kcm-16.04.2.tar.xz";
+      sha256 = "1pzwpfp93p47zghqwfqhgk16j9ar52zcx0kfacpy8z7014wsj02k";
+      name = "ktp-accounts-kcm-16.04.2.tar.xz";
+    };
+  };
+  ktp-approver = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktp-approver-16.04.2.tar.xz";
+      sha256 = "1q74di50kl46px23fp4lmx5l0j9ndlxhsfvn78j42lfp6wkgqi8c";
+      name = "ktp-approver-16.04.2.tar.xz";
+    };
+  };
+  ktp-auth-handler = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktp-auth-handler-16.04.2.tar.xz";
+      sha256 = "15dm09i4bny5b1958390r1wjsm26kkhmxlfrgd9az4yln8pmidmh";
+      name = "ktp-auth-handler-16.04.2.tar.xz";
+    };
+  };
+  ktp-call-ui = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktp-call-ui-16.04.2.tar.xz";
+      sha256 = "0wf6wmxzzpsnwglyf46q6mwznl0r5lmzf8n39a62qf84jgxj3p7v";
+      name = "ktp-call-ui-16.04.2.tar.xz";
+    };
+  };
+  ktp-common-internals = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktp-common-internals-16.04.2.tar.xz";
+      sha256 = "04177adil082qfrq7y4lg06hzmx8kcpbdgfisa59wsmmcyydziy1";
+      name = "ktp-common-internals-16.04.2.tar.xz";
+    };
+  };
+  ktp-contact-list = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktp-contact-list-16.04.2.tar.xz";
+      sha256 = "017mz9z8248d9hmz37dsnjdfjk4m58y546aq6y93mahywl0dccia";
+      name = "ktp-contact-list-16.04.2.tar.xz";
+    };
+  };
+  ktp-contact-runner = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktp-contact-runner-16.04.2.tar.xz";
+      sha256 = "0c3gl5ass4nfmrbvynj8hf3iyrrybn9h4bm07l84hky2bmhqjhkw";
+      name = "ktp-contact-runner-16.04.2.tar.xz";
+    };
+  };
+  ktp-desktop-applets = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktp-desktop-applets-16.04.2.tar.xz";
+      sha256 = "1fmm4vi6r9hhj4xaz6lz3rx04l6fkhqq9qrcxbv5xbrif0jw82f6";
+      name = "ktp-desktop-applets-16.04.2.tar.xz";
+    };
+  };
+  ktp-filetransfer-handler = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktp-filetransfer-handler-16.04.2.tar.xz";
+      sha256 = "0zlmy9fs8qvk6jzdp9zs3y4jz5nz5asxvcics4hcpbl5s4b5nyf0";
+      name = "ktp-filetransfer-handler-16.04.2.tar.xz";
+    };
+  };
+  ktp-kded-module = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktp-kded-module-16.04.2.tar.xz";
+      sha256 = "0bnqv87gbv9idspp7yh8y690d66l0j3x70krg413xk8pqs012r15";
+      name = "ktp-kded-module-16.04.2.tar.xz";
+    };
+  };
+  ktp-send-file = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktp-send-file-16.04.2.tar.xz";
+      sha256 = "1nqw7b66z4fkcvbm7cl9vdwwwsbylk0mbj5rs37laddjyn0igcnq";
+      name = "ktp-send-file-16.04.2.tar.xz";
+    };
+  };
+  ktp-text-ui = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktp-text-ui-16.04.2.tar.xz";
+      sha256 = "1ls9ns6wb6wvcxli4almc2dv7gzihsihdpb1i171c3yr16d5kmvf";
+      name = "ktp-text-ui-16.04.2.tar.xz";
+    };
+  };
+  ktuberling = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/ktuberling-16.04.2.tar.xz";
+      sha256 = "15r6m3861cpnmzyrxf5ixqwp6vvjd875237bbb6h881hgw9xfv57";
+      name = "ktuberling-16.04.2.tar.xz";
+    };
+  };
+  kturtle = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kturtle-16.04.2.tar.xz";
+      sha256 = "12z7r1fprz83da34msnns6s3ar1734y6cxh0infv758nvmykhkqn";
+      name = "kturtle-16.04.2.tar.xz";
+    };
+  };
+  kubrick = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kubrick-16.04.2.tar.xz";
+      sha256 = "16mjswzybnpb1iwzaygkva99lf551fz4864mngav1v0v6489ryc1";
+      name = "kubrick-16.04.2.tar.xz";
+    };
+  };
+  kuser = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kuser-16.04.2.tar.xz";
+      sha256 = "0cxag2p88959vk11qdcxhb3kmr18wrk5chf5644phapyns8lm0i6";
+      name = "kuser-16.04.2.tar.xz";
+    };
+  };
+  kwalletmanager = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kwalletmanager-16.04.2.tar.xz";
+      sha256 = "1l37ykkkfy8m9x9v9x5yr701nvgxwsx9npqfhlrgaq0clq0xvsxd";
+      name = "kwalletmanager-16.04.2.tar.xz";
+    };
+  };
+  kwordquiz = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/kwordquiz-16.04.2.tar.xz";
+      sha256 = "0nra7gpqfrnl0hl2ankzkbdfqrs3iwr6x6harrhcaxmszpbiw7fa";
+      name = "kwordquiz-16.04.2.tar.xz";
+    };
+  };
+  libgravatar = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libgravatar-16.04.2.tar.xz";
+      sha256 = "1rw800ch89gd1xsbgm9wz7vbayyvrli7gcnn9miaqhhjgcgpjs6p";
+      name = "libgravatar-16.04.2.tar.xz";
+    };
+  };
+  libkcddb = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkcddb-16.04.2.tar.xz";
+      sha256 = "14dsc35kh843xsva0csqkv2rgyspvg3ld3gjr8ks4zp7ry1wi6gj";
+      name = "libkcddb-16.04.2.tar.xz";
+    };
+  };
+  libkcompactdisc = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkcompactdisc-16.04.2.tar.xz";
+      sha256 = "05k19a7mhk5xxd8k653i8xqc58xjrxyphdwsw746cvw3nqpiiaml";
+      name = "libkcompactdisc-16.04.2.tar.xz";
+    };
+  };
+  libkdcraw = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkdcraw-16.04.2.tar.xz";
+      sha256 = "1kcyhc8gi2av109nracm42q91k7ndmj7yw8q52ssfzkbw4r8c9yw";
+      name = "libkdcraw-16.04.2.tar.xz";
+    };
+  };
+  libkdeedu = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkdeedu-16.04.2.tar.xz";
+      sha256 = "15prm6lfhpys4n6rsbvfqcm2w3sr315lynsnww8740nk59sjm45f";
+      name = "libkdeedu-16.04.2.tar.xz";
+    };
+  };
+  libkdegames = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkdegames-16.04.2.tar.xz";
+      sha256 = "1b87g8jihyfzpvws6xwx8cbc118nfdwksh0j2sl7hbnnkgc6s6ia";
+      name = "libkdegames-16.04.2.tar.xz";
+    };
+  };
+  libkdepim = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkdepim-16.04.2.tar.xz";
+      sha256 = "0p2p19qqdnkpvp1dnm0idffg0x03dwqkrjy426l8ahabl0xp8pl4";
+      name = "libkdepim-16.04.2.tar.xz";
+    };
+  };
+  libkeduvocdocument = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkeduvocdocument-16.04.2.tar.xz";
+      sha256 = "002scb7b174d03ady232dc2drnphnw51a9a0wb3rdm3kip4m85k1";
+      name = "libkeduvocdocument-16.04.2.tar.xz";
+    };
+  };
+  libkexiv2 = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkexiv2-16.04.2.tar.xz";
+      sha256 = "11d33wdlhlpbjkrfawb45py5akzd4nyry0vi28mx4hkk5glbhd82";
+      name = "libkexiv2-16.04.2.tar.xz";
+    };
+  };
+  libkface = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkface-16.04.2.tar.xz";
+      sha256 = "1r97j4dkm509r7nvbdpqnvfzlznlvqbsq9lghqrrcaafizrz074h";
+      name = "libkface-16.04.2.tar.xz";
+    };
+  };
+  libkgeomap = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkgeomap-16.04.2.tar.xz";
+      sha256 = "0xvgg9cb63bpl9fc68l038zlz38l175n7q3jpcqnx15f6qb8vcpk";
+      name = "libkgeomap-16.04.2.tar.xz";
+    };
+  };
+  libkipi = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkipi-16.04.2.tar.xz";
+      sha256 = "02gknmsqh9x31p83y7nb550yjr6rfnsdh3m1yqm5n3jyjdmfxd66";
+      name = "libkipi-16.04.2.tar.xz";
+    };
+  };
+  libkleo = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkleo-16.04.2.tar.xz";
+      sha256 = "1bdfqnrslzmsk7dg3f8g1p4b2m5hd5hvh1ws9phkhilhcxp2b33v";
+      name = "libkleo-16.04.2.tar.xz";
+    };
+  };
+  libkmahjongg = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkmahjongg-16.04.2.tar.xz";
+      sha256 = "0chszdkcyjmny8j5nhbl9y6334qb7wy3ll16p829cy8k2hj69pb4";
+      name = "libkmahjongg-16.04.2.tar.xz";
+    };
+  };
+  libkomparediff2 = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libkomparediff2-16.04.2.tar.xz";
+      sha256 = "035m9da6cnn0masfn79cmd43fviapr7fldl0diiwpcmjwkpmrp1v";
+      name = "libkomparediff2-16.04.2.tar.xz";
+    };
+  };
+  libksane = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libksane-16.04.2.tar.xz";
+      sha256 = "1s150l0kcmp98l134k8gwhzwzv4kk3583wv0lxd3l9li2940sjdp";
+      name = "libksane-16.04.2.tar.xz";
+    };
+  };
+  libksieve = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/libksieve-16.04.2.tar.xz";
+      sha256 = "1i51zp4fkyyrh0f998i25yx7i7a9g9kcw5pfaisprh84rbyrdq1w";
+      name = "libksieve-16.04.2.tar.xz";
+    };
+  };
+  lokalize = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/lokalize-16.04.2.tar.xz";
+      sha256 = "0cnrh49c14j64lv67ylm4fczbwbnrja8g4bwzqaaz1sm1ncxmyr3";
+      name = "lokalize-16.04.2.tar.xz";
+    };
+  };
+  lskat = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/lskat-16.04.2.tar.xz";
+      sha256 = "0qd5z1c5c8b2vn3rpgms0bqzdbh69ji8h14ascis4znrq2hqc6p2";
+      name = "lskat-16.04.2.tar.xz";
+    };
+  };
+  mailcommon = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/mailcommon-16.04.2.tar.xz";
+      sha256 = "0bcl0kqyqqhmnjli7qb4k1mgh1wwwbf622sxp9p0y91wwgy2y5f1";
+      name = "mailcommon-16.04.2.tar.xz";
+    };
+  };
+  mailimporter = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/mailimporter-16.04.2.tar.xz";
+      sha256 = "1r9y91xbbyhd0rabwavi1q16a8rbi63zlsnkb0q64sw73bbyh3zz";
+      name = "mailimporter-16.04.2.tar.xz";
+    };
+  };
+  marble = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/marble-16.04.2.tar.xz";
+      sha256 = "04wg317ypp25aszgla1vrjdc18p8xvjj1xizj4crzg85n700d81j";
+      name = "marble-16.04.2.tar.xz";
+    };
+  };
+  messagelib = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/messagelib-16.04.2.tar.xz";
+      sha256 = "0kj7y0l7xgc7km3xnbnzy9316mz81hgv8hh8p5qjczy0bi77cy9c";
+      name = "messagelib-16.04.2.tar.xz";
+    };
+  };
+  minuet = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/minuet-16.04.2.tar.xz";
+      sha256 = "1iph3g6fp96w686xm38cknqqp7kd1xb3cn7zlx7v32d12n4iasxq";
+      name = "minuet-16.04.2.tar.xz";
+    };
+  };
+  mplayerthumbs = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/mplayerthumbs-16.04.2.tar.xz";
+      sha256 = "1zr2c5f48xrzyljbycnlg4z5j6fyqrp6545vd0iwaid3nnzxp7q4";
+      name = "mplayerthumbs-16.04.2.tar.xz";
+    };
+  };
+  okteta = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/okteta-16.04.2.tar.xz";
+      sha256 = "0h5b0b64zs7v2q8wz738dd9llnifjamvq9gb1g05fvq258qan49z";
+      name = "okteta-16.04.2.tar.xz";
+    };
+  };
+  okular = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/okular-16.04.2.tar.xz";
+      sha256 = "1iw92rkbzsk82gx1ks0iqciv7d4561ab5z65jdn1aszdw5agjs2s";
+      name = "okular-16.04.2.tar.xz";
+    };
+  };
+  palapeli = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/palapeli-16.04.2.tar.xz";
+      sha256 = "103y3xmbr6km1r1ljmb66sn1d8rha7qkkssqyg1gnxq5xi4wwj1w";
+      name = "palapeli-16.04.2.tar.xz";
+    };
+  };
+  parley = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/parley-16.04.2.tar.xz";
+      sha256 = "1f8xx30wkw7h4qpg4vpxxmhmibivn5si84bpql2nyjnrjqcaj4af";
+      name = "parley-16.04.2.tar.xz";
+    };
+  };
+  picmi = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/picmi-16.04.2.tar.xz";
+      sha256 = "05i6d99pbihprl0525w3glxwbgygqincxdmvcma691r4xwdvi8p1";
+      name = "picmi-16.04.2.tar.xz";
+    };
+  };
+  pimcommon = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/pimcommon-16.04.2.tar.xz";
+      sha256 = "02x63vg599876sldwafvcjb13nf7bivahsh6gg0lkhkqq8gbxd2l";
+      name = "pimcommon-16.04.2.tar.xz";
+    };
+  };
+  poxml = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/poxml-16.04.2.tar.xz";
+      sha256 = "1d3jswsdzsglk4kwqjivwi2h7br6xw9h4y1bcdqq1n1ibzr9cxap";
+      name = "poxml-16.04.2.tar.xz";
+    };
+  };
+  print-manager = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/print-manager-16.04.2.tar.xz";
+      sha256 = "0sm6qnd2lk6c354fdah6rj9y2v9aiiss1h4nrpvc4rvb9yxi9hiz";
+      name = "print-manager-16.04.2.tar.xz";
+    };
+  };
+  rocs = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/rocs-16.04.2.tar.xz";
+      sha256 = "0gfqcvijqxvgyjz5gv9zaj72a351fkac1w0qz8yfbrsch8f190z6";
+      name = "rocs-16.04.2.tar.xz";
+    };
+  };
+  signon-kwallet-extension = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/signon-kwallet-extension-16.04.2.tar.xz";
+      sha256 = "1hbk5ssi4byi5hbb1gy8337iv1mb2c5l8sw0ckxa8mz7iqd5kg96";
+      name = "signon-kwallet-extension-16.04.2.tar.xz";
+    };
+  };
+  spectacle = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/spectacle-16.04.2.tar.xz";
+      sha256 = "0yz7gw6x746xqxsgn0iv94zsxx6l8kk5zkyzp0cx3vga925pbpvj";
+      name = "spectacle-16.04.2.tar.xz";
+    };
+  };
+  step = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/step-16.04.2.tar.xz";
+      sha256 = "14f1i8ssqyp97v4pjl6rhjd2qx9fjxzndbmssm9rww7dv3kgb3p0";
+      name = "step-16.04.2.tar.xz";
+    };
+  };
+  svgpart = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/svgpart-16.04.2.tar.xz";
+      sha256 = "1zviplnlbl261icdp9c143jw5i90k386xn2jxyf6i2vc1bw8s98w";
+      name = "svgpart-16.04.2.tar.xz";
+    };
+  };
+  sweeper = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/sweeper-16.04.2.tar.xz";
+      sha256 = "0p58h2dbwdvmrbd897h1wv3bsdfqrgvvqdq1dr6nlicwlp1dxjs1";
+      name = "sweeper-16.04.2.tar.xz";
+    };
+  };
+  syndication = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/syndication-16.04.2.tar.xz";
+      sha256 = "1yg32bhb3d0y9fl1sgb3g1ky7vww7ax1w91k7sg3w30s7zi6668m";
+      name = "syndication-16.04.2.tar.xz";
+    };
+  };
+  umbrello = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/umbrello-16.04.2.tar.xz";
+      sha256 = "0avx8s889xiwjcfx5ihj3clr10w1ax4h92pb9zvzx8nrfqp23xgl";
+      name = "umbrello-16.04.2.tar.xz";
+    };
+  };
+  zeroconf-ioslave = {
+    version = "16.04.2";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.2/src/zeroconf-ioslave-16.04.2.tar.xz";
+      sha256 = "1ly4x8js0y88nrjddcvbbv4c9gac27y9vpzzr33alr76w6g22kk1";
+      name = "zeroconf-ioslave-16.04.2.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/default.nix
index a665e62dba80..362e31c5a256 100644
--- a/pkgs/desktops/kde-5/frameworks-5.22/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.22/default.nix
@@ -1,28 +1,26 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./fetchsrcs.sh to point to the updated URL.
-#  2. Run ./fetchsrcs.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions. Be sure to check if
-#  any new components have been added and package them as necessary.
+/*
+
+# Updates
+
+Before a major version update, make a copy of this directory. (We like to
+keep the old version around for a short time after major updates.)
+
+1. Update the URL in <nixpkgs/maintainers/scripts/generate-kde-frameworks.sh>.
+2. From the top of the Nixpkgs tree, run
+   `./maintainers/scripts/generate-kde-frameworks.sh > pkgs/desktops/kde-5/frameworks-$VERSION/srcs.nix'.
+3. Check that the new packages build correctly.
+4. Commit the changes and open a pull request.
+
+*/
 
 { pkgs, debug ? false }:
 
 let
 
-  inherit (pkgs) fetchurl lib makeSetupHook stdenv;
+  inherit (pkgs) lib makeSetupHook stdenv;
 
   mirror = "mirror://kde";
-  remotesrcs = fetchurl {
-    url = "https://raw.githubusercontent.com/ttuegel/nixpkgs-kde-qt/32d38b54ac86ef22ea3e77c2bb5b5adb8438b189/frameworks-srcs.nix";
-    sha256 = "05h21hc5pzj2z3lcmzmihnrc1x3ia3g8gka4aks2jxg6f7dyq0br";
-  };
-  srcs = import remotesrcs { inherit (pkgs) fetchurl; inherit mirror; };
+  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
 
   packages = self: with self; {
     kdeFramework = args:
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.22/srcs.nix
new file mode 100644
index 000000000000..156a11ba216f
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.22/srcs.nix
@@ -0,0 +1,581 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  attica = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/attica-5.22.0.tar.xz";
+      sha256 = "1i26nwxyrb62icw49znlyz9y670cv7xvibzbdfnnxq9czsalwym7";
+      name = "attica-5.22.0.tar.xz";
+    };
+  };
+  baloo = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/baloo-5.22.0.tar.xz";
+      sha256 = "0h51j41pa8b18jkdna0247z5alqfbvgfzlxc6s6p0c7g7658z0w3";
+      name = "baloo-5.22.0.tar.xz";
+    };
+  };
+  bluez-qt = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/bluez-qt-5.22.0.tar.xz";
+      sha256 = "1lrkkg2f2qjj8cy968l3scdrvi506m5hr9x22d1zn6r12fvq6304";
+      name = "bluez-qt-5.22.0.tar.xz";
+    };
+  };
+  breeze-icons = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/breeze-icons-5.22.0.tar.xz";
+      sha256 = "162698h01cs7116la4jfygn8ka4ffjmnv7nxjl6yhcqrs25nky7l";
+      name = "breeze-icons-5.22.0.tar.xz";
+    };
+  };
+  extra-cmake-modules = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/extra-cmake-modules-5.22.0.tar.xz";
+      sha256 = "042ad7kp2ijp66gvz0q60glk95wj9f0fymrjyw68253rqynf3zj3";
+      name = "extra-cmake-modules-5.22.0.tar.xz";
+    };
+  };
+  frameworkintegration = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/frameworkintegration-5.22.0.tar.xz";
+      sha256 = "0jf9y738r86ss520hqhfll8prrfpha73myj99hbz3sqrix7b0va9";
+      name = "frameworkintegration-5.22.0.tar.xz";
+    };
+  };
+  kactivities = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kactivities-5.22.0.tar.xz";
+      sha256 = "068jhc6lw47hcibvys968m4wa1b278ccy2gas9iymzzys1ccv6kr";
+      name = "kactivities-5.22.0.tar.xz";
+    };
+  };
+  kactivities-stats = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kactivities-stats-5.22.0.tar.xz";
+      sha256 = "1gx5wm337nwbwqb56xvl16vhk47v7a5qpx5hhn7ygpfxkgxh6wiq";
+      name = "kactivities-stats-5.22.0.tar.xz";
+    };
+  };
+  kapidox = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kapidox-5.22.0.tar.xz";
+      sha256 = "0cs133g1rvbcrdvy7zvk5c14p5iwwn0x0m76c2ifal0g8qh0hmd1";
+      name = "kapidox-5.22.0.tar.xz";
+    };
+  };
+  karchive = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/karchive-5.22.0.tar.xz";
+      sha256 = "1ywd38j6jpwj21kdp504gs0pfvlnvg6ak8hjk6a269pkci3dyf91";
+      name = "karchive-5.22.0.tar.xz";
+    };
+  };
+  kauth = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kauth-5.22.0.tar.xz";
+      sha256 = "1c0kp25g57nldh1x5vfq9fypbznc991jrry2lydvb06d3jh44vbn";
+      name = "kauth-5.22.0.tar.xz";
+    };
+  };
+  kbookmarks = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kbookmarks-5.22.0.tar.xz";
+      sha256 = "093rlg8pprjg7ba52dh2z9j2x5ir7s9kjas6ni4fqxxzpp15hh3p";
+      name = "kbookmarks-5.22.0.tar.xz";
+    };
+  };
+  kcmutils = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kcmutils-5.22.0.tar.xz";
+      sha256 = "1s7gw9l2n92rrcdzy9pnwq8na65axd8bkk9nphyhpbxk76zj1gyy";
+      name = "kcmutils-5.22.0.tar.xz";
+    };
+  };
+  kcodecs = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kcodecs-5.22.0.tar.xz";
+      sha256 = "0rlqs8m2ib2kkj679gn74zqqxzsddfcbywpgwlcd6b992i4cad87";
+      name = "kcodecs-5.22.0.tar.xz";
+    };
+  };
+  kcompletion = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kcompletion-5.22.0.tar.xz";
+      sha256 = "07jqjrddigdqsdy2adzari7g626sakilg9d765s75vncv5amrvzy";
+      name = "kcompletion-5.22.0.tar.xz";
+    };
+  };
+  kconfig = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kconfig-5.22.0.tar.xz";
+      sha256 = "0n0dzgba96pkabbvk1cfm34j9jirgbd84xha6adscpxs28506cg0";
+      name = "kconfig-5.22.0.tar.xz";
+    };
+  };
+  kconfigwidgets = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kconfigwidgets-5.22.0.tar.xz";
+      sha256 = "0jr6ygd8c0gap2ay2685wj3fx4scrahzbpaaj4bjhq2s79nvmlyg";
+      name = "kconfigwidgets-5.22.0.tar.xz";
+    };
+  };
+  kcoreaddons = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kcoreaddons-5.22.0.tar.xz";
+      sha256 = "0zzwcw0n9bd3pi3rv7cdwynb67x1bqf1bh3s59hjipf9d412wl15";
+      name = "kcoreaddons-5.22.0.tar.xz";
+    };
+  };
+  kcrash = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kcrash-5.22.0.tar.xz";
+      sha256 = "1r0i9ngk5jypzfhhssjm5b3n5sqli3jhh896r1qwpfcq9w15x7qg";
+      name = "kcrash-5.22.0.tar.xz";
+    };
+  };
+  kdbusaddons = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kdbusaddons-5.22.0.tar.xz";
+      sha256 = "0w9spb5i5qi2r5kfgrylpvw6mwjxfhd4j7yslc9jy0q4y8j3f1dk";
+      name = "kdbusaddons-5.22.0.tar.xz";
+    };
+  };
+  kdeclarative = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kdeclarative-5.22.0.tar.xz";
+      sha256 = "06n6wqy8dm2hv6dbar453z4rmiyf6f34zak1fhs38sqkfy6syva1";
+      name = "kdeclarative-5.22.0.tar.xz";
+    };
+  };
+  kded = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kded-5.22.0.tar.xz";
+      sha256 = "1zfggr6pmiypw5bnh6hr22agms589hm7hw35nhfhc4r7qd1drf6q";
+      name = "kded-5.22.0.tar.xz";
+    };
+  };
+  kdelibs4support = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/portingAids/kdelibs4support-5.22.0.tar.xz";
+      sha256 = "1mmrr54kkicnz4pjksnrh40md80m18mr5ba2la7kwjxmdyl6znm3";
+      name = "kdelibs4support-5.22.0.tar.xz";
+    };
+  };
+  kdesignerplugin = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kdesignerplugin-5.22.0.tar.xz";
+      sha256 = "0cfnmpz845l39qpy5r6pknzm78js81bci9qi0xfnrf8gm3lvjg5l";
+      name = "kdesignerplugin-5.22.0.tar.xz";
+    };
+  };
+  kdesu = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kdesu-5.22.0.tar.xz";
+      sha256 = "1jsr9m32dyzvsvsy743h3jih8v4yyr2zf15hh908anbamp7449bd";
+      name = "kdesu-5.22.0.tar.xz";
+    };
+  };
+  kdewebkit = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kdewebkit-5.22.0.tar.xz";
+      sha256 = "0rmxa4j3jx7689jcf45fghh7jff16x34xrzrw0clg3fj4w47ik0b";
+      name = "kdewebkit-5.22.0.tar.xz";
+    };
+  };
+  kdnssd = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kdnssd-5.22.0.tar.xz";
+      sha256 = "1b0s5gwn51zh2h5w2mzpzjj86qaz6pl7gzqf5q88vpzsiqjg14vp";
+      name = "kdnssd-5.22.0.tar.xz";
+    };
+  };
+  kdoctools = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kdoctools-5.22.0.tar.xz";
+      sha256 = "0y4ayms0hyj4nv5flr0a198lb545plfbxkwhqsmzc0c77gagcw5k";
+      name = "kdoctools-5.22.0.tar.xz";
+    };
+  };
+  kemoticons = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kemoticons-5.22.0.tar.xz";
+      sha256 = "1swrpqm441ngmps00hr15pgvw1382zbf2q2ncndj7i30725nfq1g";
+      name = "kemoticons-5.22.0.tar.xz";
+    };
+  };
+  kfilemetadata = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kfilemetadata-5.22.0.tar.xz";
+      sha256 = "0p6s1r2qv5396ghkw79wyf7yf4hzj562yp83wgplwmr6lgh4b2fc";
+      name = "kfilemetadata-5.22.0.tar.xz";
+    };
+  };
+  kglobalaccel = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kglobalaccel-5.22.0.tar.xz";
+      sha256 = "1m1aviz5g0vwk58j0z9jckz4rzns7md7mr3zlqqpvp1r032qc30k";
+      name = "kglobalaccel-5.22.0.tar.xz";
+    };
+  };
+  kguiaddons = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kguiaddons-5.22.0.tar.xz";
+      sha256 = "10chxcvf4hxyfkgprsj7rg4dv788dzqjgsm6m0a4m6qmx12zhckh";
+      name = "kguiaddons-5.22.0.tar.xz";
+    };
+  };
+  khtml = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/portingAids/khtml-5.22.0.tar.xz";
+      sha256 = "1w5q41fjrqqq91j3dvhc9lrrhvrwy1izws6af7srh768gn6yig0m";
+      name = "khtml-5.22.0.tar.xz";
+    };
+  };
+  ki18n = {
+    version = "5.22.1";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/ki18n-5.22.1.tar.xz";
+      sha256 = "0fasp8akj6wysn4acf9vyivcgb8x9dlnhkqmw7j0g7z1qgvjn4pv";
+      name = "ki18n-5.22.1.tar.xz";
+    };
+  };
+  kiconthemes = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kiconthemes-5.22.0.tar.xz";
+      sha256 = "1bh76f7kpha4c5qs3n8z6g1qah0rsk99yqcz8j1dlss4ws65j9j3";
+      name = "kiconthemes-5.22.0.tar.xz";
+    };
+  };
+  kidletime = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kidletime-5.22.0.tar.xz";
+      sha256 = "0dgw0rin6wz31xdspbjpvcs5x1b163ggqkz2zn73zavbr7f5jypc";
+      name = "kidletime-5.22.0.tar.xz";
+    };
+  };
+  kimageformats = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kimageformats-5.22.0.tar.xz";
+      sha256 = "0g3f73m3yj5iqivcsn83pm32w4l13zbyzz5azgm3jjfhgnd00c18";
+      name = "kimageformats-5.22.0.tar.xz";
+    };
+  };
+  kinit = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kinit-5.22.0.tar.xz";
+      sha256 = "1f71y6gf00p4jkqvpzyjlbnwc4gvjl2h4wi61xhpjz8lrmpsb6ac";
+      name = "kinit-5.22.0.tar.xz";
+    };
+  };
+  kio = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kio-5.22.0.tar.xz";
+      sha256 = "02knylbs9ymb8qm7fkp3dkdqc9cvgw2dwfl4phzl1iax2fx2zkqy";
+      name = "kio-5.22.0.tar.xz";
+    };
+  };
+  kitemmodels = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kitemmodels-5.22.0.tar.xz";
+      sha256 = "03gnglfhpzrc67bi0xdcy4xdhankic5cqnpahp9wwsis12ac6i83";
+      name = "kitemmodels-5.22.0.tar.xz";
+    };
+  };
+  kitemviews = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kitemviews-5.22.0.tar.xz";
+      sha256 = "0nhwg7bmv1c8p6pnbfsz96mq9wbq339ir9yp7kfnhfrg0wqi44ar";
+      name = "kitemviews-5.22.0.tar.xz";
+    };
+  };
+  kjobwidgets = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kjobwidgets-5.22.0.tar.xz";
+      sha256 = "1inqrb0j64b3519qcr0wk9izd4c1zi4kfjc8wa04s2kwxg6z7j1p";
+      name = "kjobwidgets-5.22.0.tar.xz";
+    };
+  };
+  kjs = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/portingAids/kjs-5.22.0.tar.xz";
+      sha256 = "0xqlkhm8r021xd5a25nwp9a4r7cbjkpqkc89fjma8qyvq5785qxw";
+      name = "kjs-5.22.0.tar.xz";
+    };
+  };
+  kjsembed = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/portingAids/kjsembed-5.22.0.tar.xz";
+      sha256 = "0fcc1lm5l8r0lj35r3niliyn8zxr90by2vjc9krzfm4i7kwij7wb";
+      name = "kjsembed-5.22.0.tar.xz";
+    };
+  };
+  kmediaplayer = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/portingAids/kmediaplayer-5.22.0.tar.xz";
+      sha256 = "1pn3fmaixcxba1wl63hblhnpj7jblrala9j3xrj8z2abhhfl5vzy";
+      name = "kmediaplayer-5.22.0.tar.xz";
+    };
+  };
+  knewstuff = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/knewstuff-5.22.0.tar.xz";
+      sha256 = "1gr566k95bg58hpn569kkarmlxk5rp12jcxdp7ksw1j8mp6la7a7";
+      name = "knewstuff-5.22.0.tar.xz";
+    };
+  };
+  knotifications = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/knotifications-5.22.0.tar.xz";
+      sha256 = "0fh6ahfr9pa8643i1ma40h7afnd1jn0m6dw5f9hgndxhwi6h3bps";
+      name = "knotifications-5.22.0.tar.xz";
+    };
+  };
+  knotifyconfig = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/knotifyconfig-5.22.0.tar.xz";
+      sha256 = "0p4g7wv2w6cpjzhlkh7rnzzhwcj86sgz98fl97is1fl65q8f0szr";
+      name = "knotifyconfig-5.22.0.tar.xz";
+    };
+  };
+  kpackage = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kpackage-5.22.0.tar.xz";
+      sha256 = "1nbwjc4n8f2iisdckm5ll3qyls1sq02ia6vmhj4mfm4w44q4s1bk";
+      name = "kpackage-5.22.0.tar.xz";
+    };
+  };
+  kparts = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kparts-5.22.0.tar.xz";
+      sha256 = "091wm2flhqgpqsffdd8nlwbdffvsj7cyd0c46949d9chm64723cg";
+      name = "kparts-5.22.0.tar.xz";
+    };
+  };
+  kpeople = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kpeople-5.22.0.tar.xz";
+      sha256 = "0rbwxzmyaig92vcd26v1yqd13swk15pp0lpvjp6hdpxbhpxijyf7";
+      name = "kpeople-5.22.0.tar.xz";
+    };
+  };
+  kplotting = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kplotting-5.22.0.tar.xz";
+      sha256 = "0ljiyxa2320v937lkqkxx3jc7sg45z4vjl74lxfybwspgs6y5hqk";
+      name = "kplotting-5.22.0.tar.xz";
+    };
+  };
+  kpty = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kpty-5.22.0.tar.xz";
+      sha256 = "12lfwv45d06ksx5xc4hgk075mj2ckkqpc8mksx99f700yvcyk1db";
+      name = "kpty-5.22.0.tar.xz";
+    };
+  };
+  kross = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/portingAids/kross-5.22.0.tar.xz";
+      sha256 = "1ika9ha06vspjn8hy6mv5vi5n7xj7sj45csmjjxcqwhn2wlcdj4l";
+      name = "kross-5.22.0.tar.xz";
+    };
+  };
+  krunner = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/krunner-5.22.0.tar.xz";
+      sha256 = "09jhdy48dciqd8hwxmvjyw547fr48mzns5f0yknsnnb8a47yhrd4";
+      name = "krunner-5.22.0.tar.xz";
+    };
+  };
+  kservice = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kservice-5.22.0.tar.xz";
+      sha256 = "1c5q8cxghbji3imamjbxymcd5cz9a9rapqriy1wmskys3ms3fag9";
+      name = "kservice-5.22.0.tar.xz";
+    };
+  };
+  ktexteditor = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/ktexteditor-5.22.0.tar.xz";
+      sha256 = "1jsa8cfq0245bsris46i3k8f8g7l0sc5jpj4iwkxrl9m0nk5j1v0";
+      name = "ktexteditor-5.22.0.tar.xz";
+    };
+  };
+  ktextwidgets = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/ktextwidgets-5.22.0.tar.xz";
+      sha256 = "01a2vkdpq06libap5g6a90jrcc0phmfd859kilraqyxhbrp9sw5l";
+      name = "ktextwidgets-5.22.0.tar.xz";
+    };
+  };
+  kunitconversion = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kunitconversion-5.22.0.tar.xz";
+      sha256 = "1phbqxddp8ks36nr4982n4bwwx7d6yxll629gpb0ddc4yfsjv48p";
+      name = "kunitconversion-5.22.0.tar.xz";
+    };
+  };
+  kwallet = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kwallet-5.22.0.tar.xz";
+      sha256 = "1i20kp1gkdiwmwy8vf7vd6r89qx6lpxwr6nib35khp93ci9l3838";
+      name = "kwallet-5.22.0.tar.xz";
+    };
+  };
+  kwayland = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kwayland-5.22.0.tar.xz";
+      sha256 = "1jfibqai7vy1vklj19x7z0r4qc0rc7yd5r4wpp98mmdwzpnhlrgy";
+      name = "kwayland-5.22.0.tar.xz";
+    };
+  };
+  kwidgetsaddons = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kwidgetsaddons-5.22.0.tar.xz";
+      sha256 = "1bwmnfa1l3s33nc6b0ryk78gxhrynyd07ffqw7mw211r34pg4c14";
+      name = "kwidgetsaddons-5.22.0.tar.xz";
+    };
+  };
+  kwindowsystem = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kwindowsystem-5.22.0.tar.xz";
+      sha256 = "05jwmjqk03pc2g09rnyb9qh0dfi0c46awbaxgc7i7z4i9swv1k30";
+      name = "kwindowsystem-5.22.0.tar.xz";
+    };
+  };
+  kxmlgui = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kxmlgui-5.22.0.tar.xz";
+      sha256 = "16q222jvnsd6pj49ih44qpks97lcjsamcpjg5x5ysn4a6w5h4mds";
+      name = "kxmlgui-5.22.0.tar.xz";
+    };
+  };
+  kxmlrpcclient = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/kxmlrpcclient-5.22.0.tar.xz";
+      sha256 = "00qj4pa7r0ny6pwivq6qqw80v4dsg9lgwd2qdlp9kddi0f8i2p1b";
+      name = "kxmlrpcclient-5.22.0.tar.xz";
+    };
+  };
+  modemmanager-qt = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/modemmanager-qt-5.22.0.tar.xz";
+      sha256 = "1b1gx33vrw7qcvy3zlc01x7wlalx5csfl590gfxlf870i3m7dnhf";
+      name = "modemmanager-qt-5.22.0.tar.xz";
+    };
+  };
+  networkmanager-qt = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/networkmanager-qt-5.22.0.tar.xz";
+      sha256 = "03b710n4107qw9c3p7wdma9fz9vqixrjydfa02f7vgzw1rixmmqq";
+      name = "networkmanager-qt-5.22.0.tar.xz";
+    };
+  };
+  oxygen-icons5 = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/oxygen-icons5-5.22.0.tar.xz";
+      sha256 = "1m3f5wrgahqlzzl3jyfymh6n515fsmsi8ckimvma2d8qqpb0dc2l";
+      name = "oxygen-icons5-5.22.0.tar.xz";
+    };
+  };
+  plasma-framework = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/plasma-framework-5.22.0.tar.xz";
+      sha256 = "1wn7ib030dw8rj5dprl8bzz4c3dv4nlmrfb9wgr6x78w4ac967zc";
+      name = "plasma-framework-5.22.0.tar.xz";
+    };
+  };
+  solid = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/solid-5.22.0.tar.xz";
+      sha256 = "04a7z5g2ylhbj2572wa6w51cs98ddn4d7lfirzawxf0f8d2693w2";
+      name = "solid-5.22.0.tar.xz";
+    };
+  };
+  sonnet = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/sonnet-5.22.0.tar.xz";
+      sha256 = "0y8l3mfa65a59vjj424ga87q3bixx8inicp2jp9zi36p4g7xwww8";
+      name = "sonnet-5.22.0.tar.xz";
+    };
+  };
+  threadweaver = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.22/threadweaver-5.22.0.tar.xz";
+      sha256 = "1ax58k6nl8za79j99spa2r76m9xz8ih9iflksgpng40wlnkwlp59";
+      name = "threadweaver-5.22.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/default.nix b/pkgs/desktops/kde-5/plasma-5.6/default.nix
index 6872187147ea..16ee9c4b1294 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/default.nix
@@ -1,22 +1,26 @@
-# Maintainer's Notes:
-#
-# How To Update
-#  1. Edit the URL in ./manifest.sh
-#  2. Run ./manifest.sh
-#  3. Fix build errors.
+/*
+
+# Updates
+
+Before a major version update, make a copy of this directory. (We like to
+keep the old version around for a short time after major updates.)
+
+1. Update the URL in <nixpkgs/maintainers/scripts/generate-kde-plasma.sh>.
+2. From the top of the Nixpkgs tree, run
+   `./maintainers/scripts/generate-kde-plasma.sh > pkgs/desktops/kde-5/plasma-$VERSION/srcs.nix'.
+3. Check that the new packages build correctly.
+4. Commit the changes and open a pull request.
+
+*/
 
 { pkgs, debug ? false }:
 
 let
 
-  inherit (pkgs) fetchurl lib stdenv symlinkJoin;
+  inherit (pkgs) lib stdenv symlinkJoin;
 
   mirror = "mirror://kde";
-  remotesrcs = fetchurl {
-    url = "https://raw.githubusercontent.com/ttuegel/nixpkgs-kde-qt/7bb0608eb5b147fb302f7c37411f9cad32cb6283/plasma-srcs.nix";
-    sha256 = "1zw9s87fj4qqz5dhqm5l1mb0d6r6f6p50q8n6qi7x8i5rd4p4fyl";
-  };
-  srcs = import remotesrcs { inherit (pkgs) fetchurl; inherit mirror; };
+  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
 
   packages = self: with self; {
     plasmaPackage = args:
diff --git a/pkgs/desktops/kde-5/plasma-5.6/srcs.nix b/pkgs/desktops/kde-5/plasma-5.6/srcs.nix
new file mode 100644
index 000000000000..8307730a5503
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/srcs.nix
@@ -0,0 +1,333 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  bluedevil = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/bluedevil-5.6.5.tar.xz";
+      sha256 = "0zf9m02m039g2cpzaij56mnnffcq9bqa40xyq30r9sx5ji1wbnhx";
+      name = "bluedevil-5.6.5.tar.xz";
+    };
+  };
+  breeze = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/breeze-5.6.5.tar.xz";
+      sha256 = "0wzzixhpij8zb0jq6lsl7h3q22hfzpfz98pddlhnkf27dgmbd7zd";
+      name = "breeze-5.6.5.tar.xz";
+    };
+  };
+  breeze-grub = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/breeze-grub-5.6.5.tar.xz";
+      sha256 = "1khr8bqid58jq150snpszg3w1rnjh35y5fi20gwwa60hka556978";
+      name = "breeze-grub-5.6.5.tar.xz";
+    };
+  };
+  breeze-gtk = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/breeze-gtk-5.6.5.tar.xz";
+      sha256 = "0k4510jw89i1spb6gckf190mrspasxnwfwqddaxxrjdan4qklcbv";
+      name = "breeze-gtk-5.6.5.tar.xz";
+    };
+  };
+  breeze-plymouth = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/breeze-plymouth-5.6.5.tar.xz";
+      sha256 = "05ajv326ylbja9483k0ka6flqpk341knfaxgq056dfqlmiaq2cjp";
+      name = "breeze-plymouth-5.6.5.tar.xz";
+    };
+  };
+  discover = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/discover-5.6.5.tar.xz";
+      sha256 = "1k5jlq329k5scljdadj8yny5wxhz14c7jxx5wagazb28fq6yf3vj";
+      name = "discover-5.6.5.tar.xz";
+    };
+  };
+  kactivitymanagerd = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kactivitymanagerd-5.6.5.tar.xz";
+      sha256 = "1l0iyh6palbbw59xv6mhjv4y6c3v2xlqqk95rhhfcbpaq0kv0abh";
+      name = "kactivitymanagerd-5.6.5.tar.xz";
+    };
+  };
+  kde-cli-tools = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kde-cli-tools-5.6.5.tar.xz";
+      sha256 = "0fmlckjpc202n4ahc69mqjn6iv3xd0z9macvacx5fi2spc1i60kk";
+      name = "kde-cli-tools-5.6.5.tar.xz";
+    };
+  };
+  kdecoration = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kdecoration-5.6.5.tar.xz";
+      sha256 = "084a2ip5x15f9sdlh7icnbvbsczkc7h71qd4zzr7z9lmqk1b3sp1";
+      name = "kdecoration-5.6.5.tar.xz";
+    };
+  };
+  kde-gtk-config = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kde-gtk-config-5.6.5.tar.xz";
+      sha256 = "06nk5z1aqiwyd3vhpnmfjjpmsq6r32gx6dgij2la3c2y552d3hlx";
+      name = "kde-gtk-config-5.6.5.tar.xz";
+    };
+  };
+  kdeplasma-addons = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kdeplasma-addons-5.6.5.tar.xz";
+      sha256 = "19ijpvra2f5dbcjdl0g2lq0rivh6cvmgpryvsyhjyk740ys915kz";
+      name = "kdeplasma-addons-5.6.5.tar.xz";
+    };
+  };
+  kgamma5 = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kgamma5-5.6.5.tar.xz";
+      sha256 = "0qic1alkdzl6gxacm3i3m8xb5dxpd1hbixd8ixr1cabbviash1nw";
+      name = "kgamma5-5.6.5.tar.xz";
+    };
+  };
+  khotkeys = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/khotkeys-5.6.5.tar.xz";
+      sha256 = "1zsdpdibv2pnm6vgj28d09cpss8nizmacrnxxlilvizhmiyvrpla";
+      name = "khotkeys-5.6.5.tar.xz";
+    };
+  };
+  kinfocenter = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kinfocenter-5.6.5.tar.xz";
+      sha256 = "1ci9avkbix6366gvfc3vpwp3r5hwabk1vl29ajl40agrs7kgs9cl";
+      name = "kinfocenter-5.6.5.tar.xz";
+    };
+  };
+  kmenuedit = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kmenuedit-5.6.5.tar.xz";
+      sha256 = "1fxnmb07shbpnhwk7aw5lspaih79ldkkx69bwgrv99c2h7gbsbhg";
+      name = "kmenuedit-5.6.5.tar.xz";
+    };
+  };
+  kscreen = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kscreen-5.6.5.tar.xz";
+      sha256 = "16cnf0kmvp67jid3y4w2b2dxzidx8k8zld280svp249wwjyh3wzr";
+      name = "kscreen-5.6.5.tar.xz";
+    };
+  };
+  kscreenlocker = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kscreenlocker-5.6.5.tar.xz";
+      sha256 = "01hbjvkkhjb63ij3xqyg49s3w8ig68pqrback7r5iv1hsbybxw66";
+      name = "kscreenlocker-5.6.5.tar.xz";
+    };
+  };
+  ksshaskpass = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/ksshaskpass-5.6.5.tar.xz";
+      sha256 = "1qaja7alyx9czczkg2cpbc24jdvmsp8f9djsavgb650k6mv5h4va";
+      name = "ksshaskpass-5.6.5.tar.xz";
+    };
+  };
+  ksysguard = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/ksysguard-5.6.5.tar.xz";
+      sha256 = "0ji4q8js5g57vrirbq6nah9gwp6bzcn986pjig1l0q5sm7al95jq";
+      name = "ksysguard-5.6.5.tar.xz";
+    };
+  };
+  kwallet-pam = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kwallet-pam-5.6.5.tar.xz";
+      sha256 = "0ad2q9kwnaabv6klazg17ilsiy0ckkkcay3q2d51crn1d8kbv3gm";
+      name = "kwallet-pam-5.6.5.tar.xz";
+    };
+  };
+  kwayland = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kwayland-5.6.5.tar.xz";
+      sha256 = "1niac5g7jdyl0b840njppnw8lbl08a6g4npyxhplvr6mv744h6b9";
+      name = "kwayland-5.6.5.tar.xz";
+    };
+  };
+  kwayland-integration = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kwayland-integration-5.6.5.tar.xz";
+      sha256 = "1sf6d9062q191q5b4bngk9abnfx3ys8fmkgc04xp8pl5zq5f2m7h";
+      name = "kwayland-integration-5.6.5.tar.xz";
+    };
+  };
+  kwin = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kwin-5.6.5.tar.xz";
+      sha256 = "113q9m373wmi2dmi2v6im74gd6ava7xrwapkcxq0phyr53w5ihz4";
+      name = "kwin-5.6.5.tar.xz";
+    };
+  };
+  kwrited = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/kwrited-5.6.5.tar.xz";
+      sha256 = "19ra2pbr34ap309vxbssrkkykf2vki0829a6bqhgc482yw582k1r";
+      name = "kwrited-5.6.5.tar.xz";
+    };
+  };
+  libkscreen = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/libkscreen-5.6.5.tar.xz";
+      sha256 = "1651cj5mkpx7x43na4n9qvvm8r9zadfm3fmpvrv92idf7f3jg4hr";
+      name = "libkscreen-5.6.5.tar.xz";
+    };
+  };
+  libksysguard = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/libksysguard-5.6.5.tar.xz";
+      sha256 = "048hfxsjddqmw31w2cdzw72xwxrrnx0v6zzxq9514b5j7ak4f9jc";
+      name = "libksysguard-5.6.5.tar.xz";
+    };
+  };
+  milou = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/milou-5.6.5.tar.xz";
+      sha256 = "066k7dpjs5nrimqxfxk1krc8w771nkqjb9dinqqqrl3njn7rwvxf";
+      name = "milou-5.6.5.tar.xz";
+    };
+  };
+  oxygen = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/oxygen-5.6.5.tar.xz";
+      sha256 = "12qz947xy6xr8hzm46dy6m5hp8chmzc8ayczyy84xw5239piqa1c";
+      name = "oxygen-5.6.5.tar.xz";
+    };
+  };
+  plasma-desktop = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/plasma-desktop-5.6.5.tar.xz";
+      sha256 = "1lxvnymiivkrch7z64i5vkck5723jvv5la9hrqdlzjl8qjp2gfk6";
+      name = "plasma-desktop-5.6.5.tar.xz";
+    };
+  };
+  plasma-integration = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/plasma-integration-5.6.5.tar.xz";
+      sha256 = "1s473jg7xjw4jma7nn770q3cxj01d7bm2kf45fra5lbj6ipp3s20";
+      name = "plasma-integration-5.6.5.tar.xz";
+    };
+  };
+  plasma-mediacenter = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/plasma-mediacenter-5.6.5.tar.xz";
+      sha256 = "056wzqqhvkc6d53040g0pn22arjz9pcxdgqr8x0bqps5cq7gf846";
+      name = "plasma-mediacenter-5.6.5.tar.xz";
+    };
+  };
+  plasma-nm = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/plasma-nm-5.6.5.tar.xz";
+      sha256 = "1cmrd06l6mp478ixnwj93brkfz8gaw7081df4r4x6ql4vrga3a80";
+      name = "plasma-nm-5.6.5.tar.xz";
+    };
+  };
+  plasma-pa = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/plasma-pa-5.6.5.tar.xz";
+      sha256 = "19b43mwjhvvi1wpa68c1g2mk76rqlfg0h8gf51xgd7y3qjv462h0";
+      name = "plasma-pa-5.6.5.tar.xz";
+    };
+  };
+  plasma-sdk = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/plasma-sdk-5.6.5.tar.xz";
+      sha256 = "0v92b03ff40wkdps88aqkihs1cx4ggwg43x2cm6cdsa3gc84vyn8";
+      name = "plasma-sdk-5.6.5.tar.xz";
+    };
+  };
+  plasma-workspace = {
+    version = "5.6.5.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/plasma-workspace-5.6.5.1.tar.xz";
+      sha256 = "158lmnvvqbl3k5485yirw22vqb15qxfd1m0gc83p0hsi2lv7v7j5";
+      name = "plasma-workspace-5.6.5.1.tar.xz";
+    };
+  };
+  plasma-workspace-wallpapers = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/plasma-workspace-wallpapers-5.6.5.tar.xz";
+      sha256 = "1pkyqsaxqah8h9r8ay449g20135sjw5qsbdp0i0ahprzw07wwijr";
+      name = "plasma-workspace-wallpapers-5.6.5.tar.xz";
+    };
+  };
+  polkit-kde-agent = {
+    version = "1-5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/polkit-kde-agent-1-5.6.5.tar.xz";
+      sha256 = "1f7mzxfr463ac0cfpb653x8civ1ciwhkklndxv7mq37m5ssk4dah";
+      name = "polkit-kde-agent-1-5.6.5.tar.xz";
+    };
+  };
+  powerdevil = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/powerdevil-5.6.5.tar.xz";
+      sha256 = "07x0n311qbisycsrjjd9lkcwxcxlira0qkz1akg5xxll9q2a6qb7";
+      name = "powerdevil-5.6.5.tar.xz";
+    };
+  };
+  sddm-kcm = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/sddm-kcm-5.6.5.tar.xz";
+      sha256 = "07r20s0373y630x1vjrfgm740sgg8v6qsza4r3my1qbsdj3xwzky";
+      name = "sddm-kcm-5.6.5.tar.xz";
+    };
+  };
+  systemsettings = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/systemsettings-5.6.5.tar.xz";
+      sha256 = "01z3q8rp8barb7lyfiwcrwn407pxz17z22y46czxc7j56n4ixgim";
+      name = "systemsettings-5.6.5.tar.xz";
+    };
+  };
+  user-manager = {
+    version = "5.6.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.5/user-manager-5.6.5.tar.xz";
+      sha256 = "1fzfcq2kqrwja7y1ij8s7sbwlybharv6wqh62w7xza7pssz9yr7y";
+      name = "user-manager-5.6.5.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index b5c5cb6b8ed6..d426293ee68c 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -1,18 +1,16 @@
 /*
 
-# Minor Updates
+# Updates
 
-1. Edit ./fetchsrcs.sh to point to the updated URL.
-2. Run ./fetchsrcs.sh.
-3. Build and enjoy.
+Before a major version update, make a copy of this directory. (We like to
+keep the old version around for a short time after major updates.) Add a
+top-level attribute to <nixpkgs/top-level/all-packages.nix>.
 
-# Major Updates
-
-1. Make a copy of this directory. (We like to keep the old version around
-   for a short time after major updates.)
-2. Delete the tmp/ subdirectory of the copy.
-3. Follow the minor update instructions above.
-4. Package any new Qt modules, if necessary.
+1. Update the URL in <nixpkgs/maintainers/scripts/generate-qt.sh>.
+2. From the top of the Nixpkgs tree, run
+   `./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix'.
+3. Check that the new packages build correctly.
+4. Commit the changes and open a pull request.
 
 */
 
@@ -23,18 +21,14 @@
 , decryptSslTraffic ? false
 }:
 
-let inherit (pkgs) fetchurl makeSetupHook makeWrapper stdenv; in
+let inherit (pkgs) makeSetupHook makeWrapper stdenv; in
 
 with stdenv.lib;
 
 let
 
   mirror = "http://download.qt.io";
-  remotesrcs = fetchurl {
-    url = "https://raw.githubusercontent.com/ttuegel/nixpkgs-kde-qt/1fd3645b9d718623998fa114797630d94461f55f/qt-srcs.nix";
-    sha256 = "1idkhkjnyz8x6nczksjcccmmmgg01zclamcxxdv2lwxhsrws2m2l";
-  };
-  srcs = import remotesrcs { inherit (pkgs) fetchurl; inherit mirror; };
+  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
 
   qtSubmodule = args:
     let
diff --git a/pkgs/development/libraries/qt-5/5.6/srcs.nix b/pkgs/development/libraries/qt-5/5.6/srcs.nix
new file mode 100644
index 000000000000..6f11e4408f77
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/srcs.nix
@@ -0,0 +1,261 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  qtxmlpatterns = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtxmlpatterns-opensource-src-5.6.1.tar.xz";
+      sha256 = "0q412jv3xbg7v05b8pbahifwx17gzlp96s90akh6zwhpm8i6xx34";
+      name = "qtxmlpatterns-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtx11extras = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtx11extras-opensource-src-5.6.1.tar.xz";
+      sha256 = "0l736qiz8adrnh267xz63hv4sph6nhy90h836qfnnmv3p78ipsz8";
+      name = "qtx11extras-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwinextras = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwinextras-opensource-src-5.6.1.tar.xz";
+      sha256 = "1db3lcrj8af0z8lnh99lfbwz1cq9il7rr27rk9l38dff65qkssm8";
+      name = "qtwinextras-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwebview = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebview-opensource-src-5.6.1.tar.xz";
+      sha256 = "0q869wl61vidds551w3z49ysx88xqyn6igbz07zxac7d0gwgwpda";
+      name = "qtwebview-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwebsockets = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebsockets-opensource-src-5.6.1.tar.xz";
+      sha256 = "0fkj52i4yi6gmq4jfjgdij08cspxspac6mbpf0fknnllimmkl7jm";
+      name = "qtwebsockets-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwebengine = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebengine-opensource-src-5.6.1.tar.xz";
+      sha256 = "0yv0cflgywsyfn84vv2vc9rwpm8j7hin61rxqjqh498nnl2arw5x";
+      name = "qtwebengine-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwebchannel = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebchannel-opensource-src-5.6.1.tar.xz";
+      sha256 = "01q80917a1048hdhaii4v50dqs84h16lc9w3v99r9xvspk8vab7q";
+      name = "qtwebchannel-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtwayland = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwayland-opensource-src-5.6.1.tar.xz";
+      sha256 = "1jgghjfrg0wwyfzfwgwhagwxz9k936ylv3w2l9bwlpql8rgm8d11";
+      name = "qtwayland-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qttranslations = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qttranslations-opensource-src-5.6.1.tar.xz";
+      sha256 = "008wyk00mqz116pigm0qq78rvg28v6ykjnjxppkjnk0yd6i2vmb9";
+      name = "qttranslations-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qttools = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qttools-opensource-src-5.6.1.tar.xz";
+      sha256 = "0wbzq60d7lkvlb7b5lqcw87qgy6kyjz1npjavz8f4grdxsaqi8vp";
+      name = "qttools-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtsvg = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtsvg-opensource-src-5.6.1.tar.xz";
+      sha256 = "08ca5g46g75acy27jfnvnalmcias5hxmjp7491v3y4k9y7a4ybpi";
+      name = "qtsvg-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtserialport = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtserialport-opensource-src-5.6.1.tar.xz";
+      sha256 = "1hp63cgqhps6y1k041lzhcb2b0rcpcmszabnn293q5ilbvla4x0b";
+      name = "qtserialport-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtserialbus = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtserialbus-opensource-src-5.6.1.tar.xz";
+      sha256 = "1h683dkvnf2rdgxgisybnp8miqgn2gpi597rgx5zc7qk2k8kyidz";
+      name = "qtserialbus-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtsensors = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtsensors-opensource-src-5.6.1.tar.xz";
+      sha256 = "0bll7ll6s5g8w89knyrc0famjwqyfzwpn512m1f96bf6xwacs967";
+      name = "qtsensors-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtscript = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtscript-opensource-src-5.6.1.tar.xz";
+      sha256 = "17zp5dlfplrnzlw233lzapj55drjqchvayajd02qsggzms3yzchw";
+      name = "qtscript-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtquickcontrols2 = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtquickcontrols2-opensource-src-5.6.1.tar.xz";
+      sha256 = "13zbiv63b76ifpjalx5616nixfwjk48q977bzb1xxj363b7xv85v";
+      name = "qtquickcontrols2-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtquickcontrols = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtquickcontrols-opensource-src-5.6.1.tar.xz";
+      sha256 = "14d68ryn7r7rs7klpldnavcsccvyyg0xhwqkvjlm5wwplv2acah1";
+      name = "qtquickcontrols-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtmultimedia = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtmultimedia-opensource-src-5.6.1.tar.xz";
+      sha256 = "058523c2qra3d8fq46ygcndnkrbwlh316zy28s2cr5pjr5gmnjyj";
+      name = "qtmultimedia-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtmacextras = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtmacextras-opensource-src-5.6.1.tar.xz";
+      sha256 = "147yhv7fb0yaakrffqiw6xz8ycqdc7qsnxvnpr6j8rarw5xmdc73";
+      name = "qtmacextras-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtlocation = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtlocation-opensource-src-5.6.1.tar.xz";
+      sha256 = "0qahs7a2n3l4h0bl8bnwci9mzy1vra3zncnzr40csic9ys67ddfk";
+      name = "qtlocation-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtimageformats = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtimageformats-opensource-src-5.6.1.tar.xz";
+      sha256 = "020v1148433zx4g87z2r8fgff32n0laajxqqsja1l3yzz7jbrwvl";
+      name = "qtimageformats-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtgraphicaleffects = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtgraphicaleffects-opensource-src-5.6.1.tar.xz";
+      sha256 = "1n0i2drfr7fvydgg810dcij8mxnygdpvqcqv7l1a9a1kv9ap3sap";
+      name = "qtgraphicaleffects-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtenginio = {
+    version = "1.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtenginio-opensource-src-1.6.1.tar.xz";
+      sha256 = "1iq4lnz3s6mfdgml61b9lsjisky55bbvsdj72kh003j94mzrc3l5";
+      name = "qtenginio-opensource-src-1.6.1.tar.xz";
+    };
+  };
+  qtdoc = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdoc-opensource-src-5.6.1.tar.xz";
+      sha256 = "0yg7903vk4w3h6jjyanssfcig0s2s660q11sj14nw6gcjs7kfa5z";
+      name = "qtdoc-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtdeclarative-render2d = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdeclarative-render2d-opensource-src-5.6.1.tar.xz";
+      sha256 = "1m08x8x355545r9wgrjl5p26zjhp5q1yh3h25dww8pk25v6cn8dg";
+      name = "qtdeclarative-render2d-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtdeclarative = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdeclarative-opensource-src-5.6.1.tar.xz";
+      sha256 = "1d2217kxk85kpi7ls08b41hqzy26hvch8m4cgzq6km5sqi5zvz0j";
+      name = "qtdeclarative-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtconnectivity = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtconnectivity-opensource-src-5.6.1.tar.xz";
+      sha256 = "06fr9321f52kf0nda9zjjfzp5694hbnx0y0v315iw28mnpvandas";
+      name = "qtconnectivity-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtcanvas3d = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtcanvas3d-opensource-src-5.6.1.tar.xz";
+      sha256 = "0q17hwmj893pk0lhxmibxmgk6h1gy4ksqfi62rkfzcf81bg2q7hr";
+      name = "qtcanvas3d-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtbase = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtbase-opensource-src-5.6.1.tar.xz";
+      sha256 = "0r3jrqymnnxrig4f11xvs33c26f0kzfakbp3kcbdpv795gpc276h";
+      name = "qtbase-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtandroidextras = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtandroidextras-opensource-src-5.6.1.tar.xz";
+      sha256 = "0prkpb57j0s8k36sba47k2bhs3ajf01rdwc7qf5gkvhs991rwckc";
+      name = "qtandroidextras-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qtactiveqt = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtactiveqt-opensource-src-5.6.1.tar.xz";
+      sha256 = "0a2p0w03d04hqg71hlihj9mr6aasvb0h8jfa5rnq8b5rkm8haf4f";
+      name = "qtactiveqt-opensource-src-5.6.1.tar.xz";
+    };
+  };
+  qt3d = {
+    version = "5.6.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qt3d-opensource-src-5.6.1.tar.xz";
+      sha256 = "03d81sls30a20yna6940np15112ciwy5024f8n5imaxicm8h34xd";
+      name = "qt3d-opensource-src-5.6.1.tar.xz";
+    };
+  };
+}

From 75b460ce1b00678105f67c4e57c81952446edd6e Mon Sep 17 00:00:00 2001
From: emosenkis <eitan@mosenkis.net>
Date: Fri, 17 Jun 2016 19:31:48 +0300
Subject: [PATCH 414/436] Cantata: update homepage (#16296)

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

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 6906c7bccb5e..f4e1fe8b151c 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/cantata/;
+    homepage = https://github.com/cdrummond/cantata;
     description = "A graphical client for MPD";
     license = licenses.gpl3;
 

From ed46b468b09dd0a44450b7df348e6a572a424529 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 17 Jun 2016 12:20:18 -0500
Subject: [PATCH 415/436] Fix Travis build failure caused by Qt/KDE
 documentation

The comments in the Qt/KDE packages caused a spurious Travis build
failure because they appeared to refer to `<nixpkgs>`.
---
 pkgs/desktops/kde-5/applications-16.04/default.nix | 4 ++--
 pkgs/desktops/kde-5/frameworks-5.22/default.nix    | 2 +-
 pkgs/desktops/kde-5/plasma-5.6/default.nix         | 2 +-
 pkgs/development/libraries/qt-5/5.6/default.nix    | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/default.nix b/pkgs/desktops/kde-5/applications-16.04/default.nix
index 5c01c12d9029..bb011f091d1a 100644
--- a/pkgs/desktops/kde-5/applications-16.04/default.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/default.nix
@@ -5,9 +5,9 @@
 Before a major version update, make a copy of this directory. (We like to
 keep the old version around for a short time after major updates.)
 
-1. Update the URL in <nixpkgs/maintainers/scripts/generate-kde-applications.sh>.
+1. Update the URL in `maintainers/scripts/generate-kde-applications.sh`.
 2. From the top of the Nixpkgs tree, run
-   `./maintainers/scripts/generate-kde-applications.sh > pkgs/desktops/kde-5/applications-$VERSION/srcs.nix'.
+   `./maintainers/scripts/generate-kde-applications.sh > pkgs/desktops/kde-5/applications-$VERSION/srcs.nix`.
 3. Check that the new packages build correctly.
 4. Commit the changes and open a pull request.
 
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/default.nix
index 362e31c5a256..4d0567846f84 100644
--- a/pkgs/desktops/kde-5/frameworks-5.22/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.22/default.nix
@@ -5,7 +5,7 @@
 Before a major version update, make a copy of this directory. (We like to
 keep the old version around for a short time after major updates.)
 
-1. Update the URL in <nixpkgs/maintainers/scripts/generate-kde-frameworks.sh>.
+1. Update the URL in `maintainers/scripts/generate-kde-frameworks.sh`.
 2. From the top of the Nixpkgs tree, run
    `./maintainers/scripts/generate-kde-frameworks.sh > pkgs/desktops/kde-5/frameworks-$VERSION/srcs.nix'.
 3. Check that the new packages build correctly.
diff --git a/pkgs/desktops/kde-5/plasma-5.6/default.nix b/pkgs/desktops/kde-5/plasma-5.6/default.nix
index 16ee9c4b1294..d356dd4bd2fc 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/default.nix
@@ -5,7 +5,7 @@
 Before a major version update, make a copy of this directory. (We like to
 keep the old version around for a short time after major updates.)
 
-1. Update the URL in <nixpkgs/maintainers/scripts/generate-kde-plasma.sh>.
+1. Update the URL in `maintainers/scripts/generate-kde-plasma.sh`.
 2. From the top of the Nixpkgs tree, run
    `./maintainers/scripts/generate-kde-plasma.sh > pkgs/desktops/kde-5/plasma-$VERSION/srcs.nix'.
 3. Check that the new packages build correctly.
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index d426293ee68c..b5255b4bce1d 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -4,11 +4,11 @@
 
 Before a major version update, make a copy of this directory. (We like to
 keep the old version around for a short time after major updates.) Add a
-top-level attribute to <nixpkgs/top-level/all-packages.nix>.
+top-level attribute to `top-level/all-packages.nix`.
 
-1. Update the URL in <nixpkgs/maintainers/scripts/generate-qt.sh>.
+1. Update the URL in `maintainers/scripts/generate-qt.sh`.
 2. From the top of the Nixpkgs tree, run
-   `./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix'.
+   `./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
 3. Check that the new packages build correctly.
 4. Commit the changes and open a pull request.
 

From 4601254c733f12ee8da305b461aaa73b3119c873 Mon Sep 17 00:00:00 2001
From: Maarten Hoogendoorn <maarten@moretea.nl>
Date: Fri, 17 Jun 2016 23:56:47 +0200
Subject: [PATCH 416/436] scanbd: add missing jpeg dependency

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

diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix
index b3fd986165a7..86b4cb91de07 100644
--- a/pkgs/tools/graphics/scanbd/default.nix
+++ b/pkgs/tools/graphics/scanbd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig
-, dbus, libconfuse, sane-backends, systemd }:
+, dbus, libconfuse, libjpeg, sane-backends, systemd }:
 
 stdenv.mkDerivation rec {
   name = "scanbd-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ dbus libconfuse sane-backends systemd ];
+  buildInputs = [ dbus libconfuse libjpeg sane-backends systemd ];
 
   configureFlags = [
     "--disable-Werror"

From 6b02ae3893dda3e22fe375694bfb8d5ff317be0c Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Fri, 17 Jun 2016 23:59:58 +0100
Subject: [PATCH 417/436] pptpd: init at 1.4.0

---
 pkgs/tools/networking/pptpd/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/networking/pptpd/default.nix

diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix
new file mode 100644
index 000000000000..d5464b97a335
--- /dev/null
+++ b/pkgs/tools/networking/pptpd/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, ppp }:
+
+stdenv.mkDerivation rec {
+  name    = "${pname}-${version}";
+  pname   = "pptpd";
+  version = "1.4.0";
+
+  src = fetchurl {
+    url    = "mirror://sourceforge/poptop/${pname}/${name}/${name}.tar.gz";
+    sha256 = "1h06gyxj51ba6kbbnf6hyivwjia0i6gsmjz8kyggaany8a58pkcg";
+  };
+
+  buildInputs = [ ppp ];
+
+  postPatch = ''
+    substituteInPlace plugins/Makefile --replace "install -o root" "install"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage    = http://poptop.sourceforge.net/dox/;
+    description = "The PPTP Server for Linux";
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ obadz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf8d4e52d15b..4228ffaee052 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3003,6 +3003,8 @@ in
 
   pptp = callPackage ../tools/networking/pptp {};
 
+  pptpd = callPackage ../tools/networking/pptpd {};
+
   prey-bash-client = callPackage ../tools/security/prey { };
 
   profile-cleaner = callPackage ../tools/misc/profile-cleaner { };

From fc975bcffbd12507b143f164ecd13e3feeead1b0 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 18 Jun 2016 00:17:00 +0100
Subject: [PATCH 418/436] pptpd: add nixos service

---
 nixos/modules/module-list.nix               |   1 +
 nixos/modules/services/networking/pptpd.nix | 124 ++++++++++++++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 nixos/modules/services/networking/pptpd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 41e245f212dc..51c43b8c7c3b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -371,6 +371,7 @@
   ./services/networking/ostinato.nix
   ./services/networking/pdnsd.nix
   ./services/networking/polipo.nix
+  ./services/networking/pptpd.nix
   ./services/networking/prayer.nix
   ./services/networking/privoxy.nix
   ./services/networking/prosody.nix
diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix
new file mode 100644
index 000000000000..0ae6ae4cf2ab
--- /dev/null
+++ b/nixos/modules/services/networking/pptpd.nix
@@ -0,0 +1,124 @@
+{ config, stdenv, pkgs, lib, ... }:
+
+with lib;
+
+{
+  options = {
+    services.pptpd = {
+      enable = mkEnableOption "enable pptpd running on startup";
+
+      serverIp = mkOption {
+        type        = types.string;
+        description = "server ip";
+        default     = "10.124.124.1";
+      };
+
+      clientIpRange = mkOption {
+        type        = types.string;
+        description = "client ip range";
+        default     = "10.124.142.2-11";
+      };
+
+      maxClients = mkOption {
+        type        = types.int;
+        description = "maximum number of simultaneous connections";
+        default     = 10;
+      };
+
+      extraPptpdOptions = mkOption {
+        type        = types.lines;
+        description = "extra lines for the pptpd configuration files";
+        default     = "";
+      };
+
+      extraPppdOptions = mkOption {
+        type        = types.lines;
+        description = "extra lines for the pppd options files";
+        default     = "";
+        example     = ''
+          ms-dns 8.8.8.8
+          ms-dns 8.8.4.4
+        '';
+      };
+    };
+  };
+
+  config = mkIf config.services.pptpd.enable {
+    systemd.services.pptpd = let
+      cfg = config.services.pptpd;
+
+      pptpd-conf = pkgs.writeText "pptpd.conf" ''
+        # Inspired from pptpd-1.4.0/samples/pptpd.conf
+        ppp ${ppp-pptpd-wrapped}/bin/pppd
+        option ${pppd-options}
+        pidfile /run/pptpd.pid
+        localip ${cfg.serverIp}
+        remoteip ${cfg.clientIpRange}
+        connections ${toString cfg.maxClients} # (Will get harmless warning if inconsistent with IP range)
+
+        # Extra
+        ${cfg.extraPptpdOptions}
+      '';
+
+      pppd-options = pkgs.writeText "ppp-options-pptpd.conf" ''
+        # From: cat pptpd-1.4.0/samples/options.pptpd | grep -v ^# | grep -v ^$
+        name pptpd
+        refuse-pap
+        refuse-chap
+        refuse-mschap
+        require-mschap-v2
+        require-mppe-128
+        proxyarp
+        lock
+        nobsdcomp
+        novj
+        novjccomp
+        nologfd
+
+        # Extra:
+        ${cfg.extraPppdOptions}
+      '';
+
+      ppp-pptpd-wrapped = pkgs.stdenv.mkDerivation {
+        name         = "ppp-pptpd-wrapped";
+        phases       = [ "installPhase" ];
+        buildInputs  = with pkgs; [ makeWrapper ];
+        installPhase = ''
+          mkdir -p $out/bin
+          makeWrapper ${pkgs.ppp}/bin/pppd $out/bin/pppd \
+            --set LD_PRELOAD    "${pkgs.libredirect}/lib/libredirect.so" \
+            --set NIX_REDIRECTS "/etc/ppp=/etc/ppp-pptpd"
+        '';
+      };
+    in {
+      description = "pptpd server";
+
+      requires = [ "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      preStart = ''
+        mkdir -p -m 700 /etc/ppp-pptpd
+
+        secrets="/etc/ppp-pptpd/chap-secrets"
+
+        [ -f "$secrets" ] || cat > "$secrets" << EOF
+        # From: pptpd-1.4.0/samples/chap-secrets
+        # Secrets for authentication using CHAP
+        # client	server	secret		IP addresses
+        #username	pptpd	password	*
+        EOF
+
+        chown root.root "$secrets"
+        chmod 600 "$secrets"
+      '';
+
+      serviceConfig = {
+        ExecStart = "${pkgs.pptpd}/bin/pptpd --conf ${pptpd-conf}";
+        KillMode  = "process";
+        Restart   = "on-success";
+        Type      = "forking";
+        PIDFile   = "/run/pptpd.pid";
+      };
+    };
+  };
+}

From 2a16e37709ca9f9a766139e8f93a34a123c125e4 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 18 Jun 2016 08:19:57 +0200
Subject: [PATCH 419/436] khal: disable tests for now

Fixes #15981.
---
 pkgs/applications/misc/khal/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index f813e37cfbb0..305c5863626f 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -3,6 +3,7 @@
 with python3Packages;
 
 buildPythonApplication rec {
+  # Reenable tests for 0.9.0, they are broken at the moment: #15981
   version = "0.8.2";
   name = "khal-${version}";
 
@@ -32,7 +33,7 @@ buildPythonApplication rec {
   buildInputs = [ setuptools_scm pytest pkgs.glibcLocales ];
 
   checkPhase = ''
-    py.test
+    # py.test
   '';
 
   meta = with stdenv.lib; {

From 08f41462d7db05629a5fd8aed8a7f978b62411a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Sat, 18 Jun 2016 08:35:36 +0200
Subject: [PATCH 420/436] urbit: 2015.09.26 -> 2016-06-02

Updated to latest revision in urbit git master, fixes build error caused by missing sources.
Updated description and website.
Fixed date/version format to ISO 8061.
---
 pkgs/misc/urbit/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix
index e4049f07897a..abfeb4dd22d7 100644
--- a/pkgs/misc/urbit/default.nix
+++ b/pkgs/misc/urbit/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchgit, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel,
+{ stdenv, fetchFromGitHub, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel,
   cmake, re2c, libtool, ncurses, perl, zlib, python }:
 
 stdenv.mkDerivation rec {
 
   name = "urbit-${version}";
-  version = "2015.09.26";
+  version = "2016-06-02";
 
-  src = fetchgit {
-    url = "https://github.com/urbit/urbit.git";
-    rev = "c9592664c797b2dd74f26886528656f8a7058640";
-    sha256 = "0sgrxnmpqh54mgar81wlb6gff8c0pc24p53xwxr448g5shvnzjx9";
+  src = fetchFromGitHub {
+    owner = "urbit";
+    repo = "urbit";
+    rev = "8c113559872e4a97bce3f3ee5b370ad9545c7459";
+    sha256 = "055qdpp4gm0v04pddq4380pdsi0gp2ybgv1d2lchkhwsnjyl46jl";
   };
 
   buildInputs = with stdenv.lib; [
@@ -34,8 +35,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "an operating function";
-    homepage = http://urbit.org/preview/~2015.9.25/materials;
+    description = "An operating function";
+    homepage = http://urbit.org;
     license = licenses.mit;
     maintainers = with maintainers; [ mudri ];
   };

From 6efd480084bd585b2023128560a7a1afd5f3f259 Mon Sep 17 00:00:00 2001
From: Philip Potter <philip.g.potter@gmail.com>
Date: Sat, 18 Jun 2016 09:39:44 +0100
Subject: [PATCH 421/436] libu2f-server: mark as linux only

The darwin build has been failing for a long time, and I don't have time
or resources to determine why.
---
 pkgs/development/libraries/libu2f-server/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix
index 2649cb3660d3..5d7da127c2a9 100644
--- a/pkgs/development/libraries/libu2f-server/default.nix
+++ b/pkgs/development/libraries/libu2f-server/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     homepage = https://developers.yubico.com/libu2f-server/;
     description = "A C library that implements the server-side of the U2F protocol";
     license = licenses.bsd2;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ philandstuff ];
   };
 }

From 915edac0ce0806ba65f1d73db7b80dcd3d13da9e Mon Sep 17 00:00:00 2001
From: Severen Redwood <severen@shrike.me>
Date: Sat, 18 Jun 2016 23:33:29 +1200
Subject: [PATCH 422/436] adapta-gtk-theme: Init at 3.21.2

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index c6a10610354d..151412a9400e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -359,6 +359,7 @@
   spinus = "Tomasz Czyż <tomasz.czyz@gmail.com>";
   sprock = "Roger Mason <rmason@mun.ca>";
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
+  SShrike = "Severen Redwood <severen@shrike.me>";
   stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
   steveej = "Stefan Junker <mail@stefanjunker.de>";
   swistak35 = "Rafał Łasocha <me@swistak35.com>";
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
new file mode 100644
index 000000000000..96c43af84854
--- /dev/null
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "adapta-gtk-theme-${version}";
+  version = "3.21.2";
+
+  meta = with stdenv.lib; {
+    description = "An adaptive GTK+ theme based on Material Design";
+    homepage = "https://github.com/tista500/Adapta";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.SShrike ];
+  };
+
+  src = fetchFromGitHub {
+    owner = "tista500";
+    repo = "Adapta";
+    rev = "c48da995abc46087c22b05d2cdb0975d10774641";
+    sha256 = "17w9nsrwqwgafswyvhc5h8ld2ggi96ix5fjv6yf1hfz3l1ln9qg7";
+  };
+
+  preferLocalBuild = true;
+  buildInputs = [ gtk-engine-murrine ];
+  nativeBuildInputs = [ autoreconfHook ];
+
+  configureFlags = "--enable-chrome --disable-unity";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4228ffaee052..d6c8ecb6ae88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -501,6 +501,8 @@ in
 
   arc-gtk-theme = callPackage ../misc/themes/arc { };
 
+  adapta-gtk-theme = callPackage ../misc/themes/adapta { };
+
   aria2 = callPackage ../tools/networking/aria2 {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From bb084880effdd89ea132deb91626d56fe51dcf01 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 18 Jun 2016 13:55:53 +0200
Subject: [PATCH 423/436] perlPackages: bump some packages

 - DistZillaPluginTestCPANChanges: 0.008 -> 0.012
 - DistZillaPluginTestCompile: 2.021 -> 2.054
 - FileWhich: 1.09 -> 1.21
 - ModulePath: 0.13 -> 0.19
 - SyntaxKeywordJunction: 0.003007 -> 0.003008
---
 pkgs/top-level/perl-packages.nix | 59 ++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e44583d1874f..340f4c454e50 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4069,13 +4069,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  DistZillaPluginTestCPANChanges = buildPerlPackage {
-    name = "Dist-Zilla-Plugin-Test-CPAN-Changes-0.008";
+  DistZillaPluginTestCPANChanges = buildPerlPackage rec {
+    name = "Dist-Zilla-Plugin-Test-CPAN-Changes-0.012";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Changes-0.008.tar.gz;
-      sha256 = "e8e49a23fb6fa021dec4fc4ab0a05a2ad50ac26195536c109a96b681ba4decd2";
+      url = "mirror://cpan/authors/id/D/DO/DOHERTY/${name}.tar.gz";
+      sha256 = "215b3a5c3c58c8bab0ea27130441bbdaec737eecc00f0670937f608bdbf64806";
     };
-    buildInputs = [ CPANChanges DistZilla MooseAutobox ];
+    buildInputs = [ CPANChanges DistZilla ];
     propagatedBuildInputs = [ CPANChanges DataSection DistZilla Moose ];
     meta = {
       homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/;
@@ -4099,17 +4099,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  DistZillaPluginTestCompile = buildPerlModule {
-    name = "Dist-Zilla-Plugin-Test-Compile-2.021";
+  DistZillaPluginTestCompile = buildPerlPackage rec {
+    name = "Dist-Zilla-Plugin-Test-Compile-2.054";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Compile-2.021.tar.gz;
-      sha256 = "665c48de1c7c33e9b00e8ddc0204d02b45009e60b9b65033fa4a832dfe9fc808";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "363fc251785a36a0b2028fda3b38d71d30c7048b09145362bbfac13fc41eab7e";
     };
-    buildInputs = [ DistCheckConflicts DistZilla JSON ModuleBuildTiny PathClass TestCheckDeps TestWarnings ModuleMetadata ];
-    propagatedBuildInputs = [ DataSection DistCheckConflicts DistZilla Moose PathTiny SubExporterForMethods namespaceautoclean ModuleCoreList ];
+    buildInputs = [ CPANMetaCheck DistZilla Filepushd ModuleBuildTiny PerlPrereqScanner TestDeep TestMinimumVersion TestWarnings self."if" ];
+    propagatedBuildInputs = [ DataSection DistZilla Moose PathTiny SubExporterForMethods namespaceautoclean ];
     meta = {
-      homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Compile/;
-      description = "Common tests to check syntax of your modules";
+      homepage = https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-Compile;
+      description = "Common tests to check syntax of your modules, only using core modules";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
@@ -5317,12 +5317,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   FileWhich = buildPerlPackage rec {
-    name = "File-Which-1.09";
+    name = "File-Which-1.21";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
-      sha256 = "b72fec6590160737cba97293c094962adf4f7d44d9e68dde7062ecec13f4b2c3";
+      url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz";
+      sha256 = "9def5f10316bfd944e56b7f8a2501be1d44c288325309462aa9345e340854bcc";
+    };
+    meta = {
+      homepage = http://perl.wdlabs.com/File-Which;
+      description = "Perl implementation of the which utility as an API";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    propagatedBuildInputs = [ TestScript ];
   };
 
   Filter = buildPerlPackage {
@@ -8085,14 +8089,15 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ version ];
   };
 
-  ModulePath = buildPerlPackage {
-    name = "Module-Path-0.13";
+  ModulePath = buildPerlPackage rec {
+    name = "Module-Path-0.19";
     src = fetchurl {
-      url = mirror://cpan/authors/id/N/NE/NEILB/Module-Path-0.13.tar.gz;
-      sha256 = "1kzsi0z142gcspyyp81za29bq0y74l57a8i2q7gz4zcchf2xm23g";
+      url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz";
+      sha256 = "b33179ce4dd73dfcde7d46808804b9ffbb11db0245fe455a7d001747562feaca";
     };
     buildInputs = [ DevelFindPerl ];
     meta = {
+      homepage = https://github.com/neilbowers/Module-Path;
       description = "Get the full path to a locally installed module";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -11598,14 +11603,16 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  SyntaxKeywordJunction = buildPerlPackage {
-    name = "Syntax-Keyword-Junction-0.003007";
+  SyntaxKeywordJunction = buildPerlPackage rec {
+    name = "Syntax-Keyword-Junction-0.003008";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FR/FREW/Syntax-Keyword-Junction-0.003007.tar.gz;
-      sha256 = "0c8jvy5lkshw5gyl037gmkh7c51k3sdvpywq0zwlw4ikvrcgsglj";
+      url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz";
+      sha256 = "8b4975f21b1992a7e6c2df5dcc92b254c61925595eddcdfaf0b1498717aa95ef";
     };
-    propagatedBuildInputs = [ SubExporterProgressive TestRequires syntax ];
+    buildInputs = [ TestRequires ];
+    propagatedBuildInputs = [ SubExporterProgressive syntax ];
     meta = {
+      homepage = https://github.com/frioux/Syntax-Keyword-Junction;
       description = "Perl6 style Junction operators in Perl5";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };

From 0b061e7f753534a627ee6eb5adc8c6f48b531031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 7 Jun 2016 14:30:00 +0200
Subject: [PATCH 424/436] gnome-terminal: enable GNOME Shell search provider
 (for 3.20)

[This is a re-re-application of the patch that was originally written
for GNOME 3.16. It was lost during the transition to GNOME 3.18 and
then to 3.20. Third time's a charm?]

Silly ./configure, it looks for dbus file from gnome-shell in the
installation tree of the package it is configuring. Fix by copying
needed file from gnome-shell before ./configure is run.

This change makes gnome-shell a build time dependency (not runtime).
---
 .../gnome-3/3.20/core/gnome-terminal/default.nix         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix
index 052a16affdc0..c523d732e03a 100644
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix
@@ -11,8 +11,15 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2
                         desktop_file_utils wrapGAppsHook ];
 
+  # Silly ./configure, it looks for dbus file from gnome-shell in the
+  # installation tree of the package it is configuring.
+  preConfigure = ''
+    mkdir -p "$out/share/dbus-1/interfaces"
+    cp "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" "$out/share/dbus-1/interfaces"
+  '';
+
   # FIXME: enable for gnome3
-  configureFlags = [ "--disable-search-provider" "--disable-migration" ];
+  configureFlags = [ "--disable-migration" ];
 
   meta = with stdenv.lib; {
     description = "The GNOME Terminal Emulator";

From 333a5bf42bca79c8b3d406c1c3159c3a9c484d6b Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 18 Jun 2016 14:29:09 +0200
Subject: [PATCH 425/436] J: fix build

---
 pkgs/development/interpreters/j/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index 4c064a42ebf8..7238197fd858 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
   bits = if stdenv.is64bit then "64" else "32";
 
   buildPhase = ''
+    set -e
+
     sed -i bin/jconfig -e '
         s@bits=32@bits=${bits}@g;
         s@readline=0@readline=1@;
@@ -19,20 +21,27 @@ stdenv.mkDerivation rec {
         '
     sed -i bin/build_libj -e 's@>& make.txt@ 2>\&1 | tee make.txt@'
 
+    sed -i f2.c -e 's/_isnan(\*wv)/_isnan(y)/'
+
     touch *.c *.h
     sh -o errexit bin/build_jconsole
+    [ -e j/bin/jconsole ]
     sh -o errexit bin/build_libj
+    [ -e j/bin/libj.so ]
     sh -o errexit bin/build_defs
+    [ -e defs/hostdefs.ijs ] && [ -e defs/netdefs.ijs ]
     sh -o errexit bin/build_tsdll
+    [ -x libtsdll.so ]
 
     sed -i j/bin/profile.ijs -e "
         s@userx=[.] *'.j'@userx=. '/.j'@;
         s@bin,'/profilex.ijs'@user,'/profilex.ijs'@ ;
-	/install=./ainstall=. install,'/share/j'
+        /install=./ainstall=. install,'/share/j'
         "
   '';
 
   installPhase = ''
+    ls -R
     mkdir -p "$out"
     cp -r j/bin "$out/bin"
     rm "$out/bin/profilex_template.ijs"

From fd2d209fff843554ce4387832380120486cf7f72 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 18 Jun 2016 14:40:09 +0200
Subject: [PATCH 426/436] J: mark as Linux-only until it has been tested on
 non-Linux

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

diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index 7238197fd858..45355d41e0d2 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "J programming language, an ASCII-based APL successor";
     maintainers = with maintainers; [ raskin ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     license = licenses.gpl3Plus;
     homepage = http://jsoftware.com/;
   };

From e9cce6db44b5d547b38c59620935f4828b2ba5b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 18 Jun 2016 13:27:18 +0200
Subject: [PATCH 427/436] Updating libav from 11.6 to 11.7.

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

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index ef09b9e4b40b..acb6eb2c7291 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -27,7 +27,7 @@ with { inherit (stdenv.lib) optional optionals; };
 let
   result = {
     libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714";
-    libav_11  = libavFun  "11.6"  "2296cbd7afe98591eb164cebe436dcb5582efc9d";
+    libav_11  = libavFun  "11.7"  "9f36d136ea353fc6e3826180fe126f52eca7fec4";
   };
 
   libavFun = version : sha1 : stdenv.mkDerivation rec {

From 3078537b6afc4256460b2ba5c38d60acb77445a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 18 Jun 2016 13:27:48 +0200
Subject: [PATCH 428/436] Update x264 to a recent snapshot (1,5 years update)

---
 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 754b76de0617..708db269e946 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 = "20141218-2245";
+  version = "20160615-2245";
   name = "x264-${version}";
 
   src = fetchurl {
     url = "http://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2";
-    sha256 = "1gp1f0382vh2hmgc23ldqyywcfljg8lsgl2849ymr14r6gxfh69m";
+    sha256 = "0w5l77gm8bsmafzimzyc5s27kcw79r6nai3bpccqy0spyxhjsdc2";
   };
 
   patchPhase = ''

From 726ed32bfd983203a5d50729ecb0cb15e9cd5048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 18 Jun 2016 13:29:34 +0200
Subject: [PATCH 429/436] x265: enable parallel build

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

diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 736c350bc068..0a287363e67c 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
     sha256 = "1j0mbcf10aj6zi1nxql45f9817jd2ndcpd7x123sjmyr7q9m8iiy";
   };
 
+  enableParallelBuilding = true;
+
   patchPhase = ''
     sed -i 's/unknown/${version}/g' source/cmake/version.cmake
   '';

From 3a61de4e69431c667e6b900364a4229cd12f7019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 18 Jun 2016 15:16:33 +0200
Subject: [PATCH 430/436] Update ffmpeg-full to 3.0.2

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

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 26bc727dfdea..8ec1dd283e20 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -236,11 +236,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-full-${version}";
-  version = "3.0";
+  version = "3.0.2";
 
   src = fetchurl {
-    url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
-    sha256 = "1h0k05cj6j0nd2i16z7hc5scpwsbg3sfx68lvm0nlwvz5xxgg7zi";
+    url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
+    sha256 = "08sjp4dxgcinmv9ly7nm24swmn2cnbbhvph44ihlplf4n33kr542";
   };
 
   patchPhase = ''patchShebangs .'';

From 92de74293c3b1a3eba50e1fad00337012492509f Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 18 Jun 2016 15:18:06 +0200
Subject: [PATCH 431/436] J: add simple check phase, remove debug parts of
 build script

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

diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index 45355d41e0d2..94641e20e1bc 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline ];
   bits = if stdenv.is64bit then "64" else "32";
 
-  buildPhase = ''
-    set -e
+  doCheck = true;
 
+  buildPhase = ''
     sed -i bin/jconfig -e '
         s@bits=32@bits=${bits}@g;
         s@readline=0@readline=1@;
@@ -40,8 +40,11 @@ stdenv.mkDerivation rec {
         "
   '';
 
+  checkPhase = ''
+    echo 'i. 5' | j/bin/jconsole | fgrep "0 1 2 3 4"
+  '';
+
   installPhase = ''
-    ls -R
     mkdir -p "$out"
     cp -r j/bin "$out/bin"
     rm "$out/bin/profilex_template.ijs"

From b741df943fbe7dbbf8d2f295f9aaa0ce3991a5d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 18 Jun 2016 16:57:08 +0200
Subject: [PATCH 432/436] system-config-printer: unbreak dbus service (again)

The service file refers to /usr/bin/... instead of a Nix store path.
Fix it.

The original fix was wrongly removed in commit 03353ce6ff738acce3d
("system-config-printer: 1.3.12 -> 1 5.7"). We can remove this fixup on
the _next_ upstream release.
---
 pkgs/tools/misc/system-config-printer/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 7ed25fb549b0..b36697ede02d 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -53,6 +53,9 @@ in stdenv.mkDerivation rec {
       ( cd $out/share/system-config-printer/troubleshoot
         mv .__init__.py-wrapped __init__.py
       )
+
+      # The below line will be unneeded when the next upstream release arrives.
+      sed -i -e "s|/usr/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service"
     '';
 
   meta = {

From 8ab188eb162087855f19ef66cfdc6e39e724bc47 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 18 Jun 2016 16:26:15 +0100
Subject: [PATCH 433/436] pptpd service: improve option descriptions per
 @bjornfor's suggestion

---
 nixos/modules/services/networking/pptpd.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix
index 0ae6ae4cf2ab..efed604d3dda 100644
--- a/nixos/modules/services/networking/pptpd.nix
+++ b/nixos/modules/services/networking/pptpd.nix
@@ -5,35 +5,35 @@ with lib;
 {
   options = {
     services.pptpd = {
-      enable = mkEnableOption "enable pptpd running on startup";
+      enable = mkEnableOption "Whether pptpd should be run on startup.";
 
       serverIp = mkOption {
         type        = types.string;
-        description = "server ip";
+        description = "The server-side IP address.";
         default     = "10.124.124.1";
       };
 
       clientIpRange = mkOption {
         type        = types.string;
-        description = "client ip range";
+        description = "The range from which client IPs are drawn.";
         default     = "10.124.142.2-11";
       };
 
       maxClients = mkOption {
         type        = types.int;
-        description = "maximum number of simultaneous connections";
+        description = "The maximum number of simultaneous connections.";
         default     = 10;
       };
 
       extraPptpdOptions = mkOption {
         type        = types.lines;
-        description = "extra lines for the pptpd configuration files";
+        description = "Adds extra lines to the pptpd configuration file.";
         default     = "";
       };
 
       extraPppdOptions = mkOption {
         type        = types.lines;
-        description = "extra lines for the pppd options files";
+        description = "Adds extra lines to the pppd options file.";
         default     = "";
         example     = ''
           ms-dns 8.8.8.8

From 1d6cb3a11908924a4e7496d2b5f48836867682aa Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Sat, 18 Jun 2016 19:32:58 +0200
Subject: [PATCH 434/436] nodejs-6_x: 6.2.0 -> 6.2.2

---
 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 9ed1db66dde9..43a39451f9b1 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -4,9 +4,9 @@
 }@args:
 
 import ./nodejs.nix (args // rec {
-  version = "6.2.0";
+  version = "6.2.2";
   src = fetchurl {
     url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-    sha256 = "14p4ah9gsgifj25g2akp7kyqhnqvq726n74h4rfj7wnidxhgwcw6";
+    sha256 = "2dfeeddba750b52a528b38a1c31e35c1fb40b19cf28fbf430c3c8c7a6517005a";
   };
 })

From 20a8349d625814d6c7d9ad39f2b83a2a02e999f5 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 18 Jun 2016 22:24:31 +0200
Subject: [PATCH 435/436] Revert "Merge pull request #16172 from
 zimbatm/influxdb-0.13.0"

This reverts commit ed4869452defbc317cca130512b6d67c380fb908, reversing
changes made to 175e20ca5cc9540a1fb6be5c1630e5df56015dd6.
---
 pkgs/development/go-modules/libs.json   |  56 +---------
 pkgs/servers/nosql/influxdb/default.nix |  17 ++--
 pkgs/servers/nosql/influxdb/deps.json   | 130 +++---------------------
 pkgs/servers/nosql/influxdb/gdm2nix.rb  |  33 ------
 4 files changed, 21 insertions(+), 215 deletions(-)
 delete mode 100755 pkgs/servers/nosql/influxdb/gdm2nix.rb

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 1c25758dfbcd..c3bb2eb7ea3d 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -1537,59 +1537,5 @@
       "rev": "772320464101e904cd51198160eb4d489be9cc49",
       "sha256": "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j"
     }
-  },
-  {
-    "goPackagePath": "github.com/influxdata/usage-client",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/influxdata/usage-client.git",
-      "rev": "475977e68d79883d9c8d67131c84e4241523f452",
-      "sha256": "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy"
-    }
-  },
-  {
-    "goPackagePath": "github.com/jwilder/encoding",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/jwilder/encoding.git",
-      "rev": "b421ab402545ef5a119f4f827784c6551d9bfc37",
-      "sha256": "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq"
-    }
-  },
-  {
-    "goPackagePath": "collectd.org",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/collectd/go-collectd.git",
-      "rev": "9fc824c70f713ea0f058a07b49a4c563ef2a3b98",
-      "sha256": "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w"
-    }
-  },
-  {
-    "goPackagePath": "github.com/dgryski/go-bits",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/dgryski/go-bits.git",
-      "rev": "86c69b3c986f9d40065df5bd8f765796549eef2e",
-      "sha256": "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b"
-    }
-  },
-  {
-    "goPackagePath": "github.com/dgryski/go-bitstream",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/dgryski/go-bitstream.git",
-      "rev": "27cd5973303fde7d914860be1ea4b927a6be0c92",
-      "sha256": "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6"
-    }
-  },
-  {
-    "goPackagePath": "github.com/paulbellamy/ratecounter",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/paulbellamy/ratecounter.git",
-      "rev": "5a11f585a31379765c190c033b6ad39956584447",
-      "sha256": "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0"
-    }
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 9f119b3f1389..1372b6a3fc36 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -1,29 +1,26 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "influxdb-${version}";
-  version = "0.13.0";
-
-  goPackagePath = "github.com/influxdata/influxdb";
+  name = "influxdb-${rev}";
+  rev = "v0.9.4";
+  goPackagePath = "github.com/influxdb/influxdb";
 
   src = fetchFromGitHub {
-    owner = "influxdata";
+    inherit rev;
+    owner = "influxdb";
     repo = "influxdb";
-    rev = "v${version}";
-    sha256 = "0f7af5jb1f65qnslhc7zccml1qvk6xx5naczqfsf4s1zc556fdi4";
+    sha256 = "0yarymppnlpf2xab57i8jx595v47s5mdwnf13719mc1fv3q84yqn";
   };
 
   excludedPackages = "test";
 
-  # Generated with the `gdm2nix.rb` script and the `Godeps` file from the
-  # influxdb repo root.
   goDeps = ./deps.json;
 
   meta = with lib; {
     description = "An open-source distributed time series database";
     license = licenses.mit;
     homepage = https://influxdb.com/;
-    maintainers = with maintainers; [ offline zimbatm ];
+    maintainers = with maintainers; [ offline ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/nosql/influxdb/deps.json b/pkgs/servers/nosql/influxdb/deps.json
index 71b3bfb032f9..f091b58e8dc4 100644
--- a/pkgs/servers/nosql/influxdb/deps.json
+++ b/pkgs/servers/nosql/influxdb/deps.json
@@ -1,125 +1,21 @@
 [
   {
-    "goPackagePath": "github.com/hashicorp/raft",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/hashicorp/raft.git",
-      "rev": "8fd9a2fdfd154f4b393aa24cff91e3c317efe839",
-      "sha256": "04k03x6r6h2xwxfvbzicfdblifdjn35agw9kwla6akw6l54ygy0f"
-    }
-  },
-  {
-    "goPackagePath": "github.com/BurntSushi/toml",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/BurntSushi/toml.git",
-      "rev": "a4eecd407cf4129fc902ece859a0114e4cf1a7f4",
-      "sha256": "1l74zvd534k2fs73gmaq4mgl48p1i9559k1gwq4vakca727z5sgf"
-    }
-  },
-  {
-    "goPackagePath": "github.com/armon/go-metrics",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/armon/go-metrics.git",
-      "rev": "345426c77237ece5dab0e1605c3e4b35c3f54757",
-      "sha256": "13bp2ykqhnhzif7wzrwsg54c2b0czhgs9csbvzbvc93n72s59jh5"
-    }
-  },
-  {
-    "goPackagePath": "github.com/davecgh/go-spew",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/davecgh/go-spew.git",
-      "rev": "fc32781af5e85e548d3f1abaf0fa3dbe8a72495c",
-      "sha256": "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232"
-    }
-  },
-  {
-    "goPackagePath": "github.com/gogo/protobuf",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/gogo/protobuf.git",
-      "rev": "74b6e9deaff6ba6da1389ec97351d337f0d08b06",
-      "sha256": "0045fz4bx72rikm2ggx9j1h3yrq518299qwaizrgy5jvxzj1707b"
-    }
-  },
-  {
-    "goPackagePath": "github.com/golang/snappy",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/golang/snappy.git",
-      "rev": "5979233c5d6225d4a8e438cdd0b411888449ddab",
-      "sha256": "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s"
-    }
-  },
-  {
-    "goPackagePath": "github.com/boltdb/bolt",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/boltdb/bolt.git",
-      "rev": "2f846c3551b76d7710f159be840d66c3d064abbe",
-      "sha256": "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5"
-    }
-  },
-  {
-    "goPackagePath": "github.com/hashicorp/go-msgpack",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/hashicorp/go-msgpack.git",
-      "rev": "fa3f63826f7c23912c15263591e65d54d080b458",
-      "sha256": "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k"
-    }
-  },
-  {
-    "goPackagePath": "golang.org/x/tools",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/golang/tools.git",
-      "rev": "8b178a93c1f5b5c8f4e36cd6bd64e0d5bf0ee180",
-      "sha256": "0rqm56c4acrvyqsp53dkzr34pkz922x4rwknaslwlbkyc4gyg2c8"
-    }
-  },
-  {
-    "goPackagePath": "github.com/kimor79/gollectd",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/kimor79/gollectd.git",
-      "rev": "61d0deeb4ffcc167b2a1baa8efd72365692811bc",
-      "sha256": "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs"
-    }
-  },
-  {
-    "goPackagePath": "github.com/peterh/liner",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/peterh/liner.git",
-      "rev": "82a939e738b0ee23e84ec7a12d8e216f4d95c53f",
-      "sha256": "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04"
-    }
-  },
-  {
-    "goPackagePath": "golang.org/x/crypto",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/golang/crypto.git",
-      "rev": "1f22c0103821b9390939b6776727195525381532",
-      "sha256": "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"
-    }
-  },
-  {
-    "include": "../../../development/go-modules/libs.json",
+    "include": "../../libs.json",
     "packages": [
-      "github.com/influxdata/usage-client",
-      "github.com/jwilder/encoding",
-      "collectd.org",
-      "github.com/dgryski/go-bits",
-      "github.com/dgryski/go-bitstream",
-      "gopkg.in/fatih/pool.v2",
+      "github.com/peterh/liner",
+      "github.com/BurntSushi/toml",
+      "github.com/kimor79/gollectd",
       "github.com/bmizerany/pat",
+      "gopkg.in/fatih/pool.v2",
       "github.com/rakyll/statik",
+      "github.com/armon/go-metrics",
+      "github.com/boltdb/bolt",
+      "github.com/golang/snappy",
+      "github.com/hashicorp/go-msgpack",
       "github.com/hashicorp/raft-boltdb",
-      "github.com/paulbellamy/ratecounter"
+      "golang.org/x/crypto",
+      "github.com/gogo/protobuf",
+      "github.com/hashicorp/raft"
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/servers/nosql/influxdb/gdm2nix.rb b/pkgs/servers/nosql/influxdb/gdm2nix.rb
deleted file mode 100755
index 4c49c8a538ff..000000000000
--- a/pkgs/servers/nosql/influxdb/gdm2nix.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-#
-#
-require "json"
-
-redirects = {
-  "collectd.org" => "github.com/collectd/go-collectd",
-  "golang.org/x/crypto" => "github.com/golang/crypto",
-  "golang.org/x/tools" => "github.com/golang/tools",
-  "gopkg.in/fatih/pool.v2" => "github.com/fatih/pool",
-}
-
-deps = File.read("Godeps").lines.map do |line|
-  (name, rev) = line.split(" ")
-
-  host = redirects.fetch(name, name)
-
-  url = "https://#{host}.git"
-
-  xxx = JSON.load(`nix-prefetch-git #{url} #{rev}`)
-  
-  {
-    goPackagePath: name,
-    fetch: {
-      type: "git",
-      url: url,
-      rev: rev,
-      sha256: xxx['sha256'],
-    }
-  }
-end
-
-File.write("deps.json", JSON.pretty_generate(deps))

From 410aad942fc82bbeb9c30a4fdf826ed33998a593 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Sat, 18 Jun 2016 21:14:33 -0300
Subject: [PATCH 436/436] haskell docs: now that hydra pushes directly to S3,
 it cant function as a binary cache

---
 doc/languages-frameworks/haskell.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index 2ddec0d9aba4..3da13dd9ed64 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -653,7 +653,7 @@ then you have to download and re-install `foo` and all its dependents from
 scratch:
 
     # nix-store -q --referrers /nix/store/*-haskell-text-1.2.0.4 \
-      | xargs -L 1 nix-store --repair-path --option binary-caches http://hydra.nixos.org
+      | xargs -L 1 nix-store --repair-path
 
 If you're using additional Hydra servers other than `hydra.nixos.org`, then it
 might be necessary to purge the local caches that store data from those